cgvr/DeltaVR
1
0
Fork 1
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

added detailed collisions to hands, needs to be configured for Vivegit status! Also, added more complex collisions to furniture and simplified existing scene object collisions

Browse Source
This commit is contained in:
mxssw
2025-10-29 21:32:26 +02:00
parent 84a925b68f
commit a3975d85f7
30 changed files with 5470 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Assets/_PROJECT/Components/NewHandPresence/Prefabs/Controllers/Oculus Touch/Oculus Touch Left.prefab
View File

@@ -9,7 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4066697426206295884}
m_Layer: 0
m_Layer: 21
m_Name: grip_rotation_center
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -41,7 +41,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3134737213848559909}
m_Layer: 0
m_Layer: 21
m_Name: thumbstick_rotation_center
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -73,7 +73,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4952025666149278534}
m_Layer: 0
m_Layer: 21
m_Name: trigger_rotation_center
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -107,7 +107,7 @@ GameObject:
- component: {fileID: 9062241314923908314}
- component: {fileID: 6247171210129923414}
- component: {fileID: 8158463085824228395}
m_Layer: 0
m_Layer: 21
m_Name: thumbstick
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -190,7 +190,7 @@ GameObject:
- component: {fileID: 9062241314867636624}
- component: {fileID: 6247171210077157404}
- component: {fileID: 8158463085742774625}
m_Layer: 0
m_Layer: 21
m_Name: grip
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -273,7 +273,7 @@ GameObject:
- component: {fileID: 9062241314862212276}
- component: {fileID: 6247171210065802552}
- component: {fileID: 8158463085735253061}
m_Layer: 0
m_Layer: 21
m_Name: body
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -356,7 +356,7 @@ GameObject:
- component: {fileID: 9062241315346829503}
- component: {fileID: 6247171210487136563}
- component: {fileID: 8158463085112582222}
m_Layer: 0
m_Layer: 21
m_Name: trigger
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -439,7 +439,7 @@ GameObject:
- component: {fileID: 9062241315375960027}
- component: {fileID: 6247171210516733527}
- component: {fileID: 8158463085099777834}
m_Layer: 0
m_Layer: 21
m_Name: button_x
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -522,7 +522,7 @@ GameObject:
- component: {fileID: 9062241315500892323}
- component: {fileID: 6247171210643468591}
- component: {fileID: 8158463085226790994}
m_Layer: 0
m_Layer: 21
m_Name: button_y
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -605,7 +605,7 @@ GameObject:
- component: {fileID: 9062241315501822880}
- component: {fileID: 6247171210642522668}
- component: {fileID: 8158463085225632593}
m_Layer: 0
m_Layer: 21
m_Name: menu_button
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -689,7 +689,7 @@ GameObject:
- component: {fileID: 1270581827023853383}
- component: {fileID: 3649480308885486090}
- component: {fileID: 3376253515980734203}
m_Layer: 0
m_Layer: 21
m_Name: Oculus Touch Left
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -781,10 +781,18 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 8824389019078637771}
m_Modifications:
- target: {fileID: 106450, guid: 31fb231465c0ba947a9eb173e60f1679, type: 3}
propertyPath: m_Layer
value: 21
objectReference: {fileID: 0}
- target: {fileID: 140952, guid: 31fb231465c0ba947a9eb173e60f1679, type: 3}
propertyPath: m_Name
value: hint billboard
objectReference: {fileID: 0}
- target: {fileID: 140952, guid: 31fb231465c0ba947a9eb173e60f1679, type: 3}
propertyPath: m_Layer
value: 21
objectReference: {fileID: 0}
- target: {fileID: 444586, guid: 31fb231465c0ba947a9eb173e60f1679, type: 3}
propertyPath: m_RootOrder
value: 0
@@ -829,6 +837,21 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3698684970970094947, guid: 31fb231465c0ba947a9eb173e60f1679,
type: 3}
propertyPath: m_Layer
value: 21
objectReference: {fileID: 0}
- target: {fileID: 5615189752425831018, guid: 31fb231465c0ba947a9eb173e60f1679,
type: 3}
propertyPath: m_Layer
value: 21
objectReference: {fileID: 0}
- target: {fileID: 6886418318191067747, guid: 31fb231465c0ba947a9eb173e60f1679,
type: 3}
propertyPath: m_Layer
value: 21
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []

104
Assets/_PROJECT/Components/NewHandPresence/Prefabs/Controllers/Oculus Touch/Oculus Touch Right.prefab
View File

