Skip to content

Commit

Permalink
Strobe Functionality Rework
Browse files Browse the repository at this point in the history
-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.
  • Loading branch information
AcChosen committed Jul 11, 2023
1 parent 9300cdd commit ac4a74e
Show file tree
Hide file tree
Showing 46 changed files with 961 additions and 84 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ Material:
- _MaxMinTiltAngle: -90
- _MaxMinTiltAngleInstanced: 180
- _Metallic: 0.501
- _MinimumBeamRadius: 0.96
- _MinimumBeamRadius: 0.95
- _ModX: 0
- _ModY: 0
- _NineUniverseMode: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3200
m_CustomRenderQueue: 3001
stringTagMap:
RenderType: Transparent
disabledShaderPasses: []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3200
m_CustomRenderQueue: 3001
stringTagMap:
RenderType: Transparent
disabledShaderPasses: []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3200
m_CustomRenderQueue: 3001
stringTagMap:
RenderType: Transparent
disabledShaderPasses: []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3200
m_CustomRenderQueue: 3001
stringTagMap:
RenderType: Transparent
disabledShaderPasses: []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3200
m_CustomRenderQueue: 3001
stringTagMap:
RenderType: Transparent
disabledShaderPasses: []
Expand Down
Original file line number Diff line number Diff line change
@@ -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}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3200
m_CustomRenderQueue: 3001
stringTagMap:
RenderType: Transparent
disabledShaderPasses: []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3200
m_CustomRenderQueue: 3001
stringTagMap:
RenderType: Transparent
disabledShaderPasses: []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3200
m_CustomRenderQueue: 3001
stringTagMap:
RenderType: Transparent
disabledShaderPasses: []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Loading

0 comments on commit ac4a74e

Please sign in to comment.