Skip to content

Commit 0b549dc

Browse files
RailboyRailboy
committed
Updated BaseGrabber / BaseGrabbable architecture
1 parent 5c91096 commit 0b549dc

20 files changed

+1302
-855
lines changed

‎Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scenes/GrabMechanics.unity‎

Lines changed: 274 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
41+
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
4242
--- !u!157 &3
4343
LightmapSettings:
4444
m_ObjectHideFlags: 0
@@ -166,6 +166,29 @@ Prefab:
166166
m_RemovedComponents: []
167167
m_ParentPrefab: {fileID: 100100000, guid: 93203be7a7d93e54bbf0a9f5b8fda3fd, type: 2}
168168
m_IsPrefabParent: 0
169+
--- !u!1 &19218550 stripped
170+
GameObject:
171+
m_PrefabParentObject: {fileID: 1512360943673714, guid: 93203be7a7d93e54bbf0a9f5b8fda3fd,
172+
type: 2}
173+
m_PrefabInternal: {fileID: 19218549}
174+
--- !u!114 &19218551
175+
MonoBehaviour:
176+
m_ObjectHideFlags: 0
177+
m_PrefabParentObject: {fileID: 0}
178+
m_PrefabInternal: {fileID: 0}
179+
m_GameObject: {fileID: 19218550}
180+
m_Enabled: 1
181+
m_EditorHideFlags: 0
182+
m_Script: {fileID: 11500000, guid: 33e18b96baa53ff4b8aabb378bd52d61, type: 3}
183+
m_Name:
184+
m_EditorClassIdentifier:
185+
colorOnContactSingle: {r: 0, g: 0, b: 1, a: 1}
186+
colorOnContactMulti: {r: 0, g: 1, b: 1, a: 1}
187+
colorOnGrabSingle: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
188+
colorOnGrabMulti: {r: 1, g: 0, b: 0, a: 1}
189+
colorOnUse: {r: 1, g: 0, b: 1, a: 1}
190+
targetRenderer: {fileID: 0}
191+
grabbable: {fileID: 0}
169192
--- !u!4 &38770094 stripped
170193
Transform:
171194
m_PrefabParentObject: {fileID: 4119929437350726, guid: 8497e1771119cf843a137c11f50cbdf4,
@@ -222,6 +245,29 @@ Prefab:
222245
m_RemovedComponents: []
223246
m_ParentPrefab: {fileID: 100100000, guid: 8497e1771119cf843a137c11f50cbdf4, type: 2}
224247
m_IsPrefabParent: 0
248+
--- !u!1 &84458283 stripped
249+
GameObject:
250+
m_PrefabParentObject: {fileID: 1884745418454534, guid: 8497e1771119cf843a137c11f50cbdf4,
251+
type: 2}
252+
m_PrefabInternal: {fileID: 84458282}
253+
--- !u!114 &84458284
254+
MonoBehaviour:
255+
m_ObjectHideFlags: 0
256+
m_PrefabParentObject: {fileID: 0}
257+
m_PrefabInternal: {fileID: 0}
258+
m_GameObject: {fileID: 84458283}
259+
m_Enabled: 1
260+
m_EditorHideFlags: 0
261+
m_Script: {fileID: 11500000, guid: 33e18b96baa53ff4b8aabb378bd52d61, type: 3}
262+
m_Name:
263+
m_EditorClassIdentifier:
264+
colorOnContactSingle: {r: 0, g: 0, b: 1, a: 1}
265+
colorOnContactMulti: {r: 0, g: 1, b: 1, a: 1}
266+
colorOnGrabSingle: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
267+
colorOnGrabMulti: {r: 1, g: 0, b: 0, a: 1}
268+
colorOnUse: {r: 1, g: 0, b: 1, a: 1}
269+
targetRenderer: {fileID: 0}
270+
grabbable: {fileID: 0}
225271
--- !u!1 &105760549
226272
GameObject:
227273
m_ObjectHideFlags: 0
@@ -404,6 +450,7 @@ GameObject:
404450
- component: {fileID: 191035803}
405451
- component: {fileID: 191035802}
406452
- component: {fileID: 191035801}
453+
- component: {fileID: 191035807}
407454
m_Layer: 0
408455
m_Name: FixedJointSample
409456
m_TagString: Untagged
@@ -423,7 +470,7 @@ MonoBehaviour:
423470
m_Script: {fileID: 11500000, guid: fd6834f9d99b79644b294f1e3a31d910, type: 3}
424471
m_Name:
425472
m_EditorClassIdentifier:
426-
TouchColor: {r: 0.986207, g: 1, b: 0, a: 0}
473+
grabSpot: {fileID: 0}
427474
breakForce: 100
428475
breakTorque: 100
429476
tolerance: 0.001
@@ -517,6 +564,24 @@ Transform:
517564
m_Father: {fileID: 810663116}
518565
m_RootOrder: 5
519566
m_LocalEulerAnglesHint: {x: 0.45900002, y: -143.24301, z: 0.88900006}
567+
--- !u!114 &191035807
568+
MonoBehaviour:
569+
m_ObjectHideFlags: 0
570+
m_PrefabParentObject: {fileID: 0}
571+
m_PrefabInternal: {fileID: 0}
572+
m_GameObject: {fileID: 191035800}
573+
m_Enabled: 1
574+
m_EditorHideFlags: 0
575+
m_Script: {fileID: 11500000, guid: 33e18b96baa53ff4b8aabb378bd52d61, type: 3}
576+
m_Name:
577+
m_EditorClassIdentifier:
578+
colorOnContactSingle: {r: 0, g: 0, b: 1, a: 1}
579+
colorOnContactMulti: {r: 0, g: 1, b: 1, a: 1}
580+
colorOnGrabSingle: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
581+
colorOnGrabMulti: {r: 1, g: 0, b: 0, a: 1}
582+
colorOnUse: {r: 1, g: 0, b: 1, a: 1}
583+
targetRenderer: {fileID: 0}
584+
grabbable: {fileID: 0}
520585
--- !u!1001 &209386956
521586
Prefab:
522587
m_ObjectHideFlags: 0
@@ -718,6 +783,29 @@ Prefab:
718783
m_RemovedComponents: []
719784
m_ParentPrefab: {fileID: 100100000, guid: 133fc5a3f78368b418380475c982b2af, type: 2}
720785
m_IsPrefabParent: 0
786+
--- !u!1 &403533898 stripped
787+
GameObject:
788+
m_PrefabParentObject: {fileID: 1160495150711044, guid: 133fc5a3f78368b418380475c982b2af,
789+
type: 2}
790+
m_PrefabInternal: {fileID: 403533897}
791+
--- !u!114 &403533899
792+
MonoBehaviour:
793+
m_ObjectHideFlags: 0
794+
m_PrefabParentObject: {fileID: 0}
795+
m_PrefabInternal: {fileID: 0}
796+
m_GameObject: {fileID: 403533898}
797+
m_Enabled: 1
798+
m_EditorHideFlags: 0
799+
m_Script: {fileID: 11500000, guid: 33e18b96baa53ff4b8aabb378bd52d61, type: 3}
800+
m_Name:
801+
m_EditorClassIdentifier:
802+
colorOnContactSingle: {r: 0, g: 0, b: 1, a: 1}
803+
colorOnContactMulti: {r: 0, g: 1, b: 1, a: 1}
804+
colorOnGrabSingle: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
805+
colorOnGrabMulti: {r: 1, g: 0, b: 0, a: 1}
806+
colorOnUse: {r: 1, g: 0, b: 1, a: 1}
807+
targetRenderer: {fileID: 0}
808+
grabbable: {fileID: 0}
721809
--- !u!1 &459227680
722810
GameObject:
723811
m_ObjectHideFlags: 0
@@ -846,6 +934,29 @@ Prefab:
846934
m_RemovedComponents: []
847935
m_ParentPrefab: {fileID: 100100000, guid: 5ed4339889c32f24798ec1f74ea09462, type: 2}
848936
m_IsPrefabParent: 0
937+
--- !u!1 &687194871 stripped
938+
GameObject:
939+
m_PrefabParentObject: {fileID: 1443997611059632, guid: 5ed4339889c32f24798ec1f74ea09462,
940+
type: 2}
941+
m_PrefabInternal: {fileID: 687194870}
942+
--- !u!114 &687194872
943+
MonoBehaviour:
944+
m_ObjectHideFlags: 0
945+
m_PrefabParentObject: {fileID: 0}
946+
m_PrefabInternal: {fileID: 0}
947+
m_GameObject: {fileID: 687194871}
948+
m_Enabled: 1
949+
m_EditorHideFlags: 0
950+
m_Script: {fileID: 11500000, guid: 33e18b96baa53ff4b8aabb378bd52d61, type: 3}
951+
m_Name:
952+
m_EditorClassIdentifier:
953+
colorOnContactSingle: {r: 0, g: 0, b: 1, a: 1}
954+
colorOnContactMulti: {r: 0, g: 1, b: 1, a: 1}
955+
colorOnGrabSingle: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
956+
colorOnGrabMulti: {r: 1, g: 0, b: 0, a: 1}
957+
colorOnUse: {r: 1, g: 0, b: 1, a: 1}
958+
targetRenderer: {fileID: 0}
959+
grabbable: {fileID: 0}
849960
--- !u!4 &727213712 stripped
850961
Transform:
851962
m_PrefabParentObject: {fileID: 4794880575525426, guid: 569e6e7d4dff2314dad9c83b1bf21a9f,
@@ -1068,6 +1179,29 @@ Prefab:
10681179
m_RemovedComponents: []
10691180
m_ParentPrefab: {fileID: 100100000, guid: 8e03dafa1c3802246aeb94b8c9bd157e, type: 2}
10701181
m_IsPrefabParent: 0
1182+
--- !u!1 &1054589804 stripped
1183+
GameObject:
1184+
m_PrefabParentObject: {fileID: 1711969711886590, guid: 8e03dafa1c3802246aeb94b8c9bd157e,
1185+
type: 2}
1186+
m_PrefabInternal: {fileID: 1054589803}
1187+
--- !u!114 &1054589805
1188+
MonoBehaviour:
1189+
m_ObjectHideFlags: 0
1190+
m_PrefabParentObject: {fileID: 0}
1191+
m_PrefabInternal: {fileID: 0}
1192+
m_GameObject: {fileID: 1054589804}
1193+
m_Enabled: 1
1194+
m_EditorHideFlags: 0
1195+
m_Script: {fileID: 11500000, guid: 33e18b96baa53ff4b8aabb378bd52d61, type: 3}
1196+
m_Name:
1197+
m_EditorClassIdentifier:
1198+
colorOnContactSingle: {r: 0, g: 0, b: 1, a: 1}
1199+
colorOnContactMulti: {r: 0, g: 1, b: 1, a: 1}
1200+
colorOnGrabSingle: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
1201+
colorOnGrabMulti: {r: 1, g: 0, b: 0, a: 1}
1202+
colorOnUse: {r: 1, g: 0, b: 1, a: 1}
1203+
targetRenderer: {fileID: 0}
1204+
grabbable: {fileID: 0}
10711205
--- !u!1001 &1144309396
10721206
Prefab:
10731207
m_ObjectHideFlags: 0
@@ -1118,6 +1252,29 @@ Prefab:
11181252
m_RemovedComponents: []
11191253
m_ParentPrefab: {fileID: 100100000, guid: 648afe975c1928a449f6fe22c847e9d4, type: 2}
11201254
m_IsPrefabParent: 0
1255+
--- !u!1 &1144309397 stripped
1256+
GameObject:
1257+
m_PrefabParentObject: {fileID: 1060161738127550, guid: 648afe975c1928a449f6fe22c847e9d4,
1258+
type: 2}
1259+
m_PrefabInternal: {fileID: 1144309396}
1260+
--- !u!114 &1144309398
1261+
MonoBehaviour:
1262+
m_ObjectHideFlags: 0
1263+
m_PrefabParentObject: {fileID: 0}
1264+
m_PrefabInternal: {fileID: 0}
1265+
m_GameObject: {fileID: 1144309397}
1266+
m_Enabled: 1
1267+
m_EditorHideFlags: 0
1268+
m_Script: {fileID: 11500000, guid: 33e18b96baa53ff4b8aabb378bd52d61, type: 3}
1269+
m_Name:
1270+
m_EditorClassIdentifier:
1271+
colorOnContactSingle: {r: 0, g: 0, b: 1, a: 1}
1272+
colorOnContactMulti: {r: 0, g: 1, b: 1, a: 1}
1273+
colorOnGrabSingle: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
1274+
colorOnGrabMulti: {r: 1, g: 0, b: 0, a: 1}
1275+
colorOnUse: {r: 1, g: 0, b: 1, a: 1}
1276+
targetRenderer: {fileID: 0}
1277+
grabbable: {fileID: 0}
11211278
--- !u!4 &1191366232 stripped
11221279
Transform:
11231280
m_PrefabParentObject: {fileID: 4591266121987726, guid: 20e083692ef96a4408cb22926070e054,
@@ -1165,6 +1322,29 @@ Prefab:
11651322
m_RemovedComponents: []
11661323
m_ParentPrefab: {fileID: 100100000, guid: 1835dba728c6131409573120a3822449, type: 2}
11671324
m_IsPrefabParent: 0
1325+
--- !u!1 &1235647069 stripped
1326+
GameObject:
1327+
m_PrefabParentObject: {fileID: 1172440619654688, guid: 1835dba728c6131409573120a3822449,
1328+
type: 2}
1329+
m_PrefabInternal: {fileID: 1235647068}
1330+
--- !u!114 &1235647070
1331+
MonoBehaviour:
1332+
m_ObjectHideFlags: 0
1333+
m_PrefabParentObject: {fileID: 0}
1334+
m_PrefabInternal: {fileID: 0}
1335+
m_GameObject: {fileID: 1235647069}
1336+
m_Enabled: 1
1337+
m_EditorHideFlags: 0
1338+
m_Script: {fileID: 11500000, guid: 33e18b96baa53ff4b8aabb378bd52d61, type: 3}
1339+
m_Name:
1340+
m_EditorClassIdentifier:
1341+
colorOnContactSingle: {r: 0, g: 0, b: 1, a: 1}
1342+
colorOnContactMulti: {r: 0, g: 1, b: 1, a: 1}
1343+
colorOnGrabSingle: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
1344+
colorOnGrabMulti: {r: 1, g: 0, b: 0, a: 1}
1345+
colorOnUse: {r: 1, g: 0, b: 1, a: 1}
1346+
targetRenderer: {fileID: 0}
1347+
grabbable: {fileID: 0}
11681348
--- !u!4 &1317806054 stripped
11691349
Transform:
11701350
m_PrefabParentObject: {fileID: 4790005928100498, guid: 93203be7a7d93e54bbf0a9f5b8fda3fd,
@@ -1589,6 +1769,29 @@ Prefab:
15891769
m_RemovedComponents: []
15901770
m_ParentPrefab: {fileID: 100100000, guid: f04969aeafe8c464f84748b730c616f2, type: 2}
15911771
m_IsPrefabParent: 0
1772+
--- !u!1 &1602731318 stripped
1773+
GameObject:
1774+
m_PrefabParentObject: {fileID: 1558738065822038, guid: f04969aeafe8c464f84748b730c616f2,
1775+
type: 2}
1776+
m_PrefabInternal: {fileID: 1602731317}
1777+
--- !u!114 &1602731319
1778+
MonoBehaviour:
1779+
m_ObjectHideFlags: 0
1780+
m_PrefabParentObject: {fileID: 0}
1781+
m_PrefabInternal: {fileID: 0}
1782+
m_GameObject: {fileID: 1602731318}
1783+
m_Enabled: 1
1784+
m_EditorHideFlags: 0
1785+
m_Script: {fileID: 11500000, guid: 33e18b96baa53ff4b8aabb378bd52d61, type: 3}
1786+
m_Name:
1787+
m_EditorClassIdentifier:
1788+
colorOnContactSingle: {r: 0, g: 0, b: 1, a: 1}
1789+
colorOnContactMulti: {r: 0, g: 1, b: 1, a: 1}
1790+
colorOnGrabSingle: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
1791+
colorOnGrabMulti: {r: 1, g: 0, b: 0, a: 1}
1792+
colorOnUse: {r: 1, g: 0, b: 1, a: 1}
1793+
targetRenderer: {fileID: 0}
1794+
grabbable: {fileID: 0}
15921795
--- !u!1001 &1636109217
15931796
Prefab:
15941797
m_ObjectHideFlags: 0
@@ -1639,6 +1842,29 @@ Prefab:
16391842
m_RemovedComponents: []
16401843
m_ParentPrefab: {fileID: 100100000, guid: 569e6e7d4dff2314dad9c83b1bf21a9f, type: 2}
16411844
m_IsPrefabParent: 0
1845+
--- !u!1 &1636109218 stripped
1846+
GameObject:
1847+
m_PrefabParentObject: {fileID: 1782292157101262, guid: 569e6e7d4dff2314dad9c83b1bf21a9f,
1848+
type: 2}
1849+
m_PrefabInternal: {fileID: 1636109217}
1850+
--- !u!114 &1636109219
1851+
MonoBehaviour:
1852+
m_ObjectHideFlags: 0
1853+
m_PrefabParentObject: {fileID: 0}
1854+
m_PrefabInternal: {fileID: 0}
1855+
m_GameObject: {fileID: 1636109218}
1856+
m_Enabled: 1
1857+
m_EditorHideFlags: 0
1858+
m_Script: {fileID: 11500000, guid: 33e18b96baa53ff4b8aabb378bd52d61, type: 3}
1859+
m_Name:
1860+
m_EditorClassIdentifier:
1861+
colorOnContactSingle: {r: 0, g: 0, b: 1, a: 1}
1862+
colorOnContactMulti: {r: 0, g: 1, b: 1, a: 1}
1863+
colorOnGrabSingle: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
1864+
colorOnGrabMulti: {r: 1, g: 0, b: 0, a: 1}
1865+
colorOnUse: {r: 1, g: 0, b: 1, a: 1}
1866+
targetRenderer: {fileID: 0}
1867+
grabbable: {fileID: 0}
16421868
--- !u!1 &1730328486
16431869
GameObject:
16441870
m_ObjectHideFlags: 0
@@ -1765,6 +1991,29 @@ Prefab:
17651991
m_RemovedComponents: []
17661992
m_ParentPrefab: {fileID: 100100000, guid: 450e66a117a91604b8dff4f23018518d, type: 2}
17671993
m_IsPrefabParent: 0
1994+
--- !u!1 &2046888041 stripped
1995+
GameObject:
1996+
m_PrefabParentObject: {fileID: 1860702527024010, guid: 450e66a117a91604b8dff4f23018518d,
1997+
type: 2}
1998+
m_PrefabInternal: {fileID: 2046888040}
1999+
--- !u!114 &2046888042
2000+
MonoBehaviour:
2001+
m_ObjectHideFlags: 0
2002+
m_PrefabParentObject: {fileID: 0}
2003+
m_PrefabInternal: {fileID: 0}
2004+
m_GameObject: {fileID: 2046888041}
2005+
m_Enabled: 1
2006+
m_EditorHideFlags: 0
2007+
m_Script: {fileID: 11500000, guid: 33e18b96baa53ff4b8aabb378bd52d61, type: 3}
2008+
m_Name:
2009+
m_EditorClassIdentifier:
2010+
colorOnContactSingle: {r: 0, g: 0, b: 1, a: 1}
2011+
colorOnContactMulti: {r: 0, g: 1, b: 1, a: 1}
2012+
colorOnGrabSingle: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
2013+
colorOnGrabMulti: {r: 1, g: 0, b: 0, a: 1}
2014+
colorOnUse: {r: 1, g: 0, b: 1, a: 1}
2015+
targetRenderer: {fileID: 0}
2016+
grabbable: {fileID: 0}
17682017
--- !u!1001 &2065730248
17692018
Prefab:
17702019
m_ObjectHideFlags: 0
@@ -1807,6 +2056,29 @@ Prefab:
18072056
m_RemovedComponents: []
18082057
m_ParentPrefab: {fileID: 100100000, guid: ad56cdfae0f9dc64fb10061a01ab3249, type: 2}
18092058
m_IsPrefabParent: 0
2059+
--- !u!1 &2065730249 stripped
2060+
GameObject:
2061+
m_PrefabParentObject: {fileID: 1775908317404484, guid: ad56cdfae0f9dc64fb10061a01ab3249,
2062+
type: 2}
2063+
m_PrefabInternal: {fileID: 2065730248}
2064+
--- !u!114 &2065730250
2065+
MonoBehaviour:
2066+
m_ObjectHideFlags: 0
2067+
m_PrefabParentObject: {fileID: 0}
2068+
m_PrefabInternal: {fileID: 0}
2069+
m_GameObject: {fileID: 2065730249}
2070+
m_Enabled: 1
2071+
m_EditorHideFlags: 0
2072+
m_Script: {fileID: 11500000, guid: 33e18b96baa53ff4b8aabb378bd52d61, type: 3}
2073+
m_Name:
2074+
m_EditorClassIdentifier:
2075+
colorOnContactSingle: {r: 0, g: 0, b: 1, a: 1}
2076+
colorOnContactMulti: {r: 0, g: 1, b: 1, a: 1}
2077+
colorOnGrabSingle: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
2078+
colorOnGrabMulti: {r: 1, g: 0, b: 0, a: 1}
2079+
colorOnUse: {r: 1, g: 0, b: 1, a: 1}
2080+
targetRenderer: {fileID: 0}
2081+
grabbable: {fileID: 0}
18102082
--- !u!4 &2103405542 stripped
18112083
Transform:
18122084
m_PrefabParentObject: {fileID: 4787718754823836, guid: 7db50d6a2ae788242bfd6600c73c063d,

0 commit comments

Comments
 (0)