Fix the grip-to-scale bug

icosa-foundation · Oct 17, 2022 · 3f96da3 · 3f96da3
1 parent 72525b5
commit 3f96da3
Show file tree

Hide file tree

Showing 19 changed files with 296,515 additions and 26 deletions.
diff --git a/Assets/Environments/DressForm/Materials/DressForm_FloorBackground.mat b/Assets/Environments/DressForm/Materials/DressForm_FloorBackground.mat
@@ -2,14 +2,16 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: DressForm_FloorBackground
   m_Shader: {fileID: 4800000, guid: 85879211e00239541bb63f3b43929f20, type: 3}
-  m_ShaderKeywords: _EMISSION _NORMALMAP
+  m_ValidKeywords:
+  - _EMISSION
+  m_InvalidKeywords: []
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -59,6 +61,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BumpScale: 0.2
     - _Cutoff: 0.5
@@ -82,3 +85,4 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0, g: 0, b: 0, a: 1}
     - _WorldSpaceFogRange: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Environments/DressForm/Materials/DressForm_FloorForeground.mat b/Assets/Environments/DressForm/Materials/DressForm_FloorForeground.mat
@@ -2,14 +2,17 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: DressForm_FloorForeground
   m_Shader: {fileID: 4800000, guid: 85879211e00239541bb63f3b43929f20, type: 3}
-  m_ShaderKeywords: _DETAIL_MULX2 _EMISSION _NORMALMAP
+  m_ValidKeywords:
+  - _DETAIL_MULX2
+  - _EMISSION
+  m_InvalidKeywords: []
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -59,6 +62,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BumpScale: 0.2
     - _Cutoff: 0.5
@@ -82,3 +86,4 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0, g: 0, b: 0, a: 1}
     - _WorldSpaceFogRange: {r: 75, g: 500, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Environments/DressForm/Materials/DressForm_Spikes.mat b/Assets/Environments/DressForm/Materials/DressForm_Spikes.mat
@@ -2,14 +2,16 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: DressForm_Spikes
   m_Shader: {fileID: 4800000, guid: 85879211e00239541bb63f3b43929f20, type: 3}
-  m_ShaderKeywords: _EMISSION _NORMALMAP
+  m_ValidKeywords:
+  - _EMISSION
+  m_InvalidKeywords: []
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -59,6 +61,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BumpScale: 0.2
     - _Cutoff: 0.5
@@ -82,3 +85,4 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0, g: 0, b: 0, a: 1}
     - _WorldSpaceFogRange: {r: 75, g: 700, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Environments/Materials/concrete_tinycracks.mat b/Assets/Environments/Materials/concrete_tinycracks.mat
@@ -2,14 +2,16 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: concrete_tinycracks
   m_Shader: {fileID: 4800000, guid: 85879211e00239541bb63f3b43929f20, type: 3}
-  m_ShaderKeywords: _EMISSION _NORMALMAP
+  m_ValidKeywords:
+  - _EMISSION
+  m_InvalidKeywords: []
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -59,6 +61,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BumpScale: 2
     - _Cutoff: 0.5
@@ -80,3 +83,4 @@ Material:
     - _Color: {r: 0.44117647, g: 0.44117647, b: 0.44117647, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19117647, g: 0.19117647, b: 0.19117647, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Environments/NightSky/Materials/NightSky_FloorForeground.mat b/Assets/Environments/NightSky/Materials/NightSky_FloorForeground.mat
@@ -2,14 +2,16 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: NightSky_FloorForeground
   m_Shader: {fileID: 4800000, guid: 85879211e00239541bb63f3b43929f20, type: 3}
-  m_ShaderKeywords: _DETAIL_MULX2 _NORMALMAP
+  m_ValidKeywords:
+  - _DETAIL_MULX2
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -59,6 +61,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BumpScale: 1
     - _Cutoff: 0.5
@@ -82,3 +85,4 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0, g: 0, b: 0, a: 1}
     - _WorldSpaceFogRange: {r: 75, g: 500, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Environments/NightSky/Materials/NightSky_Spikes.mat b/Assets/Environments/NightSky/Materials/NightSky_Spikes.mat
@@ -2,15 +2,17 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: NightSky_Spikes
   m_Shader: {fileID: 4800000, guid: 85879211e00239541bb63f3b43929f20, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 5
+  m_ValidKeywords:
+  - _EMISSION
+  m_InvalidKeywords: []
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -59,6 +61,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BumpScale: 1
     - _Cutoff: 0.5
@@ -82,3 +85,4 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0, g: 0, b: 0, a: 0}
     - _WorldSpaceFogRange: {r: 75, g: 700, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Environments/NightSky/Materials/NightSky_Stage.mat b/Assets/Environments/NightSky/Materials/NightSky_Stage.mat
@@ -2,14 +2,16 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: NightSky_Stage
   m_Shader: {fileID: 4800000, guid: 85879211e00239541bb63f3b43929f20, type: 3}
-  m_ShaderKeywords: _DETAIL_MULX2 _NORMALMAP
+  m_ValidKeywords:
+  - _NORMALMAP
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -59,6 +61,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BumpScale: 1
     - _Cutoff: 0.5
@@ -80,3 +83,4 @@ Material:
     - _Color: {r: 0.1102941, g: 0.1102941, b: 0.1102941, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Environments/Pedestal/Materials/Pedestal_FloorForeground.mat b/Assets/Environments/Pedestal/Materials/Pedestal_FloorForeground.mat
@@ -2,14 +2,16 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Pedestal_FloorForeground
   m_Shader: {fileID: 4800000, guid: 85879211e00239541bb63f3b43929f20, type: 3}
-  m_ShaderKeywords: _DETAIL_MULX2 _NORMALMAP
+  m_ValidKeywords:
+  - _DETAIL_MULX2
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -59,6 +61,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BumpScale: 0.2
     - _Cutoff: 0.5
@@ -82,3 +85,4 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0, g: 0, b: 0, a: 1}
     - _WorldSpaceFogRange: {r: 75, g: 500, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Environments/Pedestal/Materials/Pedestal_Spikes.mat b/Assets/Environments/Pedestal/Materials/Pedestal_Spikes.mat
@@ -2,15 +2,17 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Pedestal_Spikes
   m_Shader: {fileID: 4800000, guid: 85879211e00239541bb63f3b43929f20, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 5
+  m_ValidKeywords:
+  - _EMISSION
+  m_InvalidKeywords: []
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -59,6 +61,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BumpScale: 1
     - _Cutoff: 0.5
@@ -82,3 +85,4 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0, g: 0, b: 0, a: 0}
     - _WorldSpaceFogRange: {r: 75, g: 700, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Scripts/Input/UnityXRInput.inputactions b/Assets/Scripts/Input/UnityXRInput.inputactions
@@ -629,7 +629,7 @@
                     "path": "<XRController>{LeftHand}/grip",
                     "interactions": "",
                     "processors": "",
-                    "groups": "HTC Vive Controller;Oculus Touch Controller;WMR Controller",
+                    "groups": "HTC Vive Controller;Oculus Touch Controller;WMR Controller;Pico Controller",
                     "action": "GripAxis",
                     "isComposite": false,
                     "isPartOfComposite": false

diff --git a/Assets/Scripts/Input/UnityXRInputAction.cs b/Assets/Scripts/Input/UnityXRInputAction.cs
@@ -653,7 +653,7 @@ public @UnityXRInputAction()
                     ""path"": ""<XRController>{LeftHand}/grip"",
                     ""interactions"": """",
                     ""processors"": """",
-                    ""groups"": ""HTC Vive Controller;Oculus Touch Controller;WMR Controller"",
+                    ""groups"": ""HTC Vive Controller;Oculus Touch Controller;WMR Controller;Pico Controller"",
                     ""action"": ""GripAxis"",
                     ""isComposite"": false,
                     ""isPartOfComposite"": false

diff --git a/Assets/Textures/Trademarked/cover.png b/Assets/Textures/Trademarked/cover.png