Rotate OriginTransform if trigger held down. Flafla2#43

createthis · Apr 25, 2017 · e7e2b64 · e7e2b64
1 parent 7013048
commit e7e2b64
Show file tree

Hide file tree

Showing 23 changed files with 564 additions and 181 deletions.
diff --git a/Assets/SteamVR/InteractionSystem/Core/Icons.meta b/Assets/SteamVR/InteractionSystem/Core/Icons.meta
diff --git a/Assets/SteamVR/InteractionSystem/Core/Shaders/SeeThru.shader b/Assets/SteamVR/InteractionSystem/Core/Shaders/SeeThru.shader
@@ -1,4 +1,6 @@
-//======= Copyright (c) Valve Corporation, All rights reserved. ===============
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+//======= Copyright (c) Valve Corporation, All rights reserved. ===============
 //
 // Purpose: Used for objects that can be seen through objects in fron of them
 //
@@ -66,7 +68,7 @@ Shader "Valve/VR/SeeThru"
 #if UNITY_VERSION >= 540
 					o.vertex = UnityObjectToClipPos(i.vertex);
 #else
-					o.vertex = mul(UNITY_MATRIX_MVP, i.vertex);
+					o.vertex = UnityObjectToClipPos(i.vertex);
 #endif					
 					o.uv = TRANSFORM_TEX( i.uv, _MainTex );
 

diff --git a/Assets/SteamVR/InteractionSystem/Core/Shaders/Silhouette.shader b/Assets/SteamVR/InteractionSystem/Core/Shaders/Silhouette.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 //======= Copyright (c) Valve Corporation, All rights reserved. ===============
 //
 // Purpose: Used to show the outline of the object
@@ -50,7 +52,7 @@ Shader "Valve/VR/Silhouette"
 #if UNITY_VERSION >= 540
 			o.vPositionPs = UnityObjectToClipPos( i.vPositionOs.xyzw );
 #else
-			o.vPositionPs = mul( UNITY_MATRIX_MVP, i.vPositionOs.xyzw );
+			o.vPositionPs = UnityObjectToClipPos( i.vPositionOs.xyzw );
 #endif
 			return o;
 		}
@@ -69,7 +71,7 @@ Shader "Valve/VR/Silhouette"
 #if UNITY_VERSION >= 540
 			extruded.vPositionPs = UnityObjectToClipPos( vertex.vPositionOs.xyzw );
 #else
-			extruded.vPositionPs = mul( UNITY_MATRIX_MVP, vertex.vPositionOs.xyzw );
+			extruded.vPositionPs = UnityObjectToClipPos( vertex.vPositionOs.xyzw );
 #endif
 			extruded.vPositionPs.xy += vOffsetPs.xy * extruded.vPositionPs.w * g_flOutlineWidth;
 

diff --git a/Assets/SteamVR/InteractionSystem/Hints/Shaders/ControllerButtonHints.shader b/Assets/SteamVR/InteractionSystem/Hints/Shaders/ControllerButtonHints.shader
@@ -1,4 +1,6 @@
-//======= Copyright (c) Valve Corporation, All rights reserved. ===============
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+//======= Copyright (c) Valve Corporation, All rights reserved. ===============
 //
 // Purpose: 
 //
@@ -60,7 +62,7 @@ Shader "Valve/VR/ControllerButtonHints"
 #if UNITY_VERSION >= 540
 				o.vertex = UnityObjectToClipPos(i.vertex);
 #else
-				o.vertex = mul(UNITY_MATRIX_MVP, i.vertex);
+				o.vertex = UnityObjectToClipPos(i.vertex);
 #endif				
 				return o;
 			}
@@ -114,7 +116,7 @@ Shader "Valve/VR/ControllerButtonHints"
 #if UNITY_VERSION >= 540
 				o.vertex = UnityObjectToClipPos(i.vertex);
 #else
-				o.vertex = mul(UNITY_MATRIX_MVP, i.vertex);
+				o.vertex = UnityObjectToClipPos(i.vertex);
 #endif
 				o.uv = TRANSFORM_TEX( i.uv, _MainTex );
 

diff --git a/Assets/SteamVR/InteractionSystem/Teleport/Shaders/Highlight.shader b/Assets/SteamVR/InteractionSystem/Teleport/Shaders/Highlight.shader
@@ -1,4 +1,6 @@
-//======= Copyright (c) Valve Corporation, All rights reserved. ===============
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+//======= Copyright (c) Valve Corporation, All rights reserved. ===============
 //
 // Purpose: Used for the teleport markers
 //
@@ -54,7 +56,7 @@ Shader "Valve/VR/Highlight"
 #if UNITY_VERSION >= 540
 			o.vertex = UnityObjectToClipPos(i.vertex);
 #else
-			o.vertex = mul(UNITY_MATRIX_MVP, i.vertex);
+			o.vertex = UnityObjectToClipPos(i.vertex);
 #endif
 			o.uv = TRANSFORM_TEX( i.uv, _MainTex );
 			o.color = i.color;

diff --git a/Assets/SteamVR/Resources/SteamVR_AlphaOut.shader b/Assets/SteamVR/Resources/SteamVR_AlphaOut.shader
@@ -1,4 +1,6 @@
-Shader "Custom/SteamVR_AlphaOut" {
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+Shader "Custom/SteamVR_AlphaOut" {
 	Properties { _MainTex ("Base (RGB)", 2D) = "white" {} }
 
 	CGINCLUDE
@@ -17,7 +19,7 @@
 #if UNITY_VERSION >= 540
 		o.pos = UnityObjectToClipPos(v.vertex);
 #else
-		o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos(v.vertex);
 #endif
 		o.tex = v.texcoord;
 		return o;

diff --git a/Assets/SteamVR/Resources/SteamVR_ClearAll.shader b/Assets/SteamVR/Resources/SteamVR_ClearAll.shader
@@ -1,4 +1,6 @@
-Shader "Custom/SteamVR_ClearAll" {
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+Shader "Custom/SteamVR_ClearAll" {
 	Properties { _MainTex ("Base (RGB)", 2D) = "white" {} }
 
 	CGINCLUDE
@@ -17,7 +19,7 @@
 #if UNITY_VERSION >= 540
 		o.pos = UnityObjectToClipPos(v.vertex);
 #else
-		o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos(v.vertex);
 #endif
 		o.tex = v.texcoord;
 		return o;

diff --git a/Assets/SteamVR/Resources/SteamVR_ColorOut.shader b/Assets/SteamVR/Resources/SteamVR_ColorOut.shader
@@ -1,4 +1,6 @@
-Shader "Custom/SteamVR_ColorOut" {
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+Shader "Custom/SteamVR_ColorOut" {
 	Properties { _MainTex ("Base (RGB)", 2D) = "white" {} }
 
 	CGINCLUDE
@@ -17,7 +19,7 @@
 #if UNITY_VERSION >= 540
 		o.pos = UnityObjectToClipPos(v.vertex);
 #else
-		o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos(v.vertex);
 #endif
 		o.tex = v.texcoord;
 		return o;

diff --git a/Assets/SteamVR/Resources/SteamVR_SphericalProjection.shader b/Assets/SteamVR/Resources/SteamVR_SphericalProjection.shader
@@ -1,4 +1,6 @@
-Shader "Custom/SteamVR_SphericalProjection" {
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+Shader "Custom/SteamVR_SphericalProjection" {
 	Properties {
 		_MainTex ("Base (RGB)", 2D) = "white" {}
 		_N ("N (normal of plane)", Vector) = (0,0,0,0)
@@ -35,7 +37,7 @@
 #if UNITY_VERSION >= 540
 		o.pos = UnityObjectToClipPos(v.vertex);
 #else
-		o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos(v.vertex);
 #endif
 		o.tex = float2(
 			lerp(_Phi0, _Phi1, v.texcoord.x),

diff --git a/Assets/Vive-Teleporter/Art/Materials/Selectable Border.mat b/Assets/Vive-Teleporter/Art/Materials/Selectable Border.mat
@@ -10,115 +10,65 @@ Material:
   m_Shader: {fileID: 4800000, guid: 18f009343c2ca574a83a6413c38bae08, type: 3}
   m_ShaderKeywords: 
   m_LightmapFlags: 5
+  m_EnableInstancingVariants: 0
   m_CustomRenderQueue: 2900
   stringTagMap: {}
+  disabledShaderPasses: []
   m_SavedProperties:
-    serializedVersion: 2
+    serializedVersion: 3
     m_TexEnvs:
-    - first:
-        name: _BumpMap
-      second:
+    - _BumpMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _DetailAlbedoMap
-      second:
+    - _DetailAlbedoMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _DetailMask
-      second:
+    - _DetailMask:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _DetailNormalMap
-      second:
+    - _DetailNormalMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _EmissionMap
-      second:
+    - _EmissionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _MainTex
-      second:
+    - _MainTex:
         m_Texture: {fileID: 2800000, guid: 8d229bee78a4c3e4a8ef189d4ce1ded1, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _MetallicGlossMap
-      second:
+    - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _OcclusionMap
-      second:
+    - _OcclusionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _ParallaxMap
-      second:
+    - _ParallaxMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
-    - first:
-        name: _Alpha
-      second: 1
-    - first:
-        name: _BumpScale
-      second: 1
-    - first:
-        name: _Cutoff
-      second: 0.5
-    - first:
-        name: _DetailNormalMapScale
-      second: 1
-    - first:
-        name: _DstBlend
-      second: 0
-    - first:
-        name: _Glossiness
-      second: 0.5
-    - first:
-        name: _Metallic
-      second: 0
-    - first:
-        name: _Mode
-      second: 0
-    - first:
-        name: _OcclusionStrength
-      second: 1
-    - first:
-        name: _Parallax
-      second: 0.02
-    - first:
-        name: _SrcBlend
-      second: 1
-    - first:
-        name: _TexScale
-      second: 1
-    - first:
-        name: _UVSec
-      second: 0
-    - first:
-        name: _ZWrite
-      second: 1
+    - _Alpha: 1
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _Glossiness: 0.5
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SrcBlend: 1
+    - _TexScale: 1
+    - _UVSec: 0
+    - _ZWrite: 1
     m_Colors:
-    - first:
-        name: _BackColor
-      second: {r: 0.7681661, g: 0.90513265, b: 0.9411765, a: 0.172}
-    - first:
-        name: _Color
-      second: {r: 0.5363322, g: 0.8340889, b: 0.9117647, a: 0.791}
-    - first:
-        name: _EmissionColor
-      second: {r: 0, g: 0, b: 0, a: 1}
+    - _BackColor: {r: 0.7681661, g: 0.90513265, b: 0.9411765, a: 0.172}
+    - _Color: {r: 0.5363322, g: 0.8340889, b: 0.9117647, a: 0.791}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}