From 0a35dbbdb2d44bf01ed6565a496a1df7b743736f Mon Sep 17 00:00:00 2001
From: Kevin Lee <kevin@infinite-lee.com>
Date: Tue, 10 Apr 2018 14:03:13 -0700
Subject: [PATCH] update duck
---
src/assets/interactables/duck/DuckyMesh.glb | Bin 33808 -> 34200 bytes
.../{gtlf => gltf}/DuckyMesh.fbm/Ducky.jpg | Bin
.../duck/{gtlf => gltf}/DuckyMesh.gltf | 70 +++++++++++++-----
.../duck/{gtlf => gltf}/DuckyMesh.gltf.meta | 0
.../interactables/duck/gltf/DuckyMesh.json | 60 +++++++++++++++
.../duck/{gtlf => gltf}/buffer.bin | Bin
.../interactables/duck/gtlf/DuckyMesh.json | 26 -------
7 files changed, 112 insertions(+), 44 deletions(-)
rename src/assets/interactables/duck/{gtlf => gltf}/DuckyMesh.fbm/Ducky.jpg (100%)
rename src/assets/interactables/duck/{gtlf => gltf}/DuckyMesh.gltf (69%)
rename src/assets/interactables/duck/{gtlf => gltf}/DuckyMesh.gltf.meta (100%)
create mode 100644 src/assets/interactables/duck/gltf/DuckyMesh.json
rename src/assets/interactables/duck/{gtlf => gltf}/buffer.bin (100%)
delete mode 100644 src/assets/interactables/duck/gtlf/DuckyMesh.json
diff --git a/src/assets/interactables/duck/DuckyMesh.glb b/src/assets/interactables/duck/DuckyMesh.glb
index 692c430abda9cab20b506de50808d89bbf7b5b0b..5e8b63043163dd8fed63463694af45a10cb8eab2 100644
GIT binary patch
delta 595
zcmbV}%SyvQ6o%7)h@0Xg$gIaQXYP}wpf6x|;v(8<6G)Siq}W<RR)XNhWznaQK9z6b
zv@vakx^WhV!{J=M|DU%PfBEWnM@j$6_dIX;?0KgrpWUxc9fcE%f|~^@nhf1#GlWqT
zCd12FY16Vm!2-=tKzcwiny(Y0F?!roWQ9>S92T~0yV@2(r2@t{0C$md@iRhz5MbI+
zr8N_}=4`zpkKLuPjI;Fjo@NN62NXb6;T>f$iEM5iXdVvYsbh3h?!-YBpjrt<1Q?->
zpsFQdjF?(5B{@(-4RG-<l>2!SrvsaBVfxu*!{h8~=q|Fd%*JgkvhgT#emP=BYO?=;
zVU$kC*LE~+oOee5AxSz#TvMhLp;B%&8RxHNO1Qw*^}~vKiYOpbX*dTh1y{29wmrMa
WuBT}cRdu_1_x+>J+3MqX`t%L+G@#7@
delta 177
zcmbQy%`~Bdi7!1T#Epr8fkB{!fuVzaBi~C#>4J>ZqEy}DjKqReC97(sqQsQU(qbhm
z13d$i$p@LFb9I!ez&vA<+FBi@r2Gnm+WfS%;?xq5t_q+M9i>W$HVc>*LldBmjKrKY
m*NT$Vyb_?P5S2iqO<}5yK}?7Z=C!q(6<C;9H>+@#)BphES26zp
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 585e60751..59eca4dbe 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 000000000..152c5231e
--- /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 1798f4ac6..000000000
--- 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
- }
- }
- }
- }
-}
--
GitLab