Final Push Before AudioLink Update

AcChosen · Oct 6, 2023 · 71f4fa6 · 71f4fa6
1 parent a6f806f
commit 71f4fa6
Show file tree

Hide file tree

Showing 32 changed files with 35 additions and 35 deletions.
diff --git a/...e/Materials/Lights/AudioLink/StandardMover/VRSL-AudioLink-StandardMover-ProjectionMat.mat b/...e/Materials/Lights/AudioLink/StandardMover/VRSL-AudioLink-StandardMover-ProjectionMat.mat
@@ -199,7 +199,7 @@ Material:
     - _ThemeColorTarget: 0
     - _TiltInvert: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: 0

diff --git a/...e/Materials/Lights/AudioLink/StandardMover/VRSL-AudioLink-StandardMover-VolumetricMat.mat b/...e/Materials/Lights/AudioLink/StandardMover/VRSL-AudioLink-StandardMover-VolumetricMat.mat
@@ -247,7 +247,7 @@ Material:
     - _TiltInvert: 0
     - _ToggleMagicNoise: 1
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.9
     - _UseDepthLight: 1
     - _UseRawGrid: 1
     - _UseWorldNorm: 0

diff --git a/...e/Materials/Lights/AudioLink/StaticLight-Blinder/VRSL-AudioLink-Blinder-ProjectionMat.mat b/...e/Materials/Lights/AudioLink/StaticLight-Blinder/VRSL-AudioLink-Blinder-ProjectionMat.mat
@@ -164,7 +164,7 @@ Material:
     - _TextureSampleMode: 0
     - _ThemeColorTarget: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: -4.21

diff --git a/...Materials/Lights/AudioLink/StaticLight-ParLight/VRSL-AudioLink-ParLight-ProjectionMat.mat b/...Materials/Lights/AudioLink/StaticLight-ParLight/VRSL-AudioLink-ParLight-ProjectionMat.mat
@@ -165,7 +165,7 @@ Material:
     - _TextureSampleMode: 0
     - _ThemeColorTarget: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: -4.21

diff --git a/...g/Runtime/Materials/Lights/AudioLink/WashMover/VRSL-AudioLink-WashMover-ProjectionMat.mat b/...g/Runtime/Materials/Lights/AudioLink/WashMover/VRSL-AudioLink-WashMover-ProjectionMat.mat
@@ -199,7 +199,7 @@ Material:
     - _ThemeColorTarget: 0
     - _TiltInvert: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: 0

diff --git a/...g/Runtime/Materials/Lights/AudioLink/WashMover/VRSL-AudioLink-WashMover-VolumetricMat.mat b/...g/Runtime/Materials/Lights/AudioLink/WashMover/VRSL-AudioLink-WashMover-VolumetricMat.mat
@@ -247,7 +247,7 @@ Material:
     - _TiltInvert: 0
     - _ToggleMagicNoise: 1
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.9
     - _UseDepthLight: 1
     - _UseRawGrid: 1
     - _UseWorldNorm: 0

diff --git a/...ghts/DMX/MoverLight - Spotlight/LegacyMode/VRSL-StandardMover-ProjectionMat-HQ-Legacy.mat b/...ghts/DMX/MoverLight - Spotlight/LegacyMode/VRSL-StandardMover-ProjectionMat-HQ-Legacy.mat
@@ -193,7 +193,7 @@ Material:
     - _TextureSampleMode: 0
     - _TiltInvert: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: 0

diff --git a/...ghts/DMX/MoverLight - Spotlight/LegacyMode/VRSL-StandardMover-VolumetricMat-HQ-Legacy.mat b/...ghts/DMX/MoverLight - Spotlight/LegacyMode/VRSL-StandardMover-VolumetricMat-HQ-Legacy.mat
@@ -235,7 +235,7 @@ Material:
     - _TiltInvert: 0
     - _ToggleMagicNoise: 1
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.9
     - _UseDepthLight: 1
     - _UseRawGrid: 1
     - _UseWorldNorm: 0

diff --git a/...ials/Lights/DMX/MoverLight - Spotlight/VRSL-StandardMover-ProjectionMat-HQ-Horizontal.mat b/...ials/Lights/DMX/MoverLight - Spotlight/VRSL-StandardMover-ProjectionMat-HQ-Horizontal.mat
@@ -194,7 +194,7 @@ Material:
     - _TextureSampleMode: 0
     - _TiltInvert: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: 0

