Improve overlay interactivability. Users can now use their index fing…

…er to trigger recognition.
Soapwood · Apr 26, 2024 · 79d7854 · 79d7854
1 parent 59066d4
commit 79d7854
Show file tree

Hide file tree

Showing 28 changed files with 292 additions and 240 deletions.
diff --git a/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/Managed/Assembly-CSharp-firstpass.dll b/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/Managed/Assembly-CSharp-firstpass.dll
diff --git a/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/globalgamemanagers b/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/globalgamemanagers
diff --git a/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/globalgamemanagers.assets b/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/globalgamemanagers.assets
diff --git a/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/level0 b/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/level0
diff --git a/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/sharedassets0.assets b/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/sharedassets0.assets
diff --git a/VXMusicOverlay/Assets/Animations/VXMRecognition.anim b/VXMusicOverlay/Assets/Animations/VXMRecognition.anim
@@ -45,7 +45,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: 0, y: 1, z: 15}
+        value: {x: 0, y: 1, z: 30}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -54,16 +54,16 @@ AnimationClip:
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 1.5
-        value: {x: 0.000000009463789, y: 1, z: 1}
-        inSlope: {x: 0.000000009463789, y: 0, z: 0}
-        outSlope: {x: 0.000000009463789, y: 0, z: 0}
+        value: {x: 0.000000009463789, y: 1, z: 15}
+        inSlope: {x: 0.0000000063091927, y: 0, z: 0}
+        outSlope: {x: 0.0000000063091927, y: 0, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 3
-        value: {x: 0.000000018927578, y: 1, z: 15}
+        value: {x: 0.000000018927578, y: 1, z: 30}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -216,6 +216,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5
+        value: 0.000000009463789
+        inSlope: 0.0000000063091927
+        outSlope: 0.0000000063091927
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 3
         value: 0.000000018927578
@@ -244,6 +253,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 3
         value: 1
@@ -265,7 +283,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 15
+        value: 30
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -274,7 +292,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 1.5
-        value: 1
+        value: 15
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -283,7 +301,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 3
-        value: 15
+        value: 30
         inSlope: 0
         outSlope: 0
         tangentMode: 136

diff --git a/VXMusicOverlay/Assets/MainScene.unity b/VXMusicOverlay/Assets/MainScene.unity
@@ -435,7 +435,7 @@ PrefabInstance:
     - target: {fileID: -8679921383154817045, guid: 9cb59f022086406408c4d3ea0f5fa4cb,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 15
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 9cb59f022086406408c4d3ea0f5fa4cb,
         type: 3}
@@ -856,13 +856,15 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   error: 1
   eventLog: 0
+  spherePrefab: {fileID: 943885321328816842, guid: f19e1b8c598cff144a92f9d52a99d55e,
+    type: 3}
   renderTexture: {fileID: 8400000, guid: 2afc18014991f7e449d31a5eb09138e8, type: 2}
   Position: {x: 0.05, y: 0, z: -0.1}
   Rotation: {x: 180, y: 270, z: 0}
   Scale: {x: 1, y: 1, z: 1}
   MirrorX: 0
   MirrorY: 0
-  width: 0.1
+  width: 0.2
   alpha: 0.2
   show: 1
   SideBySide: 0
@@ -888,6 +890,12 @@ MonoBehaviour:
   RightHandU: -1
   RightHandV: -1
   RightHandDistance: -1
+  FingerOffsetX: 0.02
+  FingerOffsetY: -0.04
+  FingerOffsetZ: 0.01
+  FingerRotationOffsetX: 80
+  FingerRotationOffsetY: 0
+  FingerRotationOffsetZ: 0
   IsInRecognitionState: 0
   OverlayTrackedDevice: 0
   TrackedDeviceInputLock: 0