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 04bc24a..d7b4774 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 @@ -102,7 +102,7 @@ Material: - _Sector: 0 - _SignalDetectionSensativity: 0.025 - _SignalDetectionSystem: 0 - - _SmoothValue: 0.9206 + - _SmoothValue: 0.7 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Functions/VRSL-GetRGBValues.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Functions/VRSL-GetRGBValues.asset index 587a763..86eb23c 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Functions/VRSL-GetRGBValues.asset +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Functions/VRSL-GetRGBValues.asset @@ -13,13 +13,13 @@ MonoBehaviour: m_Name: VRSL-GetRGBValues m_EditorClassIdentifier: m_functionInfo: "// Made with Amplify Shader Editor\n// Available at the Unity - Asset Store - http://u3d.as/y3X \n/*ASEBEGIN\nVersion=18935\n573.1429;350.8571;1206.286;666.4286;1083.553;530.1476;1.286721;True;False\nNode;AmplifyShaderEditor.DynamicAppendNode;9;362,-13;Inherit;False;COLOR;4;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;3;FLOAT;1;False;1;COLOR;0\nNode;AmplifyShaderEditor.IntNode;46;-503.589,10.23071;Inherit;False;Constant;_Int1;Int + Asset Store - http://u3d.as/y3X \n/*ASEBEGIN\nVersion=18935\n966.8572;298.8571;1206.286;666.4286;23.29504;528.8609;1.286721;True;False\nNode;AmplifyShaderEditor.DynamicAppendNode;9;362,-13;Inherit;False;COLOR;4;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;3;FLOAT;1;False;1;COLOR;0\nNode;AmplifyShaderEditor.IntNode;46;-503.589,10.23071;Inherit;False;Constant;_Int1;Int 1;3;0;Create;True;0;0;0;False;0;False;1;0;False;0;1;INT;0\nNode;AmplifyShaderEditor.FunctionInput;7;-686,-119;Inherit;False;Channel Increment;0;3;False;1;0;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.FunctionInput;4;-656,-202;Inherit;False;DMX Channel;0;1;False;1;0;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.SimpleAddOpNode;37;-369.7607,-89.33798;Inherit;False;2;2;0;INT;0;False;1;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.SimpleAddOpNode;8;-482,-181;Inherit;False;2;2;0;INT;0;False;1;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.FunctionInput;53;-372.589,-337.2693;Inherit;False;DMX Grid Input;9;0;False;1;0;SAMPLER2D;0;False;1;SAMPLER2D;0\nNode;AmplifyShaderEditor.FunctionInput;6;-662,-347;Inherit;False;Legacy - Mode?;0;2;False;1;0;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.SimpleAddOpNode;38;-315.7607,34.66202;Inherit;False;2;2;0;INT;0;False;1;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.FunctionNode;93;-58.64551,83.80005;Inherit;False;VRSL-ReadDMX;-1;;51;daf3802ef6ad79c4f8b45fd9600401f1;0;3;96;SAMPLER2D;0;False;80;INT;0;False;77;INT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionNode;94;-62.77179,-62.24646;Inherit;False;VRSL-ReadDMX;-1;;52;daf3802ef6ad79c4f8b45fd9600401f1;0;3;96;SAMPLER2D;0;False;80;INT;0;False;77;INT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionNode;95;-58.58261,-203.5536;Inherit;False;VRSL-ReadDMX;-1;;53;daf3802ef6ad79c4f8b45fd9600401f1;0;3;96;SAMPLER2D;0;False;80;INT;0;False;77;INT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionOutput;0;530,-82;Inherit;False;True;-1;RGB - Value;0;False;1;0;COLOR;0,0,0,0;False;1;COLOR;0\nWireConnection;9;0;95;0\nWireConnection;9;1;94;0\nWireConnection;9;2;93;0\nWireConnection;37;0;8;0\nWireConnection;37;1;46;0\nWireConnection;8;0;4;0\nWireConnection;8;1;7;0\nWireConnection;38;0;37;0\nWireConnection;38;1;46;0\nWireConnection;93;96;53;0\nWireConnection;93;80;6;0\nWireConnection;93;77;38;0\nWireConnection;94;96;53;0\nWireConnection;94;80;6;0\nWireConnection;94;77;37;0\nWireConnection;95;96;53;0\nWireConnection;95;80;6;0\nWireConnection;95;77;8;0\nWireConnection;0;0;9;0\nASEEND*/\n//CHKSM=B685BDE572001C4F654D35B570E289AB5DC446AB" + Mode?;0;2;False;1;0;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.SimpleAddOpNode;38;-315.7607,34.66202;Inherit;False;2;2;0;INT;0;False;1;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.FunctionNode;90;-58.64551,83.80005;Inherit;False;VRSL-ReadDMX;-1;;48;daf3802ef6ad79c4f8b45fd9600401f1;0;3;96;SAMPLER2D;0;False;80;INT;0;False;77;INT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionNode;91;-58.58261,-203.5536;Inherit;False;VRSL-ReadDMX;-1;;49;daf3802ef6ad79c4f8b45fd9600401f1;0;3;96;SAMPLER2D;0;False;80;INT;0;False;77;INT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionNode;92;-62.77179,-62.24646;Inherit;False;VRSL-ReadDMX;-1;;50;daf3802ef6ad79c4f8b45fd9600401f1;0;3;96;SAMPLER2D;0;False;80;INT;0;False;77;INT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionOutput;0;530,-82;Inherit;False;True;-1;RGB + Value;0;False;1;0;COLOR;0,0,0,0;False;1;COLOR;0\nWireConnection;9;0;91;0\nWireConnection;9;1;92;0\nWireConnection;9;2;90;0\nWireConnection;37;0;8;0\nWireConnection;37;1;46;0\nWireConnection;8;0;4;0\nWireConnection;8;1;7;0\nWireConnection;38;0;37;0\nWireConnection;38;1;46;0\nWireConnection;90;96;53;0\nWireConnection;90;80;6;0\nWireConnection;90;77;38;0\nWireConnection;91;96;53;0\nWireConnection;91;80;6;0\nWireConnection;91;77;8;0\nWireConnection;92;96;53;0\nWireConnection;92;80;6;0\nWireConnection;92;77;37;0\nWireConnection;0;0;9;0\nASEEND*/\n//CHKSM=F26E28B811B36C1DF2450C58CCD4EEE490DC8747" m_functionName: m_description: m_additionalIncludes: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Functions/VRSL-GetStrobeValue.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Functions/VRSL-GetStrobeValue.asset index 391b423..89964ae 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Functions/VRSL-GetStrobeValue.asset +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Functions/VRSL-GetStrobeValue.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: VRSL-GetStrobeValue m_EditorClassIdentifier: m_functionInfo: "// Made with Amplify Shader Editor\n// Available at the Unity - Asset Store - http://u3d.as/y3X \n/*ASEBEGIN\nVersion=18935\n573.1429;350.8571;1206.286;666.4286;1283.421;421.4252;1;True;False\nNode;AmplifyShaderEditor.FunctionInput;17;-1038.775,-143.2892;Inherit;False;Legacy + Asset Store - http://u3d.as/y3X \n/*ASEBEGIN\nVersion=18935\n966.8572;298.8571;1206.286;666.4286;1403.421;301.2824;1;True;False\nNode;AmplifyShaderEditor.FunctionInput;17;-1038.775,-143.2892;Inherit;False;Legacy Mode? (Bool);0;3;False;1;0;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.SimpleAddOpNode;6;-840.5813,-51.63255;Inherit;False;2;2;0;INT;0;False;1;INT;6;False;1;INT;0\nNode;AmplifyShaderEditor.FunctionInput;1;-1029.109,-20.8685;Inherit;False;DMX Channel;0;4;False;1;0;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.FunctionInput;4;-1042.579,-232.0323;Inherit;False;DMX Strobe Timer Texture;9;5;False;1;0;SAMPLER2D;0;False;1;SAMPLER2D;0\nNode;AmplifyShaderEditor.FunctionInput;39;-644.9973,11.49719;Inherit;False;Strobe @@ -24,7 +24,7 @@ MonoBehaviour: 1$$return strobe@;1;Create;3;True;phase;FLOAT;0;In;;Inherit;False;True;status;FLOAT;0;In;;Inherit;False;True;toggle;INT;0;In;;Inherit;False;Get Strobe;True;False;0;;False;3;0;FLOAT;0;False;1;FLOAT;0;False;2;INT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionInput;43;-1048.278,144.4319;Inherit;False;DMX Grid Input;9;0;False;1;0;SAMPLER2D;0;False;1;SAMPLER2D;0\nNode;AmplifyShaderEditor.FunctionInput;31;-1037.824,66.82068;Inherit;False;Channel - Increment;0;1;False;1;0;INT;4;False;1;INT;0\nNode;AmplifyShaderEditor.FunctionNode;45;-640.9155,-99.57251;Inherit;False;VRSL-ReadDMX;-1;;49;daf3802ef6ad79c4f8b45fd9600401f1;0;3;96;SAMPLER2D;0;False;80;INT;0;False;77;INT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionNode;46;-653.9155,-229.5725;Inherit;False;VRSL-ReadDMXRaw;-1;;50;257ccf99ab7848440b204b69d9f82d8e;0;3;96;SAMPLER2D;0;False;80;INT;0;False;77;INT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionOutput;0;-96.5954,-190.7929;Inherit;False;True;-1;Output;0;False;1;0;FLOAT;0;False;1;FLOAT;0\nWireConnection;6;0;1;0\nWireConnection;6;1;31;0\nWireConnection;40;0;39;0\nWireConnection;35;0;46;0\nWireConnection;35;1;45;0\nWireConnection;35;2;40;0\nWireConnection;45;96;43;0\nWireConnection;45;80;17;0\nWireConnection;45;77;6;0\nWireConnection;46;96;4;0\nWireConnection;46;80;17;0\nWireConnection;46;77;6;0\nWireConnection;0;0;35;0\nASEEND*/\n//CHKSM=7A6FE8AE991AAE92B07B6FFF1EE0C570698A3BA6" + Increment;0;1;False;1;0;INT;4;False;1;INT;0\nNode;AmplifyShaderEditor.FunctionNode;45;-640.9155,-99.57251;Inherit;False;VRSL-ReadDMX;-1;;49;daf3802ef6ad79c4f8b45fd9600401f1;0;3;96;SAMPLER2D;0;False;80;INT;0;False;77;INT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionNode;46;-653.9155,-229.5725;Inherit;False;VRSL-ReadDMXRaw;-1;;50;257ccf99ab7848440b204b69d9f82d8e;0;3;96;SAMPLER2D;0;False;80;INT;0;False;77;INT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionOutput;0;-96.5954,-190.7929;Inherit;False;True;-1;Output;0;False;1;0;FLOAT;0;False;1;FLOAT;0\nWireConnection;6;0;1;0\nWireConnection;6;1;31;0\nWireConnection;40;0;39;0\nWireConnection;35;0;46;0\nWireConnection;35;1;45;0\nWireConnection;35;2;40;0\nWireConnection;45;96;43;0\nWireConnection;45;80;17;0\nWireConnection;45;77;6;0\nWireConnection;46;96;4;0\nWireConnection;46;80;17;0\nWireConnection;46;77;6;0\nWireConnection;0;0;35;0\nASEEND*/\n//CHKSM=42AF6D24097385A111EC9B7D73E5EB030D5EDD2C" m_functionName: m_description: A function for getting a strobe value from the dmx grid. The higher the dmx value is from the stream, the faster the strobe rate. diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Functions/VRSL-ReadDMX.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Functions/VRSL-ReadDMX.asset index 2aedab5..2e7b6a8 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Functions/VRSL-ReadDMX.asset +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Functions/VRSL-ReadDMX.asset @@ -13,30 +13,30 @@ MonoBehaviour: m_Name: VRSL-ReadDMX m_EditorClassIdentifier: m_functionInfo: "// Made with Amplify Shader Editor\n// Available at the Unity - Asset Store - http://u3d.as/y3X \n/*ASEBEGIN\nVersion=18935\n573.1429;350.8571;1206.286;666.4286;129.5877;967.6372;1.3;True;False\nNode;AmplifyShaderEditor.IntNode;83;-25.40576,-510.0674;Inherit;False;Constant;_Int0;Int - 0;0;0;Create;True;0;0;0;False;0;False;1;0;False;0;1;INT;0\nNode;AmplifyShaderEditor.FunctionInput;80;-47.40576,-586.0674;Inherit;False;LegacyMode;0;1;False;1;0;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.WireNode;97;-236.1415,-106.0822;Inherit;False;1;0;SAMPLER2D;;False;1;SAMPLER2D;0\nNode;AmplifyShaderEditor.CustomExpressionNode;79;190.2844,-441.7575;Inherit;False;channel - = channel - 1@$$float x = 0.02000@$float y = 0.02000@$$float ymod = floor(sector - / 2.0)@ $$float xmod = sector % 2.0@$$x+= (xmod * 0.50)@$y+= (ymod * 0.04)@$$x+= - (channel * 0.04)@$$return float2(x,y)@$$;2;Create;2;True;channel;INT;0;In;;Inherit;False;True;sector;INT;0;In;;Inherit;False;Legacy - Read;False;False;0;;False;2;0;INT;0;False;1;INT;0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.BreakToComponentsNode;95;-219.9075,-443.9388;Inherit;False;FLOAT2;1;0;FLOAT2;0,0;False;16;FLOAT;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT;5;FLOAT;6;FLOAT;7;FLOAT;8;FLOAT;9;FLOAT;10;FLOAT;11;FLOAT;12;FLOAT;13;FLOAT;14;FLOAT;15\nNode;AmplifyShaderEditor.WireNode;99;336.6586,-90.08216;Inherit;False;1;0;SAMPLER2D;;False;1;SAMPLER2D;0\nNode;AmplifyShaderEditor.SamplerNode;93;833.1604,-533.869;Inherit;True;Property;_TextureSample0;Texture - Sample 0;1;0;Create;True;0;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4\nNode;AmplifyShaderEditor.AbsOpNode;94;-429.3547,-431.7595;Inherit;False;1;0;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.FunctionInput;77;-606.2667,-420.4579;Inherit;False;DMX - Channel;0;2;False;1;0;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.FunctionInput;96;-602.4658,-186.4489;Inherit;False;DMX - Grid Input;9;0;False;1;0;SAMPLER2D;0;False;1;SAMPLER2D;0\nNode;AmplifyShaderEditor.Compare;82;619.5942,-516.0674;Inherit;False;0;4;0;INT;0;False;1;INT;0;False;2;FLOAT2;0,0;False;3;FLOAT2;0,0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.CustomExpressionNode;78;-339.7133,-616.052;Inherit;False;uint + Asset Store - http://u3d.as/y3X \n/*ASEBEGIN\nVersion=18935\n966.8572;298.8571;1206.286;666.4286;-331.912;825.9372;1.3;True;False\nNode;AmplifyShaderEditor.IntNode;83;-25.40576,-510.0674;Inherit;False;Constant;_Int0;Int + 0;0;0;Create;True;0;0;0;False;0;False;1;0;False;0;1;INT;0\nNode;AmplifyShaderEditor.CustomExpressionNode;84;142.5942,-341.0674;Inherit;False;y + = y + 1@$$float resMultiplierX = (_OSCGridRenderTextureRAW_TexelSize.z / 13)@$float2 + xyUV = float2(0.0,0.0)@$$xyUV.x = ((x * resMultiplierX) * _OSCGridRenderTextureRAW_TexelSize.x)@$xyUV.y + = (y * resMultiplierX) * _OSCGridRenderTextureRAW_TexelSize.y@$xyUV.y -= 0.001915@$ + xyUV.x -= 0.015@$$return xyUV@$;2;Create;3;False;_OSCGridRenderTextureRAW_TexelSize;FLOAT4;0,0,0,0;In;;Inherit;False;True;x;INT;0;In;;Inherit;False;True;y;INT;0;In;;Inherit;False;Industry + Read;False;False;0;;False;3;0;FLOAT4;0,0,0,0;False;1;INT;0;False;2;INT;0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.Compare;82;619.5942,-516.0674;Inherit;False;0;4;0;INT;0;False;1;INT;0;False;2;FLOAT2;0,0;False;3;FLOAT2;0,0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.SamplerNode;93;833.1604,-537.7689;Inherit;True;Property;_TextureSample0;Texture + Sample 0;1;0;Create;True;0;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4\nNode;AmplifyShaderEditor.CustomExpressionNode;78;-339.7133,-616.052;Inherit;False;uint ch = abs(DMXChannel)@$uint x = ch % 13@$x = x == 0.0 ? 13.0 : x@$$float y = DMXChannel / 13.0@$y = frac(y)== 0.00000 ? y - 1 : y@$$if(x == 13.0)${$ y = DMXChannel >= 90 && DMXChannel <= 101 ? y - 1 : y@$ y = DMXChannel >= 160 && DMXChannel <= 205 ? y - 1 : y@$ y = DMXChannel >= 326 && DMXChannel <= 404 ? y - 1 : y@$ y = DMXChannel >= 676 && DMXChannel <= 819 ? y - 1 : y@$ y = DMXChannel >= 1339 ? y - 1 : y@$}$$float2 xAndy = float2(x,y)@$$return xAndy@;2;Create;1;True;DMXChannel;INT;0;In;;Float;False;Base - Read;False;False;0;;False;1;0;INT;0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.TexelSizeNode;87;-113.2081,-266.7121;Inherit;False;-1;1;0;SAMPLER2D;;False;5;FLOAT4;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4\nNode;AmplifyShaderEditor.CustomExpressionNode;84;142.5942,-342.3674;Inherit;False;y - = y + 1@$$float resMultiplierX = (_OSCGridRenderTextureRAW_TexelSize.z / 13)@$float2 - xyUV = float2(0.0,0.0)@$$xyUV.x = ((x * resMultiplierX) * _OSCGridRenderTextureRAW_TexelSize.x)@$xyUV.y - = (y * resMultiplierX) * _OSCGridRenderTextureRAW_TexelSize.y@$xyUV.y -= 0.001915@$ - xyUV.x -= 0.015@$$return xyUV@$;2;Create;3;False;_OSCGridRenderTextureRAW_TexelSize;FLOAT4;0,0,0,0;In;;Inherit;False;True;x;INT;0;In;;Inherit;False;True;y;INT;0;In;;Inherit;False;Industry - Read;False;False;0;;False;3;0;FLOAT4;0,0,0,0;False;1;INT;0;False;2;INT;0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.WireNode;98;791.0579,-126.8821;Inherit;False;1;0;SAMPLER2D;;False;1;SAMPLER2D;0\nNode;AmplifyShaderEditor.CustomExpressionNode;88;1190.159,-600.834;Inherit;False; - float3 cRGB = float3(c.r, c.g, c.b)@$ float value = LinearRgbToLuminance(cRGB)@$$ + Read;False;False;0;;False;1;0;INT;0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.TexelSizeNode;87;-113.2081,-266.7121;Inherit;False;-1;1;0;SAMPLER2D;;False;5;FLOAT4;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4\nNode;AmplifyShaderEditor.FunctionInput;96;-602.4658,-186.4489;Inherit;False;DMX + Grid Input;9;0;False;1;0;SAMPLER2D;0;False;1;SAMPLER2D;0\nNode;AmplifyShaderEditor.FunctionInput;77;-606.2667,-420.4579;Inherit;False;DMX + Channel;0;2;False;1;0;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.WireNode;98;791.0579,-126.8821;Inherit;False;1;0;SAMPLER2D;;False;1;SAMPLER2D;0\nNode;AmplifyShaderEditor.AbsOpNode;94;-429.3547,-431.7595;Inherit;False;1;0;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.WireNode;99;336.6586,-90.08216;Inherit;False;1;0;SAMPLER2D;;False;1;SAMPLER2D;0\nNode;AmplifyShaderEditor.BreakToComponentsNode;95;-219.9075,-443.9388;Inherit;False;FLOAT2;1;0;FLOAT2;0,0;False;16;FLOAT;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT;5;FLOAT;6;FLOAT;7;FLOAT;8;FLOAT;9;FLOAT;10;FLOAT;11;FLOAT;12;FLOAT;13;FLOAT;14;FLOAT;15\nNode;AmplifyShaderEditor.CustomExpressionNode;79;190.2844,-441.7575;Inherit;False;channel + = channel - 1@$$float x = 0.02000@$float y = 0.02000@$$float ymod = floor(sector + / 2.0)@ $$float xmod = sector % 2.0@$$x+= (xmod * 0.50)@$y+= (ymod * 0.04)@$$x+= + (channel * 0.04)@$$return float2(x,y)@$$;2;Create;2;True;channel;INT;0;In;;Inherit;False;True;sector;INT;0;In;;Inherit;False;Legacy + Read;False;False;0;;False;2;0;INT;0;False;1;INT;0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.WireNode;97;-236.1415,-106.0822;Inherit;False;1;0;SAMPLER2D;;False;1;SAMPLER2D;0\nNode;AmplifyShaderEditor.FunctionInput;80;-47.40576,-586.0674;Inherit;False;LegacyMode;0;1;False;1;0;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.CustomExpressionNode;88;1188.859,-602.134;Inherit;False; + float3 cRGB = float3(c.r, c.g, c.b)@$ float value = LinearRgbToLuminance(cRGB)@$ return value@;1;Create;1;True;c;FLOAT4;0,0,0,0;In;;Inherit;False;Sample DMX;True;False;0;;False;1;0;FLOAT4;0,0,0,0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionOutput;0;1949.409,-513.8898;Inherit;False;True;-1;Channel - Value;0;False;1;0;FLOAT;0;False;1;FLOAT;0\nWireConnection;97;0;96;0\nWireConnection;79;0;95;0\nWireConnection;79;1;95;1\nWireConnection;95;0;78;0\nWireConnection;99;0;97;0\nWireConnection;93;0;98;0\nWireConnection;93;1;82;0\nWireConnection;94;0;77;0\nWireConnection;82;0;80;0\nWireConnection;82;1;83;0\nWireConnection;82;2;79;0\nWireConnection;82;3;84;0\nWireConnection;78;0;94;0\nWireConnection;87;0;96;0\nWireConnection;84;0;87;0\nWireConnection;84;1;95;0\nWireConnection;84;2;95;1\nWireConnection;98;0;99;0\nWireConnection;88;0;93;0\nWireConnection;0;0;88;0\nASEEND*/\n//CHKSM=004E246B9AD5972BE57E183FBB3102276BF3EB38" + Value;0;False;1;0;FLOAT;0;False;1;FLOAT;0\nWireConnection;84;0;87;0\nWireConnection;84;1;95;0\nWireConnection;84;2;95;1\nWireConnection;82;0;80;0\nWireConnection;82;1;83;0\nWireConnection;82;2;79;0\nWireConnection;82;3;84;0\nWireConnection;93;0;98;0\nWireConnection;93;1;82;0\nWireConnection;78;0;94;0\nWireConnection;87;0;96;0\nWireConnection;98;0;99;0\nWireConnection;94;0;77;0\nWireConnection;99;0;97;0\nWireConnection;95;0;78;0\nWireConnection;79;0;95;0\nWireConnection;79;1;95;1\nWireConnection;97;0;96;0\nWireConnection;88;0;93;0\nWireConnection;0;0;88;0\nASEEND*/\n//CHKSM=E23C30B7FD8A48B8230A6B15F9F12E949E3E71B0" m_functionName: m_description: A general purpose function for reading the DMX Grid from VRSL. Input the DMX Channel and grid texture to read from. If you are using legacy mode, diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Functions/VRSL-ReadDMXRaw.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Functions/VRSL-ReadDMXRaw.asset index 2609afb..f14f0b9 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Functions/VRSL-ReadDMXRaw.asset +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Functions/VRSL-ReadDMXRaw.asset @@ -13,28 +13,28 @@ MonoBehaviour: m_Name: VRSL-ReadDMXRaw m_EditorClassIdentifier: m_functionInfo: "// Made with Amplify Shader Editor\n// Available at the Unity - Asset Store - http://u3d.as/y3X \n/*ASEBEGIN\nVersion=18935\n573.1429;350.8571;1206.286;666.4286;692.9318;595.1717;1;True;False\nNode;AmplifyShaderEditor.IntNode;83;-25.40576,-510.0674;Inherit;False;Constant;_Int0;Int - 0;0;0;Create;True;0;0;0;False;0;False;1;0;False;0;1;INT;0\nNode;AmplifyShaderEditor.FunctionInput;80;-47.40576,-586.0674;Inherit;False;LegacyMode;0;1;False;1;0;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.TexelSizeNode;87;-113.2081,-266.7121;Inherit;False;-1;1;0;SAMPLER2D;;False;5;FLOAT4;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4\nNode;AmplifyShaderEditor.Compare;82;619.5942,-516.0674;Inherit;False;0;4;0;INT;0;False;1;INT;0;False;2;FLOAT2;0,0;False;3;FLOAT2;0,0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.SamplerNode;93;844.1604,-297.7689;Inherit;True;Property;_TextureSample0;Texture - Sample 0;1;0;Create;True;0;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4\nNode;AmplifyShaderEditor.FunctionInput;77;-606.2667,-420.4579;Inherit;False;DMX + Asset Store - http://u3d.as/y3X \n/*ASEBEGIN\nVersion=18935\n966.8572;298.8571;1206.286;666.4286;694.5188;721.6321;1.3;True;False\nNode;AmplifyShaderEditor.IntNode;83;-25.40576,-510.0674;Inherit;False;Constant;_Int0;Int + 0;0;0;Create;True;0;0;0;False;0;False;1;0;False;0;1;INT;0\nNode;AmplifyShaderEditor.FunctionInput;80;-47.40576,-586.0674;Inherit;False;LegacyMode;0;1;False;1;0;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.TexelSizeNode;87;-113.2081,-266.7121;Inherit;False;-1;1;0;SAMPLER2D;;False;5;FLOAT4;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4\nNode;AmplifyShaderEditor.FunctionInput;77;-606.2667,-420.4579;Inherit;False;DMX Channel;0;2;False;1;0;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.AbsOpNode;94;-429.3547,-431.7595;Inherit;False;1;0;INT;0;False;1;INT;0\nNode;AmplifyShaderEditor.BreakToComponentsNode;95;-219.9075,-443.9388;Inherit;False;FLOAT2;1;0;FLOAT2;0,0;False;16;FLOAT;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT;5;FLOAT;6;FLOAT;7;FLOAT;8;FLOAT;9;FLOAT;10;FLOAT;11;FLOAT;12;FLOAT;13;FLOAT;14;FLOAT;15\nNode;AmplifyShaderEditor.FunctionInput;96;-610.546,-263.0571;Inherit;False;DMX - Grid IN;9;0;False;1;0;SAMPLER2D;0;False;1;SAMPLER2D;0\nNode;AmplifyShaderEditor.WireNode;98;667.6951,-142.8712;Inherit;False;1;0;SAMPLER2D;;False;1;SAMPLER2D;0\nNode;AmplifyShaderEditor.WireNode;97;-403.7713,-116.0654;Inherit;False;1;0;SAMPLER2D;;False;1;SAMPLER2D;0\nNode;AmplifyShaderEditor.CustomExpressionNode;78;-338.7133,-616.052;Inherit;False;uint + Grid IN;9;0;False;1;0;SAMPLER2D;0;False;1;SAMPLER2D;0\nNode;AmplifyShaderEditor.WireNode;98;667.6951,-142.8712;Inherit;False;1;0;SAMPLER2D;;False;1;SAMPLER2D;0\nNode;AmplifyShaderEditor.WireNode;97;-403.7713,-116.0654;Inherit;False;1;0;SAMPLER2D;;False;1;SAMPLER2D;0\nNode;AmplifyShaderEditor.SamplerNode;93;845.1604,-297.7689;Inherit;True;Property;_TextureSample0;Texture + Sample 0;1;0;Create;True;0;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4\nNode;AmplifyShaderEditor.Compare;82;619.5942,-516.0674;Inherit;False;0;4;0;INT;0;False;1;INT;0;False;2;FLOAT2;0,0;False;3;FLOAT2;0,0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.CustomExpressionNode;78;-338.7133,-616.052;Inherit;False;uint ch = abs(DMXChannel)@$uint x = ch % 13@$x = x == 0.0 ? 13.0 : x@$$float y = DMXChannel / 13.0@$y = frac(y)== 0.00000 ? y - 1 : y@$$if(x == 13.0)${$y = DMXChannel >= 90 && DMXChannel <= 101 ? y - 1 : y@$ y = DMXChannel >= 160 && DMXChannel <= 205 ? y - 1 : y@$ y = DMXChannel >= 326 && DMXChannel <= 404 ? y - 1 : y@$ y = DMXChannel >= 676 && DMXChannel <= 819 ? y - 1 : y@$ y = DMXChannel >= 1339 ? y - 1 : y@$ }$$$float2 xAndy = float2(x,y)@$$return - xAndy@;2;Create;1;True;DMXChannel;INT;0;In;;Float;False;Base Read;False;False;0;;False;1;0;INT;0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.CustomExpressionNode;79;190.2844,-442.7575;Inherit;False;channel - = channel - 1@$$float x = 0.02000@$float y = 0.02000@$$float ymod = floor(sector - / 2.0)@ $$float xmod = sector % 2.0@$$x+= (xmod * 0.50)@$y+= (ymod * 0.04)@$$x+= - (channel * 0.04)@$$return float2(x,y)@$$;2;Create;2;True;channel;INT;0;In;;Inherit;False;True;sector;INT;0;In;;Inherit;False;Legacy - Read;False;False;0;;False;2;0;INT;0;False;1;INT;0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.CustomExpressionNode;84;142.5942,-342.0674;Inherit;False;y + xAndy@;2;Create;1;True;DMXChannel;INT;0;In;;Float;False;Base Read;False;False;0;;False;1;0;INT;0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.CustomExpressionNode;84;138.6942,-339.7674;Inherit;False;y = y + 1@$$float resMultiplierX = (_OSCGridRenderTextureRAW_TexelSize.z / 13)@$float2 xyUV = float2(0.0,0.0)@$$xyUV.x = ((x * resMultiplierX) * _OSCGridRenderTextureRAW_TexelSize.x)@$xyUV.y = (y * resMultiplierX) * _OSCGridRenderTextureRAW_TexelSize.y@$xyUV.y -= 0.001915@$ xyUV.x -= 0.015@$$return xyUV@$;2;Create;3;False;_OSCGridRenderTextureRAW_TexelSize;FLOAT4;0,0,0,0;In;;Inherit;False;True;x;INT;0;In;;Inherit;False;True;y;INT;0;In;;Inherit;False;Industry - Read;False;False;0;;False;3;0;FLOAT4;0,0,0,0;False;1;INT;0;False;2;INT;0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.FunctionOutput;0;1186.409,-284.8898;Inherit;False;True;-1;Channel - Value;0;False;1;0;FLOAT;0;False;1;FLOAT;0\nWireConnection;87;0;96;0\nWireConnection;82;0;80;0\nWireConnection;82;1;83;0\nWireConnection;82;2;79;0\nWireConnection;82;3;84;0\nWireConnection;93;0;98;0\nWireConnection;93;1;82;0\nWireConnection;94;0;77;0\nWireConnection;95;0;78;0\nWireConnection;98;0;97;0\nWireConnection;97;0;96;0\nWireConnection;78;0;94;0\nWireConnection;79;0;95;0\nWireConnection;79;1;95;1\nWireConnection;84;0;87;0\nWireConnection;84;1;95;0\nWireConnection;84;2;95;1\nWireConnection;0;0;93;1\nASEEND*/\n//CHKSM=C991ECF37AF6FFBE7467D934E3315910BD82CE01" + Read;False;False;0;;False;3;0;FLOAT4;0,0,0,0;False;1;INT;0;False;2;INT;0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.CustomExpressionNode;79;187.2844,-441.4575;Inherit;False;channel + = channel - 1@$$float x = 0.02000@$float y = 0.02000@$$float ymod = floor(sector + / 2.0)@ $$float xmod = sector % 2.0@$$x+= (xmod * 0.50)@$y+= (ymod * 0.04)@$$x+= + (channel * 0.04)@$$return float2(x,y)@$$;2;Create;2;True;channel;INT;0;In;;Inherit;False;True;sector;INT;0;In;;Inherit;False;Legacy + Read;False;False;0;;False;2;0;INT;0;False;1;INT;0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.FunctionOutput;0;1187.409,-280.8898;Inherit;False;True;-1;Channel + Value;0;False;1;0;FLOAT;0;False;1;FLOAT;0\nWireConnection;87;0;96;0\nWireConnection;94;0;77;0\nWireConnection;95;0;78;0\nWireConnection;98;0;97;0\nWireConnection;97;0;96;0\nWireConnection;93;0;98;0\nWireConnection;93;1;82;0\nWireConnection;82;0;80;0\nWireConnection;82;1;83;0\nWireConnection;82;2;79;0\nWireConnection;82;3;84;0\nWireConnection;78;0;94;0\nWireConnection;84;0;87;0\nWireConnection;84;1;95;0\nWireConnection;84;2;95;1\nWireConnection;79;0;95;0\nWireConnection;79;1;95;1\nWireConnection;0;0;93;1\nASEEND*/\n//CHKSM=0EE4369984818EBB91201CF41F639E2B661EB45B" m_functionName: m_description: A general purpose function for reading the DMX Grid from VRSL. Input the DMX Channel and grid texture to read from. If you are using legacy mode, diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Shaders/VRSL-AmplifySurface.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Shaders/VRSL-AmplifySurface.shader index 2741048..6fec39a 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Shaders/VRSL-AmplifySurface.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Amplify/Shaders/VRSL-AmplifySurface.shader @@ -103,12 +103,10 @@ Shader "VRSL/Amplify/VRSL-AmplifySurface" y = frac(y)== 0.00000 ? y - 1 : y; if(x == 13.0) { - y = DMXChannel >= 90 && DMXChannel <= 101 ? y - 1 : y; - y = DMXChannel >= 160 && DMXChannel <= 205 ? y - 1 : y; - y = DMXChannel >= 326 && DMXChannel <= 404 ? y - 1 : y; - y = DMXChannel >= 676 && DMXChannel <= 819 ? y - 1 : y; - y = DMXChannel >= 1339 ? y - 1 : y; - } + y = DMXChannel >= 90 && DMXChannel <= 404 ? y - 1 : y; + y = DMXChannel >= 676 && DMXChannel <= 819 ? y - 1 : y; + y = DMXChannel >= 1339 ? y - 1 : y; + } float2 xAndy = float2(x,y); return xAndy; } @@ -135,8 +133,8 @@ Shader "VRSL/Amplify/VRSL-AmplifySurface" float2 xyUV = float2(0.0,0.0); xyUV.x = ((x * resMultiplierX) * _OSCGridRenderTextureRAW_TexelSize.x); xyUV.y = (y * resMultiplierX) * _OSCGridRenderTextureRAW_TexelSize.y; - xyUV.y -= 0.001915; - xyUV.x -= 0.015; + xyUV.y -= 0.001; + xyUV.x -= 0.015; return xyUV; } @@ -145,6 +143,7 @@ Shader "VRSL/Amplify/VRSL-AmplifySurface" { float3 cRGB = float3(c.r, c.g, c.b); float value = LinearRgbToLuminance(cRGB); + value = LinearToGammaSpaceExact(value); return value; } @@ -163,6 +162,7 @@ Shader "VRSL/Amplify/VRSL-AmplifySurface" { float3 cRGB = float3(c.r, c.g, c.b); float value = LinearRgbToLuminance(cRGB); + value = LinearToGammaSpaceExact(value); return value; } @@ -171,14 +171,7 @@ Shader "VRSL/Amplify/VRSL-AmplifySurface" { float3 cRGB = float3(c.r, c.g, c.b); float value = LinearRgbToLuminance(cRGB); - return value; - } - - - float SampleDMX88_g354( float4 c ) - { - float3 cRGB = float3(c.r, c.g, c.b); - float value = LinearRgbToLuminance(cRGB); + value = LinearToGammaSpaceExact(value); return value; } @@ -187,6 +180,16 @@ Shader "VRSL/Amplify/VRSL-AmplifySurface" { float3 cRGB = float3(c.r, c.g, c.b); float value = LinearRgbToLuminance(cRGB); + value = LinearToGammaSpaceExact(value); + return value; + } + + + float SampleDMX88_g354( float4 c ) + { + float3 cRGB = float3(c.r, c.g, c.b); + float value = LinearRgbToLuminance(cRGB); + value = LinearToGammaSpaceExact(value); return value; } @@ -259,19 +262,7 @@ Shader "VRSL/Amplify/VRSL-AmplifySurface" float4 c88_g355 = SAMPLE_TEXTURE2D( _DMXGrid, sampler_DMXGrid, ( temp_output_6_0_g352 == 1 ? localLegacyRead79_g355 : localIndustryRead84_g355 ) ); float localSampleDMX88_g355 = SampleDMX88_g355( c88_g355 ); int temp_output_37_0_g352 = ( temp_output_8_0_g352 + 1 ); - int DMXChannel78_g354 = abs( temp_output_37_0_g352 ); - float2 localBaseRead78_g354 = BaseRead( DMXChannel78_g354 ); - float2 break95_g354 = localBaseRead78_g354; - int channel79_g354 = (int)break95_g354.x; - int sector79_g354 = (int)break95_g354.y; - float2 localLegacyRead79_g354 = LegacyRead( channel79_g354 , sector79_g354 ); - float4 _OSCGridRenderTextureRAW_TexelSize84_g354 = _DMXGrid_TexelSize; - int x84_g354 = (int)break95_g354.x; - int y84_g354 = (int)break95_g354.y; - float2 localIndustryRead84_g354 = IndustryRead( _OSCGridRenderTextureRAW_TexelSize84_g354 , x84_g354 , y84_g354 ); - float4 c88_g354 = SAMPLE_TEXTURE2D( _DMXGrid, sampler_DMXGrid, ( temp_output_6_0_g352 == 1 ? localLegacyRead79_g354 : localIndustryRead84_g354 ) ); - float localSampleDMX88_g354 = SampleDMX88_g354( c88_g354 ); - int DMXChannel78_g353 = abs( ( temp_output_37_0_g352 + 1 ) ); + int DMXChannel78_g353 = abs( temp_output_37_0_g352 ); float2 localBaseRead78_g353 = BaseRead( DMXChannel78_g353 ); float2 break95_g353 = localBaseRead78_g353; int channel79_g353 = (int)break95_g353.x; @@ -283,7 +274,19 @@ Shader "VRSL/Amplify/VRSL-AmplifySurface" float2 localIndustryRead84_g353 = IndustryRead( _OSCGridRenderTextureRAW_TexelSize84_g353 , x84_g353 , y84_g353 ); float4 c88_g353 = SAMPLE_TEXTURE2D( _DMXGrid, sampler_DMXGrid, ( temp_output_6_0_g352 == 1 ? localLegacyRead79_g353 : localIndustryRead84_g353 ) ); float localSampleDMX88_g353 = SampleDMX88_g353( c88_g353 ); - float4 appendResult9_g352 = (float4(localSampleDMX88_g355 , localSampleDMX88_g354 , localSampleDMX88_g353 , 1.0)); + int DMXChannel78_g354 = abs( ( temp_output_37_0_g352 + 1 ) ); + float2 localBaseRead78_g354 = BaseRead( DMXChannel78_g354 ); + float2 break95_g354 = localBaseRead78_g354; + int channel79_g354 = (int)break95_g354.x; + int sector79_g354 = (int)break95_g354.y; + float2 localLegacyRead79_g354 = LegacyRead( channel79_g354 , sector79_g354 ); + float4 _OSCGridRenderTextureRAW_TexelSize84_g354 = _DMXGrid_TexelSize; + int x84_g354 = (int)break95_g354.x; + int y84_g354 = (int)break95_g354.y; + float2 localIndustryRead84_g354 = IndustryRead( _OSCGridRenderTextureRAW_TexelSize84_g354 , x84_g354 , y84_g354 ); + float4 c88_g354 = SAMPLE_TEXTURE2D( _DMXGrid, sampler_DMXGrid, ( temp_output_6_0_g352 == 1 ? localLegacyRead79_g354 : localIndustryRead84_g354 ) ); + float localSampleDMX88_g354 = SampleDMX88_g354( c88_g354 ); + float4 appendResult9_g352 = (float4(localSampleDMX88_g355 , localSampleDMX88_g353 , localSampleDMX88_g354 , 1.0)); float _FinalIntensity_Instance = UNITY_ACCESS_INSTANCED_PROP(_FinalIntensity_arr, _FinalIntensity); float _GlobalIntensity_Instance = UNITY_ACCESS_INSTANCED_PROP(_GlobalIntensity_arr, _GlobalIntensity); float lerpResult190 = lerp( 0.0 , _EmissionStrengthMultiplier , temp_output_173_0); @@ -307,40 +310,40 @@ Shader "VRSL/Amplify/VRSL-AmplifySurface" } /*ASEBEGIN Version=18935 -573.1429;350.8571;1206.286;666.4286;1608.715;38.12936;1.787992;True;False +245;301;1658;983;2012.546;326.2515;1.787992;True;False Node;AmplifyShaderEditor.CommentaryNode;81;-964.9736,83.32082;Inherit;False;1223.884;667.8798;5 Channel Fixture Setup. Intensity, RGB, and Strobe. ;12;80;79;43;21;16;173;175;177;176;163;39;181;5 Channel Fixture DMX Reading;1,1,1,1;0;0 Node;AmplifyShaderEditor.IntNode;16;-870.2498,453.5368;Inherit;False;InstancedProperty;_DMXChannel;DMX Channel;7;0;Create;True;0;0;0;False;0;False;0;0;False;0;1;INT;0 Node;AmplifyShaderEditor.IntNode;21;-874.9551,384.8933;Inherit;False;Property;_LegacyMode;Legacy Mode?;8;0;Create;True;0;0;0;False;1;Toggle;False;0;0;False;0;1;INT;0 Node;AmplifyShaderEditor.TexturePropertyNode;176;-946.5815,549.8076;Inherit;True;Property;_DMXGrid;DMX Grid;2;0;Create;True;0;0;0;False;0;False;None;None;False;white;Auto;Texture2D;-1;0;2;SAMPLER2D;0;SAMPLERSTATE;1 -Node;AmplifyShaderEditor.RangedFloatNode;83;-161.8089,-82.04681;Inherit;False;Property;_EmissionStrengthMultiplier;Emission Strength Multiplier;13;0;Create;True;0;0;0;False;0;False;1;0;1;200;0;1;FLOAT;0 +Node;AmplifyShaderEditor.IntNode;175;-870.8794,313.3403;Inherit;False;InstancedProperty;_EnableStrobe;Can Strobe?;9;0;Create;False;0;0;0;False;1;Toggle;False;1;0;False;0;1;INT;0 +Node;AmplifyShaderEditor.IntNode;163;-691.8258,683.2285;Inherit;False;Constant;_Int0;Int 0;19;0;Create;True;0;0;0;False;0;False;1;0;False;0;1;INT;0 +Node;AmplifyShaderEditor.TexturePropertyNode;177;-912.5815,121.8076;Inherit;True;Property;_DMXStrobeTimer;DMX Strobe Timer;4;0;Create;True;0;0;0;False;0;False;None;None;False;white;Auto;Texture2D;-1;0;2;SAMPLER2D;0;SAMPLERSTATE;1 Node;AmplifyShaderEditor.CommentaryNode;82;-578.9083,-1176.978;Inherit;False;1188.889;1049.79;Standard Surface Shader Items;17;7;12;49;10;11;9;6;64;63;65;66;67;61;70;84;183;182;Standard Surface Shader;1,1,1,1;0;0 Node;AmplifyShaderEditor.FunctionNode;173;-565.9862,338.5289;Inherit;False;VRSL-ReadDMX;-1;;351;daf3802ef6ad79c4f8b45fd9600401f1;0;3;96;SAMPLER2D;0;False;80;INT;0;False;77;INT;0;False;1;FLOAT;0 -Node;AmplifyShaderEditor.IntNode;163;-691.8258,683.2285;Inherit;False;Constant;_Int0;Int 0;19;0;Create;True;0;0;0;False;0;False;1;0;False;0;1;INT;0 -Node;AmplifyShaderEditor.IntNode;175;-870.8794,313.3403;Inherit;False;InstancedProperty;_EnableStrobe;Can Strobe?;9;0;Create;False;0;0;0;False;1;Toggle;False;1;0;False;0;1;INT;0 -Node;AmplifyShaderEditor.TexturePropertyNode;177;-912.5815,121.8076;Inherit;True;Property;_DMXStrobeTimer;DMX Strobe Timer;4;0;Create;True;0;0;0;False;0;False;None;None;False;white;Auto;Texture2D;-1;0;2;SAMPLER2D;0;SAMPLERSTATE;1 +Node;AmplifyShaderEditor.RangedFloatNode;83;-161.8089,-82.04681;Inherit;False;Property;_EmissionStrengthMultiplier;Emission Strength Multiplier;13;0;Create;True;0;0;0;False;0;False;1;0;1;200;0;1;FLOAT;0 Node;AmplifyShaderEditor.FunctionNode;172;-529.5178,545.8111;Inherit;False;VRSL-GetRGBValues;-1;;352;6ff3fb2f25dfde442a3d454ce5bfa464;0;4;53;SAMPLER2D;0;False;4;INT;0;False;6;INT;0;False;7;INT;0;False;1;COLOR;0 Node;AmplifyShaderEditor.LerpOp;190;204.0121,-175.8546;Inherit;False;3;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;1;FLOAT;0 Node;AmplifyShaderEditor.FunctionNode;181;-604.018,136.0169;Inherit;True;VRSL-GetStrobeValue;-1;;356;67bfbade731e9bf479d532da3afed0e6;0;6;43;SAMPLER2D;0;False;31;INT;4;False;39;INT;0;False;17;INT;0;False;1;INT;0;False;4;SAMPLER2D;0;False;1;FLOAT;0 Node;AmplifyShaderEditor.SamplerStateNode;7;-528.9083,-482.0835;Inherit;False;0;0;0;1;-1;None;1;0;SAMPLER2D;;False;1;SAMPLERSTATE;0 Node;AmplifyShaderEditor.CommentaryNode;80;-210.2069,120.7118;Inherit;False;132;132;CH 5;1;45;Strobe value;1,1,1,1;0;0 Node;AmplifyShaderEditor.RangedFloatNode;61;37.43338,-391.7389;Inherit;False;InstancedProperty;_GlobalIntensity;Global Intensity;11;0;Create;False;0;0;0;False;0;False;1;0;0;1;0;1;FLOAT;0 -Node;AmplifyShaderEditor.RangedFloatNode;183;250.6088,-543.0911;Inherit;False;InstancedProperty;_FinalIntensity;Final Intensity;12;0;Create;False;0;0;0;False;0;False;1;0;0;1;0;1;FLOAT;0 +Node;AmplifyShaderEditor.SimpleMultiplyOpNode;39;34.03101,433.2328;Inherit;True;2;2;0;FLOAT;0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.CommentaryNode;49;30.46555,-259.1884;Inherit;False;132;132;Emission Mask;1;48;;1,1,1,1;0;0 +Node;AmplifyShaderEditor.WireNode;45;-160.2069,170.7118;Inherit;False;1;0;FLOAT;0;False;1;FLOAT;0 Node;AmplifyShaderEditor.SamplerNode;12;-267.2777,-377.7147;Inherit;True;Property;_EmissionMask;Emission Mask;6;1;[SingleLineTexture];Create;True;0;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 Node;AmplifyShaderEditor.SimpleMultiplyOpNode;84;299.1382,-356.8202;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0 -Node;AmplifyShaderEditor.CommentaryNode;49;30.46555,-259.1884;Inherit;False;132;132;Emission Mask;1;48;;1,1,1,1;0;0 -Node;AmplifyShaderEditor.SimpleMultiplyOpNode;39;34.03101,433.2328;Inherit;True;2;2;0;FLOAT;0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 -Node;AmplifyShaderEditor.WireNode;45;-160.2069,170.7118;Inherit;False;1;0;FLOAT;0;False;1;FLOAT;0 +Node;AmplifyShaderEditor.RangedFloatNode;183;250.6088,-543.0911;Inherit;False;InstancedProperty;_FinalIntensity;Final Intensity;12;0;Create;False;0;0;0;False;0;False;1;0;0;1;0;1;FLOAT;0 Node;AmplifyShaderEditor.WireNode;48;80.46545,-209.1885;Inherit;False;1;0;FLOAT;0;False;1;FLOAT;0 Node;AmplifyShaderEditor.SimpleMultiplyOpNode;44;293.0238,125.7325;Inherit;True;2;2;0;FLOAT;0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 Node;AmplifyShaderEditor.RangedFloatNode;184;456.4612,-613.6317;Inherit;False;Property;_UniversalIntensity;Universal Intensity;10;0;Create;False;0;0;0;False;0;False;1;0;0;1;0;1;FLOAT;0 Node;AmplifyShaderEditor.SimpleMultiplyOpNode;182;393.3136,-467.1724;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0 -Node;AmplifyShaderEditor.SamplerNode;11;-266.9187,-564.269;Inherit;True;Property;_AmbientOcclusionMap;Ambient Occlusion Map;5;1;[SingleLineTexture];Create;True;0;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 -Node;AmplifyShaderEditor.RangedFloatNode;65;55.59845,-663.7995;Inherit;False;Property;_SmoothnessStrength;Smoothness Strength;15;0;Create;True;0;0;0;False;0;False;0;0;0;1;0;1;FLOAT;0 +Node;AmplifyShaderEditor.SamplerNode;10;-263.1878,-752.1567;Inherit;True;Property;_MetallicSmoothnessMap;Metallic Smoothness Map;3;1;[SingleLineTexture];Create;True;0;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 +Node;AmplifyShaderEditor.RangedFloatNode;63;68.82088,-772.7103;Inherit;False;Property;_MetallicStrength;Metallic Strength;14;0;Create;True;0;0;0;False;0;False;0;0;0;1;0;1;FLOAT;0 +Node;AmplifyShaderEditor.RangedFloatNode;67;32.24033,-467.6367;Inherit;False;Property;_AmbientOcclusionStrength;Ambient Occlusion Strength;16;0;Create;True;0;0;0;False;0;False;0;0;0;1;0;1;FLOAT;0 Node;AmplifyShaderEditor.SimpleMultiplyOpNode;185;550.4612,-492.6317;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0 Node;AmplifyShaderEditor.SimpleMultiplyOpNode;47;397.5565,-38.39049;Inherit;False;2;2;0;FLOAT;0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 -Node;AmplifyShaderEditor.RangedFloatNode;63;68.82088,-772.7103;Inherit;False;Property;_MetallicStrength;Metallic Strength;14;0;Create;True;0;0;0;False;0;False;0;0;0;1;0;1;FLOAT;0 -Node;AmplifyShaderEditor.SamplerNode;10;-263.1878,-752.1567;Inherit;True;Property;_MetallicSmoothnessMap;Metallic Smoothness Map;3;1;[SingleLineTexture];Create;True;0;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 -Node;AmplifyShaderEditor.RangedFloatNode;67;32.24033,-467.6367;Inherit;False;Property;_AmbientOcclusionStrength;Ambient Occlusion Strength;16;0;Create;True;0;0;0;False;0;False;0;0;0;1;0;1;FLOAT;0 +Node;AmplifyShaderEditor.RangedFloatNode;65;55.59845,-663.7995;Inherit;False;Property;_SmoothnessStrength;Smoothness Strength;15;0;Create;True;0;0;0;False;0;False;0;0;0;1;0;1;FLOAT;0 +Node;AmplifyShaderEditor.SamplerNode;11;-266.9187,-564.269;Inherit;True;Property;_AmbientOcclusionMap;Ambient Occlusion Map;5;1;[SingleLineTexture];Create;True;0;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 Node;AmplifyShaderEditor.SimpleMultiplyOpNode;66;333.8387,-688.778;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0 Node;AmplifyShaderEditor.SimpleMultiplyOpNode;64;331.0926,-827.6705;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0 Node;AmplifyShaderEditor.SamplerNode;9;-265.6089,-937.0826;Inherit;True;Property;_NormalMap;Normal Map;0;2;[Normal];[SingleLineTexture];Create;True;0;0;0;False;0;False;-1;None;None;True;0;False;bump;Auto;True;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;FLOAT3;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 @@ -364,23 +367,23 @@ WireConnection;181;39;175;0 WireConnection;181;17;21;0 WireConnection;181;1;16;0 WireConnection;181;4;177;0 -WireConnection;12;7;7;0 -WireConnection;84;0;61;0 -WireConnection;84;1;190;0 WireConnection;39;0;173;0 WireConnection;39;1;172;0 WireConnection;45;0;181;0 +WireConnection;12;7;7;0 +WireConnection;84;0;61;0 +WireConnection;84;1;190;0 WireConnection;48;0;12;1 WireConnection;44;0;45;0 WireConnection;44;1;39;0 WireConnection;182;0;183;0 WireConnection;182;1;84;0 -WireConnection;11;7;7;0 +WireConnection;10;7;7;0 WireConnection;185;0;184;0 WireConnection;185;1;182;0 WireConnection;47;0;48;0 WireConnection;47;1;44;0 -WireConnection;10;7;7;0 +WireConnection;11;7;7;0 WireConnection;66;0;10;4 WireConnection;66;1;65;0 WireConnection;64;0;10;1 @@ -398,4 +401,4 @@ WireConnection;0;3;64;0 WireConnection;0;4;66;0 WireConnection;0;5;70;0 ASEEND*/ -//CHKSM=A7832EA48DB9E0F0FCC537E8FC32A9E25F591CE2 \ No newline at end of file +//CHKSM=71E9F27070FDDF8DD27236D124D7D95BA55D58C0 \ No newline at end of file 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 d7b895d..16a6acd 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 @@ -43,7 +43,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/DMXRTViewer-Interpolated-Movement-Horizontal.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-Interpolated-Movement-Horizontal.asset index 4887b12..f1d4755 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 @@ -43,7 +43,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/DMXRTViewer-SpinTimer-Horizontal.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-SpinTimer-Horizontal.asset index afcf58b..9b537ef 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 @@ -43,7 +43,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/DMXRTViewer-StrobeOutput-Delay-Final-Horizontal.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Delay-Final-Horizontal.asset index beae94e..a401579 100644 --- 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 @@ -43,7 +43,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/DMXRTViewer-StrobeOutput-Delay-Initial-Horizontal.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Delay-Initial-Horizontal.asset index 4b6ca9f..51367d5 100644 --- 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 @@ -43,7 +43,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/DMXRTViewer-StrobeOutput-Horizontal.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeOutput-Horizontal.asset index 1c50d46..1815255 100644 --- 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 @@ -43,7 +43,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/DMXRTViewer-StrobeTimings-Horizontal.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-StrobeTimings-Horizontal.asset index 808fb50..c6cf0fc 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 @@ -43,7 +43,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-Color+Intensity-Vertical.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-Interpolated-Color+Intensity-Vertical.asset index 701e090..d841666 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 @@ -43,7 +43,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/VerticalMode/DMXRTViewer-Interpolated-Movement-Vertical.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-Interpolated-Movement-Vertical.asset index 8ee69ae..25fb2be 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 @@ -43,7 +43,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/VerticalMode/DMXRTViewer-SpinTimer-Vertical.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-SpinTimer-Vertical.asset index 8c6702b..2b0cffc 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 @@ -43,7 +43,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/VerticalMode/DMXRTViewer-StrobeOutput-Delay-Final-Vertical.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Delay-Final-Vertical.asset index 7689688..a56f941 100644 --- 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 @@ -43,7 +43,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/VerticalMode/DMXRTViewer-StrobeOutput-Delay-Initial-Vertical.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Delay-Initial-Vertical.asset index adeecca..4a8f5b4 100644 --- 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 @@ -43,7 +43,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/VerticalMode/DMXRTViewer-StrobeOutput-Vertical.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeOutput-Vertical.asset index 38d3c34..52df375 100644 --- 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 @@ -43,7 +43,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/VerticalMode/DMXRTViewer-StrobeTimings-Vertical.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/VerticalMode/DMXRTViewer-StrobeTimings-Vertical.asset index a51c1ee..ca61a01 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 @@ -43,7 +43,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/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 58845f1..e047df7 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -30,10 +30,10 @@ EditorUserSettings: value: 0007510704010b0d5e5e597740700a444e154c727e2c71602c7c1832b5b6316b flags: 0 RecentlyUsedSceneGuid-8: - value: 5402500751070b590957082715210b4441161e737f78736229701e30b6e23561 + value: 0106065f06510b58080a547644730944404e4a2c2e7e2562297e4b6bb6b86d3a flags: 0 RecentlyUsedSceneGuid-9: - value: 0106065f06510b58080a547644730944404e4a2c2e7e2562297e4b6bb6b86d3a + value: 5402500751070b590957082715210b4441161e737f78736229701e30b6e23561 flags: 0 vcSharedLogLevel: value: 0d5e400f0650