diff --git a/...ials/Lights/DMX/MoverLight - Spotlight/VRSL-StandardMover-VolumetricMat-HQ-Horizontal.mat b/...ials/Lights/DMX/MoverLight - Spotlight/VRSL-StandardMover-VolumetricMat-HQ-Horizontal.mat
@@ -238,7 +238,7 @@ Material:
     - _TiltInvert: 0
     - _ToggleMagicNoise: 1
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.9
     - _UseDepthLight: 1
     - _UseRawGrid: 1
     - _UseWorldNorm: 0

diff --git a/.../DMX/MoverLight - Spotlight/VerticalMode/VRSL-StandardMover-ProjectionMat-HQ-Vertical.mat b/.../DMX/MoverLight - Spotlight/VerticalMode/VRSL-StandardMover-ProjectionMat-HQ-Vertical.mat
@@ -193,7 +193,7 @@ Material:
     - _TextureSampleMode: 0
     - _TiltInvert: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: 0

diff --git a/.../DMX/MoverLight - Spotlight/VerticalMode/VRSL-StandardMover-VolumetricMat-HQ-Vertical.mat b/.../DMX/MoverLight - Spotlight/VerticalMode/VRSL-StandardMover-VolumetricMat-HQ-Vertical.mat
@@ -235,7 +235,7 @@ Material:
     - _TiltInvert: 0
     - _ToggleMagicNoise: 1
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.9
     - _UseDepthLight: 1
     - _UseRawGrid: 1
     - _UseWorldNorm: 0

diff --git a/...s/Lights/DMX/MoverLight - Washlight/LegacyMode/VRSL-WashMover-ProjectionMat-HQ-Legacy.mat b/...s/Lights/DMX/MoverLight - Washlight/LegacyMode/VRSL-WashMover-ProjectionMat-HQ-Legacy.mat
@@ -193,7 +193,7 @@ Material:
     - _TextureSampleMode: 0
     - _TiltInvert: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: 0

diff --git a/...s/Lights/DMX/MoverLight - Washlight/LegacyMode/VRSL-WashMover-VolumetricMat-HQ-Legacy.mat b/...s/Lights/DMX/MoverLight - Washlight/LegacyMode/VRSL-WashMover-VolumetricMat-HQ-Legacy.mat
@@ -235,7 +235,7 @@ Material:
     - _TiltInvert: 0
     - _ToggleMagicNoise: 1
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.9
     - _UseDepthLight: 1
     - _UseRawGrid: 1
     - _UseWorldNorm: 0

diff --git a/...aterials/Lights/DMX/MoverLight - Washlight/VRSL-WashMover-ProjectionMat-HQ-Horizontal.mat b/...aterials/Lights/DMX/MoverLight - Washlight/VRSL-WashMover-ProjectionMat-HQ-Horizontal.mat
@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: VRSL-WashMover-ProjectionMat-HQ-Horizontal
   m_Shader: {fileID: 4800000, guid: ce3c400a1c758ae48b94d80f26617ca3, type: 3}
-  m_ShaderKeywords: _DNENABLER_NONE _ENABLESPIN_ON _USERAWGRID_ON
+  m_ShaderKeywords: _DNENABLER_NONE _ENABLESPIN_ON _MULTISAMPLEDEPTH _USERAWGRID_ON
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -193,7 +193,7 @@ Material:
     - _TextureSampleMode: 0
     - _TiltInvert: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: 0

diff --git a/...aterials/Lights/DMX/MoverLight - Washlight/VRSL-WashMover-VolumetricMat-HQ-Horizontal.mat b/...aterials/Lights/DMX/MoverLight - Washlight/VRSL-WashMover-VolumetricMat-HQ-Horizontal.mat
@@ -234,7 +234,7 @@ Material:
     - _TiltInvert: 0
     - _ToggleMagicNoise: 1
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.9
     - _UseDepthLight: 1
     - _UseRawGrid: 1
     - _UseWorldNorm: 0

