Integrate hand tracking in Grotto Scene

2024-07-15 17:12:41 +02:00 · 2024-07-15 17:12:41 +02:00 · 0f161cc7fe
parent e2a9832c80
commit 0f161cc7fe
6 changed files with 4025 additions and 3777 deletions
--- a/Viagg-io/Assets/Prefabs/UI/_HANDMENU.prefab
+++ b/Viagg-io/Assets/Prefabs/UI/_HANDMENU.prefab
--- a/Viagg-io/Assets/Prefabs/UI/_HANDMENU.prefab.meta
+++ b/Viagg-io/Assets/Prefabs/UI/_HANDMENU.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 90dfe96f41d164a3081b56f73f4214e4
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Viagg-io/Assets/Resources/BuildDateTime.txt
+++ b/Viagg-io/Assets/Resources/BuildDateTime.txt
@ -1 +1 @@
-2024-07-15T13:48:15.1894300Z
+2024-07-15T15:08:55.2005900Z
--- a/Viagg-io/Assets/Scenes/3.2-Grotto.unity
+++ b/Viagg-io/Assets/Scenes/3.2-Grotto.unity
@ -373,98 +373,6 @@ MonoBehaviour:
  m_LightCookieSize: {x: 1, y: 1}
  m_LightCookieOffset: {x: 0, y: 0}
  m_SoftShadowQuality: 0
