diff --git a/src/assets/interactables/duck/DuckyMesh.glb b/src/assets/interactables/duck/DuckyMesh.glb index 692c430abda9cab20b506de50808d89bbf7b5b0b..5e8b63043163dd8fed63463694af45a10cb8eab2 100644 Binary files a/src/assets/interactables/duck/DuckyMesh.glb and b/src/assets/interactables/duck/DuckyMesh.glb differ diff --git a/src/assets/interactables/duck/gtlf/DuckyMesh.fbm/Ducky.jpg b/src/assets/interactables/duck/gltf/DuckyMesh.fbm/Ducky.jpg similarity index 100% rename from src/assets/interactables/duck/gtlf/DuckyMesh.fbm/Ducky.jpg rename to src/assets/interactables/duck/gltf/DuckyMesh.fbm/Ducky.jpg diff --git a/src/assets/interactables/duck/gtlf/DuckyMesh.gltf b/src/assets/interactables/duck/gltf/DuckyMesh.gltf similarity index 69% rename from src/assets/interactables/duck/gtlf/DuckyMesh.gltf rename to src/assets/interactables/duck/gltf/DuckyMesh.gltf index 585e6075164c20f09f2876fc89aea5c49799088d..59eca4dbe977e37b2b0075226e5691a544eedd19 100644 --- a/src/assets/interactables/duck/gtlf/DuckyMesh.gltf +++ b/src/assets/interactables/duck/gltf/DuckyMesh.gltf @@ -44,26 +44,60 @@ ], "extras": { "components": { - "sphere-shape": { - "radius": 0.045, - "offset": { - "x": 0, - "y": 0.128, - "z": 0.034 - } - }, - "box-shape": { - "offset": { - "x": 0, - "y": 0.048, - "z": 0.014 + "shape": [ + { + "shape": "box", + "halfExtents": { + "x": 0.12, + "y": 0.08, + "z": 0.16 + }, + "offset": { + "x": 0, + "y": 0.052671334114334445, + "z": 0.01001389278835843 + }, + "orientation": { + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "shape": "sphere", + "radius": 0.05, + "offset": { + "x": 0, + "y": 0.1287570519589527, + "z": 0.033095376412929145 + }, + "orientation": { + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } }, - "halfExtents": { - "x": 0.045, - "y": 0.0345, - "z": 0.07 + { + "shape": "cylinder", + "radiusTop": 0.02, + "radiusBottom": 0.02, + "height": 0.030000000000000013, + "numSegments": 8, + "offset": { + "x": 0, + "y": 0.12657048237702667, + "z": 0.09010837508332667 + }, + "orientation": { + "x": 0.7071067811865476, + "y": 0, + "z": 0, + "w": 0.7071067811865475 + } } - } + ] } } } diff --git a/src/assets/interactables/duck/gtlf/DuckyMesh.gltf.meta b/src/assets/interactables/duck/gltf/DuckyMesh.gltf.meta similarity index 100% rename from src/assets/interactables/duck/gtlf/DuckyMesh.gltf.meta rename to src/assets/interactables/duck/gltf/DuckyMesh.gltf.meta diff --git a/src/assets/interactables/duck/gltf/DuckyMesh.json b/src/assets/interactables/duck/gltf/DuckyMesh.json new file mode 100644 index 0000000000000000000000000000000000000000..152c5231ed8507e8af8a211f0ed99d7ea7006855 --- /dev/null +++ b/src/assets/interactables/duck/gltf/DuckyMesh.json @@ -0,0 +1,60 @@ +{ + "scenes": { + "Root Scene": { + "shape": [ + { + "shape": "box", + "halfExtents": { + "x": 0.12, + "y": 0.08, + "z": 0.16 + }, + "offset": { + "x": 0, + "y": 0.052671334114334445, + "z": 0.01001389278835843 + }, + "orientation": { + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "shape": "sphere", + "radius": 0.05, + "offset": { + "x": 0, + "y": 0.1287570519589527, + "z": 0.033095376412929145 + }, + "orientation": { + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "shape": "cylinder", + "radiusTop": 0.02, + "radiusBottom": 0.02, + "height": 0.030000000000000013, + "numSegments": 8, + "offset": { + "x": 0, + "y": 0.12657048237702667, + "z": 0.09010837508332667 + }, + "orientation": { + "x": 0.7071067811865476, + "y": 0, + "z": 0, + "w": 0.7071067811865475 + } + } + ] + } + } +} diff --git a/src/assets/interactables/duck/gtlf/buffer.bin b/src/assets/interactables/duck/gltf/buffer.bin similarity index 100% rename from src/assets/interactables/duck/gtlf/buffer.bin rename to src/assets/interactables/duck/gltf/buffer.bin diff --git a/src/assets/interactables/duck/gtlf/DuckyMesh.json b/src/assets/interactables/duck/gtlf/DuckyMesh.json deleted file mode 100644 index 1798f4ac6e1258d830879bd6143fac1a65d6594a..0000000000000000000000000000000000000000 --- a/src/assets/interactables/duck/gtlf/DuckyMesh.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "scenes": { - "Root Scene": { - "sphere-shape": { - "radius": 0.045, - "offset": { - "x": 0, - "y": 0.128, - "z": 0.034 - } - }, - "box-shape": { - "offset": { - "x": 0, - "y": 0.048, - "z": 0.014 - }, - "halfExtents": { - "x": 0.045, - "y": 0.0345, - "z": 0.07 - } - } - } - } -}