diff --git a/...ghts/DMX/MoverLight - Washlight/VerticalMode/VRSL-WashMover-ProjectionMat-HQ-Vertical.mat b/...ghts/DMX/MoverLight - Washlight/VerticalMode/VRSL-WashMover-ProjectionMat-HQ-Vertical.mat
@@ -193,7 +193,7 @@ Material:
     - _TextureSampleMode: 0
     - _TiltInvert: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: 0

diff --git a/...ghts/DMX/MoverLight - Washlight/VerticalMode/VRSL-WashMover-VolumetricMat-HQ-Vertical.mat b/...ghts/DMX/MoverLight - Washlight/VerticalMode/VRSL-WashMover-VolumetricMat-HQ-Vertical.mat
@@ -141,7 +141,7 @@ Material:
     - _FinalIntensity: 1
     - _FinalStrobeFreq: 0
     - _FixtureBaseRotationY: 0
-    - _FixtureMaxIntensity: 0.35
+    - _FixtureMaxIntensity: 0.3
     - _FixtureRotationX: 0
     - _GlobalIntensity: 1
     - _GlobalIntensityBlend: 1
@@ -235,7 +235,7 @@ Material:
     - _TiltInvert: 0
     - _ToggleMagicNoise: 1
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.9
     - _UseDepthLight: 1
     - _UseRawGrid: 1
     - _UseWorldNorm: 0

diff --git a/...ls/Lights/DMX/StaticLight-Blinder/5-Channel/VRSL-Blinder-ProjectionMat-Horizontal-5CH.mat b/...ls/Lights/DMX/StaticLight-Blinder/5-Channel/VRSL-Blinder-ProjectionMat-Horizontal-5CH.mat
@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: VRSL-Blinder-ProjectionMat-Horizontal-5CH
   m_Shader: {fileID: 4800000, guid: 3112589b70301d047baf8f5211152b0e, type: 3}
-  m_ShaderKeywords: _CHANNEL_MODE _EMISSION _USERAWGRID_ON
+  m_ShaderKeywords: _CHANNEL_MODE _EMISSION _MULTISAMPLEDEPTH _USERAWGRID_ON
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -153,7 +153,7 @@ Material:
     - _StrobeFreq: 12.76
     - _TextureSampleMode: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: -4.21

diff --git a/...ts/DMX/StaticLight-Blinder/LegacyMode/5-Channel/VRSL-Blinder-ProjectionMat-Legacy-5CH.mat b/...ts/DMX/StaticLight-Blinder/LegacyMode/5-Channel/VRSL-Blinder-ProjectionMat-Legacy-5CH.mat
@@ -153,7 +153,7 @@ Material:
     - _StrobeFreq: 12.76
     - _TextureSampleMode: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: -4.21

diff --git a/...Materials/Lights/DMX/StaticLight-Blinder/LegacyMode/VRSL-Blinder-ProjectionMat-Legacy.mat b/...Materials/Lights/DMX/StaticLight-Blinder/LegacyMode/VRSL-Blinder-ProjectionMat-Legacy.mat
@@ -153,7 +153,7 @@ Material:
     - _StrobeFreq: 12.76
     - _TextureSampleMode: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: -4.21

diff --git a/...untime/Materials/Lights/DMX/StaticLight-Blinder/VRSL-Blinder-ProjectionMat-Horizontal.mat b/...untime/Materials/Lights/DMX/StaticLight-Blinder/VRSL-Blinder-ProjectionMat-Horizontal.mat
@@ -153,7 +153,7 @@ Material:
     - _StrobeFreq: 12.76
     - _TextureSampleMode: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: -4.21

diff --git a/...MX/StaticLight-Blinder/VerticalMode/5-Channel/VRSL-Blinder-ProjectionMat-Vertical-5CH.mat b/...MX/StaticLight-Blinder/VerticalMode/5-Channel/VRSL-Blinder-ProjectionMat-Vertical-5CH.mat
@@ -153,7 +153,7 @@ Material:
     - _StrobeFreq: 12.76
     - _TextureSampleMode: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: -4.21

diff --git a/...rials/Lights/DMX/StaticLight-Blinder/VerticalMode/VRSL-Blinder-ProjectionMat-Vertical.mat b/...rials/Lights/DMX/StaticLight-Blinder/VerticalMode/VRSL-Blinder-ProjectionMat-Vertical.mat
@@ -153,7 +153,7 @@ Material:
     - _StrobeFreq: 12.76
     - _TextureSampleMode: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: -4.21

