diff --git a/Packages/com.acchosen.vr-stage-lighting/Editor/VRSLInspector.cs b/Packages/com.acchosen.vr-stage-lighting/Editor/VRSLInspector.cs index 25ce387..c86874a 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Editor/VRSLInspector.cs +++ b/Packages/com.acchosen.vr-stage-lighting/Editor/VRSLInspector.cs @@ -235,6 +235,7 @@ public class VRSLInspector : ShaderGUI //Interpolation Render Texture MaterialProperty _SmoothValue = null; + MaterialProperty _UseOldSchoolSmoothing = null; MaterialProperty _MinimumSmoothnessDMX = null; MaterialProperty _MaximumSmoothnessDMX = null; @@ -1756,6 +1757,7 @@ public class VRSLInspector : ShaderGUI { GUILayout.Space(5); EditorGUI.indentLevel++; + matEditor.ShaderProperty(_UseOldSchoolSmoothing, new GUIContent("Use Old School Smoothing Technique", "Uses the old smoothing technique. Recommended for Light+Color Textures.")); matEditor.ShaderProperty(_EnableLegacyGlobalMovementSpeedChannel, new GUIContent("Enable Legacy Global Movement Speed", "Enables the use of the old Global Movement Speed Channel (DMX Channel 511) instead of having each sector have its own movement speed control. /nThis will always be true when compatibility mode is enabled")); matEditor.ShaderProperty(_EnableCompatibilityMode, new GUIContent("Enable Compatibility Mode", "Changes the grid from reading the new 208x1080 grid to the old 200x200 grid. \nThis property is not an instanced property.")); matEditor.ShaderProperty(_EnableDMX, new GUIContent("Enable DMX", "Enables or Disables reading from the DMX Render Textures")); diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-Interpolated-Color+Intensity-Horizontal.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-Interpolated-Color+Intensity-Horizontal.mat index de9592c..5b2b5f6 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-Interpolated-Color+Intensity-Horizontal.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-Interpolated-Color+Intensity-Horizontal.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: DMXRTMaterial-Interpolated-Color+Intensity-Horizontal m_Shader: {fileID: 4800000, guid: 715ebff4a0305954f96e78ccb3676141, type: 3} - m_ShaderKeywords: _NINEUNIVERSEMODE_ON + m_ShaderKeywords: _NINEUNIVERSEMODE_ON _OLD_SCHOOL_SMOOTHING m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -94,11 +94,12 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _Sector: 0 - - _SmoothValue: 0.755 + - _SmoothValue: 0.7 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 + - _UseOldSchoolSmoothing: 1 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-Interpolated-Movement-Horizontal.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-Interpolated-Movement-Horizontal.mat index 0eadbfc..2f10882 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-Interpolated-Movement-Horizontal.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-Interpolated-Movement-Horizontal.mat @@ -84,21 +84,22 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - - _MaximumSmoothnessDMX: 0.15 + - _MaximumSmoothnessDMX: 0.5 - _MaximumSmoothnessOSC: 0.15 - _Metallic: 0 - - _MinimumSmoothnessDMX: 0.0025 + - _MinimumSmoothnessDMX: 0.25 - _MinimumSmoothnessOSC: 0.0025 - _Mode: 0 - _NineUniverseMode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _Sector: 39 - - _SmoothValue: 0.033 + - _SmoothValue: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 + - _UseOldSchoolSmoothing: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRT-StrobeOutput-Vertical.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeOutput-Horizontal.mat similarity index 97% rename from Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRT-StrobeOutput-Vertical.mat rename to Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeOutput-Horizontal.mat index 05103b7..16729cc 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRT-StrobeOutput-Vertical.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeOutput-Horizontal.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: DMXRT-StrobeOutput-Vertical + m_Name: DMXRTMaterial-StrobeOutput-Horizontal m_Shader: {fileID: 4800000, guid: 4fd2aba1f194f2944983084cf77021b3, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRT-StrobeOutput-Horizontal.mat.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeOutput-Horizontal.mat.meta similarity index 100% rename from Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRT-StrobeOutput-Horizontal.mat.meta rename to Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeOutput-Horizontal.mat.meta diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeOutput-ReRender-Final-Horizontal.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeOutput-ReRender-Final-Horizontal.mat new file mode 100644 index 0000000..1960df5 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeOutput-ReRender-Final-Horizontal.mat @@ -0,0 +1,81 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DMXRTMaterial-StrobeOutput-ReRender-Final-Horizontal + m_Shader: {fileID: 4800000, guid: ef72139c4ded1554faff62378cee3ee3, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Input: + m_Texture: {fileID: 8600000, guid: 99d1c91f47ceb344ea8d62554a087e98, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeOutput-ReRender-Final-Horizontal.mat.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeOutput-ReRender-Final-Horizontal.mat.meta new file mode 100644 index 0000000..d70c6c8 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeOutput-ReRender-Final-Horizontal.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8c13ae49b6d25b544baa640882e96203 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeOutput-ReRender-Initial-Horizontal.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeOutput-ReRender-Initial-Horizontal.mat new file mode 100644 index 0000000..1cccb53 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeOutput-ReRender-Initial-Horizontal.mat @@ -0,0 +1,81 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DMXRTMaterial-StrobeOutput-ReRender-Initial-Horizontal + m_Shader: {fileID: 4800000, guid: ef72139c4ded1554faff62378cee3ee3, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Input: + m_Texture: {fileID: 8600000, guid: 580ab95419bdcc845a4bd0b1a94983c0, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeOutput-ReRender-Initial-Horizontal.mat.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeOutput-ReRender-Initial-Horizontal.mat.meta new file mode 100644 index 0000000..3e926de --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeOutput-ReRender-Initial-Horizontal.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3295662a5302f2e48945f52943308c6f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeTimings-Horizontal.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeTimings-Horizontal.mat index 5278884..6bc3ddb 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeTimings-Horizontal.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeTimings-Horizontal.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: DMXRTMaterial-StrobeTimings-Horizontal m_Shader: {fileID: 4800000, guid: 70d085252a756e54e96824cb28a38a48, type: 3} - m_ShaderKeywords: _NINEUNIVERSEMODE_ON _VRSL_STATICFREQUENCIES + m_ShaderKeywords: _VRSL_STATICFREQUENCIES m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,10 +32,10 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _HighFrequency: 75 - - _LowFrequency: 40 + - _HighFrequency: 65 + - _LowFrequency: 25 - _MaxStrobeFreq: 185 - - _MedFrequency: 60 + - _MedFrequency: 45 - _NineUniverseMode: 0 - _SmoothValue: 0.5 - _StrobeType: 1 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-Interpolated-Color+Intensity-Legacy.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-Interpolated-Color+Intensity-Legacy.mat index c6f02a4..7293682 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-Interpolated-Color+Intensity-Legacy.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-Interpolated-Color+Intensity-Legacy.mat @@ -10,6 +10,7 @@ Material: m_Name: DMXRTMaterial-Interpolated-Color+Intensity-Legacy m_Shader: {fileID: 4800000, guid: 715ebff4a0305954f96e78ccb3676141, type: 3} m_ShaderKeywords: _ENABLECOMPATIBILITYMODE_ON _ENABLELEGACYGLOBALMOVEMENTSPEEDCHANNEL_ON + _OLD_SCHOOL_SMOOTHING m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -94,11 +95,12 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _Sector: 0 - - _SmoothValue: 0.4 + - _SmoothValue: 0.6 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 + - _UseOldSchoolSmoothing: 1 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-Interpolated-Movement-Legacy.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-Interpolated-Movement-Legacy.mat index 4f45742..1d6d3c3 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-Interpolated-Movement-Legacy.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-Interpolated-Movement-Legacy.mat @@ -85,10 +85,10 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - - _MaximumSmoothnessDMX: 0.15 + - _MaximumSmoothnessDMX: 0.5 - _MaximumSmoothnessOSC: 0.15 - _Metallic: 0 - - _MinimumSmoothnessDMX: 0.0025 + - _MinimumSmoothnessDMX: 0.25 - _MinimumSmoothnessOSC: 0.0025 - _Mode: 0 - _NineUniverseMode: 0 @@ -100,6 +100,7 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 + - _UseOldSchoolSmoothing: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-SpinnerTimer-Legacy.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-SpinnerTimer-Legacy.mat index c7384dc..8a9ac08 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-SpinnerTimer-Legacy.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-SpinnerTimer-Legacy.mat @@ -32,6 +32,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + - _MaxSpinSpeed: 0 - _MaxStrobeFreq: 100 - _NineUniverseMode: 0 - _SmoothValue: 0.5 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/Legacy/DMXRT-StrobeOutput-Legacy.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-StrobeOutput-Legacy.mat similarity index 98% rename from Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/Legacy/DMXRT-StrobeOutput-Legacy.mat rename to Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-StrobeOutput-Legacy.mat index 7e74f7d..6f69009 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/Legacy/DMXRT-StrobeOutput-Legacy.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-StrobeOutput-Legacy.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: DMXRT-StrobeOutput-Legacy + m_Name: DMXRTMaterial-StrobeOutput-Legacy m_Shader: {fileID: 4800000, guid: 4fd2aba1f194f2944983084cf77021b3, type: 3} m_ShaderKeywords: _ENABLECOMPATIBILITYMODE_ON m_LightmapFlags: 4 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/Legacy/DMXRT-StrobeOutput-Legacy.mat.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-StrobeOutput-Legacy.mat.meta similarity index 100% rename from Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/Legacy/DMXRT-StrobeOutput-Legacy.mat.meta rename to Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-StrobeOutput-Legacy.mat.meta diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-Interpolated-Color+Intensity-Vertical.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-Interpolated-Color+Intensity-Vertical.mat index 69f9046..d069fc2 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-Interpolated-Color+Intensity-Vertical.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-Interpolated-Color+Intensity-Vertical.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: DMXRTMaterial-Interpolated-Color+Intensity-Vertical m_Shader: {fileID: 4800000, guid: 715ebff4a0305954f96e78ccb3676141, type: 3} - m_ShaderKeywords: + m_ShaderKeywords: _OLD_SCHOOL_SMOOTHING m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -94,11 +94,12 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _Sector: 0 - - _SmoothValue: 0.6 + - _SmoothValue: 0.7 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 + - _UseOldSchoolSmoothing: 1 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-Interpolated-Movement-Vertical.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-Interpolated-Movement-Vertical.mat index 65b6d6a..d6fd288 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-Interpolated-Movement-Vertical.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-Interpolated-Movement-Vertical.mat @@ -84,10 +84,10 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - - _MaximumSmoothnessDMX: 0.15 + - _MaximumSmoothnessDMX: 0.5 - _MaximumSmoothnessOSC: 0.15 - _Metallic: 0 - - _MinimumSmoothnessDMX: 0.0025 + - _MinimumSmoothnessDMX: 0.25 - _MinimumSmoothnessOSC: 0.0025 - _Mode: 0 - _NineUniverseMode: 0 @@ -99,6 +99,7 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 + - _UseOldSchoolSmoothing: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeOutput-ReRender-Final-Vertical.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeOutput-ReRender-Final-Vertical.mat new file mode 100644 index 0000000..08e071b --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeOutput-ReRender-Final-Vertical.mat @@ -0,0 +1,81 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DMXRTMaterial-StrobeOutput-ReRender-Final-Vertical + m_Shader: {fileID: 4800000, guid: ef72139c4ded1554faff62378cee3ee3, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Input: + m_Texture: {fileID: 8600000, guid: cc132e098e98e24448b3171b5f9834d8, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeOutput-ReRender-Final-Vertical.mat.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeOutput-ReRender-Final-Vertical.mat.meta new file mode 100644 index 0000000..2494b2f --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeOutput-ReRender-Final-Vertical.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0b687747c5a82cd4c97da8c251df6f04 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeOutput-ReRender-Initial-Vertical.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeOutput-ReRender-Initial-Vertical.mat new file mode 100644 index 0000000..54eb60c --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeOutput-ReRender-Initial-Vertical.mat @@ -0,0 +1,81 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DMXRTMaterial-StrobeOutput-ReRender-Initial-Vertical + m_Shader: {fileID: 4800000, guid: ef72139c4ded1554faff62378cee3ee3, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Input: + m_Texture: {fileID: 8600000, guid: 42aa50059d38ab44a95ee1cb7a7c5d5b, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeOutput-ReRender-Initial-Vertical.mat.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeOutput-ReRender-Initial-Vertical.mat.meta new file mode 100644 index 0000000..152e9e4 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeOutput-ReRender-Initial-Vertical.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6241055f6a0bfc140aa7dbf5d4d47eb1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRT-StrobeOutput-Horizontal.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeOutput-Vertical.mat similarity index 97% rename from Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRT-StrobeOutput-Horizontal.mat rename to Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeOutput-Vertical.mat index 9594782..2316c8d 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRT-StrobeOutput-Horizontal.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeOutput-Vertical.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: DMXRT-StrobeOutput-Horizontal + m_Name: DMXRTMaterial-StrobeOutput-Vertical m_Shader: {fileID: 4800000, guid: 4fd2aba1f194f2944983084cf77021b3, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRT-StrobeOutput-Vertical.mat.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeOutput-Vertical.mat.meta similarity index 100% rename from Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRT-StrobeOutput-Vertical.mat.meta rename to Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeOutput-Vertical.mat.meta diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeTimings-Vertical.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeTimings-Vertical.mat index f255286..505fc27 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeTimings-Vertical.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeTimings-Vertical.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: DMXRTMaterial-StrobeTimings-Vertical m_Shader: {fileID: 4800000, guid: 70d085252a756e54e96824cb28a38a48, type: 3} - m_ShaderKeywords: + m_ShaderKeywords: _VRSL_STATICFREQUENCIES m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,11 +32,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _HighFrequency: 75 + - _HighFrequency: 65 - _LowFrequency: 25 - _MaxStrobeFreq: 100 - - _MedFrequency: 50 + - _MedFrequency: 45 - _NineUniverseMode: 0 - _SmoothValue: 0.5 - - _StrobeType: 0 + - _StrobeType: 1 m_Colors: [] diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/AudioLink/WashMover/VRSL-AudioLink-WashMover-VolumetricMat.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/AudioLink/WashMover/VRSL-AudioLink-WashMover-VolumetricMat.mat index 1f99da0..778e66b 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/AudioLink/WashMover/VRSL-AudioLink-WashMover-VolumetricMat.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/AudioLink/WashMover/VRSL-AudioLink-WashMover-VolumetricMat.mat @@ -50,6 +50,10 @@ Material: m_Texture: {fileID: 2800000, guid: 95dae414ef2ffd7438602114879b8b41, type: 3} m_Scale: {x: 0.001, y: 5} m_Offset: {x: 0, y: 0} + - _NoiseTexHigh: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OSCGridRenderTexture: m_Texture: {fileID: 8600000, guid: 85ba02ef33f4e4c4a94d9085f48ec5c1, type: 2} m_Scale: {x: 1, y: 1} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/MoverLight - Washlight/LegacyMode/VRSL-WashMover-VolumetricMat-HQ-Legacy.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/MoverLight - Washlight/LegacyMode/VRSL-WashMover-VolumetricMat-HQ-Legacy.mat index 81f5692..6c1312b 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/MoverLight - Washlight/LegacyMode/VRSL-WashMover-VolumetricMat-HQ-Legacy.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/MoverLight - Washlight/LegacyMode/VRSL-WashMover-VolumetricMat-HQ-Legacy.mat @@ -46,6 +46,10 @@ Material: m_Texture: {fileID: 2800000, guid: 95dae414ef2ffd7438602114879b8b41, type: 3} m_Scale: {x: 0.001, y: 5} m_Offset: {x: 0, y: 0} + - _NoiseTexHigh: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OSCGridRenderTexture: m_Texture: {fileID: 8600000, guid: 85ba02ef33f4e4c4a94d9085f48ec5c1, type: 2} m_Scale: {x: 1, y: 1} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers.meta index b287479..f1eea03 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers.meta +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d7e301d15bc2f34409daed7a958bd5ab +guid: 6a0fbdbee2f2bc64a813d1ce8cb37d0f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/5-Channel.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/5-Channel.meta index 1562d0f..4a86512 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/5-Channel.meta +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/5-Channel.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3e3f9fcfad2dd2c4e96a7a6ca3e42089 +guid: 220192ae439d7464c90e7b8363b74ad3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/LegacyMode.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/LegacyMode.meta index 9ab39ab..25d2fdb 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/LegacyMode.meta +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/LegacyMode.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f4e4503f526cdde469ff76a45b49c9e5 +guid: 872c196db06a81f4da224fda62cc0764 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/VerticalMode.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/VerticalMode.meta index d23272d..3453255 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/VerticalMode.meta +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/VerticalMode.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d725d4dac45a04b42b6d36922da979e0 +guid: e09cf32890c5adc4bbf0f8d86562abdc folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/VerticalMode/5-Channel.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/VerticalMode/5-Channel.meta index 0ba0fb9..9cb4db0 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/VerticalMode/5-Channel.meta +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/VerticalMode/5-Channel.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3f9e6af7be09cf34681c8cef5e9a08f2 +guid: 2901ff78daf05104aa6a3786bb170201 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Prefabs/VRSL-LocalUIControlPanel.prefab b/Packages/com.acchosen.vr-stage-lighting/Runtime/Prefabs/VRSL-LocalUIControlPanel.prefab index 5d4186c..29fb868 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Prefabs/VRSL-LocalUIControlPanel.prefab +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Prefabs/VRSL-LocalUIControlPanel.prefab @@ -5034,18 +5034,23 @@ MonoBehaviour: isUsingDMX: 1 isUsingAudioLink: 0 DMXMode: 0 + delayStrobeForGI: 1 DMX_CRTS_Horizontal: - {fileID: 8600000, guid: 57481ad1fad57a247b2754e1469292a9, type: 2} - {fileID: 8600000, guid: 5225295a38260644c99eb0aebf544ec8, type: 2} - {fileID: 8600000, guid: 7d9e75ad34a1ba34db218840cb76100e, type: 2} - {fileID: 8600000, guid: fbbd57abbf5ece54c9996e59beb3dac1, type: 2} - {fileID: 8600000, guid: 580ab95419bdcc845a4bd0b1a94983c0, type: 2} + - {fileID: 8600000, guid: 99d1c91f47ceb344ea8d62554a087e98, type: 2} + - {fileID: 8600000, guid: 8c4ff92799dcc5641ac0f7d4ec2f8163, type: 2} DMX_CRTS_Vertical: - {fileID: 8600000, guid: 2db39b03bdcb2124aaba3db138dd0754, type: 2} - {fileID: 8600000, guid: 3d0e5498d25faf34999f530603c36e4d, type: 2} - {fileID: 8600000, guid: d8d7d540bd7f30c4b845dcca7a985f31, type: 2} - {fileID: 8600000, guid: d4c740f9462f25d4a9d1cc2063318a5f, type: 2} - {fileID: 8600000, guid: 42aa50059d38ab44a95ee1cb7a7c5d5b, type: 2} + - {fileID: 8600000, guid: cc132e098e98e24448b3171b5f9834d8, type: 2} + - {fileID: 8600000, guid: 57baa88f99df79f428add8e6e1c79597, type: 2} DMX_CRTS_Legacy: - {fileID: 8600000, guid: 3bcce6f0fa9c3d4499ca3015b073785e, type: 2} - {fileID: 8600000, guid: 85ba02ef33f4e4c4a94d9085f48ec5c1, type: 2} @@ -5060,6 +5065,9 @@ MonoBehaviour: tiltRangeTarget: -180 useLegacyStaticLights: 0 useExtendedUniverses: 0 + sperateInGameInterpolationSpeed: 1 + inGameInterpolationModifier: 1.55 + useDMXGI: 0 _volumetricNoise: 1 _requireDepthLight: 1 --- !u!114 &5530545822544342666 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Scripts/VRSL_LocalUIControlPanel.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Scripts/VRSL_LocalUIControlPanel.asset index 4cdd923..03fac99 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Scripts/VRSL_LocalUIControlPanel.asset +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Scripts/VRSL_LocalUIControlPanel.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 90 + Data: 94 - Name: Entry: 7 Data: @@ -3870,25 +3870,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: DMX_CRTS_Horizontal + Data: delayStrobeForGI - Name: $v Entry: 7 Data: 186|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: DMX_CRTS_Horizontal + Data: delayStrobeForGI - Name: k__BackingField - Entry: 7 - Data: 187|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.CustomRenderTexture[], UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 24 - Name: k__BackingField Entry: 9 - Data: 187 + Data: 24 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3903,14 +3897,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 188|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 187|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 189|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 188|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 20 @@ -3934,19 +3928,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: DMX_CRTS_Vertical + Data: DMX_CRTS_Horizontal - Name: $v Entry: 7 - Data: 190|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 189|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: DMX_CRTS_Vertical + Data: DMX_CRTS_Horizontal - Name: k__BackingField - Entry: 9 - Data: 187 + Entry: 7 + Data: 190|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.CustomRenderTexture[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 187 + Data: 190 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3963,159 +3963,15 @@ MonoBehaviour: Entry: 7 Data: 191|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: DMX_CRTS_Legacy - - Name: $v - Entry: 7 - Data: 192|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: DMX_CRTS_Legacy - - Name: k__BackingField - Entry: 9 - Data: 187 - - Name: k__BackingField - Entry: 9 - Data: 187 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 193|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: AudioLink_CRTs - - Name: $v - Entry: 7 - Data: 194|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: AudioLink_CRTs - - Name: k__BackingField - Entry: 9 - Data: 187 - - Name: k__BackingField - Entry: 9 - Data: 187 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 195|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: fixtureGizmos - - Name: $v - Entry: 7 - Data: 196|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: fixtureGizmos - - Name: k__BackingField - Entry: 9 - Data: 20 - - Name: k__BackingField - Entry: 9 - Data: 20 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 197|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 198|UnityEngine.HideInInspector, UnityEngine.CoreModule + Data: 192|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 5 - Name: Entry: 8 Data: @@ -4136,19 +3992,166 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: panRangeTarget + Data: DMX_CRTS_Vertical + - Name: $v + Entry: 7 + Data: 193|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: DMX_CRTS_Vertical + - Name: k__BackingField + Entry: 9 + Data: 190 + - Name: k__BackingField + Entry: 9 + Data: 190 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 194|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: DMX_CRTS_Legacy + - Name: $v + Entry: 7 + Data: 195|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: DMX_CRTS_Legacy + - Name: k__BackingField + Entry: 9 + Data: 190 + - Name: k__BackingField + Entry: 9 + Data: 190 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 196|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: AudioLink_CRTs + - Name: $v + Entry: 7 + Data: 197|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: AudioLink_CRTs + - Name: k__BackingField + Entry: 9 + Data: 190 + - Name: k__BackingField + Entry: 9 + Data: 190 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 198|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: fixtureGizmos - Name: $v Entry: 7 Data: 199|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: panRangeTarget + Data: fixtureGizmos - Name: k__BackingField Entry: 9 - Data: 106 + Data: 20 - Name: k__BackingField Entry: 9 - Data: 106 + Data: 20 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4191,13 +4194,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: tiltRangeTarget + Data: panRangeTarget - Name: $v Entry: 7 Data: 202|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: tiltRangeTarget + Data: panRangeTarget - Name: k__BackingField Entry: 9 Data: 106 @@ -4246,19 +4249,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: useLegacyStaticLights + Data: tiltRangeTarget - Name: $v Entry: 7 Data: 205|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: useLegacyStaticLights + Data: tiltRangeTarget - Name: k__BackingField Entry: 9 - Data: 24 + Data: 106 - Name: k__BackingField Entry: 9 - Data: 24 + Data: 106 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4301,13 +4304,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: useExtendedUniverses + Data: useLegacyStaticLights - Name: $v Entry: 7 Data: 208|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: useExtendedUniverses + Data: useLegacyStaticLights - Name: k__BackingField Entry: 9 Data: 24 @@ -4332,7 +4335,13 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 210|UnityEngine.HideInInspector, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -4350,13 +4359,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: useDMXGI + Data: useExtendedUniverses - Name: $v Entry: 7 - Data: 210|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 211|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: useDMXGI + Data: useExtendedUniverses - Name: k__BackingField Entry: 9 Data: 24 @@ -4377,17 +4386,11 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 211|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 212|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 212|UnityEngine.HideInInspector, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -4405,13 +4408,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _volumetricNoise + Data: sperateInGameInterpolationSpeed - Name: $v Entry: 7 Data: 213|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _volumetricNoise + Data: sperateInGameInterpolationSpeed - Name: k__BackingField Entry: 9 Data: 24 @@ -4436,19 +4439,7 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 215|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 216|UnityEngine.SerializeField, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -4466,19 +4457,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Udon_DMXGridRenderTexture + Data: inGameInterpolationModifier - Name: $v Entry: 7 - Data: 217|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 215|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Udon_DMXGridRenderTexture + Data: inGameInterpolationModifier - Name: k__BackingField Entry: 9 - Data: 20 + Data: 106 - Name: k__BackingField Entry: 9 - Data: 20 + Data: 106 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4490,7 +4481,56 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 216|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: outputDebugLogs + - Name: $v + Entry: 7 + Data: 217|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: outputDebugLogs + - Name: k__BackingField + Entry: 9 + Data: 24 + - Name: k__BackingField + Entry: 9 + Data: 24 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true - Name: _fieldAttributes Entry: 7 Data: 218|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], @@ -4515,19 +4555,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Udon_DMXGridRenderTextureMovement + Data: useDMXGI - Name: $v Entry: 7 Data: 219|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Udon_DMXGridRenderTextureMovement + Data: useDMXGI - Name: k__BackingField Entry: 9 - Data: 20 + Data: 24 - Name: k__BackingField Entry: 9 - Data: 20 + Data: 24 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4539,11 +4579,176 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 Data: 220|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 221|UnityEngine.HideInInspector, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _volumetricNoise + - Name: $v + Entry: 7 + Data: 222|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _volumetricNoise + - Name: k__BackingField + Entry: 9 + Data: 24 + - Name: k__BackingField + Entry: 9 + Data: 24 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 223|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 224|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 225|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Udon_DMXGridRenderTexture + - Name: $v + Entry: 7 + Data: 226|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Udon_DMXGridRenderTexture + - Name: k__BackingField + Entry: 9 + Data: 20 + - Name: k__BackingField + Entry: 9 + Data: 20 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 227|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Udon_DMXGridRenderTextureMovement + - Name: $v + Entry: 7 + Data: 228|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Udon_DMXGridRenderTextureMovement + - Name: k__BackingField + Entry: 9 + Data: 20 + - Name: k__BackingField + Entry: 9 + Data: 20 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 229|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 0 @@ -4567,7 +4772,7 @@ MonoBehaviour: Data: _Udon_DMXGridSpinTimer - Name: $v Entry: 7 - Data: 221|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 230|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Udon_DMXGridSpinTimer @@ -4591,7 +4796,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 222|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 231|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -4616,7 +4821,7 @@ MonoBehaviour: Data: _Udon_DMXGridStrobeTimer - Name: $v Entry: 7 - Data: 223|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 232|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Udon_DMXGridStrobeTimer @@ -4640,7 +4845,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 224|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 233|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -4665,7 +4870,7 @@ MonoBehaviour: Data: _Udon_DMXGridStrobeOutput - Name: $v Entry: 7 - Data: 225|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 234|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Udon_DMXGridStrobeOutput @@ -4689,7 +4894,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 226|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 235|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -4714,7 +4919,7 @@ MonoBehaviour: Data: _requireDepthLight - Name: $v Entry: 7 - Data: 227|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 236|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _requireDepthLight @@ -4738,20 +4943,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 228|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 237|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 229|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 238|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 230|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 239|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Scripts/VRSL_LocalUIControlPanel.cs b/Packages/com.acchosen.vr-stage-lighting/Runtime/Scripts/VRSL_LocalUIControlPanel.cs index 910d82b..eb9defb 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Scripts/VRSL_LocalUIControlPanel.cs +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Scripts/VRSL_LocalUIControlPanel.cs @@ -116,6 +116,8 @@ namespace VRSL const int VERTICAL_MODE = 1; const int LEGACY_MODE = 2; [Space(20)] + public bool delayStrobeForGI = true; + [Space(5)] public CustomRenderTexture[] DMX_CRTS_Horizontal; public CustomRenderTexture[] DMX_CRTS_Vertical; public CustomRenderTexture[] DMX_CRTS_Legacy; @@ -132,6 +134,10 @@ namespace VRSL [HideInInspector] public bool useLegacyStaticLights = false; public bool useExtendedUniverses = false; + // public bool adjustInGameInterpolation; + public bool sperateInGameInterpolationSpeed = true; + public float inGameInterpolationModifier = 1.55f; + public bool outputDebugLogs; [HideInInspector] @@ -174,6 +180,44 @@ namespace VRSL _Udon_DMXGridStrobeOutput = PropertyToID("_Udon_DMXGridStrobeOutput"); } + void ReduceInGameInterpolation() + { + if(sperateInGameInterpolationSpeed) + { + foreach(CustomRenderTexture rend in DMX_CRTS_Horizontal) + { + + if(rend.material != null && rend.material.name.Contains("Interpolated")) + { + float max = Mathf.Clamp01(rend.material.GetFloat("_MaximumSmoothnessDMX")); + float min = Mathf.Clamp01(rend.material.GetFloat("_MinimumSmoothnessDMX")); + rend.material.SetFloat("_MaximumSmoothnessDMX", Mathf.Clamp01(max/inGameInterpolationModifier)); + rend.material.SetFloat("_MinimumSmoothnessDMX", Mathf.Clamp01(min/inGameInterpolationModifier)); + } + } + foreach(CustomRenderTexture rend in DMX_CRTS_Vertical) + { + if(rend.material != null && rend.material.name.Contains("Interpolated")) + { + float max = Mathf.Clamp01(rend.material.GetFloat("_MaximumSmoothnessDMX")); + float min = Mathf.Clamp01(rend.material.GetFloat("_MinimumSmoothnessDMX")); + rend.material.SetFloat("_MaximumSmoothnessDMX", Mathf.Clamp01(max/inGameInterpolationModifier)); + rend.material.SetFloat("_MinimumSmoothnessDMX", Mathf.Clamp01(min/inGameInterpolationModifier)); + } + } + foreach(CustomRenderTexture rend in DMX_CRTS_Legacy) + { + if(rend.material != null && rend.material.name.Contains("Interpolated")) + { + float max = Mathf.Clamp01(rend.material.GetFloat("_MaximumSmoothnessDMX")); + float min = Mathf.Clamp01(rend.material.GetFloat("_MinimumSmoothnessDMX")); + rend.material.SetFloat("_MaximumSmoothnessDMX", Mathf.Clamp01(max/inGameInterpolationModifier)); + rend.material.SetFloat("_MinimumSmoothnessDMX", Mathf.Clamp01(min/inGameInterpolationModifier)); + } + } + } + } + public void OnEnable() { @@ -205,6 +249,10 @@ namespace VRSL _SetDiscoBallQualityMode(); _SetLensFlareQualtiyMode(); _CheckButtonLockStatus(); + + #if !UNITY_EDITOR + ReduceInGameInterpolation(); + #endif } void _CheckButtonLockStatus() @@ -287,7 +335,8 @@ namespace VRSL public void _Test() { - Debug.Log("This is a test"); + if(outputDebugLogs) + Debug.Log("This is a test"); } @@ -540,6 +589,8 @@ namespace VRSL rt.updateMode = CustomRenderTextureUpdateMode.Realtime; if(rt.name.Contains("Color")) { + if(outputDebugLogs){ + Debug.Log("DMX Color: " + rt.name);} #if UDONSHARP VRCShader.SetGlobalTexture(_Udon_DMXGridRenderTexture, rt); #else @@ -548,6 +599,8 @@ namespace VRSL } else if(rt.name.Contains("Movement")) { + if(outputDebugLogs){ + Debug.Log("DMX Movement: " + rt.name);} #if UDONSHARP VRCShader.SetGlobalTexture(_Udon_DMXGridRenderTextureMovement, rt); #else @@ -556,6 +609,8 @@ namespace VRSL } else if(rt.name.Contains("Spin")) { + if(outputDebugLogs){ + Debug.Log("DMX Spin Timings: " + rt.name);} #if UDONSHARP VRCShader.SetGlobalTexture(_Udon_DMXGridSpinTimer, rt); #else @@ -566,7 +621,8 @@ namespace VRSL { if(rt.name.Contains("Timings")) { - Debug.Log("Setting Strobe Timer"); + if(outputDebugLogs){ + Debug.Log("DMX Strobe Timings: " + rt.name);} #if UDONSHARP VRCShader.SetGlobalTexture(_Udon_DMXGridStrobeTimer, rt); #else @@ -575,12 +631,43 @@ namespace VRSL } else { - Debug.Log("Setting Strobe Output"); - #if UDONSHARP - VRCShader.SetGlobalTexture(_Udon_DMXGridStrobeOutput, rt); - #else - Shader.SetGlobalTexture(_Udon_DMXGridStrobeOutput, rt, RenderTextureSubElement.Default); - #endif + //Debug.Log("Setting Strobe Output"); + if(delayStrobeForGI) + { + if(rt.name.Contains("Delay-Final") && DMXMode != LEGACY_MODE) + { + #if UDONSHARP + if(outputDebugLogs){ + Debug.Log("DMX Strobe Output: " + rt.name);} + VRCShader.SetGlobalTexture(_Udon_DMXGridStrobeOutput, rt); + #else + Shader.SetGlobalTexture(_Udon_DMXGridStrobeOutput, rt, RenderTextureSubElement.Default); + #endif + } + else if(DMXMode == LEGACY_MODE) + { + #if UDONSHARP + if(outputDebugLogs){ + Debug.Log("DMX Strobe Output: " + rt.name);} + VRCShader.SetGlobalTexture(_Udon_DMXGridStrobeOutput, rt); + #else + Shader.SetGlobalTexture(_Udon_DMXGridStrobeOutput, rt, RenderTextureSubElement.Default); + #endif + } + } + else + { + if(rt.name.Contains("Delay") == false) + { + #if UDONSHARP + if(outputDebugLogs){ + Debug.Log("Strobe Output: " + rt.name);} + VRCShader.SetGlobalTexture(_Udon_DMXGridStrobeOutput, rt); + #else + Shader.SetGlobalTexture(_Udon_DMXGridStrobeOutput, rt, RenderTextureSubElement.Default); + #endif + } + } } } } diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Scripts/VRStageLighting_DMX_Static.cs b/Packages/com.acchosen.vr-stage-lighting/Runtime/Scripts/VRStageLighting_DMX_Static.cs index 99f6b18..c9983ec 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Scripts/VRStageLighting_DMX_Static.cs +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Scripts/VRStageLighting_DMX_Static.cs @@ -278,6 +278,8 @@ namespace VRSL props.SetFloat("_MaxMinTiltAngle", (maxMinTilt/2.0f)); switch(objRenderers.Length) { + case 0: + break; case 1: if(objRenderers[0]) objRenderers[0].SetPropertyBlock(props); @@ -376,6 +378,8 @@ namespace VRSL props.SetFloat("_MaxMinTiltAngle", (maxMinTilt/2.0f)); switch(objRenderers.Length) { + case 0: + break; case 1: if(objRenderers[0]) objRenderers[0].SetPropertyBlock(props); diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-DMXInterpolation.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-DMXInterpolation.shader index 77c1e35..7871cd3 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-DMXInterpolation.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-DMXInterpolation.shader @@ -7,6 +7,7 @@ Shader "VRSL/DMX CRTs/Interpolation" [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [Toggle] _NineUniverseMode ("Extended Universe Mode", Int) = 0 [Toggle] _EnableCompatibilityMode ("Enable Stream DMX/DMX Control", Int) = 0 + [Toggle(_OLD_SCHOOL_SMOOTHING)] _UseOldSchoolSmoothing ("Use Old School Smoothing", Int) = 0 [NoScaleOffset]_DMXTexture("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} _SmoothValue ("Smoothness Level (0 to 1, 0 = max)", Range(0,1)) = 0.5 _MinimumSmoothnessDMX ("Minimum Smoothness Value for DMX", Float) = 0 @@ -39,6 +40,8 @@ Shader "VRSL/DMX CRTs/Interpolation" float3 rgbSmoothnessRaw; #define IF(a, b, c) lerp(b, c, step((fixed) (a), 0)); + #pragma multi_compile_local _ _OLD_SCHOOL_SMOOTHING + float2 getSectorCoordinates(float x, float y, uint sector) @@ -115,41 +118,107 @@ Shader "VRSL/DMX CRTs/Interpolation" { return float2(0.911, uv.y); } - float getSmoothnessValue(float2 uv) + + float getSmoothnessValuePreSet() + { + return _SmoothValue; + } + + float3 getSmoothnessValueRGBPreSet() + { + return float3(_SmoothValue, _SmoothValue, _SmoothValue); + } + + float getSmoothnessValue(float2 uv, out float dmxSmoothness) { if(_EnableLegacyGlobalMovementSpeedChannel == 1) { - oscSmoothnessRAW = IF(_EnableCompatibilityMode == 1, getValueAtCoords(0.096151, 0.019231, _DMXChannel), getValueAtCoords(0.189936, 0.00762, _DMXChannel)); + dmxSmoothness = IF(_EnableCompatibilityMode == 1, getValueAtCoords(0.096151, 0.019231, _DMXChannel), getValueAtCoords(0.189936, 0.00762, _DMXChannel)); } else { - oscSmoothnessRAW = IF(_EnableCompatibilityMode == 1, getValueAtCoords(0.096151, 0.019231, _DMXChannel), getValueAtUV(float2(0.960, uv.y))); + dmxSmoothness = IF(_EnableCompatibilityMode == 1, getValueAtCoords(0.096151, 0.019231, _DMXChannel), getValueAtUV(float2(0.960, uv.y))); } - float oscSmoothness = lerp(_MinimumSmoothnessDMX, _MaximumSmoothnessDMX, oscSmoothnessRAW); - return IF(_EnableDMX == 1, oscSmoothness, _SmoothValue); + float oscSmoothness = lerp(saturate(_MaximumSmoothnessDMX), saturate(_MinimumSmoothnessDMX), dmxSmoothness); + return oscSmoothness; + // return IF(_EnableDMX == 1, oscSmoothness, _SmoothValue); } - float3 getSmoothnessValueRGB(float2 uv) + float3 getSmoothnessValueRGB(float2 uv, out float3 dmxSmoothness) { - rgbSmoothnessRaw = float3(0,0,0); + //rgbSmoothnessRaw = float3(0,0,0); if(_EnableLegacyGlobalMovementSpeedChannel == 1) { - rgbSmoothnessRaw = getValueAtCoordsRGB(0.189936, 0.00762, _DMXChannel); + dmxSmoothness = getValueAtCoordsRGB(0.189936, 0.00762, _DMXChannel); } else { - rgbSmoothnessRaw = getValueAtUVRGB(float2(0.960, uv.y)); + dmxSmoothness = getValueAtUVRGB(float2(0.960, uv.y)); } - float3 rgbSmoothness = float3(lerp(_MinimumSmoothnessDMX, _MaximumSmoothnessDMX, rgbSmoothnessRaw.r), - lerp(_MinimumSmoothnessDMX, _MaximumSmoothnessDMX, rgbSmoothnessRaw.g), - lerp(_MinimumSmoothnessDMX, _MaximumSmoothnessDMX, rgbSmoothnessRaw.b)); - - return IF(_EnableDMX == 1, rgbSmoothness, float3(_SmoothValue, _SmoothValue, _SmoothValue)); + float3 rgbSmoothness = float3(lerp( saturate(_MaximumSmoothnessDMX), saturate(_MinimumSmoothnessDMX), dmxSmoothness.r), + lerp(saturate(_MaximumSmoothnessDMX), saturate(_MinimumSmoothnessDMX), dmxSmoothness.g), + lerp(saturate(_MaximumSmoothnessDMX), saturate(_MinimumSmoothnessDMX), dmxSmoothness.b)); + return rgbSmoothness; + // return IF(_EnableDMX == 1, rgbSmoothness, float3(_SmoothValue, _SmoothValue, _SmoothValue)); } + float SmoothDamp (float current, float target, inout float currentVelocity, float smoothTime, float maxSpeed, float deltaTime) + { + //smoothTime = 1-pow(smoothTime, deltaTime); + + float multiplier = target < current ? 0.4 : 1.0; + smoothTime *= multiplier; + smoothTime = max(0.0001, smoothTime); + float num = 2.0 / smoothTime; + float num2 = num * deltaTime; + float num3 = 1.0 / (1.0 + num2 + 0.48 * num2 * num2 + 0.235 * num2 * num2 * num2); + float num4 = current - target; + float num5 = target; + float num6 = maxSpeed * smoothTime; + num4 = clamp(num4, -num6, num6); + target = current - num4; + float num7 = (currentVelocity + num * num4) * deltaTime; + currentVelocity = (currentVelocity - num * num7) * num3; + float num8 = target + (num4 + num7) * num3; + if (num5 - current > 0.0 == num8 > num5) + { + num8 = num5; + currentVelocity = (num8 - num5) / deltaTime; + } + return num8; + } + + + // float invLerp(float from, float to, float value){ + // return (value - from) / (to - from); + // } + + // float remap(float origFrom, float origTo, float targetFrom, float targetTo, float value){ + // float rel = invLerp(origFrom, origTo, value); + // return lerp(targetFrom, targetTo, rel); + // } + + + + float DampComplex(float source, float target, float smoothing, float dt, float dmxMod) + { + float multiplier = target < source ? 0.02-(0.01 * dmxMod) : 1.0; + smoothing *= multiplier; + return lerp(source, target, 1 - pow(saturate(smoothing), dt)); + } + + float Damp(float source, float target, float smoothing, float dt) + { + return lerp(source, target, 1 - pow(saturate(smoothing), dt)); + } + // float3 Damp(float3 source, float3 target, float smoothing, float dt) + // { + // return lerp(source, target, 1 - pow(smoothing, dt)) + // } + float4 frag(v2f_customrendertexture IN) : COLOR { @@ -164,14 +233,49 @@ Shader "VRSL/DMX CRTs/Interpolation" // } if(_NineUniverseMode && _EnableDMX) { - float3 s = getSmoothnessValueRGB(IN.localTexcoord.xy); - s = lerp(clamp(lerp(previousFrame.rgb, currentFrame.rgb,smoothstep(0.0, 1.0, clamp(unity_DeltaTime.z,0.0,1.0))) , 0.0, 400.0), currentFrame.rgb, s); + + float3 dmxSmoothness = float3(1.0, 1.0, 1.0); + #if _OLD_SCHOOL_SMOOTHING + float3 s = getSmoothnessValueRGB(IN.localTexcoord.xy, dmxSmoothness); + s = lerp(clamp(lerp(previousFrame.rgb, currentFrame.rgb,smoothstep(0.0, 1.0, clamp(unity_DeltaTime.z,0.0,100.0))) , 0.0, 100.0), currentFrame.rgb, s); + #else + + float3 smoothing = _EnableDMX == 1 ? getSmoothnessValueRGB(IN.localTexcoord.xy, dmxSmoothness) : getSmoothnessValueRGBPreSet() ; + + + + + float3 s = float3( + lerp(DampComplex(previousFrame.r, currentFrame.r, smoothing.r, unity_DeltaTime.x, dmxSmoothness.r), currentFrame.r, dmxSmoothness.r * 0.1), + lerp(DampComplex(previousFrame.g, currentFrame.g, smoothing.g, unity_DeltaTime.x, dmxSmoothness.g), currentFrame.g, dmxSmoothness.g * 0.1), + (DampComplex(previousFrame.b, currentFrame.b, smoothing.b, unity_DeltaTime.x, dmxSmoothness.b), currentFrame.b, dmxSmoothness.b * 0.1) + ); + + #endif + return float4(s, currentFrame.a); } else { - float smoothness = getSmoothnessValue(IN.localTexcoord.xy); - return lerp(clamp(lerp(previousFrame, currentFrame,smoothstep(0.0, 1.0, clamp(unity_DeltaTime.z,0.0,1.0))) , 0.0, 400.0), currentFrame, smoothness); + float dmxSmoothness = 1.0; + float smoothing = 0.0; + #if _OLD_SCHOOL_SMOOTHING + float smoothness = _EnableDMX == 1 ? getSmoothnessValue(IN.localTexcoord.xy, dmxSmoothness) : getSmoothnessValuePreSet(); + return lerp(clamp(lerp(previousFrame, currentFrame,smoothstep(0.0, 1.0, clamp(unity_DeltaTime.x,0.0,100.0))) , 0.0, 100.0), currentFrame, smoothness); + #else + //float currentVelocity = previousFrame.a; + if(_EnableDMX == 1) + { + smoothing = getSmoothnessValue(IN.localTexcoord.xy, dmxSmoothness); + } + else + { + smoothing = getSmoothnessValuePreSet(); + } + return lerp(DampComplex(previousFrame.r, currentFrame.r, smoothing, unity_DeltaTime.x, dmxSmoothness), currentFrame.r , dmxSmoothness * 0.1); + //float output = SmoothDamp(previousFrame.r, currentFrame.r, currentVelocity, smoothing,100000.0,unity_DeltaTime.x); + // return (float4(output, output, output, currentVelocity)); + #endif } } else diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-ReRenderTexture.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-ReRenderTexture.shader new file mode 100644 index 0000000..8a42e22 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-ReRenderTexture.shader @@ -0,0 +1,32 @@ +Shader "VRSL/DMX CRTs/Re-Render RT" +{ + //THIS IS A TIMER, TO KEEP TRACK OF HOW MUCH TIME HAS PASSED FOR THE STROBE + Properties + { + [NoScaleOffset]_Input("", 2D) = "white" {} + } + + SubShader + { + Lighting Off + Blend One Zero + Pass + { + CGPROGRAM + #include "UnityCustomRenderTexture.cginc" + #include "UnityCG.cginc" + #pragma vertex CustomRenderTextureVertexShader + #pragma fragment frag + #pragma target 4.5 + + #define VRSL_DMX + + sampler2D _Input; + float4 frag(v2f_customrendertexture IN) : COLOR + { + return tex2D(_Input, IN.localTexcoord.xy); + } + ENDCG + } + } +} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-ReRenderTexture.shader.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-ReRenderTexture.shader.meta new file mode 100644 index 0000000..daaf5a8 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-ReRenderTexture.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: ef72139c4ded1554faff62378cee3ee3 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-SpinnerTimer.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-SpinnerTimer.shader index 4ffab01..6cd7168 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-SpinnerTimer.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-SpinnerTimer.shader @@ -5,6 +5,7 @@ { [NoScaleOffset]_DMXTexture("DMX Grid Texture", 2D) = "white" {} [Toggle] _NineUniverseMode ("Extended Universe Mode", Int) = 0 + // _MaxSpinSpeed("Maximum Spin Speed", Range(0.0,1.0)) = 0.0 } SubShader @@ -26,6 +27,7 @@ sampler2D _Tex; Texture2D _DMXTexture; + // half _MaxSpinSpeed; uniform float4 _DMXTexture_TexelSize; SamplerState sampler_point_repeat; uint _NineUniverseMode; @@ -55,13 +57,13 @@ float4 previousFrame = tex2D(_SelfTexture2D, IN.localTexcoord.xy); float4 currentFrame = _DMXTexture.SampleLevel(sampler_point_repeat, IN.localTexcoord.xy, 0); - float dt = clamp(unity_DeltaTime.x, 0.0, 2.0); + float dt = unity_DeltaTime.x; if(_NineUniverseMode) { float3 dmx = GetDMXValueRGB(currentFrame); float3 t = previousFrame.rgb; float3 spin; - + spin *= 2.0; spin.rgb = dmx.rgb > float3(0.5, 0.5, 0.5) ? -(dmx.rgb - float3(0.5, 0.5, 0.5)) : dmx.rgb; t.rgb = dmx.rgb > float3(0.5, 0.5, 0.5) ? t.rgb + (dt * spin * 10.0) : t.rgb - (dt * spin * 10.0); @@ -89,6 +91,7 @@ float spin; spin = dmx > 0.5 ? -(dmx - 0.5) : dmx; + spin *= 2.0; t = dmx > 0.5 ? t + (dt * spin * 10.0) : t - (dt * spin * 10.0); t-= t >= 2*PI && dmx > 0.5 ? 2*PI : 0.0; diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-StrobeTimings.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-StrobeTimings.shader index f6b8001..2e8a906 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-StrobeTimings.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-StrobeTimings.shader @@ -85,11 +85,27 @@ { #if _VRSL_STATICFREQUENCIES - float3 t = float3(currentFrame.r, currentFrame.g, currentFrame.b); - float sinTime = sin(_Time.y); - float speed = (sinTime) * _LowFrequency; - t *= (GetDMXValueRGB(currentFrame) * float3(speed, speed, speed)); - return float4(t, currentFrame.a); + float3 dmx = float3(currentFrame.r, currentFrame.g, currentFrame.b); + float sinTime = _Time.y; + + + float3 speeds = float3(0,0,0); + + speeds.x = dmx.x > 0.2 ? _MedFrequency : _LowFrequency; + speeds.x = dmx.x > 0.5 ? _HighFrequency : speeds.x; + + speeds.y = dmx.y > 0.2 ? _MedFrequency : _LowFrequency; + speeds.y = dmx.y > 0.5 ? _HighFrequency : speeds.y; + + speeds.z = dmx.z > 0.2 ? _MedFrequency : _LowFrequency; + speeds.z = dmx.z > 0.5 ? _HighFrequency : speeds.z; + + // float speed = dmx > 0.2 ? _MedFrequency : _LowFrequency; + //speed = dmx > 0.5 ? _HighFrequency : speed; + + float3 t = float3(sinTime * speeds.x, sinTime * speeds.y, sinTime * speeds.z); + //t *= (GetDMXValueRGB(currentFrame) * float3(speed, speed, speed)); + return float4(t, 1); #else float3 t = float3(previousFrame.r, previousFrame.g, previousFrame.b); //INCREMENT CURRENT PHASE CLOSER TO 2PI @@ -118,9 +134,9 @@ float speed = dmx > 0.2 ? _MedFrequency : _LowFrequency; speed = dmx > 0.5 ? _HighFrequency : speed; - float t =((sinTime) * speed); + float t =(sinTime * speed); - return clamp(t, 0.0, 1000000.0); + return t; #else float t = previousFrame.r; //INCREMENT CURRENT PHASE CLOSER TO 2PI diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLight-LightBarAndFlashers.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLight-LightBarAndFlashers.meta new file mode 100644 index 0000000..b287479 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLight-LightBarAndFlashers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d7e301d15bc2f34409daed7a958bd5ab +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLight-LightBarAndFlashers/5-Channel.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLight-LightBarAndFlashers/5-Channel.meta new file mode 100644 index 0000000..1562d0f --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLight-LightBarAndFlashers/5-Channel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3e3f9fcfad2dd2c4e96a7a6ca3e42089 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLight-LightBarAndFlashers/LegacyMode.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLight-LightBarAndFlashers/LegacyMode.meta new file mode 100644 index 0000000..9ab39ab --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLight-LightBarAndFlashers/LegacyMode.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f4e4503f526cdde469ff76a45b49c9e5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLight-LightBarAndFlashers/VerticalMode.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLight-LightBarAndFlashers/VerticalMode.meta new file mode 100644 index 0000000..d23272d --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLight-LightBarAndFlashers/VerticalMode.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d725d4dac45a04b42b6d36922da979e0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLight-LightBarAndFlashers/VerticalMode/5-Channel.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLight-LightBarAndFlashers/VerticalMode/5-Channel.meta new file mode 100644 index 0000000..0ba0fb9 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLight-LightBarAndFlashers/VerticalMode/5-Channel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3f9e6af7be09cf34681c8cef5e9a08f2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/MoverLightTextures/Washlight/WashLight-Mesh_WashMover-HQ_EmissionMask.png b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/MoverLightTextures/Washlight/WashLight-Mesh_WashMover-HQ_EmissionMask.png index c5ac6d7..4f03e24 100644 Binary files a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/MoverLightTextures/Washlight/WashLight-Mesh_WashMover-HQ_EmissionMask.png and b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/MoverLightTextures/Washlight/WashLight-Mesh_WashMover-HQ_EmissionMask.png differ diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Delay-Final-Horizontal.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Delay-Final-Horizontal.asset new file mode 100644 index 0000000..f39c44c --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Delay-Final-Horizontal.asset @@ -0,0 +1,52 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!86 &8600000 +CustomRenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DMXRTViewer-StrobeOutput-Delay-Final-Horizontal + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 3 + m_Width: 26 + m_Height: 240 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 0 + m_ColorFormat: 52 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 0 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 + m_Material: {fileID: 2100000, guid: 8c13ae49b6d25b544baa640882e96203, type: 2} + m_InitSource: 0 + m_InitMaterial: {fileID: 0} + m_InitColor: {r: 0, g: 0, b: 0, a: 1} + m_InitTexture: {fileID: 0} + m_UpdateMode: 1 + m_InitializationMode: 0 + m_UpdateZoneSpace: 0 + m_CurrentUpdateZoneSpace: 0 + m_UpdateZones: [] + m_UpdatePeriod: 0 + m_ShaderPass: 0 + m_CubemapFaceMask: 4294967295 + m_DoubleBuffered: 0 + m_WrapUpdateZones: 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Delay-Final-Horizontal.asset.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Delay-Final-Horizontal.asset.meta new file mode 100644 index 0000000..10e8e8a --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Delay-Final-Horizontal.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8c4ff92799dcc5641ac0f7d4ec2f8163 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8600000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Delay-Initial-Horizontal.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Delay-Initial-Horizontal.asset new file mode 100644 index 0000000..f4c96c2 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Delay-Initial-Horizontal.asset @@ -0,0 +1,52 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!86 &8600000 +CustomRenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DMXRTViewer-StrobeOutput-Delay-Initial-Horizontal + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 3 + m_Width: 26 + m_Height: 240 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 0 + m_ColorFormat: 52 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 0 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 + m_Material: {fileID: 2100000, guid: 3295662a5302f2e48945f52943308c6f, type: 2} + m_InitSource: 0 + m_InitMaterial: {fileID: 0} + m_InitColor: {r: 0, g: 0, b: 0, a: 1} + m_InitTexture: {fileID: 0} + m_UpdateMode: 1 + m_InitializationMode: 0 + m_UpdateZoneSpace: 0 + m_CurrentUpdateZoneSpace: 0 + m_UpdateZones: [] + m_UpdatePeriod: 0 + m_ShaderPass: 0 + m_CubemapFaceMask: 4294967295 + m_DoubleBuffered: 0 + m_WrapUpdateZones: 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Delay-Initial-Horizontal.asset.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Delay-Initial-Horizontal.asset.meta new file mode 100644 index 0000000..0772d65 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Delay-Initial-Horizontal.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 99d1c91f47ceb344ea8d62554a087e98 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8600000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Delay-Final-Vertical.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Delay-Final-Vertical.asset new file mode 100644 index 0000000..bd58259 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Delay-Final-Vertical.asset @@ -0,0 +1,52 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!86 &8600000 +CustomRenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DMXRTViewer-StrobeOutput-Delay-Final-Vertical + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 3 + m_Width: 26 + m_Height: 240 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 0 + m_ColorFormat: 52 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 0 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 + m_Material: {fileID: 2100000, guid: 0b687747c5a82cd4c97da8c251df6f04, type: 2} + m_InitSource: 0 + m_InitMaterial: {fileID: 0} + m_InitColor: {r: 0, g: 0, b: 0, a: 1} + m_InitTexture: {fileID: 0} + m_UpdateMode: 2 + m_InitializationMode: 0 + m_UpdateZoneSpace: 0 + m_CurrentUpdateZoneSpace: 0 + m_UpdateZones: [] + m_UpdatePeriod: 0 + m_ShaderPass: 0 + m_CubemapFaceMask: 4294967295 + m_DoubleBuffered: 0 + m_WrapUpdateZones: 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Delay-Final-Vertical.asset.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Delay-Final-Vertical.asset.meta new file mode 100644 index 0000000..2c95464 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Delay-Final-Vertical.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57baa88f99df79f428add8e6e1c79597 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8600000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Delay-Initial-Vertical.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Delay-Initial-Vertical.asset new file mode 100644 index 0000000..eeaf36b --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Delay-Initial-Vertical.asset @@ -0,0 +1,52 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!86 &8600000 +CustomRenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DMXRTViewer-StrobeOutput-Delay-Initial-Vertical + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 3 + m_Width: 26 + m_Height: 240 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 0 + m_ColorFormat: 52 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 0 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 + m_Material: {fileID: 2100000, guid: 6241055f6a0bfc140aa7dbf5d4d47eb1, type: 2} + m_InitSource: 0 + m_InitMaterial: {fileID: 0} + m_InitColor: {r: 0, g: 0, b: 0, a: 1} + m_InitTexture: {fileID: 0} + m_UpdateMode: 2 + m_InitializationMode: 0 + m_UpdateZoneSpace: 0 + m_CurrentUpdateZoneSpace: 0 + m_UpdateZones: [] + m_UpdatePeriod: 0 + m_ShaderPass: 0 + m_CubemapFaceMask: 4294967295 + m_DoubleBuffered: 0 + m_WrapUpdateZones: 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Delay-Initial-Vertical.asset.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Delay-Initial-Vertical.asset.meta new file mode 100644 index 0000000..de4de01 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Delay-Initial-Vertical.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cc132e098e98e24448b3171b5f9834d8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8600000 + userData: + assetBundleName: + assetBundleVariant: