Merge pull request #17 from VRLabs/dev

Dev
VRLabs · Sep 1, 2024 · e7fbe56 · e7fbe56
2 parents 7e5578e + bf93b51
commit e7fbe56
Show file tree

Hide file tree

Showing 17 changed files with 1,704 additions and 847 deletions.
diff --git a/Contact Tracker.prefab b/Contact Tracker.prefab
diff --git a/README.md b/README.md
@@ -3,9 +3,10 @@
 # Contact Tracker
 
 [![Generic badge](https://img.shields.io/github/downloads/VRLabs/Contact-Tracker/total?label=Downloads)](/~https://github.com/VRLabs/Contact-Tracker/releases/latest)
-[![Generic badge](https://img.shields.io/badge/License-MIT-informational.svg)](/~https://github.com/VRLabs/Contact-Tracker/blob/main/LICENSE)
-[![Generic badge](https://img.shields.io/badge/Unity-2019.4.31f1-lightblue.svg)](https://unity3d.com/unity/whats-new/2019.4.31)
-[![Generic badge](https://img.shields.io/badge/SDK-AvatarSDK3-lightblue.svg)](https://vrchat.com/home/download)
+[![Generic badge](https://img.shields.io/badge/License-MIT-informational)](/~https://github.com/VRLabs/Contact-Tracker/blob/main/LICENSE)
+[![Generic badge](https://img.shields.io/badge/Quest-Compatible-green?logo=Meta)](https://img.shields.io/badge/Quest-Compatible-green?logo=Meta)
+[![Generic badge](https://img.shields.io/badge/Unity-2022.3.22f1-lightblue?logo=Unity)](https://unity.com/releases/editor/whats-new/2022.3.22)
+[![Generic badge](https://img.shields.io/badge/SDK-AvatarSDK3-lightblue)](https://vrchat.com/home/download)
 
 [![Generic badge](https://img.shields.io/discord/706913824607043605?color=%237289da&label=DISCORD&logo=Discord&style=for-the-badge)](https://discord.vrlabs.dev/)
 [![Generic badge](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Dvrlabs%26type%3Dpatrons&style=for-the-badge)](https://patreon.vrlabs.dev/)
@@ -14,10 +15,8 @@ System for attaching objects to contacts on other players
 
 ![ContactTracker](/~https://github.com/VRLabs/Contact-Tracker/assets/76777936/0059a587-8ada-4891-bc18-bf5d5d7a6f6a)
 
-
 ### ⬇️ [Download Latest Version](/~https://github.com/VRLabs/Contact-Tracker/releases/latest)
 
-
 ### 📦 [Add to VRChat Creator Companion](https://vrlabs.dev/packages?package=dev.vrlabs.contact-tracker)
 
 </div>
@@ -41,6 +40,9 @@ /~https://github.com/VRLabs/Contact-Tracker/assets/76777936/39dd0fb1-9333-42d3-91b
 * Expand the prefab hierarchy and find ``Tracker Target``.
 * Move ``Tracker Target`` outside of ``Contact Tracker`` and place it anywhere in your avatar's hierarchy as needed.
 
+> [!NOTE]  
+> When building for Quest, you will have to remove unsupported components and shaders
+
 ## How to use
 
 * Place the objects you want to attach to other players inside ``Contact Tracker`` -> ``Container``.
@@ -58,6 +60,7 @@ /~https://github.com/VRLabs/Contact-Tracker/assets/76777936/39dd0fb1-9333-42d3-91b
 
 ```c++
 Constraints:        6
+Constraint Depth:   5
 Contact Receivers:  6
 FX Animator Layers: 2
 Mesh Renderers:     1
@@ -83,7 +86,7 @@ Contact Tracker
 
 ## Contributors
 
-* [Red](/~https://github.com/hfcRed)
+* [hfcRed](/~https://github.com/hfcRed)
 * [Dreadrith](/~https://github.com/Dreadrith)
 * [lin](/~https://github.com/oofdesu)
 
@@ -104,4 +107,3 @@ Contact Tracker is available as-is under MIT. For more information see [LICENSE]
 [<img src="/~https://github.com/VRLabs/Resources/raw/main/Icons/Twitter.png" width="50" height="50">](https://twitter.com/vrlabsdev "VRLabs")
 
 </div>
-
diff --git a/Resources/Animations/Blend Tree/Tracker Scale.anim b/Resources/Animations/Blend Tree/Tracker Scale.anim
@@ -7,7 +7,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Tracker Scale
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1
@@ -17,7 +17,8 @@ AnimationClip:
   m_PositionCurves: []
   m_ScaleCurves: []
   m_FloatCurves:
-  - curve:
+  - serializedVersion: 2
+    curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
@@ -41,11 +42,13 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_ScaleAtRest.x
+    attribute: ScaleAtRest.x
     path: Contact Tracker/Tracking Points
-    classID: 1818360610
-    script: {fileID: 0}
-  - curve:
+    classID: 114
+    script: {fileID: 41250163, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3}
+    flags: 16
+  - serializedVersion: 2
+    curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
@@ -69,11 +72,13 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_ScaleAtRest.y
+    attribute: ScaleAtRest.y
     path: Contact Tracker/Tracking Points
-    classID: 1818360610
-    script: {fileID: 0}
-  - curve:
+    classID: 114
+    script: {fileID: 41250163, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3}
+    flags: 16
+  - serializedVersion: 2
+    curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
@@ -97,10 +102,11 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_ScaleAtRest.z
+    attribute: ScaleAtRest.z
     path: Contact Tracker/Tracking Points
-    classID: 1818360610
-    script: {fileID: 0}
+    classID: 114
+    script: {fileID: 41250163, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3}
+    flags: 16
   m_PPtrCurves: []
   m_SampleRate: 60
   m_WrapMode: 0
@@ -111,25 +117,31 @@ AnimationClip:
     genericBindings:
     - serializedVersion: 2
       path: 3695631678
-      attribute: 4294967280
-      script: {fileID: 0}
-      typeID: 1818360610
-      customType: 33
+      attribute: 983732862
+      script: {fileID: 41250163, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3}
+      typeID: 114
+      customType: 0
       isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
     - serializedVersion: 2
       path: 3695631678
-      attribute: 4294967281
-      script: {fileID: 0}
-      typeID: 1818360610
-      customType: 33
+      attribute: 1302700776
+      script: {fileID: 41250163, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3}
+      typeID: 114
+      customType: 0
       isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
     - serializedVersion: 2
       path: 3695631678
-      attribute: 4294967282
-      script: {fileID: 0}
-      typeID: 1818360610
-      customType: 33
+      attribute: 3568104274
+      script: {fileID: 41250163, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3}
+      typeID: 114
+      customType: 0
       isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
     serializedVersion: 2
@@ -152,7 +164,8 @@ AnimationClip:
     m_HeightFromFeet: 0
     m_Mirror: 0
   m_EditorCurves:
-  - curve:
+  - serializedVersion: 2
+    curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
@@ -176,11 +189,13 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_ScaleAtRest.x
+    attribute: ScaleAtRest.x
     path: Contact Tracker/Tracking Points
-    classID: 1818360610
-    script: {fileID: 0}
-  - curve:
+    classID: 114
+    script: {fileID: 41250163, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3}
+    flags: 16
+  - serializedVersion: 2
+    curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
@@ -204,11 +219,13 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_ScaleAtRest.y
+    attribute: ScaleAtRest.y
     path: Contact Tracker/Tracking Points
-    classID: 1818360610
-    script: {fileID: 0}
-  - curve:
+    classID: 114
+    script: {fileID: 41250163, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3}
+    flags: 16
+  - serializedVersion: 2
+    curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
@@ -232,10 +249,11 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_ScaleAtRest.z
+    attribute: ScaleAtRest.z
     path: Contact Tracker/Tracking Points
-    classID: 1818360610
-    script: {fileID: 0}
+    classID: 114
+    script: {fileID: 41250163, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3}
+    flags: 16
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0

diff --git a/Resources/Animations/Blend Tree/Tracker X+.anim b/Resources/Animations/Blend Tree/Tracker X+.anim
@@ -7,7 +7,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Tracker X+
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1
@@ -17,7 +17,8 @@ AnimationClip:
   m_PositionCurves: []
   m_ScaleCurves: []
   m_FloatCurves:
-  - curve:
+  - serializedVersion: 2
+    curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
@@ -41,10 +42,11 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Sources.Array.data[0].weight
+    attribute: Sources.source0.Weight
     path: Contact Tracker/Tracking Points
-    classID: 1818360608
-    script: {fileID: 0}
+    classID: 114
+    script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3}
+    flags: 16
   m_PPtrCurves: []
   m_SampleRate: 60
   m_WrapMode: 0
@@ -55,11 +57,13 @@ AnimationClip:
     genericBindings:
     - serializedVersion: 2
       path: 3695631678
-      attribute: 12
-      script: {fileID: 0}
-      typeID: 1818360608
-      customType: 31
+      attribute: 236596898
+      script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3}
+      typeID: 114
+      customType: 0
       isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
     serializedVersion: 2
@@ -82,7 +86,8 @@ AnimationClip:
     m_HeightFromFeet: 0
     m_Mirror: 0
   m_EditorCurves:
-  - curve:
+  - serializedVersion: 2
+    curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
@@ -106,10 +111,11 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Sources.Array.data[0].weight
+    attribute: Sources.source0.Weight
     path: Contact Tracker/Tracking Points
-    classID: 1818360608
-    script: {fileID: 0}
+    classID: 114
+    script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3}
+    flags: 16
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0

diff --git a/Resources/Animations/Blend Tree/Tracker X-.anim b/Resources/Animations/Blend Tree/Tracker X-.anim
@@ -7,7 +7,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Tracker X-
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1
@@ -17,7 +17,8 @@ AnimationClip:
   m_PositionCurves: []
   m_ScaleCurves: []
   m_FloatCurves:
-  - curve:
+  - serializedVersion: 2
+    curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
@@ -41,10 +42,11 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Sources.Array.data[1].weight
+    attribute: Sources.source1.Weight
     path: Contact Tracker/Tracking Points
-    classID: 1818360608
-    script: {fileID: 0}
+    classID: 114
+    script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3}
+    flags: 16
   m_PPtrCurves: []
   m_SampleRate: 60
   m_WrapMode: 0
@@ -55,11 +57,13 @@ AnimationClip:
     genericBindings:
     - serializedVersion: 2
       path: 3695631678
-      attribute: 28
-      script: {fileID: 0}
-      typeID: 1818360608
-      customType: 31
+      attribute: 3266326076
+      script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3}
+      typeID: 114
+      customType: 0
       isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
     serializedVersion: 2
@@ -82,7 +86,8 @@ AnimationClip:
     m_HeightFromFeet: 0
     m_Mirror: 0
   m_EditorCurves:
-  - curve:
+  - serializedVersion: 2
+    curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
@@ -106,10 +111,11 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Sources.Array.data[1].weight
+    attribute: Sources.source1.Weight
     path: Contact Tracker/Tracking Points
-    classID: 1818360608
-    script: {fileID: 0}
+    classID: 114
+    script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3}
+    flags: 16
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0