From ac4a74e38ef71f07953bdd4145c899c89b98cb72 Mon Sep 17 00:00:00 2001 From: AcChosen Date: Tue, 11 Jul 2023 16:02:27 -0400 Subject: [PATCH] Strobe Functionality Rework -Adjusted the DMX strobe functionality to go through a separate "Strobe Output" Texture. This will ensure that every shader reading from the same DMX Strobe Channel will all flash at the exact same intervals. --- ...ndardMover-ProjectionMat-HQ-Horizontal.mat | 2 +- ...ndardMover-VolumetricMat-HQ-Horizontal.mat | 2 +- ...SL-Blinder-LensFlareMat-Horizontal-5CH.mat | 2 +- .../VRSL-Blinder-LensFlareMat-Legacy.mat | 2 +- .../VRSL-Blinder-LensFlareMat-Horizontal.mat | 2 +- ...VRSL-Blinder-LensFlareMat-Vertical-5CH.mat | 2 +- .../VRSL-Blinder-LensFlareMat-Vertical.mat | 2 +- ...Bar-FixtureMat-Horizontal-5CH-Standard.mat | 225 ++++++++++++++++++ ...ixtureMat-Horizontal-5CH-Standard.mat.meta | 8 + .../VRSL-LensFlareBase-Flasher-Legacy.mat | 2 +- .../VRSL-LensFlareBase-Flasher-Horizontal.mat | 2 +- .../VRSL-LensFlareBase-Flasher-Vertical.mat | 2 +- .../Prefabs/VRSL-LocalUIControlPanel.prefab | 3 + .../Scripts/VRSL_LocalUIControlPanel.asset | 59 ++++- .../Scripts/VRSL_LocalUIControlPanel.cs | 26 +- .../VRSL-StandardSurface-Functions.cginc | 14 +- .../DMXRTShader-StrobeOutput.shader | 84 +++++++ .../DMXRTShader-StrobeOutput.shader.meta | 9 + .../VRSL-BarMover-FixtureMesh.shader | 2 +- .../VRSL-BarMover-VolumetricMesh.shader | 2 +- .../VRSL-StandardMover-ProjectionMesh.shader | 2 +- .../Shaders/Shared/VRSL-DMXFunctions.cginc | 21 +- .../Runtime/Shaders/Shared/VRSL-Defines.cginc | 12 +- .../Runtime/Shaders/VRSLDMX.cginc | 52 ++-- .../RTs/DMXRT-StrobeOutput-Horizontal.mat | 83 +++++++ .../DMXRT-StrobeOutput-Horizontal.mat.meta | 8 + ...erpolated-Color+Intensity-Horizontal.asset | 2 +- ...wer-Interpolated-Movement-Horizontal.asset | 2 +- .../DMXRTViewer-SpinTimer-Horizontal.asset | 2 +- .../DMXRTViewer-StrobeOutput-Horizontal.asset | 52 ++++ ...TViewer-StrobeOutput-Horizontal.asset.meta | 8 + ...DMXRTViewer-StrobeTimings-Horizontal.asset | 2 +- .../RTs/Legacy/DMXRT-StrobeOutput-Legacy.mat | 84 +++++++ .../Legacy/DMXRT-StrobeOutput-Legacy.mat.meta | 8 + .../DMXRTViewer-StrobeOutput-Legacy.asset | 52 ++++ ...DMXRTViewer-StrobeOutput-Legacy.asset.meta | 8 + .../DMXRT-StrobeOutput-Vertical.mat | 84 +++++++ .../DMXRT-StrobeOutput-Vertical.mat.meta | 8 + ...nterpolated-Color+Intensity-Vertical.asset | 2 +- ...iewer-Interpolated-Movement-Vertical.asset | 2 +- .../DMXRTViewer-SpinTimer-Vertical.asset | 2 +- .../DMXRTViewer-StrobeOutput-Vertical.asset | 52 ++++ ...XRTViewer-StrobeOutput-Vertical.asset.meta | 8 + .../DMXRTViewer-StrobeTimings-Vertical.asset | 2 +- ...ar_LightBarMaterialFixture_Normal.png.meta | 4 +- .../package.json | 31 ++- 46 files changed, 961 insertions(+), 84 deletions(-) create mode 100644 Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/5-Channel/VRSL-LightBar-FixtureMat-Horizontal-5CH-Standard.mat create mode 100644 Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/5-Channel/VRSL-LightBar-FixtureMat-Horizontal-5CH-Standard.mat.meta create mode 100644 Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-StrobeOutput.shader create mode 100644 Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-StrobeOutput.shader.meta create mode 100644 Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRT-StrobeOutput-Horizontal.mat create mode 100644 Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRT-StrobeOutput-Horizontal.mat.meta create mode 100644 Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Horizontal.asset create mode 100644 Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Horizontal.asset.meta create mode 100644 Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/Legacy/DMXRT-StrobeOutput-Legacy.mat create mode 100644 Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/Legacy/DMXRT-StrobeOutput-Legacy.mat.meta create mode 100644 Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/Legacy/DMXRTViewer-StrobeOutput-Legacy.asset create mode 100644 Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/Legacy/DMXRTViewer-StrobeOutput-Legacy.asset.meta create mode 100644 Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRT-StrobeOutput-Vertical.mat create mode 100644 Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRT-StrobeOutput-Vertical.mat.meta create mode 100644 Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Vertical.asset create mode 100644 Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Vertical.asset.meta diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/MoverLight - Spotlight/VRSL-StandardMover-ProjectionMat-HQ-Horizontal.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/MoverLight - Spotlight/VRSL-StandardMover-ProjectionMat-HQ-Horizontal.mat index 57e3adc..c6012e8 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/MoverLight - Spotlight/VRSL-StandardMover-ProjectionMat-HQ-Horizontal.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/MoverLight - Spotlight/VRSL-StandardMover-ProjectionMat-HQ-Horizontal.mat @@ -166,7 +166,7 @@ Material: - _ProjectionFadeCurve: 1.99 - _ProjectionIntensity: 3 - _ProjectionOriginCutoff: 0.19 - - _ProjectionRange: 6.5 + - _ProjectionRange: 10 - _ProjectionRotation: -180 - _ProjectionSelection: 0 - _ProjectionShadowHarshness: 0.9 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/MoverLight - Spotlight/VRSL-StandardMover-VolumetricMat-HQ-Horizontal.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/MoverLight - Spotlight/VRSL-StandardMover-VolumetricMat-HQ-Horizontal.mat index 6f78b07..cf680ac 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/MoverLight - Spotlight/VRSL-StandardMover-VolumetricMat-HQ-Horizontal.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/MoverLight - Spotlight/VRSL-StandardMover-VolumetricMat-HQ-Horizontal.mat @@ -160,7 +160,7 @@ Material: - _MaxMinTiltAngle: -90 - _MaxMinTiltAngleInstanced: 180 - _Metallic: 0.501 - - _MinimumBeamRadius: 0.96 + - _MinimumBeamRadius: 0.95 - _ModX: 0 - _ModY: 0 - _NineUniverseMode: 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/5-Channel/VRSL-Blinder-LensFlareMat-Horizontal-5CH.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/5-Channel/VRSL-Blinder-LensFlareMat-Horizontal-5CH.mat index 10ace37..acb97a5 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/5-Channel/VRSL-Blinder-LensFlareMat-Horizontal-5CH.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/5-Channel/VRSL-Blinder-LensFlareMat-Horizontal-5CH.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3200 + m_CustomRenderQueue: 3001 stringTagMap: RenderType: Transparent disabledShaderPasses: [] diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/LegacyMode/VRSL-Blinder-LensFlareMat-Legacy.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/LegacyMode/VRSL-Blinder-LensFlareMat-Legacy.mat index 32eb2df..a36122b 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/LegacyMode/VRSL-Blinder-LensFlareMat-Legacy.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/LegacyMode/VRSL-Blinder-LensFlareMat-Legacy.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3200 + m_CustomRenderQueue: 3001 stringTagMap: RenderType: Transparent disabledShaderPasses: [] diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/VRSL-Blinder-LensFlareMat-Horizontal.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/VRSL-Blinder-LensFlareMat-Horizontal.mat index fec8782..c2a3168 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/VRSL-Blinder-LensFlareMat-Horizontal.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/VRSL-Blinder-LensFlareMat-Horizontal.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3200 + m_CustomRenderQueue: 3001 stringTagMap: RenderType: Transparent disabledShaderPasses: [] diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/VerticalMode/5-Channel/VRSL-Blinder-LensFlareMat-Vertical-5CH.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/VerticalMode/5-Channel/VRSL-Blinder-LensFlareMat-Vertical-5CH.mat index 9d23aec..50bc0d9 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/VerticalMode/5-Channel/VRSL-Blinder-LensFlareMat-Vertical-5CH.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/VerticalMode/5-Channel/VRSL-Blinder-LensFlareMat-Vertical-5CH.mat @@ -14,7 +14,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3200 + m_CustomRenderQueue: 3001 stringTagMap: RenderType: Transparent disabledShaderPasses: [] diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/VerticalMode/VRSL-Blinder-LensFlareMat-Vertical.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/VerticalMode/VRSL-Blinder-LensFlareMat-Vertical.mat index 9300522..a1847a9 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/VerticalMode/VRSL-Blinder-LensFlareMat-Vertical.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-Blinder/VerticalMode/VRSL-Blinder-LensFlareMat-Vertical.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3200 + m_CustomRenderQueue: 3001 stringTagMap: RenderType: Transparent disabledShaderPasses: [] diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/5-Channel/VRSL-LightBar-FixtureMat-Horizontal-5CH-Standard.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/5-Channel/VRSL-LightBar-FixtureMat-Horizontal-5CH-Standard.mat new file mode 100644 index 0000000..3f3d806 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/5-Channel/VRSL-LightBar-FixtureMat-Horizontal-5CH-Standard.mat @@ -0,0 +1,225 @@ +%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: VRSL-LightBar-FixtureMat-Horizontal-5CH-Standard + m_Shader: {fileID: 4800000, guid: 323ff3e2b9a08514c99611b25f115f7e, type: 3} + m_ShaderKeywords: _5CH_MODE _FORWARD_Y _METALLICGLOSSMAP _NORMALMAP _STROBE_ON + _USERAWGRID_ON _USE_DEPTH_LIGHT _VRSL_GI _VRSL_MIX_MULT _VRSL_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AudioSpectrum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 30883d403f58448469709a65b0f45736, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DMXEmissionMap: + m_Texture: {fileID: 2800000, guid: 4fed70ee86b71514aadfcd7054e2bcd7, type: 3} + 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: 2800000, guid: b4cb310d700df3f4a8145cae79a55d6a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMask: + m_Texture: {fileID: 2800000, guid: 4fed70ee86b71514aadfcd7054e2bcd7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LightMainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 4b156bec52a041744bce7376441a23fb, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 2800000, guid: 1203e1ce9a1f8264ab985632f9e0ee0f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicSmoothness: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 2800000, guid: 30883d403f58448469709a65b0f45736, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OSCGridRenderTexture: + m_Texture: {fileID: 8600000, guid: 5225295a38260644c99eb0aebf544ec8, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OSCGridRenderTextureRAW: + m_Texture: {fileID: 8600000, guid: 57481ad1fad57a247b2754e1469292a9, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OSCGridStrobeTimer: + m_Texture: {fileID: 8600000, guid: fbbd57abbf5ece54c9996e59beb3dac1, type: 2} + 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} + - _ProjectionMainTex: + m_Texture: {fileID: 2800000, guid: 2e4e1fd2424262246bc882aa92947216, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ProjectionTex2: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ProjectionTex3: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ProjectionTex4: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ProjectionTex5: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ProjectionTex6: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SceneAlbedo: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SceneNormals: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - FinalStrobeFreq: 0 + - _BlendDst: 1 + - _BlendOp: 0 + - _BlendSrc: 1 + - _BulbMaxIntensity: 1 + - _BumpScale: 1 + - _ChannelMode: 2 + - _ConeWidth: 0 + - _CurveMod: 5 + - _Cutoff: 0.5 + - _DMXChannel: 0 + - _DMXEmissionMapMix: 0 + - _DetailNormalMapScale: 1 + - _DistFade: 0.7 + - _DstBlend: 0 + - _EnableAudioReact: 0 + - _EnableCompatibilityMode: 0 + - _EnableDMX: 0 + - _EnableOSC: 0 + - _EnablePanMovement: 0 + - _EnableSpin: 0 + - _EnableStrobe: 1 + - _EnableTiltMovement: 0 + - _EnableVerticalMode: 0 + - _Fade: 0.83 + - _FadeAmt: 0.1 + - _FadeStrength: 1 + - _FeatherOffset: 0 + - _FinalIntensity: 1 + - _FinalStrobeFreq: 0 + - _FixtureBaseRotationY: 0 + - _FixtureMaxIntensity: 1000 + - _FixtureRotationX: 0 + - _FixutreIntensityMultiplier: 5 + - _GlobalIntensity: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.673 + - _GlossyReflections: 1 + - _LMStrength: 1 + - _LightProbeMethod: 0 + - _MaxMinPanAngle: 180 + - _MaxMinTiltAngle: 180 + - _Metallic: 0.781 + - _ModX: -0.12 + - _ModY: -0.37 + - _Mode: 0 + - _NineUniverseMode: 0 + - _OcclusionStrength: 1 + - _PanInvert: 0 + - _Parallax: 0.02 + - _ProjectionDistanceFallOff: 0 + - _ProjectionFade: 1.73 + - _ProjectionFadeCurve: 0.96 + - _ProjectionIntensity: 0 + - _ProjectionMaxIntensity: 0 + - _ProjectionRange: 10 + - _ProjectionRotation: 125 + - _ProjectionSelection: 0 + - _ProjectionUVMod: 0.312 + - _ProjectionUVMod2: 0 + - _ProjectionUVMod3: 0 + - _ProjectionUVMod4: 0 + - _ProjectionUVMod5: 0 + - _ProjectionUVMod6: 0 + - _PulseSpeed: 0 + - _RTLMStrength: 1 + - _Saturation: 0.95 + - _Sector: 0 + - _SmoothnessTextureChannel: 0 + - _SpecLMOcclusionAdjust: 0.359 + - _SpecularHighlights: 1 + - _SpecularLMOcclusion: 0 + - _SpinSpeed: 0 + - _SrcBlend: 1 + - _StrobeFreq: 12.76 + - _TextureSampleMode: 0 + - _ThirteenChannelMode: 0 + - _TiltInvert: 0 + - _TriplanarFalloff: 1 + - _UVSec: 0 + - _UniversalIntensity: 1 + - _UseLegacyDMXTextures: 0 + - _UseRawGrid: 1 + - _UseWorldNorm: 0 + - _VRSLGlossiness: 10 + - _VRSLSpecularStrength: 0.5 + - _VRSLToggle: 1 + - _XOffset: -4.21 + - _YOffset: 2.14 + - _ZWrite: 1 + - useVRSLGI: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Emission: {r: 11.984314, g: 11.984314, b: 11.984314, a: 3} + - _EmissionColor: {r: 11.984314, g: 11.984314, b: 11.984314, a: 3} + - _EmissionDMX: {r: 1, g: 1, b: 1, a: 1} + - _FixtureRotationOrigin: {r: 0, g: 0.014709, b: -1.02868, a: 0} + - _ProjectionRangeOrigin: {r: 0, g: 0, b: 0, a: 0} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/5-Channel/VRSL-LightBar-FixtureMat-Horizontal-5CH-Standard.mat.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/5-Channel/VRSL-LightBar-FixtureMat-Horizontal-5CH-Standard.mat.meta new file mode 100644 index 0000000..f536e04 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/5-Channel/VRSL-LightBar-FixtureMat-Horizontal-5CH-Standard.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 396b1e0270dcf49418b7eb47a2dce2b2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/LegacyMode/VRSL-LensFlareBase-Flasher-Legacy.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/LegacyMode/VRSL-LensFlareBase-Flasher-Legacy.mat index fafc9fc..517e2a7 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/LegacyMode/VRSL-LensFlareBase-Flasher-Legacy.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/LegacyMode/VRSL-LensFlareBase-Flasher-Legacy.mat @@ -14,7 +14,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3200 + m_CustomRenderQueue: 3001 stringTagMap: RenderType: Transparent disabledShaderPasses: [] diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/VRSL-LensFlareBase-Flasher-Horizontal.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/VRSL-LensFlareBase-Flasher-Horizontal.mat index 813149b..6dccc6e 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/VRSL-LensFlareBase-Flasher-Horizontal.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/VRSL-LensFlareBase-Flasher-Horizontal.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3200 + m_CustomRenderQueue: 3001 stringTagMap: RenderType: Transparent disabledShaderPasses: [] diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/VerticalMode/VRSL-LensFlareBase-Flasher-Vertical.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/VerticalMode/VRSL-LensFlareBase-Flasher-Vertical.mat index 0f0e0d7..d91211b 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/VerticalMode/VRSL-LensFlareBase-Flasher-Vertical.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/StaticLight-LightBarAndFlashers/VerticalMode/VRSL-LensFlareBase-Flasher-Vertical.mat @@ -14,7 +14,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3200 + m_CustomRenderQueue: 3001 stringTagMap: RenderType: Transparent disabledShaderPasses: [] 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 dfad617..5d4186c 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 @@ -5039,16 +5039,19 @@ MonoBehaviour: - {fileID: 8600000, guid: 5225295a38260644c99eb0aebf544ec8, type: 2} - {fileID: 8600000, guid: 7d9e75ad34a1ba34db218840cb76100e, type: 2} - {fileID: 8600000, guid: fbbd57abbf5ece54c9996e59beb3dac1, type: 2} + - {fileID: 8600000, guid: 580ab95419bdcc845a4bd0b1a94983c0, 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} DMX_CRTS_Legacy: - {fileID: 8600000, guid: 3bcce6f0fa9c3d4499ca3015b073785e, type: 2} - {fileID: 8600000, guid: 85ba02ef33f4e4c4a94d9085f48ec5c1, type: 2} - {fileID: 8600000, guid: 6e9260e8140b1ea4a97d6cc9a137efca, type: 2} - {fileID: 8600000, guid: a0e2ea8d6ec133f4fb7ad6f74d904820, type: 2} + - {fileID: 8600000, guid: 12347cc9d183cff41b75a6e1d133bff6, type: 2} AudioLink_CRTs: - {fileID: 8600000, guid: f51fa799ef0abde489235f40fc0328ef, type: 2} - {fileID: 8600000, guid: a4ea854836fbd3747b614c334c0182d8, type: 2} 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 5ff5551..a0a0416 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: 88 + Data: 89 - Name: Entry: 7 Data: @@ -4607,10 +4607,59 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _requireDepthLight + Data: _Udon_DMXGridStrobeOutput - Name: $v Entry: 7 Data: 222|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Udon_DMXGridStrobeOutput + - 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: 223|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: _requireDepthLight + - Name: $v + Entry: 7 + Data: 224|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _requireDepthLight @@ -4634,20 +4683,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 223|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 225|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 224|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 226|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 225|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 227|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 8718f56..b10a857 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 @@ -135,7 +135,7 @@ namespace VRSL [FieldChangeCallback(nameof(VolumetricNoise)), SerializeField] private bool _volumetricNoise = true; - int _Udon_DMXGridRenderTexture, _Udon_DMXGridRenderTextureMovement, _Udon_DMXGridSpinTimer, _Udon_DMXGridStrobeTimer; + int _Udon_DMXGridRenderTexture, _Udon_DMXGridRenderTextureMovement, _Udon_DMXGridSpinTimer, _Udon_DMXGridStrobeTimer, _Udon_DMXGridStrobeOutput; public bool VolumetricNoise { @@ -167,6 +167,7 @@ namespace VRSL _Udon_DMXGridRenderTextureMovement = PropertyToID("_Udon_DMXGridRenderTextureMovement"); _Udon_DMXGridSpinTimer = PropertyToID("_Udon_DMXGridSpinTimer"); _Udon_DMXGridStrobeTimer = PropertyToID("_Udon_DMXGridStrobeTimer"); + _Udon_DMXGridStrobeOutput = PropertyToID("_Udon_DMXGridStrobeOutput"); } @@ -558,11 +559,24 @@ namespace VRSL } else if(rt.name.Contains("Strobe")) { - #if UDONSHARP - VRCShader.SetGlobalTexture(_Udon_DMXGridStrobeTimer, rt); - #else - Shader.SetGlobalTexture(_Udon_DMXGridStrobeTimer, rt, RenderTextureSubElement.Default); - #endif + if(rt.name.Contains("Timings")) + { + Debug.Log("Setting Strobe Timer"); + #if UDONSHARP + VRCShader.SetGlobalTexture(_Udon_DMXGridStrobeTimer, rt); + #else + Shader.SetGlobalTexture(_Udon_DMXGridStrobeTimer, rt, RenderTextureSubElement.Default); + #endif + } + else + { + Debug.Log("Setting Strobe Output"); + #if UDONSHARP + VRCShader.SetGlobalTexture(_Udon_DMXGridStrobeOutput, rt); + #else + Shader.SetGlobalTexture(_Udon_DMXGridStrobeOutput, rt, RenderTextureSubElement.Default); + #endif + } } } } diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-Functions.cginc b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-Functions.cginc index 6fc6a41..da09feb 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-Functions.cginc +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-Functions.cginc @@ -1,14 +1,16 @@ float GetSurfaceStrobe(uint DMXChannel) { - float phase = getValueAtCoordsRaw(DMXChannel + 4, _Udon_DMXGridStrobeTimer); - float status = getValueAtCoords(DMXChannel + 4, _Udon_DMXGridRenderTexture); + // float phase = getValueAtCoordsRaw(DMXChannel + 4, _Udon_DMXGridStrobeTimer); + // float status = getValueAtCoords(DMXChannel + 4, _Udon_DMXGridRenderTexture); - half strobe = (sin(phase));//Get sin wave - strobe = IF(strobe > 0.0, 1.0, 0.0);//turn to square wave - //strobe = saturate(strobe); + half strobe = getValueAtCoords(DMXChannel + 4, _Udon_DMXGridStrobeOutput); - strobe = IF(status > 0.2, strobe, 1); //minimum channel threshold set + // half strobe = (sin(phase));//Get sin wave + // strobe = IF(strobe > 0.0, 1.0, 0.0);//turn to square wave + // //strobe = saturate(strobe); + + // strobe = IF(status > 0.2, strobe, 1); //minimum channel threshold set //check if we should even be strobing at all. strobe = IF(isDMX() == 1, strobe, 1); diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-StrobeOutput.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-StrobeOutput.shader new file mode 100644 index 0000000..2ab7697 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-StrobeOutput.shader @@ -0,0 +1,84 @@ +Shader "VRSL/DMX CRTs/Strobe Output" +{ + //THIS IS A TIMER, TO KEEP TRACK OF HOW MUCH TIME HAS PASSED FOR THE STROBE + Properties + { + [NoScaleOffset]_DMXTexture("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + _MaxStrobeFreq("Maximum Strobe Frequency", Range(1,100)) = 25 + [Toggle]_EnableCompatibilityMode("Compatibility Mode", Float) = 0 + [Toggle]_NineUniverseMode("Nine Universe Mode", Float) = 0 + } + + SubShader + { + Lighting Off + Blend One Zero + Pass + { + Name "Strobe Pass" + CGPROGRAM + #include "UnityCustomRenderTexture.cginc" + #include "UnityCG.cginc" + #pragma vertex CustomRenderTextureVertexShader + #pragma fragment frag + #pragma target 4.5 + + #define VRSL_DMX + + // #include "Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/VRSLDMX.cginc" + Texture2D _Udon_DMXGridRenderTexture; + Texture2D _Udon_DMXGridStrobeTimer; + SamplerState VRSL_PointClampSampler; + float _NineUniverseMode, _EnableCompatibilityMode; + + #define IF(a, b, c) lerp(b, c, step((fixed) (a), 0)); + + float3 getValue(float3 c) + { + float3 value = float3(0,0,0); + + if(_NineUniverseMode == 1 && _EnableCompatibilityMode != 1) + { + value.r = c.r; + value.g = c.g; + value.b = c.b; + } + else + { + float3 cRGB = float3(c.r, c.g, c.b); + float v = LinearRgbToLuminance(cRGB); + value = float3(v,v,v); + } + value = float3(LinearToGammaSpaceExact(value.r),LinearToGammaSpaceExact(value.g),LinearToGammaSpaceExact(value.b)); + return value; + } + + float4 frag(v2f_customrendertexture IN) : COLOR + + + { + //CHILL FOR 1 SECOND TO ALLOW DATA TO COME IN + // if (_Time.y > 1.0) + // { + float4 p = _Udon_DMXGridStrobeTimer.SampleLevel(VRSL_PointClampSampler, IN.localTexcoord.xy, 0); + float4 s = _Udon_DMXGridRenderTexture.SampleLevel(VRSL_PointClampSampler, IN.localTexcoord.xy, 0); + float phase = p.r; + float status = getValue(s).r; + half strobe = (sin(phase));//Get sin wave + strobe = IF(strobe > 0.0, 1.0, 0.0);//turn to square wave + //strobe = saturate(strobe); + + strobe = IF(status > 0.2, strobe, 1); //minimum channel threshold set + return strobe; + // } + + // else + // { + // return float4(0,0,0,0); + // } + } + ENDCG + } + } + //CustomEditor "VRSLInspector" +} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-StrobeOutput.shader.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-StrobeOutput.shader.meta new file mode 100644 index 0000000..8d7c4ca --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-StrobeOutput.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 4fd2aba1f194f2944983084cf77021b3 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/Bar Mover/VRSL-BarMover-FixtureMesh.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/Bar Mover/VRSL-BarMover-FixtureMesh.shader index f785805..033ea76 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/Bar Mover/VRSL-BarMover-FixtureMesh.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/Bar Mover/VRSL-BarMover-FixtureMesh.shader @@ -67,7 +67,7 @@ #pragma target 3.0 sampler2D _MainTex, _MetallicMap, _BumpMap, _EmissionMask; - sampler2D _Udon_DMXGridRenderTexture, _Udon_DMXGridRenderTextureMovement, _Udon_DMXGridStrobeTimer; + sampler2D _Udon_DMXGridRenderTexture, _Udon_DMXGridRenderTextureMovement, _Udon_DMXGridStrobeOutput; uniform float4 _Udon_DMXGridRenderTexture_TexelSize; float4 _FixtureRotationOrigin; float _FixtureMaxIntensity, _FixutreIntensityMultiplier; diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/Bar Mover/VRSL-BarMover-VolumetricMesh.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/Bar Mover/VRSL-BarMover-VolumetricMesh.shader index 27f637b..4b11699 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/Bar Mover/VRSL-BarMover-VolumetricMesh.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/Bar Mover/VRSL-BarMover-VolumetricMesh.shader @@ -124,7 +124,7 @@ float4 _Emission1, _Emission2, _Emission3, _Emission4, _Emission5, _Emission6, _Emission7, _Emission8, _Emission9, _Emission10; half _EStart1, _EStart2, _EStart3, _EStart4, _EStart5, _EStart6, _EStart7, _EStart8, _EStart9, _Offset; - sampler2D _Udon_DMXGridRenderTexture, _Udon_DMXGridRenderTextureMovement, _Udon_DMXGridStrobeTimer; + sampler2D _Udon_DMXGridRenderTexture, _Udon_DMXGridRenderTextureMovement, _Udon_DMXGridStrobeOutput; uniform float4 _Udon_DMXGridRenderTexture_TexelSize; float4 _FixtureLensCenter; float4 _FixtureRotationOrigin; diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-ProjectionMesh.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-ProjectionMesh.shader index 763fb6c..c875a59 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-ProjectionMesh.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-ProjectionMesh.shader @@ -71,7 +71,7 @@ _ProjectionFade("Projection Edge Fade", Range(0,10)) = 0 _ProjectionFadeCurve("Projection Edge Fade Harshness", Range(0, 10)) = 1 _ProjectionDistanceFallOff("Projection Distance Fallof Strength", Range(0.001,0.5)) = 0.05 - _ProjectionRange ("Projection Drawing Range", Range(0,10)) = 0 + _ProjectionRange ("Projection Drawing Range", Range(0,100)) = 0 _ProjectionRangeOrigin ("Projection Drawing Range Scale Origin", Float) = (0, -0.07535, 0.12387, 0) _ProjectionShadowHarshness("Projection Shadow Harshness", Range(0,1)) = 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Shared/VRSL-DMXFunctions.cginc b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Shared/VRSL-DMXFunctions.cginc index 5322f3d..2a6f5a1 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Shared/VRSL-DMXFunctions.cginc +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Shared/VRSL-DMXFunctions.cginc @@ -226,14 +226,15 @@ float getFinalIntensity() float GetStrobeOutput(uint DMXChannel) { - float phase = getValueAtCoordsRaw(DMXChannel + 6, _Udon_DMXGridStrobeTimer); - float status = getValueAtCoords(DMXChannel + 6, _Udon_DMXGridRenderTexture); + // float phase = getValueAtCoordsRaw(DMXChannel + 6, _Udon_DMXGridStrobeTimer); + // float status = getValueAtCoords(DMXChannel + 6, _Udon_DMXGridRenderTexture); - half strobe = (sin(phase));//Get sin wave - strobe = IF(strobe > 0.0, 1.0, 0.0);//turn to square wave + half strobe = getValueAtCoords(DMXChannel + 6, _Udon_DMXGridStrobeOutput); + // half strobe = (sin(phase));//Get sin wave + // strobe = IF(strobe > 0.0, 1.0, 0.0);//turn to square wave //strobe = saturate(strobe); - strobe = IF(status > 0.2, strobe, 1); //minimum channel threshold set + // strobe = IF(status > 0.2, strobe, 1); //minimum channel threshold set //check if we should even be strobing at all. strobe = IF(isDMX() == 1, strobe, 1); @@ -245,14 +246,14 @@ float GetStrobeOutput(uint DMXChannel) float GetStrobeOutputFiveCH(uint DMXChannel) { - float phase = getValueAtCoordsRaw(DMXChannel + 4, _Udon_DMXGridStrobeTimer); - float status = getValueAtCoords(DMXChannel + 4, _Udon_DMXGridRenderTexture); + // float phase = getValueAtCoordsRaw(DMXChannel + 4, _Udon_DMXGridStrobeTimer); + // float status = getValueAtCoords(DMXChannel + 4, _Udon_DMXGridRenderTexture); - half strobe = (sin(phase));//Get sin wave - strobe = IF(strobe > 0.0, 1.0, 0.0);//turn to square wave + half strobe = getValueAtCoords(DMXChannel + 4, _Udon_DMXGridStrobeOutput); + // strobe = IF(strobe > 0.0, 1.0, 0.0);//turn to square wave //strobe = saturate(strobe); - strobe = IF(status > 0.2, strobe, 1); //minimum channel threshold set + // strobe = IF(status > 0.2, strobe, 1); //minimum channel threshold set //check if we should even be strobing at all. strobe = IF(isDMX() == 1, strobe, 1); diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Shared/VRSL-Defines.cginc b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Shared/VRSL-Defines.cginc index ec67fa6..71f8f8b 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Shared/VRSL-Defines.cginc +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Shared/VRSL-Defines.cginc @@ -12,8 +12,18 @@ sampler2D _MainTex; #ifdef VRSL_DMX uint _UseRawGrid, _EnableExtraChannels; uniform float4 _Udon_DMXGridRenderTexture_TexelSize; - sampler2D _Udon_DMXGridRenderTexture, _Udon_DMXGridRenderTextureMovement, _Udon_DMXGridStrobeTimer, _Udon_DMXGridSpinTimer; + sampler2D _Udon_DMXGridRenderTexture, _Udon_DMXGridRenderTextureMovement, _Udon_DMXGridStrobeOutput, _Udon_DMXGridSpinTimer; float _SpinSpeed; + + #ifdef FIXTURE_EMIT + Texture2D _Udon_VRSL_GI_LightTexture; + uniform float4 _Udon_VRSL_GI_LightTexture_TexelSize; + SamplerState VRSL_PointClampSampler; + int _Udon_VRSL_GI_LightCount; + float _VRSLSpecularStrength; + float _VRSLGlossiness; + #endif + #endif #ifdef VRSL_AUDIOLINK uniform float4 _AudioSpectrum_TexelSize; diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/VRSLDMX.cginc b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/VRSLDMX.cginc index 5c23aa2..828c618 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/VRSLDMX.cginc +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/VRSLDMX.cginc @@ -12,6 +12,7 @@ UNITY_INSTANCING_BUFFER_START(Props) UNITY_DEFINE_INSTANCED_PROP(uint, _EnableStrobe) UNITY_DEFINE_INSTANCED_PROP(uint, _FixtureRotationX) UNITY_DEFINE_INSTANCED_PROP(uint, _FixtureBaseRotationY) + UNITY_DEFINE_INSTANCED_PROP(float, _ConeWidth) UNITY_INSTANCING_BUFFER_END(Props) #ifdef _VRSL_LEGACY_TEXTURES @@ -21,8 +22,8 @@ UNITY_INSTANCING_BUFFER_END(Props) #else Texture2D _Udon_DMXGridRenderTexture; uniform float4 _Udon_DMXGridRenderTexture_TexelSize; - Texture2D _Udon_DMXGridStrobeTimer, _Udon_DMXGridSpinTimer, _Udon_DMXGridRenderTextureMovement; - uniform float4 _Udon_DMXGridStrobeTimer_TexelSize, _Udon_DMXGridSpinTimer_TexelSize, _Udon_DMXGridRenderTextureMovement_TexelSize; + Texture2D _Udon_DMXGridStrobeOutput, _Udon_DMXGridSpinTimer, _Udon_DMXGridRenderTextureMovement; + uniform float4 _Udon_DMXGridStrobeOutput_TexelSize, _Udon_DMXGridSpinTimer_TexelSize, _Udon_DMXGridRenderTextureMovement_TexelSize; SamplerState VRSL_PointClampSampler; #endif @@ -240,22 +241,31 @@ float GetStrobeOutput(uint DMXChannel) #ifdef _VRSL_LEGACY_TEXTURES float phase = ReadDMXRaw(DMXChannel, _OSCGridStrobeTimer); float status = ReadDMX(DMXChannel, _OSCGridRenderTextureRAW); + half strobe = (sin(phase));//Get sin wave + strobe = IF(strobe > 0.0, 1.0, 0.0);//turn to square wave + //strobe = saturate(strobe); + + strobe = IF(status > 0.2, strobe, 1); //minimum channel threshold set + + //check if we should even be strobing at all. + strobe = IF(isDMX() == 1, strobe, 1); + strobe = IF(isStrobe() == 1, strobe, 1); + + return strobe; + #else - float phase = ReadDMXRaw(DMXChannel, _Udon_DMXGridStrobeTimer); - float status = ReadDMX(DMXChannel, _Udon_DMXGridRenderTexture); + //float phase = ReadDMXRaw(DMXChannel, _Udon_DMXGridStrobeTimer); + half strobe = ReadDMX(DMXChannel, _Udon_DMXGridStrobeOutput); + + //check if we should even be strobing at all. + strobe = IF(isDMX() == 1, strobe, 1); + strobe = IF(isStrobe() == 1, strobe, 1); + + return strobe; + #endif - half strobe = (sin(phase));//Get sin wave - strobe = IF(strobe > 0.0, 1.0, 0.0);//turn to square wave - //strobe = saturate(strobe); - strobe = IF(status > 0.2, strobe, 1); //minimum channel threshold set - - //check if we should even be strobing at all. - strobe = IF(isDMX() == 1, strobe, 1); - strobe = IF(isStrobe() == 1, strobe, 1); - - return strobe; } @@ -265,17 +275,17 @@ float GetImmediateStrobeOutput(uint DMXChannel) #ifdef _VRSL_LEGACY_TEXTURES float phase = ReadDMXRaw(DMXChannel, _OSCGridStrobeTimer); float status = ReadDMX(DMXChannel, _OSCGridRenderTextureRAW); + half strobe = (sin(phase));//Get sin wave + strobe = IF(strobe > 0.0, 1.0, 0.0);//turn to square wave + //strobe = saturate(strobe); + + strobe = IF(status > 0.2, strobe, 1); //minimum channel threshold set + return strobe; #else - float phase = ReadDMXRaw(DMXChannel, _Udon_DMXGridStrobeTimer); - float status = ReadDMX(DMXChannel, _Udon_DMXGridRenderTexture); + return ReadDMX(DMXChannel, _Udon_DMXGridStrobeOutput); #endif - half strobe = (sin(phase));//Get sin wave - strobe = IF(strobe > 0.0, 1.0, 0.0);//turn to square wave - //strobe = saturate(strobe); - strobe = IF(status > 0.2, strobe, 1); //minimum channel threshold set - return strobe; } diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRT-StrobeOutput-Horizontal.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRT-StrobeOutput-Horizontal.mat new file mode 100644 index 0000000..2c11282 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRT-StrobeOutput-Horizontal.mat @@ -0,0 +1,83 @@ +%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: DMXRT-StrobeOutput-Horizontal + m_Shader: {fileID: 4800000, guid: 4fd2aba1f194f2944983084cf77021b3, 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} + - _DMXTexture: + 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} + - _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 + - _EnableCompatibilityMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _MaxStrobeFreq: 27 + - _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/Textures/RTs/DMXRT-StrobeOutput-Horizontal.mat.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRT-StrobeOutput-Horizontal.mat.meta new file mode 100644 index 0000000..5800491 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRT-StrobeOutput-Horizontal.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 038cddd0ea70e1d41ad37272c1e7c31c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-Interpolated-Color+Intensity-Horizontal.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-Interpolated-Color+Intensity-Horizontal.asset index 362e886..4891bd1 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-Interpolated-Color+Intensity-Horizontal.asset +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-Interpolated-Color+Intensity-Horizontal.asset @@ -40,7 +40,7 @@ CustomRenderTexture: m_InitMaterial: {fileID: 0} m_InitColor: {r: 0, g: 0, b: 0, a: 1} m_InitTexture: {fileID: 0} - m_UpdateMode: 2 + m_UpdateMode: 1 m_InitializationMode: 0 m_UpdateZoneSpace: 0 m_CurrentUpdateZoneSpace: 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-Interpolated-Movement-Horizontal.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-Interpolated-Movement-Horizontal.asset index c026f25..7bcbbe5 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-Interpolated-Movement-Horizontal.asset +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-Interpolated-Movement-Horizontal.asset @@ -40,7 +40,7 @@ CustomRenderTexture: m_InitMaterial: {fileID: 0} m_InitColor: {r: 0, g: 0, b: 0, a: 1} m_InitTexture: {fileID: 0} - m_UpdateMode: 2 + m_UpdateMode: 1 m_InitializationMode: 0 m_UpdateZoneSpace: 0 m_CurrentUpdateZoneSpace: 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-SpinTimer-Horizontal.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-SpinTimer-Horizontal.asset index 06ac055..6fed95a 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-SpinTimer-Horizontal.asset +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-SpinTimer-Horizontal.asset @@ -40,7 +40,7 @@ CustomRenderTexture: m_InitMaterial: {fileID: 0} m_InitColor: {r: 0, g: 0, b: 0, a: 1} m_InitTexture: {fileID: 0} - m_UpdateMode: 2 + m_UpdateMode: 1 m_InitializationMode: 0 m_UpdateZoneSpace: 0 m_CurrentUpdateZoneSpace: 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Horizontal.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Horizontal.asset new file mode 100644 index 0000000..1abab70 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-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-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: 038cddd0ea70e1d41ad37272c1e7c31c, 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-Horizontal.asset.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Horizontal.asset.meta new file mode 100644 index 0000000..2cd54f2 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Horizontal.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 580ab95419bdcc845a4bd0b1a94983c0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8600000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeTimings-Horizontal.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeTimings-Horizontal.asset index 55ff584..04bf0ac 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeTimings-Horizontal.asset +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeTimings-Horizontal.asset @@ -40,7 +40,7 @@ CustomRenderTexture: m_InitMaterial: {fileID: 0} m_InitColor: {r: 0, g: 0, b: 0, a: 1} m_InitTexture: {fileID: 0} - m_UpdateMode: 2 + m_UpdateMode: 1 m_InitializationMode: 0 m_UpdateZoneSpace: 0 m_CurrentUpdateZoneSpace: 0 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/Textures/RTs/Legacy/DMXRT-StrobeOutput-Legacy.mat new file mode 100644 index 0000000..7e74f7d --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/Legacy/DMXRT-StrobeOutput-Legacy.mat @@ -0,0 +1,84 @@ +%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: DMXRT-StrobeOutput-Legacy + m_Shader: {fileID: 4800000, guid: 4fd2aba1f194f2944983084cf77021b3, type: 3} + m_ShaderKeywords: _ENABLECOMPATIBILITYMODE_ON + 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} + - _DMXTexture: + 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} + - _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 + - _EnableCompatibilityMode: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _MaxStrobeFreq: 27 + - _Metallic: 0 + - _Mode: 0 + - _NineUniverseMode: 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/Textures/RTs/Legacy/DMXRT-StrobeOutput-Legacy.mat.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/Legacy/DMXRT-StrobeOutput-Legacy.mat.meta new file mode 100644 index 0000000..176fb25 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/Legacy/DMXRT-StrobeOutput-Legacy.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8af3b80e2a7dd3e458aacc6701d4c657 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/Legacy/DMXRTViewer-StrobeOutput-Legacy.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/Legacy/DMXRTViewer-StrobeOutput-Legacy.asset new file mode 100644 index 0000000..b974531 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/Legacy/DMXRTViewer-StrobeOutput-Legacy.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-Legacy + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 3 + m_Width: 25 + m_Height: 25 + 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: 8af3b80e2a7dd3e458aacc6701d4c657, 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/Legacy/DMXRTViewer-StrobeOutput-Legacy.asset.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/Legacy/DMXRTViewer-StrobeOutput-Legacy.asset.meta new file mode 100644 index 0000000..841de30 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/Legacy/DMXRTViewer-StrobeOutput-Legacy.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 12347cc9d183cff41b75a6e1d133bff6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8600000 + userData: + assetBundleName: + assetBundleVariant: 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/Textures/RTs/VerticalMode/DMXRT-StrobeOutput-Vertical.mat new file mode 100644 index 0000000..05103b7 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRT-StrobeOutput-Vertical.mat @@ -0,0 +1,84 @@ +%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: DMXRT-StrobeOutput-Vertical + m_Shader: {fileID: 4800000, guid: 4fd2aba1f194f2944983084cf77021b3, 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} + - _DMXTexture: + 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} + - _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 + - _EnableCompatibilityMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _MaxStrobeFreq: 27 + - _Metallic: 0 + - _Mode: 0 + - _NineUniverseMode: 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/Textures/RTs/VerticalMode/DMXRT-StrobeOutput-Vertical.mat.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRT-StrobeOutput-Vertical.mat.meta new file mode 100644 index 0000000..2992f7b --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRT-StrobeOutput-Vertical.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fafb9a56ddc548e4dafd9cb0befa0e2e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-Interpolated-Color+Intensity-Vertical.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-Interpolated-Color+Intensity-Vertical.asset index 682d08b..c6775ee 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-Interpolated-Color+Intensity-Vertical.asset +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-Interpolated-Color+Intensity-Vertical.asset @@ -40,7 +40,7 @@ CustomRenderTexture: m_InitMaterial: {fileID: 0} m_InitColor: {r: 0, g: 0, b: 0, a: 1} m_InitTexture: {fileID: 0} - m_UpdateMode: 1 + m_UpdateMode: 2 m_InitializationMode: 0 m_UpdateZoneSpace: 0 m_CurrentUpdateZoneSpace: 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-Interpolated-Movement-Vertical.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-Interpolated-Movement-Vertical.asset index 5f99f6a..b6736ce 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-Interpolated-Movement-Vertical.asset +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-Interpolated-Movement-Vertical.asset @@ -40,7 +40,7 @@ CustomRenderTexture: m_InitMaterial: {fileID: 0} m_InitColor: {r: 0, g: 0, b: 0, a: 1} m_InitTexture: {fileID: 0} - m_UpdateMode: 1 + m_UpdateMode: 2 m_InitializationMode: 0 m_UpdateZoneSpace: 0 m_CurrentUpdateZoneSpace: 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-SpinTimer-Vertical.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-SpinTimer-Vertical.asset index 9b02cf3..3a96fd6 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-SpinTimer-Vertical.asset +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-SpinTimer-Vertical.asset @@ -40,7 +40,7 @@ CustomRenderTexture: m_InitMaterial: {fileID: 0} m_InitColor: {r: 0, g: 0, b: 0, a: 1} m_InitTexture: {fileID: 0} - m_UpdateMode: 1 + m_UpdateMode: 2 m_InitializationMode: 0 m_UpdateZoneSpace: 0 m_CurrentUpdateZoneSpace: 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Vertical.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Vertical.asset new file mode 100644 index 0000000..1acbf19 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-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-Vertical + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 3 + m_Width: 26 + m_Height: 135 + 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: fafb9a56ddc548e4dafd9cb0befa0e2e, 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-Vertical.asset.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Vertical.asset.meta new file mode 100644 index 0000000..39e2df3 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Vertical.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 42aa50059d38ab44a95ee1cb7a7c5d5b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8600000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeTimings-Vertical.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeTimings-Vertical.asset index 750e6d4..d8faef0 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeTimings-Vertical.asset +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeTimings-Vertical.asset @@ -40,7 +40,7 @@ CustomRenderTexture: m_InitMaterial: {fileID: 0} m_InitColor: {r: 0, g: 0, b: 0, a: 1} m_InitTexture: {fileID: 0} - m_UpdateMode: 1 + m_UpdateMode: 2 m_InitializationMode: 0 m_UpdateZoneSpace: 0 m_CurrentUpdateZoneSpace: 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/StaticLightTextures/LightBarTextures/LightBar_LightBarMaterialFixture_Normal.png.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/StaticLightTextures/LightBarTextures/LightBar_LightBarMaterialFixture_Normal.png.meta index 935dae7..8a03dff 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/StaticLightTextures/LightBarTextures/LightBar_LightBarMaterialFixture_Normal.png.meta +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/StaticLightTextures/LightBarTextures/LightBar_LightBarMaterialFixture_Normal.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -51,7 +51,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 1 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/package.json b/Packages/com.acchosen.vr-stage-lighting/package.json index cf8af60..1e2ebbf 100644 --- a/Packages/com.acchosen.vr-stage-lighting/package.json +++ b/Packages/com.acchosen.vr-stage-lighting/package.json @@ -1,14 +1,21 @@ { - "name": "com.acchosen.vr-stage-lighting", - "displayName": "VR Stage Lighting", - "version": "2.3.1", - "description": "A collection of HLSL shaders, UdonSharp scripts, 3D models, prefabs, and assets designed to emulate the real control, quality, and complexity of professional stage lighting into VRChat in as many ways as possible.", - "gitDependencies": {}, - "vpmDependencies": {}, - "legacyFolders": {}, - "legacyFiles": {}, - "localPath": "I:\\VRSL2022\\Packages\\com.acchosen.vr-stage-lighting", - "dependencies": { - "com.llealloo.audiolink": "0.3.1" - } + "name":"com.acchosen.vr-stage-lighting", + "displayName":"VR Stage Lighting", + "version":"2.4.0", + "description":"A collection of HLSL shaders, UdonSharp scripts, 3D models, prefabs, and assets designed to emulate the real control, quality, and complexity of professional stage lighting into VRChat in as many ways as possible.", + "url":"https://github.com/AcChosen/VR-Stage-Lighting", + "author":{ + "name":"AcChosen" + }, + "gitDependencies":{}, + "vpmDependencies":{ + "com.llealloo.audiolink":">=0.3.1" + }, + "legacyFolders":{ + "Assets\\VR-Stage-Lighting":"" + }, + "legacyFiles":{}, + "hideInEditor":false, + "license":"MIT", + "unity":"2019.4" } \ No newline at end of file