diff --git a/.../Lights/DMX/StaticLight-ParLight/5-Channel/VRSL-ParLight-ProjectionMat-Horizontal-5CH.mat b/.../Lights/DMX/StaticLight-ParLight/5-Channel/VRSL-ParLight-ProjectionMat-Horizontal-5CH.mat
@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: VRSL-ParLight-ProjectionMat-Horizontal-5CH
   m_Shader: {fileID: 4800000, guid: 3112589b70301d047baf8f5211152b0e, type: 3}
-  m_ShaderKeywords: _CHANNEL_MODE _EMISSION _USERAWGRID_ON
+  m_ShaderKeywords: _CHANNEL_MODE _EMISSION _MULTISAMPLEDEPTH _USERAWGRID_ON
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -150,7 +150,7 @@ Material:
     - _StrobeFreq: 12.76
     - _TextureSampleMode: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: -4.21

diff --git a/.../DMX/StaticLight-ParLight/LegacyMode/5-Channel/VRSL-ParLight-ProjectionMat-Legacy-5CH.mat b/.../DMX/StaticLight-ParLight/LegacyMode/5-Channel/VRSL-ParLight-ProjectionMat-Legacy-5CH.mat
@@ -150,7 +150,7 @@ Material:
     - _StrobeFreq: 12.76
     - _TextureSampleMode: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: -4.21

diff --git a/...terials/Lights/DMX/StaticLight-ParLight/LegacyMode/VRSL-ParLight-ProjectionMat-Legacy.mat b/...terials/Lights/DMX/StaticLight-ParLight/LegacyMode/VRSL-ParLight-ProjectionMat-Legacy.mat
@@ -150,7 +150,7 @@ Material:
     - _StrobeFreq: 12.76
     - _TextureSampleMode: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: -4.21

diff --git a/...time/Materials/Lights/DMX/StaticLight-ParLight/VRSL-ParLight-ProjectionMat-Horizontal.mat b/...time/Materials/Lights/DMX/StaticLight-ParLight/VRSL-ParLight-ProjectionMat-Horizontal.mat
@@ -150,7 +150,7 @@ Material:
     - _StrobeFreq: 12.76
     - _TextureSampleMode: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: -4.21

diff --git a/.../StaticLight-ParLight/VerticalMode/5-Channel/VRSL-ParLight-ProjectionMat-Vertical-5CH.mat b/.../StaticLight-ParLight/VerticalMode/5-Channel/VRSL-ParLight-ProjectionMat-Vertical-5CH.mat
@@ -150,7 +150,7 @@ Material:
     - _StrobeFreq: 12.76
     - _TextureSampleMode: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: -4.21

diff --git a/...als/Lights/DMX/StaticLight-ParLight/VerticalMode/VRSL-ParLight-ProjectionMat-Vertical.mat b/...als/Lights/DMX/StaticLight-ParLight/VerticalMode/VRSL-ParLight-ProjectionMat-Vertical.mat
@@ -150,7 +150,7 @@ Material:
     - _StrobeFreq: 12.76
     - _TextureSampleMode: 0
     - _TriplanarFalloff: 1
-    - _UniversalIntensity: 1
+    - _UniversalIntensity: 0.5
     - _UseRawGrid: 1
     - _UseWorldNorm: 0
     - _XOffset: -4.21

diff --git a/...sen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-ProjectionMesh.shader b/...sen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-ProjectionMesh.shader
@@ -102,7 +102,7 @@
 			Stencil
 			{
 				Ref 142
-				Comp Greater
+				Comp NotEqual
 			}
             CGPROGRAM
 

diff --git a/...tures/MoverLightTextures/Washlight/WashLight-Mesh_WashMover-HQ_EmissionMask.png b/...tures/MoverLightTextures/Washlight/WashLight-Mesh_WashMover-HQ_EmissionMask.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -102,7 +102,7 @@ @@
     			Stencil
     			{
     				Ref 142
-    				Comp Greater
+    				Comp NotEqual
     			}
                 CGPROGRAM
@@ Expand Down @@