--- !u!1001 &452463679
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 4134505312059479865, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4134505312059479865, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 3.73
-      objectReference: {fileID: 0}
-    - target: {fileID: 4134505312059479865, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4134505312059479865, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 2.26
-      objectReference: {fileID: 0}
-    - target: {fileID: 4134505312059479865, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 4134505312059479865, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4134505312059479865, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.70710677
-      objectReference: {fileID: 0}
-    - target: {fileID: 4134505312059479865, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4134505312059479865, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4134505312059479865, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 90
-      objectReference: {fileID: 0}
-    - target: {fileID: 4134505312059479865, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7313654230448209575, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      propertyPath: m_Name
-      value: Complete XR Origin Set Up
-      objectReference: {fileID: 0}
-    - target: {fileID: 7313654230448209575, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7696548424635294051, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 2.26
-      objectReference: {fileID: 0}
-    - target: {fileID: 7696548424635294051, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -3.98
-      objectReference: {fileID: 0}
-    - target: {fileID: 7696548424635294051, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 7696548424635294051, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 7696548424635294051, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 90
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873184977108000993, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      propertyPath: m_RequestedTrackingOriginMode
-      value: 2
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 9014170783809206332, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 1950127539}
-  m_SourcePrefab: {fileID: 100100000, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
 --- !u!1 &548436409
 GameObject:
  m_ObjectHideFlags: 0
@ -589,7 +497,7 @@ PrefabInstance:
    - target: {fileID: 7099584338114317453, guid: c49ceeff408a54a4dbde71675195362c, type: 3}
      propertyPath: m_Camera
      value: 
-      objectReference: {fileID: 1950127540}
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -633,6 +541,127 @@ Transform:
  - {fileID: 199753431}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1477346289
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 865075385244835223, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+      propertyPath: m_Name
+      value: XR Interaction Hands Setup
+      objectReference: {fileID: 0}
+    - target: {fileID: 5773256366622995465, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5773256366622995465, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5773256366622995465, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5773256366622995465, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5773256366622995465, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5773256366622995465, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5773256366622995465, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5773256366622995465, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5773256366622995465, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5773256366622995465, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8733093507751517968, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -1.751
+      objectReference: {fileID: 0}
+    - target: {fileID: 8733093507751517968, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -8.953
+      objectReference: {fileID: 0}
+    - target: {fileID: 9132913291935407762, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+      propertyPath: m_RequestedTrackingOriginMode
+      value: 2
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 7990873191231833679, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1477346291}
+  m_SourcePrefab: {fileID: 100100000, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+--- !u!1 &1477346290 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7990873191231833679, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+  m_PrefabInstance: {fileID: 1477346289}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1477346291
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1477346290}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 2
+  m_RequiresOpaqueTextureOption: 2
+  m_CameraType: 0
+  m_Cameras: []
+  m_RendererIndex: -1
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 1
+  m_VolumeTrigger: {fileID: 0}
+  m_VolumeFrameworkUpdateModeOption: 2
+  m_RenderPostProcessing: 0
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_AllowXRRendering: 1
+  m_AllowHDROutput: 1
+  m_UseScreenCoordOverride: 0
+  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_Version: 2
+  m_TaaSettings:
+    quality: 3
+    frameInfluence: 0.1
+    jitterScale: 1
+    mipBias: 0
+    varianceClampScale: 0.9
+    contrastAdaptiveSharpening: 0
 --- !u!1001 &1603096580
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -770,70 +799,74 @@ MonoBehaviour:
  overrideLogStringDisplay: 0
  overrideDebugInternalActive: 0
  overrideDebugChangesActive: 0
-  instanceID: 371378
+  instanceID: 116288
  __behaviourTreeGenerator: {fileID: 0}
  taskScripts:
  - {fileID: 4900000, guid: 7100bc138828c402baf6fdd9c426735b, type: 3}
--- !u!1 &1950127534 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 9014170783809206332, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-  m_PrefabInstance: {fileID: 452463679}
-  m_PrefabAsset: {fileID: 0}
--- !u!114 &1950127539
-MonoBehaviour:
+--- !u!1001 &6287328681816955598
+PrefabInstance:
  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1950127534}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_RenderShadows: 1
-  m_RequiresDepthTextureOption: 2
-  m_RequiresOpaqueTextureOption: 2
-  m_CameraType: 0
-  m_Cameras: []
-  m_RendererIndex: -1
-  m_VolumeLayerMask:
-    serializedVersion: 2
-    m_Bits: 1
-  m_VolumeTrigger: {fileID: 0}
-  m_VolumeFrameworkUpdateModeOption: 2
-  m_RenderPostProcessing: 0
-  m_Antialiasing: 0
-  m_AntialiasingQuality: 2
-  m_StopNaN: 0
-  m_Dithering: 0
-  m_ClearDepth: 1
-  m_AllowXRRendering: 1
-  m_AllowHDROutput: 1
-  m_UseScreenCoordOverride: 0
-  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
-  m_RequiresDepthTexture: 0
-  m_RequiresColorTexture: 0
-  m_Version: 2
-  m_TaaSettings:
-    quality: 3
-    frameInfluence: 0.1
-    jitterScale: 1
-    mipBias: 0
-    varianceClampScale: 0.9
-    contrastAdaptiveSharpening: 0
--- !u!20 &1950127540 stripped
-Camera:
-  m_CorrespondingSourceObject: {fileID: 9014170783809206330, guid: f6d068939d6bf4b74b6421e3f84b2027, type: 3}
-  m_PrefabInstance: {fileID: 452463679}
-  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 776132496818511512, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -1.751
+      objectReference: {fileID: 0}
+    - target: {fileID: 776132496818511512, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 776132496818511512, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -8.953
+      objectReference: {fileID: 0}
+    - target: {fileID: 776132496818511512, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 776132496818511512, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 776132496818511512, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 776132496818511512, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 776132496818511512, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 776132496818511512, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 776132496818511512, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2567612984494618424, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
+      propertyPath: m_Name
+      value: _HANDMENU
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
  m_ObjectHideFlags: 0
  m_Roots:
-  - {fileID: 452463679}
  - {fileID: 1873602410}
+  - {fileID: 1477346289}
  - {fileID: 767720727}
  - {fileID: 1016571816}
  - {fileID: 548436410}
+  - {fileID: 6287328681816955598}
--- a/Viagg-io/Assets/Scenes/Test-HandInteraction.unity
+++ b/Viagg-io/Assets/Scenes/Test-HandInteraction.unity
--- a/Viagg-io/ProjectSettings/EditorBuildSettings.asset
+++ b/Viagg-io/ProjectSettings/EditorBuildSettings.asset
@ -6,11 +6,14 @@ EditorBuildSettings:
  serializedVersion: 2
  m_Scenes:
  - enabled: 1
-    path: Assets/Scenes/Test-HandInteraction.unity
-    guid: 6560c631efa4b492689f76d06071d916
+    path: Assets/Scenes/3.2-Grotto.unity
+    guid: 51bd2edc532024f96a432eaf867d3a47
  - enabled: 1
    path: Assets/Scenes/1.0-SBB.unity
    guid: 6a1144d40bbf04513a9929856271d4e7
+  - enabled: 1
+    path: Assets/Scenes/Test-HandInteraction.unity
+    guid: 6560c631efa4b492689f76d06071d916
  - enabled: 1
    path: Assets/Scenes/Test-Scene.unity
    guid: 5739d873cf7d24221bea4b568b59f9c1
@ -44,9 +47,6 @@ EditorBuildSettings:
  - enabled: 1
    path: Assets/Scenes/3.1-Slideshow.unity
    guid: 4a08bc26692b04e5da8898f704f20b69
-  - enabled: 1
-    path: Assets/Scenes/3.2-Grotto.unity
-    guid: 51bd2edc532024f96a432eaf867d3a47
  - enabled: 1
    path: Assets/Scenes/3.5-Slideshow.unity
    guid: f6bca66b31e88434d98bdbed5c399b64