diff --git a/Packages/RealityKitContent/Package.realitycomposerpro/ProjectData/main.json b/Packages/RealityKitContent/Package.realitycomposerpro/ProjectData/main.json index 0c03cc0..3cc55b5 100644 --- a/Packages/RealityKitContent/Package.realitycomposerpro/ProjectData/main.json +++ b/Packages/RealityKitContent/Package.realitycomposerpro/ProjectData/main.json @@ -9,11 +9,20 @@ "\/RealityKitContent\/Sources\/RealityKitContent\/RealityKitContent.rkassets\/Untitled Scene.usda" : "D560BB77-AAF3-4BDE-B7C4-989332A4688B", "RealityKitContent\/Sources\/RealityKitContent\/RealityKitContent.rkassets\/_GridMaterial.usda" : "CC9FD5C7-161F-48CA-B2B9-61DD597CBD66", "RealityKitContent\/Sources\/RealityKitContent\/RealityKitContent.rkassets\/_PlainMaterial.usda" : "1510F6C7-214D-4800-9C6C-F3964D5FC3E3", + "RealityKitContent\/Sources\/RealityKitContent\/RealityKitContent.rkassets\/Animations\/MotorcycleEngine04.usdz" : "1103D271-1F3C-4BDC-B68A-9E60CC9730AE", + "RealityKitContent\/Sources\/RealityKitContent\/RealityKitContent.rkassets\/Animations\/Untitled%20Scene.usda" : "2B5A0F7C-4675-4957-A84A-A13CEEE83B94", "RealityKitContent\/Sources\/RealityKitContent\/RealityKitContent.rkassets\/GridMaterial.usda" : "66168B71-AB05-424E-8B6C-D33D6E61B08F", "RealityKitContent\/Sources\/RealityKitContent\/RealityKitContent.rkassets\/Immersive.usda" : "AF09ED6F-1707-48FD-8720-65B998362C09", + "RealityKitContent\/Sources\/RealityKitContent\/RealityKitContent.rkassets\/Materials\/_PlainMaterial.usda" : "837202E5-6611-4B9A-ACA0-A587F88F2D89", + "RealityKitContent\/Sources\/RealityKitContent\/RealityKitContent.rkassets\/Models\/Moon.usdz" : "5502CCCC-992E-47DD-BB04-08D397CBF755", + "RealityKitContent\/Sources\/RealityKitContent\/RealityKitContent.rkassets\/Models\/Sun.usdz" : "E99B9288-90C9-479E-A583-84ABB93724D9", + "RealityKitContent\/Sources\/RealityKitContent\/RealityKitContent.rkassets\/Models\/TargetPlane.usda" : "7F97E7A7-D70E-452A-905E-523A80E9E6F5", + "RealityKitContent\/Sources\/RealityKitContent\/RealityKitContent.rkassets\/MotorcycleEngine04.usdz" : "BAE3E1A8-75FD-4639-ABF4-B3B989817422", "RealityKitContent\/Sources\/RealityKitContent\/RealityKitContent.rkassets\/Scene.usda" : "D66134B1-3681-4A8E-AFE5-29F257229F3B", "RealityKitContent\/Sources\/RealityKitContent\/RealityKitContent.rkassets\/Scenes\/Gesture.usda" : "69AC107E-ADB6-45C0-A2DC-1BFF552C78AF", + "RealityKitContent\/Sources\/RealityKitContent\/RealityKitContent.rkassets\/Scenes\/Immersive.usda" : "EC80B12E-14A8-439E-9945-710A4ADDD6BB", "RealityKitContent\/Sources\/RealityKitContent\/RealityKitContent.rkassets\/Scenes\/PanoramaVideo.usda" : "C30A4F52-F05B-46C1-A943-EA1124FC3436", - "RealityKitContent\/Sources\/RealityKitContent\/RealityKitContent.rkassets\/Scenes\/TargetPlane.usda" : "CB645D82-C41A-42A5-968D-F2A28261AAA9" + "RealityKitContent\/Sources\/RealityKitContent\/RealityKitContent.rkassets\/Scenes\/TargetPlane.usda" : "CB645D82-C41A-42A5-968D-F2A28261AAA9", + "RealityKitContent\/Sources\/RealityKitContent\/RealityKitContent.rkassets\/Sun.usdz" : "6C267B15-C1EE-4274-837D-A8EC56BCE91E" } } \ No newline at end of file diff --git a/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Immersive.usda b/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Immersive.usda index cf1c78e..afcee98 100644 --- a/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Immersive.usda +++ b/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Immersive.usda @@ -1,50 +1,2 @@ #usda 1.0 -( - defaultPrim = "Root" - metersPerUnit = 1 - upAxis = "Y" -) - -def Xform "Root" -{ - reorder nameChildren = ["Sphere_Left", "Sphere_Right", "_PlainMaterial"] - def Sphere "Sphere_Right" ( - active = true - prepend apiSchemas = ["MaterialBindingAPI"] - ) - { - rel material:binding = ( - bindMaterialAs = "weakerThanDescendants" - ) - double radius = 0.1 - quatf xformOp:orient = (1, 0, 0, 0) - float3 xformOp:scale = (1, 1, 1) - float3 xformOp:translate = (0.5, 1.5, -1.5) - uniform token[] xformOpOrder = ["xformOp:translate", "xformOp:orient", "xformOp:scale"] - } - - def Sphere "Sphere_Left" ( - active = true - prepend apiSchemas = ["MaterialBindingAPI"] - ) - { - rel material:binding = ( - bindMaterialAs = "weakerThanDescendants" - ) - double radius = 0.1 - quatf xformOp:orient = (1, 0, 0, 0) - float3 xformOp:scale = (1, 1, 1) - float3 xformOp:translate = (-0.5, 1.5, -1.5) - uniform token[] xformOpOrder = ["xformOp:translate", "xformOp:orient", "xformOp:scale"] - } - - def "_PlainMaterial" ( - active = true - prepend references = @_PlainMaterial.usda@ - ) - { - float3 xformOp:scale = (1, 1, 1) - uniform token[] xformOpOrder = ["xformOp:translate", "xformOp:orient", "xformOp:scale"] - } -} diff --git a/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/_PlainMaterial.usda b/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Materials/_PlainMaterial.usda similarity index 100% rename from Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/_PlainMaterial.usda rename to Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Materials/_PlainMaterial.usda diff --git a/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Moon.usdz b/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Models/Moon.usdz similarity index 100% rename from Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Moon.usdz rename to Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Models/Moon.usdz diff --git a/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Models/Sun.usdz b/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Models/Sun.usdz new file mode 100644 index 0000000..302bb93 Binary files /dev/null and b/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Models/Sun.usdz differ diff --git a/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Scene.usda b/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Scene.usda deleted file mode 100644 index b0be32c..0000000 --- a/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Scene.usda +++ /dev/null @@ -1,59 +0,0 @@ -#usda 1.0 -( - defaultPrim = "Root" - metersPerUnit = 1 - upAxis = "Y" -) - -def Xform "Root" -{ - reorder nameChildren = ["Sphere", "_GridMaterial", "_PlainMaterial"] - rel material:binding = None ( - bindMaterialAs = "weakerThanDescendants" - ) - - def Sphere "Sphere" ( - active = true - prepend apiSchemas = ["MaterialBindingAPI"] - ) - { - rel material:binding = ( - bindMaterialAs = "weakerThanDescendants" - ) - double radius = 0.05 - quatf xformOp:orient = (1, 0, 0, 0) - float3 xformOp:scale = (1, 1, 1) - float3 xformOp:translate = (0, 0, 0.0004) - uniform token[] xformOpOrder = ["xformOp:translate", "xformOp:orient", "xformOp:scale"] - - def RealityKitComponent "Collider" - { - uint group = 1 - uniform token info:id = "RealityKit.Collider" - uint mask = 4294967295 - token type = "Default" - - def RealityKitStruct "Shape" - { - float3 extent = (0.2, 0.2, 0.2) - float radius = 0.05 - token shapeType = "Sphere" - } - } - - def RealityKitComponent "InputTarget" - { - uniform token info:id = "RealityKit.InputTarget" - } - } - - def "_PlainMaterial" ( - active = true - prepend references = @_PlainMaterial.usda@ - ) - { - float3 xformOp:scale = (1, 1, 1) - uniform token[] xformOpOrder = ["xformOp:translate", "xformOp:orient", "xformOp:scale"] - } -} - diff --git a/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Scenes/Gesture.usda b/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Scenes/Gesture.usda index 89eafaf..c4b33a9 100644 --- a/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Scenes/Gesture.usda +++ b/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Scenes/Gesture.usda @@ -9,7 +9,7 @@ def Xform "Root" { def "Moon" ( active = true - prepend references = @../Moon.usdz@ + references = @../Models/Moon.usdz@ ) { float3 xformOp:scale = (1, 1, 1) @@ -34,5 +34,14 @@ def Xform "Root" } } } + + def "Sun" ( + active = false + prepend references = @../Models/Sun.usdz@ + ) + { + float3 xformOp:scale = (1, 1, 1) + uniform token[] xformOpOrder = ["xformOp:translate", "xformOp:orient", "xformOp:scale"] + } } diff --git a/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Scenes/PanoramaVideo.usda b/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Scenes/PanoramaVideo.usda deleted file mode 100644 index 14a474b..0000000 --- a/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/Scenes/PanoramaVideo.usda +++ /dev/null @@ -1,36 +0,0 @@ -#usda 1.0 -( - defaultPrim = "Root" - metersPerUnit = 1 - upAxis = "Y" -) - -def Xform "Root" -{ - def Sphere "Sphere" ( - active = true - prepend apiSchemas = ["MaterialBindingAPI"] - ) - { - rel material:binding = - double radius = 0.1 - quatf xformOp:orient = (1, 0, 0, 0) - float3 xformOp:scale = (1, 1, 1) - float3 xformOp:translate = (0, 0, 0) - uniform token[] xformOpOrder = ["xformOp:translate", "xformOp:orient", "xformOp:scale"] - - def Material "DefaultMaterial" - { - prepend token outputs:surface.connect = - - def Shader "DefaultSurfaceShader" - { - uniform token info:id = "UsdPreviewSurface" - color3f inputs:diffuseColor = (1, 1, 1) - float inputs:roughness = 0.75 - token outputs:surface - } - } - } -} - diff --git a/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/TargetPlane.usda b/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/TargetPlane.usda deleted file mode 100644 index 5c35d3f..0000000 --- a/Packages/RealityKitContent/Sources/RealityKitContent/RealityKitContent.rkassets/TargetPlane.usda +++ /dev/null @@ -1,48 +0,0 @@ -#usda 1.0 -( - defaultPrim = "Root" - metersPerUnit = 1 - upAxis = "Y" -) - -def Xform "Root" -{ - def "imac" ( - active = true - prepend references = @Models/imac.usdz@ - ) - { - float3 xformOp:scale = (0.01, 0.01, 0.01) - float3 xformOp:translate = (0, 0, 0) - uniform token[] xformOpOrder = ["xformOp:translate", "xformOp:orient", "xformOp:scale"] - } - - def Capsule "Capsule" ( - active = true - prepend apiSchemas = ["MaterialBindingAPI"] - ) - { - uniform token axis = "Y" - double height = 0.2 - rel material:binding = - double radius = 0.1 - quatf xformOp:orient = (1, 0, 0, 0) - float3 xformOp:scale = (1, 1, 1) - float3 xformOp:translate = (-0.00006597594, 0, 0.43053058) - uniform token[] xformOpOrder = ["xformOp:translate", "xformOp:orient", "xformOp:scale"] - - def Material "DefaultMaterial" - { - prepend token outputs:surface.connect = - - def Shader "DefaultSurfaceShader" - { - uniform token info:id = "UsdPreviewSurface" - color3f inputs:diffuseColor = (1, 1, 1) - float inputs:roughness = 0.75 - token outputs:surface - } - } - } -} -