@@ -9,7 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4558648361292797792}
m_Layer: 0
m_Layer: 21
m_Name: grip_rotation_center
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -44,7 +44,7 @@ GameObject:
- component: {fileID: 3060242288266649367}
- component: {fileID: 6570840354189838564}
- component: {fileID: 4475894781922331434}
m_Layer: 0
m_Layer: 21
m_Name: Oculus Touch Right
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -72,7 +72,7 @@ Transform:
- {fileID: 4558648361292797792}
- {fileID: 5973681094436754426}
m_Father: {fileID: 0}
m_RootOrder: -1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3060242288266649367
MonoBehaviour:
@@ -127,6 +127,60 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &5311823096500135044
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 835650820590754452}
- component: {fileID: 2252121980502252906}
m_Layer: 21
m_Name: Collider
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &835650820590754452
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5311823096500135044}
m_LocalRotation: {x: 0.041203193, y: -0.08091445, z: 0.003347616, w: 0.99586344}
m_LocalPosition: {x: 0.016, y: 0.0187, z: 0.0367}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5507434294320401727}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 4.738, y: -9.29, z: 0}
--- !u!65 &2252121980502252906
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5311823096500135044}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.09, y: 0.09, z: -0.02}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &5926245407173495046
GameObject:
m_ObjectHideFlags: 0
@@ -138,7 +192,7 @@ GameObject:
- component: {fileID: 5507434295091381683}
- component: {fileID: 7430854878937093183}
- component: {fileID: 4653754205148935490}
m_Layer: 0
m_Layer: 21
m_Name: right_button_b
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -221,7 +275,7 @@ GameObject:
- component: {fileID: 5507434294993827119}
- component: {fileID: 7430854878908834979}
- component: {fileID: 4653754205112174046}
m_Layer: 0
m_Layer: 21
m_Name: thumbstick
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -304,7 +358,7 @@ GameObject:
- component: {fileID: 5507434295805006344}
- component: {fileID: 7430854879188157316}
- component: {fileID: 4653754204280251129}
m_Layer: 0
m_Layer: 21
m_Name: right_grip
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -387,7 +441,7 @@ GameObject:
- component: {fileID: 5507434295828729425}
- component: {fileID: 7430854879139274717}
- component: {fileID: 4653754204277767840}
m_Layer: 0
m_Layer: 21
m_Name: right_button_menu
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -470,7 +524,7 @@ GameObject:
- component: {fileID: 5507434295466739281}
- component: {fileID: 7430854879383820253}
- component: {fileID: 4653754204484105888}
m_Layer: 0
m_Layer: 21
m_Name: right_button_a
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -553,7 +607,7 @@ GameObject:
- component: {fileID: 5507434294320401727}
- component: {fileID: 7430854878240070835}
- component: {fileID: 4653754203366079950}
m_Layer: 0
m_Layer: 21
m_Name: body
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -571,7 +625,8 @@ Transform:
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 835650820590754452}
m_Father: {fileID: 5466065062541431104}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -636,7 +691,7 @@ GameObject:
- component: {fileID: 5507434294574195081}
- component: {fileID: 7430854878422495237}
- component: {fileID: 4653754203519193464}
m_Layer: 0
m_Layer: 21
m_Name: right_trigger
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -717,7 +772,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1577107718795983854}
m_Layer: 0
m_Layer: 21
m_Name: trigger_rotation_center
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -749,7 +804,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6509558431624773915}
m_Layer: 0
m_Layer: 21
m_Name: thumbstick_rotation_center
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -780,10 +835,18 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 5466065062541431104}
m_Modifications:
- target: {fileID: 106450, guid: 31fb231465c0ba947a9eb173e60f1679, type: 3}
propertyPath: m_Layer
value: 21
objectReference: {fileID: 0}
- target: {fileID: 140952, guid: 31fb231465c0ba947a9eb173e60f1679, type: 3}
propertyPath: m_Name
value: hint billboard
objectReference: {fileID: 0}
- target: {fileID: 140952, guid: 31fb231465c0ba947a9eb173e60f1679, type: 3}
propertyPath: m_Layer
value: 21
objectReference: {fileID: 0}
- target: {fileID: 444586, guid: 31fb231465c0ba947a9eb173e60f1679, type: 3}
propertyPath: m_RootOrder
value: 0
@@ -836,6 +899,21 @@ PrefabInstance:
propertyPath: m_LocalPosition.z
value: -0.05
objectReference: {fileID: 0}
- target: {fileID: 3698684970970094947, guid: 31fb231465c0ba947a9eb173e60f1679,
type: 3}
propertyPath: m_Layer
value: 21
objectReference: {fileID: 0}
- target: {fileID: 5615189752425831018, guid: 31fb231465c0ba947a9eb173e60f1679,
type: 3}
propertyPath: m_Layer
value: 21
objectReference: {fileID: 0}
- target: {fileID: 6886418318191067747, guid: 31fb231465c0ba947a9eb173e60f1679,
type: 3}
propertyPath: m_Layer
value: 21
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []