diff --git a/Packages/com.acchosen.vr-stage-lighting/Editor/VRSLInspector.cs b/Packages/com.acchosen.vr-stage-lighting/Editor/VRSLInspector.cs index 86a634a..48e933c 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Editor/VRSLInspector.cs +++ b/Packages/com.acchosen.vr-stage-lighting/Editor/VRSLInspector.cs @@ -15,12 +15,13 @@ public class VRSLInspector : ShaderGUI BindingFlags.Static; MaterialProperty _DMXChannel = null; MaterialProperty _NineUniverseMode = null; - MaterialProperty _EnableOSC = null; + MaterialProperty _EnableDMX = null; MaterialProperty _EnableExtraChannels = null; - MaterialProperty _OSCGridRenderTextureRAW = null; - MaterialProperty _OSCGridRenderTexture = null; - MaterialProperty _OSCGridStrobeTimer = null; - MaterialProperty _OSCGridSpinTimer = null; + // MaterialProperty _Udon_DMXGridRenderTextureMovement = null; + // MaterialProperty _Udon_DMXGridRenderTexture = null; + // MaterialProperty _Udon_DMXGridStrobeTimer = null; + // MaterialProperty _Udon_DMXGridSpinTimer = null; + MaterialProperty _DMXTexture = null; MaterialProperty _UseRawGrid = null; MaterialProperty _EnableCompatibilityMode = null; MaterialProperty _EnableVerticalMode = null; @@ -162,8 +163,8 @@ public class VRSLInspector : ShaderGUI //Interpolation Render Texture MaterialProperty _SmoothValue = null; - MaterialProperty _MinimumSmoothnessOSC = null; - MaterialProperty _MaximumSmoothnessOSC = null; + MaterialProperty _MinimumSmoothnessDMX = null; + MaterialProperty _MaximumSmoothnessDMX = null; //Strobe RenderTexture MaterialProperty _MaxStrobeFreq = null; @@ -356,7 +357,7 @@ public class VRSLInspector : ShaderGUI GUILayout.Space(5); EditorGUILayout.HelpBox("''Sector'' and ''Enable DMX'' are usually overridden by their corresponding Udon Script. \nAdjust these at your own risk.", MessageType.Info,true); EditorGUI.indentLevel++; - matEditor.ShaderProperty(_EnableOSC, new GUIContent("Enable DMX", "Enables or Disables reading from the DMX Render Textures")); + matEditor.ShaderProperty(_EnableDMX, new GUIContent("Enable DMX", "Enables or Disables reading from the DMX Render Textures")); matEditor.ShaderProperty(_NineUniverseMode, new GUIContent("Enable Extended Universe Mode", "Enables or Disables extended universe mode (9-universes via RGB)")); matEditor.ShaderProperty(_EnableCompatibilityMode, new GUIContent("Enable Compatibility Mode", "Changes the grid from reading the new 208x1080 grid to the old 200x200 grid. \nThis property is not an instanced property.")); matEditor.ShaderProperty(_EnableVerticalMode, new GUIContent("Enable Vertical Mode", "Switches this material to read from the vertical grid instead of the horizontal when not in legacy mode.")); @@ -367,9 +368,9 @@ public class VRSLInspector : ShaderGUI EditorGUILayout.HelpBox("These are the render texture grids used to read DMX signals from a video panel.", MessageType.None,true); EditorGUI.indentLevel++; matEditor.ShaderProperty(_UseRawGrid, new GUIContent("Use Seperate Grid for Light Intensity and Color", "Use this to switch to the normal grid for light/color if smooothed is too slow")); - matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid", "The DMX Render Texture to read from for color and intensity. Slightly smoothed."),_OSCGridRenderTextureRAW); - matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid Smoothed", "DMX Render Texture smoothed out by a custom render texture."),_OSCGridRenderTexture); - matEditor.TexturePropertySingleLine(new GUIContent("DMX Strobe Timer", "DMX Grid with strobe timings embedded."),_OSCGridStrobeTimer); + // matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid", "The DMX Render Texture to read from for color and intensity. Slightly smoothed."),_Udon_DMXGridRenderTexture); + // matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid Smoothed", "DMX Render Texture smoothed out by a custom render texture."),_Udon_DMXGridRenderTextureMovement); + // matEditor.TexturePropertySingleLine(new GUIContent("DMX Strobe Timer", "DMX Grid with strobe timings embedded."),_Udon_DMXGridStrobeTimer); EditorGUI.indentLevel--; GUILayout.Space(5); } @@ -459,7 +460,7 @@ public class VRSLInspector : ShaderGUI EditorGUI.indentLevel++; matEditor.ShaderProperty(_EnableCompatibilityMode, new GUIContent("Enable Compatibility Mode", "Changes the grid from reading the new 208x1080 grid to the old 200x200 grid. \nThis property is not an instanced property.")); matEditor.ShaderProperty(_EnableVerticalMode, new GUIContent("Enable Vertical Mode", "Switches this material to read from the vertical grid instead of the horizontal when not in legacy mode.")); - matEditor.ShaderProperty(_EnableOSC, new GUIContent("Enable DMX", "Enables or Disables reading from the DMX Render Textures")); + matEditor.ShaderProperty(_EnableDMX, new GUIContent("Enable DMX", "Enables or Disables reading from the DMX Render Textures")); matEditor.ShaderProperty(_NineUniverseMode, new GUIContent("Enable Extended Universe Mode", "Enables or Disables extended universe mode (9-universes via RGB)")); matEditor.ShaderProperty(_DMXChannel, new GUIContent("DMX Channel","Chooses the DMX Address to start this fixture at.")); EditorGUI.indentLevel--; @@ -467,9 +468,9 @@ public class VRSLInspector : ShaderGUI EditorGUILayout.HelpBox("These are the render texture grids used to read DMX signals from a video panel.", MessageType.None,true); EditorGUI.indentLevel++; matEditor.ShaderProperty(_UseRawGrid, new GUIContent("Use Seperate Grid for Light Intensity and Color", "Use this to switch to the normal grid for light/color if smooothed is too slow")); - matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid", "The DMX Render Texture to read from for color and intensity. Slightly smoothed."),_OSCGridRenderTextureRAW); - matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid Smoothed", "DMX Render Texture smoothed out by a custom render texture."),_OSCGridRenderTexture); - matEditor.TexturePropertySingleLine(new GUIContent("DMX Strobe Timer", "DMX Grid with strobe timings embedded."),_OSCGridStrobeTimer); + // matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid", "The DMX Render Texture to read from for color and intensity. Slightly smoothed."),_Udon_DMXGridRenderTexture); + // matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid Smoothed", "DMX Render Texture smoothed out by a custom render texture."),_Udon_DMXGridRenderTextureMovement); + // matEditor.TexturePropertySingleLine(new GUIContent("DMX Strobe Timer", "DMX Grid with strobe timings embedded."),_Udon_DMXGridStrobeTimer); EditorGUI.indentLevel--; GUILayout.Space(5); } @@ -534,7 +535,7 @@ public class VRSLInspector : ShaderGUI EditorGUI.indentLevel++; matEditor.ShaderProperty(_EnableCompatibilityMode, new GUIContent("Enable Compatibility Mode", "Changes the grid from reading the new 208x1080 grid to the old 200x200 grid. \nThis property is not an instanced property.")); matEditor.ShaderProperty(_EnableVerticalMode, new GUIContent("Enable Vertical Mode", "Switches this material to read from the vertical grid instead of the horizontal when not in legacy mode.")); - matEditor.ShaderProperty(_EnableOSC, new GUIContent("Enable DMX", "Enables or Disables reading from the DMX Render Textures")); + matEditor.ShaderProperty(_EnableDMX, new GUIContent("Enable DMX", "Enables or Disables reading from the DMX Render Textures")); matEditor.ShaderProperty(_NineUniverseMode, new GUIContent("Enable Extended Universe Mode", "Enables or Disables extended universe mode (9-universes via RGB)")); matEditor.ShaderProperty(_DMXChannel, new GUIContent("DMX Channel","Chooses the DMX Address to start this fixture at.")); EditorGUI.indentLevel--; @@ -543,10 +544,10 @@ public class VRSLInspector : ShaderGUI EditorGUI.indentLevel++; matEditor.ShaderProperty(_UseRawGrid, new GUIContent("Use Seperate Grid for Light Intensity and Color", "Use this to switch to the normal grid for light/color if smooothed is too slow")); matEditor.ShaderProperty(_LegacyGoboRange, new GUIContent("Enable Legacy Gobo Range", "Use Only the first 6 gobos instead of all. This is for legacy content where only 6 gobos were originally supported and the channel range was different.")); - matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid", "The DMX Render Texture to read from for color and intensity. Slightly smoothed."),_OSCGridRenderTextureRAW); - matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid Smoothed", "DMX Render Texture smoothed out heavily by a custom render texture. Used for movement."),_OSCGridRenderTexture); - matEditor.TexturePropertySingleLine(new GUIContent("DMX Strobe Timer", "DMX Grid with strobe timings embedded."),_OSCGridStrobeTimer); - matEditor.TexturePropertySingleLine(new GUIContent("DMX Spin Timer", "DMX Grid with GOBO Spin timings embedded"),_OSCGridSpinTimer); + // matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid", "The DMX Render Texture to read from for color and intensity. Slightly smoothed."),_Udon_DMXGridRenderTexture); + // matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid Smoothed", "DMX Render Texture smoothed out heavily by a custom render texture. Used for movement."),_Udon_DMXGridRenderTextureMovement); + // matEditor.TexturePropertySingleLine(new GUIContent("DMX Strobe Timer", "DMX Grid with strobe timings embedded."),_Udon_DMXGridStrobeTimer); + // matEditor.TexturePropertySingleLine(new GUIContent("DMX Spin Timer", "DMX Grid with GOBO Spin timings embedded"),_Udon_DMXGridSpinTimer); EditorGUI.indentLevel--; GUILayout.Space(5); } @@ -678,7 +679,7 @@ public class VRSLInspector : ShaderGUI EditorGUI.indentLevel++; matEditor.ShaderProperty(_EnableCompatibilityMode, new GUIContent("Enable Compatibility Mode", "Changes the grid from reading the new 208x1080 grid to the old 200x200 grid. \nThis property is not an instanced property.")); matEditor.ShaderProperty(_EnableVerticalMode, new GUIContent("Enable Vertical Mode", "Switches this material to read from the vertical grid instead of the horizontal when not in legacy mode.")); - matEditor.ShaderProperty(_EnableOSC, new GUIContent("Enable DMX", "Enables or Disables reading from the DMX Render Textures")); + matEditor.ShaderProperty(_EnableDMX, new GUIContent("Enable DMX", "Enables or Disables reading from the DMX Render Textures")); matEditor.ShaderProperty(_NineUniverseMode, new GUIContent("Enable Extended Universe Mode", "Enables or Disables extended universe mode (9-universes via RGB)")); matEditor.ShaderProperty(_DMXChannel, new GUIContent("DMX Channel","Chooses the DMX Address to start this fixture at.")); matEditor.ShaderProperty(_EnableExtraChannels, new GUIContent("Enable Cone Length DMX Controls","Enable this if you want to be able to extend the lenghth of the cone on Channel 2!")); @@ -687,10 +688,10 @@ public class VRSLInspector : ShaderGUI EditorGUILayout.HelpBox("These are the render texture grids used to read DMX signals from a video panel.", MessageType.None,true); EditorGUI.indentLevel++; matEditor.ShaderProperty(_UseRawGrid, new GUIContent("Use Seperate Grid for Light Intensity and Color", "Use this to switch to the normal grid for light/color if smooothed is too slow")); - matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid", "The DMX Render Texture to read from for color and intensity. Slightly smoothed."),_OSCGridRenderTextureRAW); - matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid Smoothed", "DMX Render Texture smoothed out heavily by a custom render texture. Used for movement."),_OSCGridRenderTexture); - matEditor.TexturePropertySingleLine(new GUIContent("DMX Strobe Timer", "DMX Grid with strobe timings embedded."),_OSCGridStrobeTimer); - matEditor.TexturePropertySingleLine(new GUIContent("DMX Spin Timer", "DMX Grid with GOBO Spin timings embedded"),_OSCGridSpinTimer); + // matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid", "The DMX Render Texture to read from for color and intensity. Slightly smoothed."),_Udon_DMXGridRenderTexture); + // matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid Smoothed", "DMX Render Texture smoothed out heavily by a custom render texture. Used for movement."),_Udon_DMXGridRenderTextureMovement); + // matEditor.TexturePropertySingleLine(new GUIContent("DMX Strobe Timer", "DMX Grid with strobe timings embedded."),_Udon_DMXGridStrobeTimer); + // matEditor.TexturePropertySingleLine(new GUIContent("DMX Spin Timer", "DMX Grid with GOBO Spin timings embedded"),_Udon_DMXGridSpinTimer); EditorGUI.indentLevel--; GUILayout.Space(5); } @@ -845,7 +846,7 @@ public class VRSLInspector : ShaderGUI EditorGUI.indentLevel++; matEditor.ShaderProperty(_EnableCompatibilityMode, new GUIContent("Enable Compatibility Mode", "Changes the grid from reading the new 208x1080 grid to the old 200x200 grid. \nThis property is not an instanced property.")); matEditor.ShaderProperty(_EnableVerticalMode, new GUIContent("Enable Vertical Mode", "Switches this material to read from the vertical grid instead of the horizontal when not in legacy mode.")); - matEditor.ShaderProperty(_EnableOSC, new GUIContent("Enable DMX", "Enables or Disables reading from the DMX Render Textures")); + matEditor.ShaderProperty(_EnableDMX, new GUIContent("Enable DMX", "Enables or Disables reading from the DMX Render Textures")); matEditor.ShaderProperty(_NineUniverseMode, new GUIContent("Enable Extended Universe Mode", "Enables or Disables extended universe mode (9-universes via RGB)")); matEditor.ShaderProperty(_DMXChannel, new GUIContent("DMX Channel","Chooses the DMX Address to start this fixture at.")); EditorGUI.indentLevel--; @@ -853,9 +854,9 @@ public class VRSLInspector : ShaderGUI EditorGUILayout.HelpBox("These are the render texture grids used to read DMX signals from a video panel.", MessageType.None,true); EditorGUI.indentLevel++; matEditor.ShaderProperty(_UseRawGrid, new GUIContent("Use Seperate Grid for Light Intensity and Color", "Use this to switch to the normal grid for light/color if smooothed is too slow")); - matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid", "The DMX Render Texture to read from for color and intensity. Slightly smoothed."),_OSCGridRenderTextureRAW); - matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid Smoothed", "DMX Render Texture smoothed out by a custom render texture."),_OSCGridRenderTexture); - matEditor.TexturePropertySingleLine(new GUIContent("DMX Strobe Timer", "DMX Grid with strobe timings embedded."),_OSCGridStrobeTimer); + // matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid", "The DMX Render Texture to read from for color and intensity. Slightly smoothed."),_Udon_DMXGridRenderTexture); + // matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid Smoothed", "DMX Render Texture smoothed out by a custom render texture."),_Udon_DMXGridRenderTextureMovement); + // matEditor.TexturePropertySingleLine(new GUIContent("DMX Strobe Timer", "DMX Grid with strobe timings embedded."),_Udon_DMXGridStrobeTimer); EditorGUI.indentLevel--; GUILayout.Space(5); } @@ -953,11 +954,11 @@ public class VRSLInspector : ShaderGUI EditorGUI.indentLevel++; matEditor.ShaderProperty(_EnableCompatibilityMode, new GUIContent("Enable Compatibility Mode", "Changes the grid from reading the new 208x1080 grid to the old 200x200 grid. \nThis property is not an instanced property.")); matEditor.ShaderProperty(_EnableVerticalMode, new GUIContent("Enable Vertical Mode", "Switches this material to read from the vertical grid instead of the horizontal when not in legacy mode.")); - matEditor.ShaderProperty(_EnableOSC, new GUIContent("Enable DMX", "Enables or Disables reading from the DMX Render Textures")); + matEditor.ShaderProperty(_EnableDMX, new GUIContent("Enable DMX", "Enables or Disables reading from the DMX Render Textures")); matEditor.ShaderProperty(_NineUniverseMode, new GUIContent("Enable Extended Universe Mode", "Enables or Disables extended universe mode (9-universes via RGB)")); matEditor.ShaderProperty(_DMXChannel, new GUIContent("DMX Channel","Chooses the DMX Address to start this fixture at.")); VRSLStyles.PartingLine(); - matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid", "The DMX Render Texture to read from for color and intensity. Slightly smoothed."),_OSCGridRenderTextureRAW); + // matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid", "The DMX Render Texture to read from for color and intensity. Slightly smoothed."),_Udon_DMXGridRenderTexture); GUILayout.Space(5); EditorGUI.indentLevel--; GUILayout.Space(5); @@ -999,13 +1000,13 @@ public class VRSLInspector : ShaderGUI EditorGUI.indentLevel++; matEditor.ShaderProperty(_EnableLegacyGlobalMovementSpeedChannel, new GUIContent("Enable Legacy Global Movement Speed", "Enables the use of the old Global Movement Speed Channel (DMX Channel 511) instead of having each sector have its own movement speed control. /nThis will always be true when compatibility mode is enabled")); matEditor.ShaderProperty(_EnableCompatibilityMode, new GUIContent("Enable Compatibility Mode", "Changes the grid from reading the new 208x1080 grid to the old 200x200 grid. \nThis property is not an instanced property.")); - matEditor.ShaderProperty(_EnableOSC, new GUIContent("Enable DMX", "Enables or Disables reading from the DMX Render Textures")); + matEditor.ShaderProperty(_EnableDMX, new GUIContent("Enable DMX", "Enables or Disables reading from the DMX Render Textures")); matEditor.ShaderProperty(_NineUniverseMode, new GUIContent("Enable Extended Universe Mode", "Enables or Disables extended universe mode (9-universes via RGB)")); matEditor.ShaderProperty(_DMXChannel, new GUIContent("Sector","for legacy global movement speed")); - matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid Raw", "The raw DMX Render texture from the camera."),_OSCGridRenderTexture); + matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid Raw", "The raw DMX Render texture from the camera."),_DMXTexture); matEditor.ShaderProperty(_SmoothValue, new GUIContent("Smoothness Level", "Changes how much interpolated smoothing is applied to the texture. The closer to 0, the more smoothing applied, the closer to 1, the less smoothing applied. \nThis value is usually controlled by a seperate DMX signal to control the movement speed of the movers. ")); - matEditor.ShaderProperty(_MinimumSmoothnessOSC, new GUIContent("Minimum Smoothness Value", "Sets the minimum amount of smoothing applied to the texture by default.")); - matEditor.ShaderProperty(_MaximumSmoothnessOSC, new GUIContent("Maximum Smoothness Value", "Sets the maximum amount of smoothing applied to the texture by default.")); + matEditor.ShaderProperty(_MinimumSmoothnessDMX, new GUIContent("Minimum Smoothness Value", "Sets the minimum amount of smoothing applied to the texture by default.")); + matEditor.ShaderProperty(_MaximumSmoothnessDMX, new GUIContent("Maximum Smoothness Value", "Sets the maximum amount of smoothing applied to the texture by default.")); matEditor.RenderQueueField(); EditorGUI.indentLevel--; GUILayout.Space(5); @@ -1014,7 +1015,7 @@ public class VRSLInspector : ShaderGUI { GUILayout.Space(5); EditorGUI.indentLevel++; - matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid Raw", "The raw DMX Render texture from the camera."),_OSCGridRenderTexture); + matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid Raw", "The raw DMX Render texture from the camera."),_DMXTexture); matEditor.ShaderProperty(_MaxStrobeFreq, new GUIContent("Maximum Strobe Frequency", "The maximum strobing frequency of all fixtures.")); matEditor.ShaderProperty(_NineUniverseMode, new GUIContent("Enable Extended Universe Mode", "Enables or Disables extended universe mode (9-universes via RGB)")); matEditor.RenderQueueField(); @@ -1026,7 +1027,7 @@ public class VRSLInspector : ShaderGUI { GUILayout.Space(5); EditorGUI.indentLevel++; - matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid Raw", "The raw DMX Render texture from the camera."),_OSCGridRenderTexture); + matEditor.TexturePropertySingleLine(new GUIContent("DMX Grid Raw", "The raw DMX Render texture from the camera."),_DMXTexture); matEditor.ShaderProperty(_NineUniverseMode, new GUIContent("Enable Extended Universe Mode", "Enables or Disables extended universe mode (9-universes via RGB)")); matEditor.RenderQueueField(); EditorGUI.indentLevel--; diff --git a/Packages/com.acchosen.vr-stage-lighting/Editor/VRSL_UdonEditor.cs b/Packages/com.acchosen.vr-stage-lighting/Editor/VRSL_UdonEditor.cs index 5336b29..e2532c7 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Editor/VRSL_UdonEditor.cs +++ b/Packages/com.acchosen.vr-stage-lighting/Editor/VRSL_UdonEditor.cs @@ -30,10 +30,6 @@ namespace VRSL.EditorScripts } public static void DrawLogo() { - ///GUILayout.BeginArea(new Rect(0,0, Screen.width, Screen.height)); - // GUILayout.FlexibleSpace(); - //GUI.DrawTexture(pos,logo,ScaleMode.ScaleToFit); - //EditorGUI.DrawPreviewTexture(new Rect(0,0,400,150), logo); Vector2 contentOffset = new Vector2(0f, -2f); GUIStyle style = new GUIStyle(EditorStyles.label); style.fixedHeight = 150; @@ -41,11 +37,7 @@ namespace VRSL.EditorScripts style.contentOffset = contentOffset; style.alignment = TextAnchor.MiddleCenter; var rect = GUILayoutUtility.GetRect(300f, 140f, style); - //GUILayout.Label(logo,style, GUILayout.MaxWidth(500), GUILayout.MaxHeight(200)); GUI.Box(rect, logo,style); - //GUILayout.Label(logo); - // GUILayout.FlexibleSpace(); - //GUILayout.EndArea(); } private static Rect DrawShurikenCenteredTitle(string title, Vector2 contentOffset, int HeaderHeight) { @@ -68,30 +60,6 @@ namespace VRSL.EditorScripts } #endif - // #if !COMPILER_UDONSHARP && UNITY_EDITOR - // [CustomEditor(typeof(VRStageLighting_DMX))] - // public class VRStageLighting_DMX_Editor : VRSL_UdonEditor - // { - // public override void OnInspectorGUI() - // { - // if (UdonSharpGUI.DrawDefaultUdonSharpBehaviourHeader(target)) return; - // DrawLogo(); - // ShurikenHeaderCentered(ver); - // EditorGUILayout.Space(); - // EditorGUILayout.Space(); - // VRStageLighting_DMX fixture = (VRStageLighting_DMX) target; - // //EditorGUILayout.Space(); - // EditorGUILayout.Space(); - // EditorGUILayout.Space(); - // base.OnInspectorGUI(); - // if(GUI.changed && Application.isPlaying) - // { - // fixture._UpdateInstancedProperties(); - // } - // } - // } - // #endif - #if !COMPILER_UDONSHARP && UNITY_EDITOR [CustomEditor(typeof(VRStageLighting_DMX_Static))] @@ -289,109 +257,6 @@ namespace VRSL.EditorScripts } #endif - // #if !COMPILER_UDONSHARP && UNITY_EDITOR - // [CustomEditor(typeof(VRStageLighting_RAW))] - // public class VRStageLighting_RAW_Editor : VRSL_UdonEditor - // { - // public override void OnInspectorGUI() - // { - // if (UdonSharpGUI.DrawDefaultUdonSharpBehaviourHeader(target)) return; - // DrawLogo(); - // ShurikenHeaderCentered(ver); - // EditorGUILayout.Space(); - // EditorGUILayout.Space(); - - // //EditorGUILayout.Space(); - // base.OnInspectorGUI(); - // VRStageLighting_RAW fixture = (VRStageLighting_RAW)target; - // if(GUI.changed && Application.isPlaying) - // { - // fixture._UpdateInstancedProperties(); - // } - // } - // } - // #endif - - // #if !COMPILER_UDONSHARP && UNITY_EDITOR - // [CustomEditor(typeof(VRStageLighting_RAW_Static))] - // public class VRStageLighting_RAW_Static_Editor : VRSL_UdonEditor - // { - // public override void OnInspectorGUI() - // { - // if (UdonSharpGUI.DrawDefaultUdonSharpBehaviourHeader(target)) return; - // DrawLogo(); - // ShurikenHeaderCentered(ver); - // EditorGUILayout.Space(); - // EditorGUILayout.Space(); - - // //EditorGUILayout.Space(); - // VRStageLighting_RAW_Static fixture = (VRStageLighting_RAW_Static)target; - // EditorGUI.BeginChangeCheck(); - // base.OnInspectorGUI(); - // if(EditorGUI.EndChangeCheck()) - // { - // if(fixture.objRenderers.Length > 0) - // { - // bool isEmpty = false; - // foreach(MeshRenderer rend in fixture.objRenderers) - // { - // if(rend == null) - // { - // isEmpty = true; - // break; - // } - // } - // if(!isEmpty) - // { - // fixture._SetProps(); - // fixture._UpdateInstancedProperties(); - // } - // } - // } - // } - // } - // #endif - - // #if !COMPILER_UDONSHARP && UNITY_EDITOR - // [CustomEditor(typeof(VRStageLighting_RAW_Laser))] - // public class VRStageLighting_RAW_Laser_Editor : VRSL_UdonEditor - // { - // public override void OnInspectorGUI() - // { - // if (UdonSharpGUI.DrawDefaultUdonSharpBehaviourHeader(target)) return; - // DrawLogo(); - // ShurikenHeaderCentered(ver); - // EditorGUILayout.Space(); - // EditorGUILayout.Space(); - - // //EditorGUILayout.Space(); - // VRStageLighting_RAW_Laser fixture = (VRStageLighting_RAW_Laser)target; - // EditorGUI.BeginChangeCheck(); - // base.OnInspectorGUI(); - // if(EditorGUI.EndChangeCheck()) - // { - // if(fixture.objRenderers.Length > 0) - // { - // bool isEmpty = false; - // foreach(MeshRenderer rend in fixture.objRenderers) - // { - // if(rend == null) - // { - // isEmpty = true; - // break; - // } - // } - // if(!isEmpty) - // { - // fixture._SetProps(); - // fixture._UpdateInstancedProperties(); - // } - // } - // } - // } - // } - // #endif - #if !COMPILER_UDONSHARP && UNITY_EDITOR [CustomEditor(typeof(VRStageLighting_AudioLink_Laser))] public class VRStageLighting_AudioLink_Laser_Editor : VRSL_UdonEditor @@ -467,34 +332,6 @@ namespace VRSL.EditorScripts } #endif - // #if !COMPILER_UDONSHARP && UNITY_EDITOR - // [CustomEditor(typeof(VRStageLighting_AudioLink))] - // public class VRStageLighting_AudioLink_Editor : VRSL_UdonEditor - // { - // public override void OnInspectorGUI() - // { - // if (UdonSharpGUI.DrawDefaultUdonSharpBehaviourHeader(target)) return; - // DrawLogo(); - // ShurikenHeaderCentered(ver); - // EditorGUILayout.Space(); - // EditorGUILayout.Space(); - // base.OnInspectorGUI(); - // VRStageLighting_AudioLink fixture = (VRStageLighting_AudioLink)target; - // if(GUI.changed && Application.isPlaying) - // { - // fixture._UpdateInstancedProperties(); - // } - - // // serializedObject.Update(); - // // if(previousColor != lightColor.colorValue) - // // { - // // fixture.LightColorTint = fixture.LightColorTint; - // // } - // // serializedObject.ApplyModifiedProperties(); - // } - // } - // #endif - #if !COMPILER_UDONSHARP && UNITY_EDITOR [InitializeOnLoad] [CustomEditor(typeof(VRStageLighting_AudioLink_Static))] @@ -568,87 +405,10 @@ namespace VRSL.EditorScripts { UpdateSettings(fixture); } - - //serializedObject.Update(); - // if(previousColor != lightColor.colorValue) - // { - // fixture.LightColorTint = fixture.LightColorTint; - // } - // serializedObject.ApplyModifiedProperties(); } } #endif - - // #if !COMPILER_UDONSHARP && UNITY_EDITOR - // [CustomEditor(typeof(VRStageLighting_Animated))] - // public class VRStageLighting_Animated_Editor : VRSL_UdonEditor - // { - // public override void OnInspectorGUI() - // { - // if (UdonSharpGUI.DrawDefaultUdonSharpBehaviourHeader(target)) return; - // DrawLogo(); - // ShurikenHeaderCentered(ver); - // EditorGUILayout.Space(); - // EditorGUILayout.Space(); - // //EditorGUILayout.Space(); - // base.OnInspectorGUI(); - // VRStageLighting_Animated fixture = (VRStageLighting_Animated)target; - // if(GUI.changed && Application.isPlaying) - // { - // fixture._UpdateInstancedProperties(); - // } - // } - // } - // #endif - - // #if !COMPILER_UDONSHARP && UNITY_EDITOR - // [CustomEditor(typeof(VRStageLighting_Animated_Static))] - // public class VRStageLighting_Animated_Static_Editor : VRSL_UdonEditor - // { - // public override void OnInspectorGUI() - // { - // if (UdonSharpGUI.DrawDefaultUdonSharpBehaviourHeader(target)) return; - // DrawLogo(); - // ShurikenHeaderCentered(ver); - // EditorGUILayout.Space(); - // EditorGUILayout.Space(); - // //EditorGUILayout.Space(); - // VRStageLighting_Animated_Static fixture = (VRStageLighting_Animated_Static)target; - // EditorGUI.BeginChangeCheck(); - // base.OnInspectorGUI(); - // if(EditorGUI.EndChangeCheck()) - // { - // if(fixture.objRenderers.Length > 0) - // { - // bool isEmpty = false; - // foreach(MeshRenderer rend in fixture.objRenderers) - // { - // if(rend == null) - // { - // isEmpty = true; - // break; - // } - // } - // if(!isEmpty) - // { - // fixture._SetProps(); - // if(Application.isPlaying) - // { - // fixture._UpdateInstancedProperties(); - // } - // else - // { - // fixture._UpdateInstancedPropertiesSansAudioLink(); - // } - // } - // } - // } - - // } - // } - // #endif - #if UNITY_EDITOR && !COMPILER_UDONSHARP // ensure class initializer is called whenever scripts recompile [InitializeOnLoad] @@ -676,13 +436,6 @@ namespace VRSL.EditorScripts LoadFixtureSettings(); } - // public static void DelayedFixtureLoad() - // { - // //await Task.Delay(1000); - // Thread.Sleep(10000); - // LoadFixtureSettings(); - // Debug.Log("Finsihed Loading VRSL!"); - // } private static void LogPlayModeState(PlayModeStateChange state) { // Debug.Log(state); @@ -720,17 +473,6 @@ namespace VRSL.EditorScripts // VRStageLighting_DMX_Static[] dmxLights = obj.GetUdonSharpComponentsInChildren(); VRSL_LocalUIControlPanel[] controlPanels = obj.GetUdonSharpComponentsInChildren(); #pragma warning restore 0618 //suppressing obsoletion warnings - // if(staticLights != null) - // { - // foreach(VRStageLighting_RAW_Static fixture in staticLights) - // { - // if(fixture.objRenderers.Length > 0 && fixture.objRenderers[0] != null) - // { - // fixture._SetProps(); - // fixture._UpdateInstancedProperties(); - // } - // } - // } if(dmxLights != null) { foreach(VRStageLighting_DMX_Static fixture in dmxLights) @@ -746,17 +488,7 @@ namespace VRSL.EditorScripts } } } - // if(rawLasers != null) - // { - // foreach(VRStageLighting_RAW_Laser fixture in rawLasers) - // { - // if(fixture.objRenderers.Length > 0 && fixture.objRenderers[0] != null) - // { - // fixture._SetProps(); - // fixture._UpdateInstancedProperties(); - // } - // } - // } + if(audioLinkLasers != null) { foreach(VRStageLighting_AudioLink_Laser fixture in audioLinkLasers) @@ -803,32 +535,7 @@ namespace VRSL.EditorScripts //Debug.Log("AutoChecking Status"); } } - // if(animatedLights != null) - // { - // foreach(VRStageLighting_Animated_Static fixture in animatedLights) - // { - // if(fixture.objRenderers.Length > 0 && fixture.objRenderers[0] != null) - // { - // fixture._SetProps(); - // if(Application.isPlaying) - // { - // fixture._UpdateInstancedProperties(); - // } - // else - // { - // fixture._UpdateInstancedPropertiesSansAudioLink(); - // } - // } - // } - // } - // foreach(VRStageLighting_DMX_Static fixture in dmxLights) - // { - // if(fixture.objRenderers.Length > 0 && fixture.objRenderers[0] != null) - // { - // fixture._SetProps(); - // fixture._UpdateInstancedProperties(); - // } - // } + } } catch(NullReferenceException e) diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Example Scenes/DMX-DDScenes/VRSL-ExampleScene-DesktopDupli-Horizontal.unity b/Packages/com.acchosen.vr-stage-lighting/Runtime/Example Scenes/DMX-DDScenes/VRSL-ExampleScene-DesktopDupli-Horizontal.unity index 58d9096..f6da1d1 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Example Scenes/DMX-DDScenes/VRSL-ExampleScene-DesktopDupli-Horizontal.unity +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Example Scenes/DMX-DDScenes/VRSL-ExampleScene-DesktopDupli-Horizontal.unity @@ -1021,81 +1021,152 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &338600026 -PrefabInstance: +--- !u!1 &347977784 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_RootOrder - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalPosition.x - value: 9000 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalPosition.y - value: 99824 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalPosition.z - value: 92375 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalRotation.w + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 347977787} + - component: {fileID: 347977786} + - component: {fileID: 347977785} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &347977785 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 347977784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -617992517, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} + m_Name: + m_EditorClassIdentifier: + Gain: 10 + Far: 40 + Near: 0 + VolumetricRadius: 0 + EnableSpatialization: 0 + UseAudioSourceVolumeCurve: 0 +--- !u!82 &347977786 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 347977784} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalRotation.x + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalRotation.y + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalRotation.z + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3321494235335125342, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: serializedProgramAsset - value: - objectReference: {fileID: 11400000, guid: 247e96171d5523249822f5b5e0ba3a82, - type: 2} - - target: {fileID: 3321494235335125343, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_Name - value: VRSL-DMXToAvatarExport-EXPERIMENTAL - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 61a8ccc637573374885bf2b0cdf41507, type: 3} + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!4 &347977787 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 347977784} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -35.14728, y: 8.455267, z: 153.02211} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &437806082 PrefabInstance: m_ObjectHideFlags: 0 @@ -2436,7 +2507,7 @@ Transform: - {fileID: 1228973413} - {fileID: 933457151} m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &890993317 PrefabInstance: @@ -5790,6 +5861,11 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5595631434132784427, guid: dedfba01424b93148b3d9a42e95ed2f7, + type: 3} + propertyPath: DMXMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5595631434132784427, guid: dedfba01424b93148b3d9a42e95ed2f7, type: 3} propertyPath: fixtureGizmos @@ -6591,7 +6667,7 @@ PrefabInstance: - target: {fileID: 1590388465911483962, guid: 8c5b2abb4f158154cad77f35b9ce2643, type: 3} propertyPath: m_RootOrder - value: 16 + value: 15 objectReference: {fileID: 0} - target: {fileID: 1590388465911483962, guid: 8c5b2abb4f158154cad77f35b9ce2643, type: 3} @@ -6664,6 +6740,16 @@ PrefabInstance: propertyPath: fixtureID value: 1100 objectReference: {fileID: 0} + - target: {fileID: 4904392944439432061, guid: 8c5b2abb4f158154cad77f35b9ce2643, + type: 3} + propertyPath: dmxChannel + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4904392944439432061, guid: 8c5b2abb4f158154cad77f35b9ce2643, + type: 3} + propertyPath: dmxUniverse + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4904392944439432061, guid: 8c5b2abb4f158154cad77f35b9ce2643, type: 3} propertyPath: serializationData.Prefab diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Example Scenes/DMX-DDScenes/VRSL-ExampleScene-DesktopDupli-Vertical.unity b/Packages/com.acchosen.vr-stage-lighting/Runtime/Example Scenes/DMX-DDScenes/VRSL-ExampleScene-DesktopDupli-Vertical.unity index 99f3679..25fb775 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Example Scenes/DMX-DDScenes/VRSL-ExampleScene-DesktopDupli-Vertical.unity +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Example Scenes/DMX-DDScenes/VRSL-ExampleScene-DesktopDupli-Vertical.unity @@ -236,6 +236,16 @@ PrefabInstance: propertyPath: coneLength value: 8.75 objectReference: {fileID: 0} + - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, + type: 3} + propertyPath: globalIntensity + value: 0.741 + objectReference: {fileID: 0} + - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, type: 3} propertyPath: useLegacySectorMode @@ -350,6 +360,11 @@ PrefabInstance: propertyPath: dmxChannel value: 405 objectReference: {fileID: 0} + - target: {fileID: -1540904920109350075, guid: 51b428740444288448e19c88c64d5311, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: -1540904920109350075, guid: 51b428740444288448e19c88c64d5311, type: 3} propertyPath: serializationData.Prefab @@ -532,11 +547,26 @@ PrefabInstance: propertyPath: fixtureID value: 104 objectReference: {fileID: 0} + - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, + type: 3} + propertyPath: invertPan + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, type: 3} propertyPath: coneLength value: 8.75 objectReference: {fileID: 0} + - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, + type: 3} + propertyPath: globalIntensity + value: 0.943 + objectReference: {fileID: 0} + - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, type: 3} propertyPath: useLegacySectorMode @@ -608,6 +638,11 @@ PrefabInstance: propertyPath: fixtureID value: 402 objectReference: {fileID: 0} + - target: {fileID: -1099839980980406309, guid: b2a0b640363bc10408fb7a3803939fa0, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: -1099839980980406309, guid: b2a0b640363bc10408fb7a3803939fa0, type: 3} propertyPath: useLegacySectorMode @@ -725,6 +760,11 @@ PrefabInstance: propertyPath: fixtureID value: 500 objectReference: {fileID: 0} + - target: {fileID: 314734411489633854, guid: d7a8bacd5310e8e499962549ef931c57, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 314734411489633854, guid: d7a8bacd5310e8e499962549ef931c57, type: 3} propertyPath: useLegacySectorMode @@ -892,6 +932,11 @@ PrefabInstance: propertyPath: lightColorTint.r value: 1.4980392 objectReference: {fileID: 0} + - target: {fileID: -5868383465523654329, guid: 88bee1a0ddf090d4bb0721b30240c949, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: -5868383465523654329, guid: 88bee1a0ddf090d4bb0721b30240c949, type: 3} propertyPath: useLegacySectorMode @@ -1116,6 +1161,11 @@ PrefabInstance: propertyPath: dmxUniverse value: 0 objectReference: {fileID: 0} + - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, type: 3} propertyPath: useLegacySectorMode @@ -1161,6 +1211,11 @@ PrefabInstance: propertyPath: lightColorTint.r value: 1.4980392 objectReference: {fileID: 0} + - target: {fileID: -189608094357393713, guid: 2ff8eb277ef9d7047b12d127b2eaeb36, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: -189608094357393713, guid: 2ff8eb277ef9d7047b12d127b2eaeb36, type: 3} propertyPath: useLegacySectorMode @@ -1313,6 +1368,11 @@ PrefabInstance: propertyPath: fixtureID value: 501 objectReference: {fileID: 0} + - target: {fileID: 314734411489633854, guid: d7a8bacd5310e8e499962549ef931c57, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 314734411489633854, guid: d7a8bacd5310e8e499962549ef931c57, type: 3} propertyPath: useLegacySectorMode @@ -1546,6 +1606,11 @@ PrefabInstance: propertyPath: coneLength value: 8.75 objectReference: {fileID: 0} + - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, type: 3} propertyPath: useLegacySectorMode @@ -1682,6 +1747,11 @@ PrefabInstance: propertyPath: lightColorTint.r value: 2 objectReference: {fileID: 0} + - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, type: 3} propertyPath: useLegacySectorMode @@ -1798,6 +1868,11 @@ PrefabInstance: propertyPath: coneLength value: 8.75 objectReference: {fileID: 0} + - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, type: 3} propertyPath: useLegacySectorMode @@ -1838,6 +1913,11 @@ PrefabInstance: propertyPath: dmxChannel value: 410 objectReference: {fileID: 0} + - target: {fileID: 5753258519388771502, guid: b8873da88b401dd4ab93b061c5ddf750, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5753258519388771502, guid: b8873da88b401dd4ab93b061c5ddf750, type: 3} propertyPath: serializationData.Prefab @@ -1929,6 +2009,11 @@ PrefabInstance: propertyPath: fixtureID value: 403 objectReference: {fileID: 0} + - target: {fileID: -1099839980980406309, guid: b2a0b640363bc10408fb7a3803939fa0, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: -1099839980980406309, guid: b2a0b640363bc10408fb7a3803939fa0, type: 3} propertyPath: useLegacySectorMode @@ -2120,6 +2205,11 @@ PrefabInstance: propertyPath: fixtureID value: 203 objectReference: {fileID: 0} + - target: {fileID: -189608094357393713, guid: 2ff8eb277ef9d7047b12d127b2eaeb36, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: -189608094357393713, guid: 2ff8eb277ef9d7047b12d127b2eaeb36, type: 3} propertyPath: useLegacySectorMode @@ -2451,6 +2541,11 @@ PrefabInstance: propertyPath: coneLength value: 8.75 objectReference: {fileID: 0} + - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, type: 3} propertyPath: useLegacySectorMode @@ -2517,6 +2612,11 @@ PrefabInstance: propertyPath: fixtureID value: 800 objectReference: {fileID: 0} + - target: {fileID: 4598979384299495407, guid: 55058c5ef8c22d04991b48a99a10acfe, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4598979384299495407, guid: 55058c5ef8c22d04991b48a99a10acfe, type: 3} propertyPath: useLegacySectorMode @@ -2649,6 +2749,11 @@ PrefabInstance: propertyPath: lightColorTint.r value: 1.4980392 objectReference: {fileID: 0} + - target: {fileID: -189608094357393713, guid: 2ff8eb277ef9d7047b12d127b2eaeb36, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: -189608094357393713, guid: 2ff8eb277ef9d7047b12d127b2eaeb36, type: 3} propertyPath: useLegacySectorMode @@ -2766,6 +2871,11 @@ PrefabInstance: propertyPath: fixtureID value: 201 objectReference: {fileID: 0} + - target: {fileID: -189608094357393713, guid: 2ff8eb277ef9d7047b12d127b2eaeb36, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: -189608094357393713, guid: 2ff8eb277ef9d7047b12d127b2eaeb36, type: 3} propertyPath: useLegacySectorMode @@ -2952,6 +3062,11 @@ PrefabInstance: propertyPath: fixtureID value: 200 objectReference: {fileID: 0} + - target: {fileID: -189608094357393713, guid: 2ff8eb277ef9d7047b12d127b2eaeb36, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: -189608094357393713, guid: 2ff8eb277ef9d7047b12d127b2eaeb36, type: 3} propertyPath: useLegacySectorMode @@ -3069,6 +3184,11 @@ PrefabInstance: propertyPath: fixtureID value: 502 objectReference: {fileID: 0} + - target: {fileID: 314734411489633854, guid: d7a8bacd5310e8e499962549ef931c57, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 314734411489633854, guid: d7a8bacd5310e8e499962549ef931c57, type: 3} propertyPath: useLegacySectorMode @@ -3317,6 +3437,11 @@ PrefabInstance: propertyPath: lightColorTint.r value: 2 objectReference: {fileID: 0} + - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7154669077426579507, guid: 9a6d4144bda0d3c4ba95593af446b653, type: 3} propertyPath: useLegacySectorMode @@ -3718,6 +3843,11 @@ PrefabInstance: propertyPath: tiltRangeTarget value: -180 objectReference: {fileID: 0} + - target: {fileID: 5595631434132784427, guid: dedfba01424b93148b3d9a42e95ed2f7, + type: 3} + propertyPath: useExtendedUniverses + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5595631434132784427, guid: dedfba01424b93148b3d9a42e95ed2f7, type: 3} propertyPath: serializationData.Prefab @@ -3842,6 +3972,11 @@ PrefabInstance: propertyPath: fixtureID value: 205 objectReference: {fileID: 0} + - target: {fileID: -189608094357393713, guid: 2ff8eb277ef9d7047b12d127b2eaeb36, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: -189608094357393713, guid: 2ff8eb277ef9d7047b12d127b2eaeb36, type: 3} propertyPath: useLegacySectorMode @@ -3959,6 +4094,11 @@ PrefabInstance: propertyPath: fixtureID value: 400 objectReference: {fileID: 0} + - target: {fileID: -1099839980980406309, guid: b2a0b640363bc10408fb7a3803939fa0, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: -1099839980980406309, guid: b2a0b640363bc10408fb7a3803939fa0, type: 3} propertyPath: useLegacySectorMode @@ -4088,6 +4228,11 @@ PrefabInstance: propertyPath: fixtureID value: 801 objectReference: {fileID: 0} + - target: {fileID: 4598979384299495407, guid: 55058c5ef8c22d04991b48a99a10acfe, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4598979384299495407, guid: 55058c5ef8c22d04991b48a99a10acfe, type: 3} propertyPath: useLegacySectorMode @@ -4205,6 +4350,11 @@ PrefabInstance: propertyPath: dmxChannel value: 400 objectReference: {fileID: 0} + - target: {fileID: -1540904920109350075, guid: 51b428740444288448e19c88c64d5311, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: -1540904920109350075, guid: 51b428740444288448e19c88c64d5311, type: 3} propertyPath: serializationData.Prefab @@ -4698,6 +4848,11 @@ PrefabInstance: propertyPath: dmxChannel value: 425 objectReference: {fileID: 0} + - target: {fileID: 5753258519388771502, guid: b8873da88b401dd4ab93b061c5ddf750, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5753258519388771502, guid: b8873da88b401dd4ab93b061c5ddf750, type: 3} propertyPath: serializationData.Prefab @@ -4835,6 +4990,11 @@ PrefabInstance: propertyPath: fixtureID value: 401 objectReference: {fileID: 0} + - target: {fileID: -1099839980980406309, guid: b2a0b640363bc10408fb7a3803939fa0, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: -1099839980980406309, guid: b2a0b640363bc10408fb7a3803939fa0, type: 3} propertyPath: useLegacySectorMode @@ -4977,6 +5137,11 @@ PrefabInstance: propertyPath: lightColorTint.r value: 1.4980392 objectReference: {fileID: 0} + - target: {fileID: -5868383465523654329, guid: 88bee1a0ddf090d4bb0721b30240c949, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: -5868383465523654329, guid: 88bee1a0ddf090d4bb0721b30240c949, type: 3} propertyPath: useLegacySectorMode @@ -5114,6 +5279,11 @@ PrefabInstance: propertyPath: dmxChannel value: 440 objectReference: {fileID: 0} + - target: {fileID: 5753258519388771502, guid: b8873da88b401dd4ab93b061c5ddf750, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5753258519388771502, guid: b8873da88b401dd4ab93b061c5ddf750, type: 3} propertyPath: serializationData.Prefab @@ -5291,6 +5461,11 @@ PrefabInstance: propertyPath: fixtureID value: 1003 objectReference: {fileID: 0} + - target: {fileID: 8781542543671338413, guid: 1c08f57da0cd0414c85f64b373431921, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8781542543671338413, guid: 1c08f57da0cd0414c85f64b373431921, type: 3} propertyPath: singleChannelMode @@ -5428,6 +5603,11 @@ PrefabInstance: propertyPath: fixtureID value: 1002 objectReference: {fileID: 0} + - target: {fileID: 8781542543671338413, guid: 1c08f57da0cd0414c85f64b373431921, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8781542543671338413, guid: 1c08f57da0cd0414c85f64b373431921, type: 3} propertyPath: singleChannelMode @@ -5667,6 +5847,11 @@ PrefabInstance: propertyPath: fixtureID value: 1001 objectReference: {fileID: 0} + - target: {fileID: 8781542543671338413, guid: 1c08f57da0cd0414c85f64b373431921, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8781542543671338413, guid: 1c08f57da0cd0414c85f64b373431921, type: 3} propertyPath: singleChannelMode @@ -5929,6 +6114,11 @@ PrefabInstance: propertyPath: fixtureID value: 1000 objectReference: {fileID: 0} + - target: {fileID: 8781542543671338413, guid: 1c08f57da0cd0414c85f64b373431921, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8781542543671338413, guid: 1c08f57da0cd0414c85f64b373431921, type: 3} propertyPath: singleChannelMode @@ -6072,6 +6262,11 @@ PrefabInstance: propertyPath: fixtureID value: 900 objectReference: {fileID: 0} + - target: {fileID: 7660880176422083061, guid: 8bb1407f1f0e2cc48b9bbf35ca1951a6, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7660880176422083061, guid: 8bb1407f1f0e2cc48b9bbf35ca1951a6, type: 3} propertyPath: useLegacySectorMode @@ -6178,6 +6373,11 @@ PrefabInstance: propertyPath: fixtureID value: 1100 objectReference: {fileID: 0} + - target: {fileID: 7506158748614765239, guid: 6b906c7cc969ac346a656210549c02c7, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7506158748614765239, guid: 6b906c7cc969ac346a656210549c02c7, type: 3} propertyPath: serializationData.Prefab @@ -6260,6 +6460,11 @@ PrefabInstance: propertyPath: lightColorTint.r value: 1.4980392 objectReference: {fileID: 0} + - target: {fileID: -5868383465523654329, guid: 88bee1a0ddf090d4bb0721b30240c949, + type: 3} + propertyPath: nineUniverseMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: -5868383465523654329, guid: 88bee1a0ddf090d4bb0721b30240c949, type: 3} propertyPath: useLegacySectorMode diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Example Scenes/DMX-EditorViaOSCScenes/VRSL-ExampleScene-EditorViaOSC-Horizontal.unity b/Packages/com.acchosen.vr-stage-lighting/Runtime/Example Scenes/DMX-EditorViaOSCScenes/VRSL-ExampleScene-EditorViaOSC-Horizontal.unity index b4afe73..7716b8a 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Example Scenes/DMX-EditorViaOSCScenes/VRSL-ExampleScene-EditorViaOSC-Horizontal.unity +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Example Scenes/DMX-EditorViaOSCScenes/VRSL-ExampleScene-EditorViaOSC-Horizontal.unity @@ -953,81 +953,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &338600026 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_RootOrder - value: 14 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalPosition.x - value: 9000 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalPosition.y - value: 99824 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalPosition.z - value: 92375 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2042307433419858189, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3321494235335125342, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: serializedProgramAsset - value: - objectReference: {fileID: 11400000, guid: 247e96171d5523249822f5b5e0ba3a82, - type: 2} - - target: {fileID: 3321494235335125343, guid: 61a8ccc637573374885bf2b0cdf41507, - type: 3} - propertyPath: m_Name - value: VRSL-DMXToAvatarExport-EXPERIMENTAL - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 61a8ccc637573374885bf2b0cdf41507, type: 3} --- !u!1001 &437806082 PrefabInstance: m_ObjectHideFlags: 0 @@ -2396,7 +2321,7 @@ Transform: - {fileID: 1228973413} - {fileID: 933457151} m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &890993317 PrefabInstance: @@ -5246,7 +5171,7 @@ PrefabInstance: - target: {fileID: -8425864988521483086, guid: f5be3cfe3f15bfb4e9477904c5af9daf, type: 3} propertyPath: sector - value: 280 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8425864988521483086, guid: f5be3cfe3f15bfb4e9477904c5af9daf, type: 3} @@ -6567,7 +6492,7 @@ PrefabInstance: - target: {fileID: 1590388465911483962, guid: 8c5b2abb4f158154cad77f35b9ce2643, type: 3} propertyPath: m_RootOrder - value: 15 + value: 14 objectReference: {fileID: 0} - target: {fileID: 1590388465911483962, guid: 8c5b2abb4f158154cad77f35b9ce2643, type: 3} @@ -6640,6 +6565,21 @@ PrefabInstance: propertyPath: fixtureID value: 1100 objectReference: {fileID: 0} + - target: {fileID: 4904392944439432061, guid: 8c5b2abb4f158154cad77f35b9ce2643, + type: 3} + propertyPath: dmxChannel + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4904392944439432061, guid: 8c5b2abb4f158154cad77f35b9ce2643, + type: 3} + propertyPath: dmxUniverse + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4904392944439432061, guid: 8c5b2abb4f158154cad77f35b9ce2643, + type: 3} + propertyPath: globalIntensity + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4904392944439432061, guid: 8c5b2abb4f158154cad77f35b9ce2643, type: 3} propertyPath: serializationData.Prefab @@ -6658,7 +6598,7 @@ PrefabInstance: - target: {fileID: 6797431179136431173, guid: 2fac0fb7284c1fd4db25bf3e83243796, type: 3} propertyPath: m_RootOrder - value: 18 + value: 17 objectReference: {fileID: 0} - target: {fileID: 6797431179136431173, guid: 2fac0fb7284c1fd4db25bf3e83243796, type: 3} @@ -6752,7 +6692,7 @@ PrefabInstance: - target: {fileID: 2860796836492000921, guid: f37d8aba2d9398d4aa2fc86f7d8c0cd4, type: 3} propertyPath: m_RootOrder - value: 17 + value: 16 objectReference: {fileID: 0} - target: {fileID: 2860796836492000921, guid: f37d8aba2d9398d4aa2fc86f7d8c0cd4, type: 3} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport.meta deleted file mode 100644 index 841ee0d..0000000 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: df8e88f3dd711de4da4377ec84e34871 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content.meta deleted file mode 100644 index 637f886..0000000 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5f759c40c3b454e49a08f1cb1ea442fc -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/New Material.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/New Material.mat deleted file mode 100644 index 9831538..0000000 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/New Material.mat +++ /dev/null @@ -1,77 +0,0 @@ -%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: New Material - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 8600000, guid: c338bc88b12aea148b5453e22475863d, type: 2} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/New Material.mat.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/New Material.mat.meta deleted file mode 100644 index 0180f6e..0000000 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/New Material.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a40486e53699b6c4e98831d300c114f1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/TestAvatarShader.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/TestAvatarShader.shader deleted file mode 100644 index a6db940..0000000 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/TestAvatarShader.shader +++ /dev/null @@ -1,64 +0,0 @@ -Shader "Unlit/TestAvatarShader" -{ - Properties - { - //_MainTex ("Texture", 2D) = "white" {} - _DMXGroup("DMX Group", Int) = 1 - } - SubShader - { - Tags { "RenderType"="Opaque" } - LOD 100 - - Pass - { - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - // make fog work - #pragma multi_compile_fog - - uint group; - #include "UnityCG.cginc" - #include "VRSL-DMXAvatarFunctions.cginc" - - struct appdata - { - float4 vertex : POSITION; - //float2 uv : TEXCOORD0; - }; - - struct v2f - { - //float2 uv : TEXCOORD0; - //UNITY_FOG_COORDS(1) - float4 vertex : SV_POSITION; - }; - - //sampler2D _MainTex; - //float4 _MainTex_ST; - uint _DMXGroup; - - v2f vert (appdata v) - { - v2f o; - o.vertex = UnityObjectToClipPos(v.vertex); - // o.uv = TRANSFORM_TEX(v.uv, _MainTex); - //UNITY_TRANSFER_FOG(o,o.vertex); - return o; - } - - fixed4 frag (v2f i) : SV_Target - { - // sample the texture - //fixed4 col = tex2D(_MainTex, i.uv); - fixed4 col = GetDMXColorAndIntensity(_DMXGroup); - - // apply fog - //UNITY_APPLY_FOG(i.fogCoord, col); - return col; - } - ENDCG - } - } -} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-DMXAvatarFunctions.cginc b/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-DMXAvatarFunctions.cginc deleted file mode 100644 index 05a885e..0000000 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-DMXAvatarFunctions.cginc +++ /dev/null @@ -1,53 +0,0 @@ -SamplerState sampler_point_clamp; -Texture2D _DMXTexture; -//sampler2D _DMXTexture; - -//CHANNELS - Groups: Intesnity, Red, Green, Blue -//Group 1: 0 - 3 -//Group 2: 4 - 7 -//Group 3: 8 - 11 -//Group 4: 12 - 15 -//Aux 1: 16 -//Aux 2: 17 - -float2 GetGroupUVs(uint group, uint channel) -{ - group = clamp(group, 1, 4); - float2 uv = float2(0.0,0.5); - uint g = (group - 1) * 3; - uint ch = group + channel + g; - uv.x = (ch/18.0) - 0.0260; - - return uv; -} -//function for getting the value on the OSC Grid in the bottom right corner configuration -float GetValueAtCoords(uint group, uint channel) -{ - float2 xyUV = GetGroupUVs(group, channel); - float4 uvcoords = float4(xyUV.x, xyUV.y, 0,0); - // float4 c = tex2Dlod(_DMXTexture, uvcoords); - float4 c = _DMXTexture.SampleLevel(sampler_point_clamp, xyUV, 0); - float3 cRGB = float3(c.r, c.g, c.b); - float value = LinearRgbToLuminance(cRGB); - value = LinearToGammaSpaceExact(value); - return value; -} -float GetDMXIntensity(uint group) -{ - return GetValueAtCoords(group, 0); -} - -float4 GetDMXColor(uint group) -{ - float red = GetValueAtCoords(group, 1); - float green = GetValueAtCoords(group, 2); - float blue = GetValueAtCoords(group, 3); - return float4(red, green, blue, 1.0); -} - -float4 GetDMXColorAndIntensity(uint group) -{ - //return lerp(fixed4(0,0,0,1), GetDMXColor(group), GetDMXIntensity(group)); - return GetDMXColor(group) * GetDMXIntensity(group); -} - diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-DMXAvatarFunctions.cginc.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-DMXAvatarFunctions.cginc.meta deleted file mode 100644 index 93383ea..0000000 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-DMXAvatarFunctions.cginc.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 2b5ca64d7810c5e43a4c38d5d47a577f -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlbobalDMXExport-Material.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlbobalDMXExport-Material.mat deleted file mode 100644 index 6edb26c..0000000 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlbobalDMXExport-Material.mat +++ /dev/null @@ -1,77 +0,0 @@ -%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-GlbobalDMXExport-Material - m_Shader: {fileID: 4800000, guid: 21cdcf79e51d06c4aa3ce1713314d2ca, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlbobalDMXExport-Material.mat.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlbobalDMXExport-Material.mat.meta deleted file mode 100644 index 1a5c822..0000000 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlbobalDMXExport-Material.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 29c4267f3512ad8459b354499c28f1e1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMX-Material.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMX-Material.mat deleted file mode 100644 index eed3c4c..0000000 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMX-Material.mat +++ /dev/null @@ -1,33 +0,0 @@ -%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-GlobalDMX-Material - m_Shader: {fileID: 4800000, guid: 71bb31abdb8597e4e9dd1f21981b333d, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _DMXGridRenderTexture: - m_Texture: {fileID: 8400000, guid: 87c3021d20ea2004cad2ca0d2dd14d07, type: 2} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OSCGridRenderTexture: - m_Texture: {fileID: 8400000, guid: 87c3021d20ea2004cad2ca0d2dd14d07, type: 2} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _Test: 37.3 - - _TestY: 0.00105 - m_Colors: [] diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMX-Material.mat.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMX-Material.mat.meta deleted file mode 100644 index 1c59df0..0000000 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMX-Material.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eefa8f5bdaa6936459349821d04a45db -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMXExport-Shader.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMXExport-Shader.shader deleted file mode 100644 index cf6fde6..0000000 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMXExport-Shader.shader +++ /dev/null @@ -1,28 +0,0 @@ -Shader "VRSL/DMX CRTs/Experimental/Global Avatar Export" -{ - Properties - { - [HideInInspector] _MainTex ("MainTex", 2D) = "white" {} - } - SubShader - { - Tags { "Queue"="Geometry" "RenderType"="Opaque" "DMXExport"="DMXExport" } - Pass - { - Tags { "LightMode"="Vertex" } - ColorMask 0 - ZTest Off - } - GrabPass - { - Tags { "LightMode"="Vertex" } - "_DMXTexture" - } - Pass - { - Tags { "LightMode"="ForwardBase" } - ColorMask 0 - ZTest Off - } - } -} \ No newline at end of file diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMXExport-Shader.shader.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMXExport-Shader.shader.meta deleted file mode 100644 index 539294c..0000000 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMXExport-Shader.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 21cdcf79e51d06c4aa3ce1713314d2ca -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMXRT-Shader.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMXRT-Shader.shader deleted file mode 100644 index d74499a..0000000 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMXRT-Shader.shader +++ /dev/null @@ -1,69 +0,0 @@ -Shader "VRSL/DMX CRTs/Experimental/Global Avatar Texture" -{ - //THIS IS A TIMER, TO KEEP TRACK OF HOW MUCH TIME HAS PASSED FOR THE STROBE - Properties - { - [NoScaleOffset]_DMXGridRenderTexture("DMX Grid Render Texture", 2D) = "white" {} - _Test("Test", Range(0, 40)) = 0 - _TestY("TestY", Range(-0.01, 0.01)) = 0.001 - } - - SubShader - { - Lighting Off - Blend One Zero - Pass - { - Name "Pass1DMXGrab" - CGPROGRAM - #include "UnityCustomRenderTexture.cginc" - #include "UnityCG.cginc" - #pragma vertex CustomRenderTextureVertexShader - #pragma fragment frag - #pragma target 4.5 - - Texture2D _DMXGridRenderTexture; - uniform float4 _DMXGridRenderTexture_TexelSize; - SamplerState sampler_point_repeat; - half _Test, _TestY; - - #define IF(a, b, c) lerp(b, c, step((fixed) (a), 0)); - - float2 IndustryRead(int x, int y) - { - - float resMultiplierX = (_DMXGridRenderTexture_TexelSize.z / 13); - float2 xyUV = float2(0.0,0.0); - - xyUV.x = ((x * resMultiplierX) * _DMXGridRenderTexture_TexelSize.x); - xyUV.y = (y * resMultiplierX) * _DMXGridRenderTexture_TexelSize.y; - xyUV.y -= 0.00105; - xyUV.x -= 0.015; - // xyUV.x = DMXChannel == 15 ? xyUV.x + 0.0769 : xyUV.x; - return xyUV; - } - - - - - float4 frag(v2f_customrendertexture IN) : COLOR - { - //CHILL FOR 1 SECOND TO ALLOW DATA TO COME IN - uint currentPixel = floor(IN.localTexcoord.x * 18); - //uint DMXChannel = (494+1024+17) + currentPixel; - uint DMXChannel = 1535 + currentPixel; - uint x = DMXChannel % 13; // starts at 1 ends at 13 - //x = x == 0.0 ? 13.0 : x; - //x = currentPixel == 12 ? _Test : x; - float y = DMXChannel / 13.0; // starts at 1 // doubles as sector - //y = frac(y)== 0.00000 ? y - 1 : y; - y = currentPixel == 12 ? y - 1 : y; - - - float4 currentFrame = _DMXGridRenderTexture.SampleLevel(sampler_point_repeat, IndustryRead(x,y+1), 0); - return currentFrame; - } - ENDCG - } - } -} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMXRT-Shader.shader.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMXRT-Shader.shader.meta deleted file mode 100644 index 9b92234..0000000 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMXRT-Shader.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 71bb31abdb8597e4e9dd1f21981b333d -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMXRT-Texture.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMXRT-Texture.asset deleted file mode 100644 index 877846d..0000000 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMXRT-Texture.asset +++ /dev/null @@ -1,52 +0,0 @@ -%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: VRSL-GlobalDMXRT-Texture - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - serializedVersion: 3 - m_Width: 18 - m_Height: 1 - 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: eefa8f5bdaa6936459349821d04a45db, 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: 1 - m_CurrentUpdateZoneSpace: 1 - 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/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMXRT-Texture.asset.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMXRT-Texture.asset.meta deleted file mode 100644 index e2c7a68..0000000 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/VRSL-GlobalDMXRT-Texture.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c338bc88b12aea148b5453e22475863d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8600000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/VRSL-DMXToAvatarExport-EXPERIMENTAL.prefab b/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/VRSL-DMXToAvatarExport-EXPERIMENTAL.prefab deleted file mode 100644 index f3fa822..0000000 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/VRSL-DMXToAvatarExport-EXPERIMENTAL.prefab +++ /dev/null @@ -1,207 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &681557890671014439 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2488653903460471630} - - component: {fileID: 2515194447760622180} - - component: {fileID: 7673843055271207720} - m_Layer: 0 - m_Name: DMXTextureExport - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2488653903460471630 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 681557890671014439} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2042307433419858189} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &2515194447760622180 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 681557890671014439} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &7673843055271207720 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 681557890671014439} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 0 - m_MotionVectors: 2 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 29c4267f3512ad8459b354499c28f1e1, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!1 &3321494235335125343 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2042307433419858189} - - component: {fileID: 235022497496711746} - - component: {fileID: -4432857584869554992} - - component: {fileID: 3321494235335125342} - m_Layer: 0 - m_Name: VRSL-DMXToAvatarExport-EXPERIMENTAL - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2042307433419858189 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3321494235335125343} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 9000, y: 99824, z: 92375} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2488653903460471630} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!20 &235022497496711746 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3321494235335125343} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 4 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: -10 - far clip plane: 10 - field of view: 60 - orthographic: 1 - orthographic size: 10 - m_Depth: -99 - m_CullingMask: - serializedVersion: 2 - m_Bits: 1 - m_RenderingPath: 0 - m_TargetTexture: {fileID: 8600000, guid: c338bc88b12aea148b5453e22475863d, type: 2} - m_TargetDisplay: 0 - m_TargetEye: 0 - m_HDR: 1 - m_AllowMSAA: 0 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 0 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!114 &-4432857584869554992 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3321494235335125343} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0501a0ead223a214a9af8681031ec014, type: 3} - m_Name: - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 3321494235335125342} - dmxExportTexture: {fileID: 8600000, guid: c338bc88b12aea148b5453e22475863d, type: 2} ---- !u!114 &3321494235335125342 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3321494235335125343} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} - m_Name: - m_EditorClassIdentifier: - interactTextPlacement: {fileID: 0} - interactText: Use - interactTextGO: {fileID: 0} - proximity: 2 - SynchronizePosition: 0 - AllowCollisionOwnershipTransfer: 0 - Reliable: 0 - _syncMethod: 1 - serializedProgramAsset: {fileID: 0} - programSource: {fileID: 11400000, guid: 46fce3f7e6dbb504883b33ddc15e3472, type: 2} - serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgMAAAAAAAAAAi8CAAAAAWoAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAVQBuAGkAdAB5AEUAbgBnAGkAbgBlAC4AQwB1AHMAdABvAG0AUgBlAG4AZABlAHIAVABlAHgAdAB1AHIAZQAsACAAVQBuAGkAdAB5AEUAbgBnAGkAbgBlAC4AQwBvAHIAZQBNAG8AZAB1AGwAZQBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAARAAAABkAG0AeABFAHgAcABvAHIAdABUAGUAeAB0AHUAcgBlACcBBAAAAHQAeQBwAGUAATcAAABVAG4AaQB0AHkARQBuAGcAaQBuAGUALgBDAHUAcwB0AG8AbQBSAGUAbgBkAGUAcgBUAGUAeAB0AHUAcgBlACwAIABVAG4AaQB0AHkARQBuAGcAaQBuAGUALgBDAG8AcgBlAE0AbwBkAHUAbABlAAsBBQAAAFYAYQBsAHUAZQAAAAAABwUCLwMAAAABSQAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiAF0AXQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAwAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABHwAAAF8AXwBfAFUAZABvAG4AUwBoAGEAcgBwAEIAZQBoAGEAdgBpAG8AdQByAFYAZQByAHMAaQBvAG4AXwBfAF8AJwEEAAAAdAB5AHAAZQABFgAAAFMAeQBzAHQAZQBtAC4ASQBuAHQAMwAyACwAIABtAHMAYwBvAHIAbABpAGIAFwEFAAAAVgBhAGwAdQBlAAIAAAAHBQIvBAAAAAFLAAAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQBgADEAWwBbAFMAeQBzAHQAZQBtAC4AQgBvAG8AbABlAGEAbgAsACAAbQBzAGMAbwByAGwAaQBiAF0AXQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ABAAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABLgAAAF8AXwBfAFUAZABvAG4AUwBoAGEAcgBwAEIAZQBoAGEAdgBpAG8AdQByAFAAZQByAHMAaQBzAHQARABhAHQAYQBGAHIAbwBtAFUAcABnAHIAYQBkAGUAXwBfAF8AJwEEAAAAdAB5AHAAZQABGAAAAFMAeQBzAHQAZQBtAC4AQgBvAG8AbABlAGEAbgAsACAAbQBzAGMAbwByAGwAaQBiACsBBQAAAFYAYQBsAHUAZQABBwUHBQcF - publicVariablesUnityEngineObjects: - - {fileID: 8600000, guid: c338bc88b12aea148b5453e22475863d, type: 2} - publicVariablesSerializationDataFormat: 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/VRSL-DMXToAvatarExport-EXPERIMENTAL.prefab.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/VRSL-DMXToAvatarExport-EXPERIMENTAL.prefab.meta deleted file mode 100644 index 8538b3a..0000000 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/VRSL-DMXToAvatarExport-EXPERIMENTAL.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 61a8ccc637573374885bf2b0cdf41507 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: 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 55c584d..516a48c 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 @@ -23,6 +23,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DMXGridRenderTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DMXTexture: + m_Texture: {fileID: 8400000, guid: 87c3021d20ea2004cad2ca0d2dd14d07, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -70,13 +78,16 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableCompatibilityMode: 0 + - _EnableDMX: 0 - _EnableLegacyGlobalMovementSpeedChannel: 0 - _EnableOSC: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 + - _MaximumSmoothnessDMX: 0 - _MaximumSmoothnessOSC: 0 - _Metallic: 0 + - _MinimumSmoothnessDMX: 0 - _MinimumSmoothnessOSC: 0 - _Mode: 0 - _NineUniverseMode: 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-Interpolated-Movement-Horizontal.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-Interpolated-Movement-Horizontal.mat index eb6b6e3..0eadbfc 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-Interpolated-Movement-Horizontal.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-Interpolated-Movement-Horizontal.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: DMXRTMaterial-Interpolated-Movement-Horizontal m_Shader: {fileID: 4800000, guid: 715ebff4a0305954f96e78ccb3676141, type: 3} - m_ShaderKeywords: _ENABLEOSC_ON _NINEUNIVERSEMODE_ON + m_ShaderKeywords: _ENABLEDMX_ON _ENABLEOSC_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -23,6 +23,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DMXGridRenderTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DMXTexture: + m_Texture: {fileID: 8400000, guid: 87c3021d20ea2004cad2ca0d2dd14d07, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -70,13 +78,16 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableCompatibilityMode: 0 + - _EnableDMX: 1 - _EnableLegacyGlobalMovementSpeedChannel: 0 - _EnableOSC: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 + - _MaximumSmoothnessDMX: 0.15 - _MaximumSmoothnessOSC: 0.15 - _Metallic: 0 + - _MinimumSmoothnessDMX: 0.0025 - _MinimumSmoothnessOSC: 0.0025 - _Mode: 0 - _NineUniverseMode: 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-SpinnerTimer-Horizontal.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-SpinnerTimer-Horizontal.mat index 74bda2e..b62b63d 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-SpinnerTimer-Horizontal.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-SpinnerTimer-Horizontal.mat @@ -19,6 +19,14 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _DMXGridRenderTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DMXTexture: + m_Texture: {fileID: 8400000, guid: 87c3021d20ea2004cad2ca0d2dd14d07, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OSCGridRenderTexture: m_Texture: {fileID: 8400000, guid: 87c3021d20ea2004cad2ca0d2dd14d07, type: 2} m_Scale: {x: 1, y: 1} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeTimings-Horizontal.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeTimings-Horizontal.mat index bddbb52..32cba8d 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeTimings-Horizontal.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/DMXRTMaterial-StrobeTimings-Horizontal.mat @@ -19,6 +19,14 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _DMXGridRenderTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DMXTexture: + m_Texture: {fileID: 8400000, guid: 87c3021d20ea2004cad2ca0d2dd14d07, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OSCGridRenderTexture: m_Texture: {fileID: 8400000, guid: 87c3021d20ea2004cad2ca0d2dd14d07, type: 2} m_Scale: {x: 1, y: 1} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-Interpolated-Color+Intensity-Legacy.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-Interpolated-Color+Intensity-Legacy.mat index f5cd318..c6f02a4 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-Interpolated-Color+Intensity-Legacy.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-Interpolated-Color+Intensity-Legacy.mat @@ -23,6 +23,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DMXGridRenderTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DMXTexture: + m_Texture: {fileID: 8400000, guid: ce7f82c50d92c534190ca620c2fe4410, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -70,15 +78,19 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableCompatibilityMode: 1 + - _EnableDMX: 0 - _EnableLegacyGlobalMovementSpeedChannel: 1 - _EnableOSC: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 + - _MaximumSmoothnessDMX: 0 - _MaximumSmoothnessOSC: 0 - _Metallic: 0 + - _MinimumSmoothnessDMX: 0 - _MinimumSmoothnessOSC: 0 - _Mode: 0 + - _NineUniverseMode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _Sector: 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-Interpolated-Movement-Legacy.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-Interpolated-Movement-Legacy.mat index bd43ffc..4f45742 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-Interpolated-Movement-Legacy.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-Interpolated-Movement-Legacy.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: DMXRTMaterial-Interpolated-Movement-Legacy m_Shader: {fileID: 4800000, guid: 715ebff4a0305954f96e78ccb3676141, type: 3} - m_ShaderKeywords: _ENABLECOMPATIBILITYMODE_ON _ENABLELEGACYGLOBALMOVEMENTSPEEDCHANNEL_ON + m_ShaderKeywords: _ENABLECOMPATIBILITYMODE_ON _ENABLEDMX_ON _ENABLELEGACYGLOBALMOVEMENTSPEEDCHANNEL_ON _ENABLEOSC_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -24,6 +24,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DMXGridRenderTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DMXTexture: + m_Texture: {fileID: 8400000, guid: ce7f82c50d92c534190ca620c2fe4410, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -71,15 +79,19 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableCompatibilityMode: 1 + - _EnableDMX: 1 - _EnableLegacyGlobalMovementSpeedChannel: 1 - _EnableOSC: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 + - _MaximumSmoothnessDMX: 0.15 - _MaximumSmoothnessOSC: 0.15 - _Metallic: 0 + - _MinimumSmoothnessDMX: 0.0025 - _MinimumSmoothnessOSC: 0.0025 - _Mode: 0 + - _NineUniverseMode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _Sector: 39 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-SpinnerTimer-Legacy.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-SpinnerTimer-Legacy.mat index 3ec75fa..c7384dc 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-SpinnerTimer-Legacy.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-SpinnerTimer-Legacy.mat @@ -19,11 +19,20 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _DMXGridRenderTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DMXTexture: + m_Texture: {fileID: 8400000, guid: ce7f82c50d92c534190ca620c2fe4410, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OSCGridRenderTexture: m_Texture: {fileID: 8400000, guid: ce7f82c50d92c534190ca620c2fe4410, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - _MaxStrobeFreq: 100 + - _NineUniverseMode: 0 - _SmoothValue: 0.5 m_Colors: [] diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-StrobeTimings-Legacy.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-StrobeTimings-Legacy.mat index ce466ed..46d8ec1 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-StrobeTimings-Legacy.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/Legacy/DMXRTMaterial-StrobeTimings-Legacy.mat @@ -19,11 +19,20 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _DMXGridRenderTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DMXTexture: + m_Texture: {fileID: 8400000, guid: ce7f82c50d92c534190ca620c2fe4410, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OSCGridRenderTexture: m_Texture: {fileID: 8400000, guid: ce7f82c50d92c534190ca620c2fe4410, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - _MaxStrobeFreq: 100 + - _NineUniverseMode: 0 - _SmoothValue: 0.5 m_Colors: [] diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-Interpolated-Color+Intensity-Vertical.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-Interpolated-Color+Intensity-Vertical.mat index 4e32cec..69f9046 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-Interpolated-Color+Intensity-Vertical.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-Interpolated-Color+Intensity-Vertical.mat @@ -23,6 +23,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DMXGridRenderTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DMXTexture: + m_Texture: {fileID: 8400000, guid: 159c71081e572e648a894d41fca32894, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -70,13 +78,16 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableCompatibilityMode: 0 + - _EnableDMX: 0 - _EnableLegacyGlobalMovementSpeedChannel: 0 - _EnableOSC: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 + - _MaximumSmoothnessDMX: 0 - _MaximumSmoothnessOSC: 0 - _Metallic: 0 + - _MinimumSmoothnessDMX: 0 - _MinimumSmoothnessOSC: 0 - _Mode: 0 - _NineUniverseMode: 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-Interpolated-Movement-Vertical.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-Interpolated-Movement-Vertical.mat index 9638d1c..65b6d6a 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-Interpolated-Movement-Vertical.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-Interpolated-Movement-Vertical.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: DMXRTMaterial-Interpolated-Movement-Vertical m_Shader: {fileID: 4800000, guid: 715ebff4a0305954f96e78ccb3676141, type: 3} - m_ShaderKeywords: _ENABLEOSC_ON + m_ShaderKeywords: _ENABLEDMX_ON _ENABLEOSC_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -23,6 +23,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DMXGridRenderTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DMXTexture: + m_Texture: {fileID: 8400000, guid: 159c71081e572e648a894d41fca32894, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -70,13 +78,16 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableCompatibilityMode: 0 + - _EnableDMX: 1 - _EnableLegacyGlobalMovementSpeedChannel: 0 - _EnableOSC: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 + - _MaximumSmoothnessDMX: 0.15 - _MaximumSmoothnessOSC: 0.15 - _Metallic: 0 + - _MinimumSmoothnessDMX: 0.0025 - _MinimumSmoothnessOSC: 0.0025 - _Mode: 0 - _NineUniverseMode: 0 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-SpinnerTimer-Vertical.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-SpinnerTimer-Vertical.mat index fa58ab4..4cd3ac6 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-SpinnerTimer-Vertical.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-SpinnerTimer-Vertical.mat @@ -19,6 +19,14 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _DMXGridRenderTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DMXTexture: + m_Texture: {fileID: 8400000, guid: 159c71081e572e648a894d41fca32894, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OSCGridRenderTexture: m_Texture: {fileID: 8400000, guid: 159c71081e572e648a894d41fca32894, type: 2} m_Scale: {x: 1, y: 1} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeTimings-Vertical.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeTimings-Vertical.mat index 24ab2b1..a40d8a8 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeTimings-Vertical.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/CRT Materials/VerticalMode/DMXRTMaterial-StrobeTimings-Vertical.mat @@ -19,6 +19,14 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _DMXGridRenderTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DMXTexture: + m_Texture: {fileID: 8400000, guid: 159c71081e572e648a894d41fca32894, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OSCGridRenderTexture: m_Texture: {fileID: 8400000, guid: 159c71081e572e648a894d41fca32894, type: 2} m_Scale: {x: 1, y: 1} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/Lasers/VRSL-BasicLaser-DMX-Horizontal.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/Lasers/VRSL-BasicLaser-DMX-Horizontal.mat index 5aaa31c..b964ea7 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/Lasers/VRSL-BasicLaser-DMX-Horizontal.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/Lasers/VRSL-BasicLaser-DMX-Horizontal.mat @@ -67,6 +67,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Udon_DMXGridRenderTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Udon_DMXGridRenderTextureMovement: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -74,6 +82,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableCompatibilityMode: 0 + - _EnableDMX: 0 - _EnableOSC: 0 - _EnableVerticalMode: 0 - _EndFade: 3 @@ -86,7 +95,7 @@ Material: - _Glossiness: 0.5 - _GlossyReflections: 1 - _InternalShine: 1 - - _InternalShineLength: 12.1 + - _InternalShineLength: 64 - _LaserCount: 8 - _LaserSoftening: 7.2 - _LaserThickness: 0.1 @@ -99,6 +108,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _Scroll: 0.092 + - _ScrollOffset: 0.00002182 - _Sector: 0 - _SmoothnessTextureChannel: 0 - _SourceIntensity: 0.041 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/VRSL-Horizontal-ExampleSurfaceShader-Cube.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/VRSL-Horizontal-ExampleSurfaceShader-Cube.mat index a15345b..de9b516 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/VRSL-Horizontal-ExampleSurfaceShader-Cube.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Lights/DMX/VRSL-Horizontal-ExampleSurfaceShader-Cube.mat @@ -87,18 +87,20 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableCompatibilityMode: 0 + - _EnableDMX: 0 - _EnableOSC: 1 - _EnableSpin: 0 - _EnableStrobe: 1 - _EnableVerticalMode: 0 - _FinalIntensity: 1 - - _FixtureMaxIntensity: 1 + - _FixtureMaxIntensity: 0.1 - _GlobalIntensity: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 + - _NineUniverseMode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _Saturation: 0.95 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/TestAvatarShader-Mateial.mat b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Other/VRSL-VideoScreen.mat similarity index 72% rename from Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/TestAvatarShader-Mateial.mat rename to Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Other/VRSL-VideoScreen.mat index 30173c5..ae5fdb1 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/TestAvatarShader-Mateial.mat +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Other/VRSL-VideoScreen.mat @@ -7,10 +7,10 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: TestAvatarShader-Mateial - m_Shader: {fileID: 4800000, guid: 5c7bbfccd7987e34cbd3be7802a5949c, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 + m_Name: VRSL-VideoScreen + m_Shader: {fileID: 4800000, guid: d3f1403d8eeadc943ab8db6b21fb67d7, type: 3} + m_ShaderKeywords: _EMISSION _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF + m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -36,11 +36,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: e5b174a8d905de44d938cdd3adf85546, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: e5b174a8d905de44d938cdd3adf85546, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -58,22 +58,23 @@ Material: m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 - - _DMXGroup: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _IsAVProInput: 0 + - _MetaPassEmissiveBoost: 1.25 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SampleOffset: 0 - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 + - _SpecularHighlights: 0 - _SrcBlend: 1 + - _TargetAspectRatio: 1.7777778 - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/TestAvatarShader-Mateial.mat.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Other/VRSL-VideoScreen.mat.meta similarity index 79% rename from Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/TestAvatarShader-Mateial.mat.meta rename to Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Other/VRSL-VideoScreen.mat.meta index 5ae624a..4416ccf 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/TestAvatarShader-Mateial.mat.meta +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Materials/Other/VRSL-VideoScreen.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c51eb5eee921a9e4ebaca57bc349e5e9 +guid: d1ceac8b980ef2b44a8de109ba8d1d1b NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Prefabs/DMX/Horizontal Mode/DMX Reader Screens/VRSL-DMX-USharpVideoReaderScreen-Horizontal.prefab b/Packages/com.acchosen.vr-stage-lighting/Runtime/Prefabs/DMX/Horizontal Mode/DMX Reader Screens/VRSL-DMX-USharpVideoReaderScreen-Horizontal.prefab index 541c406..2f7c6b1 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Prefabs/DMX/Horizontal Mode/DMX Reader Screens/VRSL-DMX-USharpVideoReaderScreen-Horizontal.prefab +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Prefabs/DMX/Horizontal Mode/DMX Reader Screens/VRSL-DMX-USharpVideoReaderScreen-Horizontal.prefab @@ -225,7 +225,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f9f0ca4e1c93d7c449df855cc90deab0, type: 2} + - {fileID: 2100000, guid: d1ceac8b980ef2b44a8de109ba8d1d1b, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9614,7 +9614,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f9f0ca4e1c93d7c449df855cc90deab0, type: 2} + - {fileID: 2100000, guid: d1ceac8b980ef2b44a8de109ba8d1d1b, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9678,7 +9678,8 @@ MonoBehaviour: AllowCollisionOwnershipTransfer: 0 Reliable: 0 _syncMethod: 1 - serializedProgramAsset: {fileID: 0} + serializedProgramAsset: {fileID: 11400000, guid: ac388dea588159d4db6367a7504e6884, + type: 2} programSource: {fileID: 11400000, guid: 553f0db2752ead24590f8ac2e1f80c06, type: 2} serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgIAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUCLwMAAAABSwAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBTAHkAcwB0AGUAbQAuAEIAbwBvAGwAZQBhAG4ALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAMAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAS4AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBQAGUAcgBzAGkAcwB0AEQAYQB0AGEARgByAG8AbQBVAHAAZwByAGEAZABlAF8AXwBfACcBBAAAAHQAeQBwAGUAARgAAABTAHkAcwB0AGUAbQAuAEIAbwBvAGwAZQBhAG4ALAAgAG0AcwBjAG8AcgBsAGkAYgArAQUAAABWAGEAbAB1AGUAAQcFBwUHBQ== publicVariablesUnityEngineObjects: [] @@ -9731,7 +9732,8 @@ MonoBehaviour: AllowCollisionOwnershipTransfer: 0 Reliable: 0 _syncMethod: 1 - serializedProgramAsset: {fileID: 0} + serializedProgramAsset: {fileID: 11400000, guid: 62e9eeddd9c5fa84d8fd139d9555c2f1, + type: 2} programSource: {fileID: 11400000, guid: 358a98096f2187c4eb0cee20115d2f3a, type: 2} serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABggAAAAAAAAAAi8CAAAAAVMAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AVQBkAG8AbgBCAGUAaABhAHYAaQBvAHUAcgAsACAAVgBSAEMALgBVAGQAbwBuAF0AXQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAgAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABEQAAAHMAbwB1AHIAYwBlAFYAaQBkAGUAbwBQAGwAYQB5AGUAcgAnAQQAAAB0AHkAcABlAAEgAAAAVgBSAEMALgBVAGQAbwBuAC4AVQBkAG8AbgBCAGUAaABhAHYAaQBvAHUAcgAsACAAVgBSAEMALgBVAGQAbwBuAAsBBQAAAFYAYQBsAHUAZQAAAAAABwUCLwMAAAABSwAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBTAHkAcwB0AGUAbQAuAEIAbwBvAGwAZQBhAG4ALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAMAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAREAAAB1AHMAZQBTAGgAYQByAGUAZABNAGEAdABlAHIAaQBhAGwAJwEEAAAAdAB5AHAAZQABGAAAAFMAeQBzAHQAZQBtAC4AQgBvAG8AbABlAGEAbgAsACAAbQBzAGMAbwByAGwAaQBiACsBBQAAAFYAYQBsAHUAZQABBwUCLwQAAAABSgAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAXQBdACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAEAAAABgIAAAAAAAAAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwB0AHIAaQBuAGcALAAgAG0AcwBjAG8AcgBsAGkAYgAnAQoAAABTAHkAbQBiAG8AbABOAGEAbQBlAAEIAAAAdABlAHgAUABhAHIAYQBtACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEFAAAAVgBhAGwAdQBlAAEMAAAAXwBFAG0AaQBzAHMAaQBvAG4ATQBhAHAABwUCLwUAAAABSQAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiAF0AXQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ABQAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABDQAAAHIAZQBuAGQAZQByAGUAcgBJAG4AZABlAHgAJwEEAAAAdAB5AHAAZQABFgAAAFMAeQBzAHQAZQBtAC4ASQBuAHQAMwAyACwAIABtAHMAYwBvAHIAbABpAGIAFwEFAAAAVgBhAGwAdQBlAAAAAAAHBQIwBAAAAAYAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAARAAAABhAHYAUAByAG8AVABvAGcAZwBsAGUAUABhAHIAYQBtACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEFAAAAVgBhAGwAdQBlAAENAAAAXwBJAHMAQQBWAFAAcgBvAEkAbgBwAHUAdAAHBQIvBgAAAAFeAAAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQBgADEAWwBbAFUAbgBpAHQAeQBFAG4AZwBpAG4AZQAuAFQAZQB4AHQAdQByAGUALAAgAFUAbgBpAHQAeQBFAG4AZwBpAG4AZQAuAEMAbwByAGUATQBvAGQAdQBsAGUAXQBdACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAHAAAABgIAAAAAAAAAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwB0AHIAaQBuAGcALAAgAG0AcwBjAG8AcgBsAGkAYgAnAQoAAABTAHkAbQBiAG8AbABOAGEAbQBlAAEOAAAAcwB0AGEAbgBkAGIAeQBUAGUAeAB0AHUAcgBlACcBBAAAAHQAeQBwAGUAAS0AAABVAG4AaQB0AHkARQBuAGcAaQBuAGUALgBUAGUAeAB0AHUAcgBlADIARAAsACAAVQBuAGkAdAB5AEUAbgBnAGkAbgBlAC4AQwBvAHIAZQBNAG8AZAB1AGwAZQALAQUAAABWAGEAbAB1AGUAAQAAAAcFAjAFAAAACAAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABHwAAAF8AXwBfAFUAZABvAG4AUwBoAGEAcgBwAEIAZQBoAGEAdgBpAG8AdQByAFYAZQByAHMAaQBvAG4AXwBfAF8AJwEEAAAAdAB5AHAAZQABFgAAAFMAeQBzAHQAZQBtAC4ASQBuAHQAMwAyACwAIABtAHMAYwBvAHIAbABpAGIAFwEFAAAAVgBhAGwAdQBlAAIAAAAHBQIwAwAAAAkAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAS4AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBQAGUAcgBzAGkAcwB0AEQAYQB0AGEARgByAG8AbQBVAHAAZwByAGEAZABlAF8AXwBfACcBBAAAAHQAeQBwAGUAARgAAABTAHkAcwB0AGUAbQAuAEIAbwBvAGwAZQBhAG4ALAAgAG0AcwBjAG8AcgBsAGkAYgArAQUAAABWAGEAbAB1AGUAAQcFBwUHBQ== publicVariablesUnityEngineObjects: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Prefabs/DMX/Legacy Mode/DMX Reader Screens/VRSL-DMX-USharpVideoReaderScreen-Legacy.prefab b/Packages/com.acchosen.vr-stage-lighting/Runtime/Prefabs/DMX/Legacy Mode/DMX Reader Screens/VRSL-DMX-USharpVideoReaderScreen-Legacy.prefab index c84f32f..6815bd6 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Prefabs/DMX/Legacy Mode/DMX Reader Screens/VRSL-DMX-USharpVideoReaderScreen-Legacy.prefab +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Prefabs/DMX/Legacy Mode/DMX Reader Screens/VRSL-DMX-USharpVideoReaderScreen-Legacy.prefab @@ -196,7 +196,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f9f0ca4e1c93d7c449df855cc90deab0, type: 2} + - {fileID: 2100000, guid: d1ceac8b980ef2b44a8de109ba8d1d1b, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -7747,7 +7747,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f9f0ca4e1c93d7c449df855cc90deab0, type: 2} + - {fileID: 2100000, guid: d1ceac8b980ef2b44a8de109ba8d1d1b, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -7811,7 +7811,8 @@ MonoBehaviour: AllowCollisionOwnershipTransfer: 0 Reliable: 0 _syncMethod: 1 - serializedProgramAsset: {fileID: 0} + serializedProgramAsset: {fileID: 11400000, guid: ac388dea588159d4db6367a7504e6884, + type: 2} programSource: {fileID: 11400000, guid: 553f0db2752ead24590f8ac2e1f80c06, type: 2} serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgIAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUCLwMAAAABSwAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBTAHkAcwB0AGUAbQAuAEIAbwBvAGwAZQBhAG4ALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAMAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAS4AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBQAGUAcgBzAGkAcwB0AEQAYQB0AGEARgByAG8AbQBVAHAAZwByAGEAZABlAF8AXwBfACcBBAAAAHQAeQBwAGUAARgAAABTAHkAcwB0AGUAbQAuAEIAbwBvAGwAZQBhAG4ALAAgAG0AcwBjAG8AcgBsAGkAYgArAQUAAABWAGEAbAB1AGUAAQcFBwUHBQ== publicVariablesUnityEngineObjects: [] @@ -7864,7 +7865,8 @@ MonoBehaviour: AllowCollisionOwnershipTransfer: 0 Reliable: 0 _syncMethod: 1 - serializedProgramAsset: {fileID: 0} + serializedProgramAsset: {fileID: 11400000, guid: 62e9eeddd9c5fa84d8fd139d9555c2f1, + type: 2} programSource: {fileID: 11400000, guid: 358a98096f2187c4eb0cee20115d2f3a, type: 2} serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABggAAAAAAAAAAi8CAAAAAVMAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AVQBkAG8AbgBCAGUAaABhAHYAaQBvAHUAcgAsACAAVgBSAEMALgBVAGQAbwBuAF0AXQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAgAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABEQAAAHMAbwB1AHIAYwBlAFYAaQBkAGUAbwBQAGwAYQB5AGUAcgAnAQQAAAB0AHkAcABlAAEgAAAAVgBSAEMALgBVAGQAbwBuAC4AVQBkAG8AbgBCAGUAaABhAHYAaQBvAHUAcgAsACAAVgBSAEMALgBVAGQAbwBuAAsBBQAAAFYAYQBsAHUAZQAAAAAABwUCLwMAAAABSwAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBTAHkAcwB0AGUAbQAuAEIAbwBvAGwAZQBhAG4ALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAMAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAREAAAB1AHMAZQBTAGgAYQByAGUAZABNAGEAdABlAHIAaQBhAGwAJwEEAAAAdAB5AHAAZQABGAAAAFMAeQBzAHQAZQBtAC4AQgBvAG8AbABlAGEAbgAsACAAbQBzAGMAbwByAGwAaQBiACsBBQAAAFYAYQBsAHUAZQABBwUCLwQAAAABSgAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAXQBdACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAEAAAABgIAAAAAAAAAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwB0AHIAaQBuAGcALAAgAG0AcwBjAG8AcgBsAGkAYgAnAQoAAABTAHkAbQBiAG8AbABOAGEAbQBlAAEIAAAAdABlAHgAUABhAHIAYQBtACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEFAAAAVgBhAGwAdQBlAAEMAAAAXwBFAG0AaQBzAHMAaQBvAG4ATQBhAHAABwUCLwUAAAABSQAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiAF0AXQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ABQAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABDQAAAHIAZQBuAGQAZQByAGUAcgBJAG4AZABlAHgAJwEEAAAAdAB5AHAAZQABFgAAAFMAeQBzAHQAZQBtAC4ASQBuAHQAMwAyACwAIABtAHMAYwBvAHIAbABpAGIAFwEFAAAAVgBhAGwAdQBlAAAAAAAHBQIwBAAAAAYAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAARAAAABhAHYAUAByAG8AVABvAGcAZwBsAGUAUABhAHIAYQBtACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEFAAAAVgBhAGwAdQBlAAENAAAAXwBJAHMAQQBWAFAAcgBvAEkAbgBwAHUAdAAHBQIvBgAAAAFeAAAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQBgADEAWwBbAFUAbgBpAHQAeQBFAG4AZwBpAG4AZQAuAFQAZQB4AHQAdQByAGUALAAgAFUAbgBpAHQAeQBFAG4AZwBpAG4AZQAuAEMAbwByAGUATQBvAGQAdQBsAGUAXQBdACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAHAAAABgIAAAAAAAAAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwB0AHIAaQBuAGcALAAgAG0AcwBjAG8AcgBsAGkAYgAnAQoAAABTAHkAbQBiAG8AbABOAGEAbQBlAAEOAAAAcwB0AGEAbgBkAGIAeQBUAGUAeAB0AHUAcgBlACcBBAAAAHQAeQBwAGUAAS0AAABVAG4AaQB0AHkARQBuAGcAaQBuAGUALgBUAGUAeAB0AHUAcgBlADIARAAsACAAVQBuAGkAdAB5AEUAbgBnAGkAbgBlAC4AQwBvAHIAZQBNAG8AZAB1AGwAZQALAQUAAABWAGEAbAB1AGUAAQAAAAcFAjAFAAAACAAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABHwAAAF8AXwBfAFUAZABvAG4AUwBoAGEAcgBwAEIAZQBoAGEAdgBpAG8AdQByAFYAZQByAHMAaQBvAG4AXwBfAF8AJwEEAAAAdAB5AHAAZQABFgAAAFMAeQBzAHQAZQBtAC4ASQBuAHQAMwAyACwAIABtAHMAYwBvAHIAbABpAGIAFwEFAAAAVgBhAGwAdQBlAAIAAAAHBQIwAwAAAAkAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAS4AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBQAGUAcgBzAGkAcwB0AEQAYQB0AGEARgByAG8AbQBVAHAAZwByAGEAZABlAF8AXwBfACcBBAAAAHQAeQBwAGUAARgAAABTAHkAcwB0AGUAbQAuAEIAbwBvAGwAZQBhAG4ALAAgAG0AcwBjAG8AcgBsAGkAYgArAQUAAABWAGEAbAB1AGUAAQcFBwUHBQ== publicVariablesUnityEngineObjects: diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Prefabs/DMX/Vertical Mode/DMX Reader Screens/VRSL-DMX-USharpVideoReaderScreen-Vertical.prefab b/Packages/com.acchosen.vr-stage-lighting/Runtime/Prefabs/DMX/Vertical Mode/DMX Reader Screens/VRSL-DMX-USharpVideoReaderScreen-Vertical.prefab index 52ea9a6..2294414 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Prefabs/DMX/Vertical Mode/DMX Reader Screens/VRSL-DMX-USharpVideoReaderScreen-Vertical.prefab +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Prefabs/DMX/Vertical Mode/DMX Reader Screens/VRSL-DMX-USharpVideoReaderScreen-Vertical.prefab @@ -257,7 +257,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f9f0ca4e1c93d7c449df855cc90deab0, type: 2} + - {fileID: 2100000, guid: d1ceac8b980ef2b44a8de109ba8d1d1b, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9593,7 +9593,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f9f0ca4e1c93d7c449df855cc90deab0, type: 2} + - {fileID: 2100000, guid: d1ceac8b980ef2b44a8de109ba8d1d1b, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9657,7 +9657,8 @@ MonoBehaviour: AllowCollisionOwnershipTransfer: 0 Reliable: 0 _syncMethod: 1 - serializedProgramAsset: {fileID: 0} + serializedProgramAsset: {fileID: 11400000, guid: ac388dea588159d4db6367a7504e6884, + type: 2} programSource: {fileID: 11400000, guid: 553f0db2752ead24590f8ac2e1f80c06, type: 2} serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgIAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUCLwMAAAABSwAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBTAHkAcwB0AGUAbQAuAEIAbwBvAGwAZQBhAG4ALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAMAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAS4AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBQAGUAcgBzAGkAcwB0AEQAYQB0AGEARgByAG8AbQBVAHAAZwByAGEAZABlAF8AXwBfACcBBAAAAHQAeQBwAGUAARgAAABTAHkAcwB0AGUAbQAuAEIAbwBvAGwAZQBhAG4ALAAgAG0AcwBjAG8AcgBsAGkAYgArAQUAAABWAGEAbAB1AGUAAQcFBwUHBQ== publicVariablesUnityEngineObjects: [] @@ -9710,7 +9711,8 @@ MonoBehaviour: AllowCollisionOwnershipTransfer: 0 Reliable: 0 _syncMethod: 1 - serializedProgramAsset: {fileID: 0} + serializedProgramAsset: {fileID: 11400000, guid: 62e9eeddd9c5fa84d8fd139d9555c2f1, + type: 2} programSource: {fileID: 11400000, guid: 358a98096f2187c4eb0cee20115d2f3a, type: 2} serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABggAAAAAAAAAAi8CAAAAAVMAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AVQBkAG8AbgBCAGUAaABhAHYAaQBvAHUAcgAsACAAVgBSAEMALgBVAGQAbwBuAF0AXQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAgAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABEQAAAHMAbwB1AHIAYwBlAFYAaQBkAGUAbwBQAGwAYQB5AGUAcgAnAQQAAAB0AHkAcABlAAEgAAAAVgBSAEMALgBVAGQAbwBuAC4AVQBkAG8AbgBCAGUAaABhAHYAaQBvAHUAcgAsACAAVgBSAEMALgBVAGQAbwBuAAsBBQAAAFYAYQBsAHUAZQAAAAAABwUCLwMAAAABSwAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBTAHkAcwB0AGUAbQAuAEIAbwBvAGwAZQBhAG4ALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAMAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAREAAAB1AHMAZQBTAGgAYQByAGUAZABNAGEAdABlAHIAaQBhAGwAJwEEAAAAdAB5AHAAZQABGAAAAFMAeQBzAHQAZQBtAC4AQgBvAG8AbABlAGEAbgAsACAAbQBzAGMAbwByAGwAaQBiACsBBQAAAFYAYQBsAHUAZQABBwUCLwQAAAABSgAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAXQBdACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAEAAAABgIAAAAAAAAAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwB0AHIAaQBuAGcALAAgAG0AcwBjAG8AcgBsAGkAYgAnAQoAAABTAHkAbQBiAG8AbABOAGEAbQBlAAEIAAAAdABlAHgAUABhAHIAYQBtACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEFAAAAVgBhAGwAdQBlAAEMAAAAXwBFAG0AaQBzAHMAaQBvAG4ATQBhAHAABwUCLwUAAAABSQAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiAF0AXQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ABQAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABDQAAAHIAZQBuAGQAZQByAGUAcgBJAG4AZABlAHgAJwEEAAAAdAB5AHAAZQABFgAAAFMAeQBzAHQAZQBtAC4ASQBuAHQAMwAyACwAIABtAHMAYwBvAHIAbABpAGIAFwEFAAAAVgBhAGwAdQBlAAAAAAAHBQIwBAAAAAYAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAARAAAABhAHYAUAByAG8AVABvAGcAZwBsAGUAUABhAHIAYQBtACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEFAAAAVgBhAGwAdQBlAAENAAAAXwBJAHMAQQBWAFAAcgBvAEkAbgBwAHUAdAAHBQIvBgAAAAFeAAAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQBgADEAWwBbAFUAbgBpAHQAeQBFAG4AZwBpAG4AZQAuAFQAZQB4AHQAdQByAGUALAAgAFUAbgBpAHQAeQBFAG4AZwBpAG4AZQAuAEMAbwByAGUATQBvAGQAdQBsAGUAXQBdACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAHAAAABgIAAAAAAAAAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwB0AHIAaQBuAGcALAAgAG0AcwBjAG8AcgBsAGkAYgAnAQoAAABTAHkAbQBiAG8AbABOAGEAbQBlAAEOAAAAcwB0AGEAbgBkAGIAeQBUAGUAeAB0AHUAcgBlACcBBAAAAHQAeQBwAGUAAS0AAABVAG4AaQB0AHkARQBuAGcAaQBuAGUALgBUAGUAeAB0AHUAcgBlADIARAAsACAAVQBuAGkAdAB5AEUAbgBnAGkAbgBlAC4AQwBvAHIAZQBNAG8AZAB1AGwAZQALAQUAAABWAGEAbAB1AGUAAQAAAAcFAjAFAAAACAAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABHwAAAF8AXwBfAFUAZABvAG4AUwBoAGEAcgBwAEIAZQBoAGEAdgBpAG8AdQByAFYAZQByAHMAaQBvAG4AXwBfAF8AJwEEAAAAdAB5AHAAZQABFgAAAFMAeQBzAHQAZQBtAC4ASQBuAHQAMwAyACwAIABtAHMAYwBvAHIAbABpAGIAFwEFAAAAVgBhAGwAdQBlAAIAAAAHBQIwAwAAAAkAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAS4AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBQAGUAcgBzAGkAcwB0AEQAYQB0AGEARgByAG8AbQBVAHAAZwByAGEAZABlAF8AXwBfACcBBAAAAHQAeQBwAGUAARgAAABTAHkAcwB0AGUAbQAuAEIAbwBvAGwAZQBhAG4ALAAgAG0AcwBjAG8AcgBsAGkAYgArAQUAAABWAGEAbAB1AGUAAQcFBwUHBQ== publicVariablesUnityEngineObjects: 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 4039f6a..2564df4 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: 41 + Data: 45 - Name: Entry: 7 Data: @@ -2152,10 +2152,206 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _requireDepthLight + Data: _Udon_DMXGridRenderTexture - Name: $v Entry: 7 Data: 107|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Udon_DMXGridRenderTexture + - Name: k__BackingField + Entry: 9 + Data: 74 + - Name: k__BackingField + Entry: 9 + Data: 74 + - 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: 108|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Udon_DMXGridRenderTextureMovement + - Name: $v + Entry: 7 + Data: 109|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Udon_DMXGridRenderTextureMovement + - Name: k__BackingField + Entry: 9 + Data: 74 + - Name: k__BackingField + Entry: 9 + Data: 74 + - 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: 110|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Udon_DMXGridSpinTimer + - Name: $v + Entry: 7 + Data: 111|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Udon_DMXGridSpinTimer + - Name: k__BackingField + Entry: 9 + Data: 74 + - Name: k__BackingField + Entry: 9 + Data: 74 + - 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: 112|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Udon_DMXGridStrobeTimer + - Name: $v + Entry: 7 + Data: 113|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Udon_DMXGridStrobeTimer + - Name: k__BackingField + Entry: 9 + Data: 74 + - Name: k__BackingField + Entry: 9 + Data: 74 + - 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: 114|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: 115|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _requireDepthLight @@ -2179,20 +2375,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 108|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 116|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 109|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 117|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 110|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 118|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 747fcaf..6ab7b9a 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 @@ -9,6 +9,12 @@ using UnityEditor; using UdonSharpEditor; #endif +#if UDONSHARP +using static VRC.SDKBase.VRCShader; +#else + using static UnityEngine.Shader; + using UnityEngine.Rendering; +#endif namespace VRSL { @@ -16,6 +22,9 @@ namespace VRSL public class VRSL_LocalUIControlPanel : UdonSharpBehaviour { + + + public Texture videoSampleTargetTexture; [Header("Materials")] @@ -73,6 +82,7 @@ namespace VRSL [FieldChangeCallback(nameof(VolumetricNoise)), SerializeField] private bool _volumetricNoise = true; + int _Udon_DMXGridRenderTexture, _Udon_DMXGridRenderTextureMovement, _Udon_DMXGridSpinTimer, _Udon_DMXGridStrobeTimer; public bool VolumetricNoise { @@ -97,6 +107,15 @@ namespace VRSL } get => _requireDepthLight; } + + void _SetTextureIDS() + { + _Udon_DMXGridRenderTexture = PropertyToID("_Udon_DMXGridRenderTexture"); + _Udon_DMXGridRenderTextureMovement = PropertyToID("_Udon_DMXGridRenderTextureMovement"); + _Udon_DMXGridSpinTimer = PropertyToID("_Udon_DMXGridSpinTimer"); + _Udon_DMXGridStrobeTimer = PropertyToID("_Udon_DMXGridStrobeTimer"); + } + public void OnEnable() { @@ -104,6 +123,7 @@ namespace VRSL } void Start() { + _SetTextureIDS(); _CheckDepthLightStatus(); _SetFinalIntensity(); _SetFixtureIntensity(); @@ -161,6 +181,38 @@ namespace VRSL foreach(CustomRenderTexture rt in rtArray) { rt.updateMode = CustomRenderTextureUpdateMode.Realtime; + if(rt.name.Contains("Color")) + { + #if UDONSHARP + VRCShader.SetGlobalTexture(_Udon_DMXGridRenderTexture, rt); + #else + Shader.SetGlobalTexture(_Udon_DMXGridRenderTexture, rt, RenderTextureSubElement.Default); + #endif + } + else if(rt.name.Contains("Movement")) + { + #if UDONSHARP + VRCShader.SetGlobalTexture(_Udon_DMXGridRenderTextureMovement, rt); + #else + Shader.SetGlobalTexture(_Udon_DMXGridRenderTextureMovement, rt, RenderTextureSubElement.Default); + #endif + } + else if(rt.name.Contains("Spin")) + { + #if UDONSHARP + VRCShader.SetGlobalTexture(_Udon_DMXGridSpinTimer, rt); + #else + Shader.SetGlobalTexture(_Udon_DMXGridSpinTimer, rt, RenderTextureSubElement.Default); + #endif + } + else if(rt.name.Contains("Strobe")) + { + #if UDONSHARP + VRCShader.SetGlobalTexture(_Udon_DMXGridStrobeTimer, rt); + #else + Shader.SetGlobalTexture(_Udon_DMXGridStrobeTimer, rt, RenderTextureSubElement.Default); + #endif + } } } void DisableCRTS(CustomRenderTexture[] rtArray) diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Scripts/VRStageLighting_DMX_Static.cs b/Packages/com.acchosen.vr-stage-lighting/Runtime/Scripts/VRStageLighting_DMX_Static.cs index dd43dbc..c518bf1 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Scripts/VRStageLighting_DMX_Static.cs +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Scripts/VRStageLighting_DMX_Static.cs @@ -263,7 +263,7 @@ namespace VRSL props.SetInt("_TiltInvert", invertTilt == true ? 1 : 0); props.SetInt("_EnableStrobe", enableStrobe == true ? 1 : 0); props.SetInt("_EnableSpin", enableAutoSpin == true ? 1 : 0); - props.SetInt("_EnableOSC", enableDMXChannels == true ? 1 : 0); + props.SetInt("_EnableDMX", enableDMXChannels == true ? 1 : 0); props.SetInt("_ProjectionSelection", selectGOBO); props.SetFloat("_FixtureRotationX", tiltOffsetBlue); props.SetFloat("_FixtureBaseRotationY", panOffsetBlueGreen); @@ -360,7 +360,7 @@ namespace VRSL props.SetInt("_LegacyGoboRange", legacyGoboRange == true ? 1 : 0); props.SetInt("_EnableStrobe", 0); props.SetInt("_EnableSpin", enableAutoSpin == true ? 1 : 0); - props.SetInt("_EnableOSC", 0); + props.SetInt("_EnableDMX", 0); props.SetInt("_ProjectionSelection", selectGOBO); props.SetFloat("_FixtureRotationX", tiltOffsetBlue); props.SetFloat("_FixtureBaseRotationY", panOffsetBlueGreen); diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-AlphaCutout.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-AlphaCutout.shader index 4a883b6..dfeb1d7 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-AlphaCutout.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-AlphaCutout.shader @@ -2,19 +2,19 @@ { Properties { - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [HideInInspector][Toggle] _NineUniverseMode ("Extended Universe Mode", Int) = 0 _DMXChannel ("DMX Fixture Number/Sector (Per 13 Channels)", Int) = 0 [Toggle] _UseRawGrid("Use Raw Grid For Light Intensity", Int) = 0 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} - [NoScaleOffset] _OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} - [NoScaleOffset] _OSCGridStrobeTimer ("OSC Grid Render Texture (For Strobe Timings", 2D) = "white" {} + //[NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + //[NoScaleOffset] _Udon_DMXGridRenderTextureMovement("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + //[NoScaleOffset] _Udon_DMXGridStrobeTimer ("DMX Grid Render Texture (For Strobe Timings", 2D) = "white" {} [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 [Toggle] _EnableDMXAlpha ("Allow Alpha to be controlled by DMX (Channel 6)", Int) = 0 [Toggle] _EnableStrobe ("Enable Strobe", Int) = 0 - //[HideInInspector][Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + //[HideInInspector][Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [HideInInspector]_StrobeFreq("Strobe Frequency", Range(0,25)) = 1 [HideInInspector][Toggle] _EnableSpin("Enable Auto Spinning", Float) = 0 @@ -96,7 +96,7 @@ - // o.Emission = OSCcol; + // o.Emission = DMXcol; fixed4 ms = tex2D (_MetallicSmoothness, IN.uv_MetallicSmoothness); 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 2aef34f..49a59f1 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,8 +1,8 @@ float GetSurfaceStrobe(uint DMXChannel) { - float phase = getValueAtCoordsRaw(DMXChannel + 4, _OSCGridStrobeTimer); - float status = getValueAtCoords(DMXChannel + 4, _OSCGridRenderTextureRAW); + 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 @@ -11,7 +11,7 @@ float GetSurfaceStrobe(uint DMXChannel) strobe = IF(status > 0.2, strobe, 1); //minimum channel threshold set //check if we should even be strobing at all. - strobe = IF(isOSC() == 1, strobe, 1); + strobe = IF(isDMX() == 1, strobe, 1); strobe = IF(isStrobe() == 1, strobe, 1); return strobe; @@ -19,9 +19,9 @@ float GetSurfaceStrobe(uint DMXChannel) } float4 GetDMXRGB(uint DMXChannel, float intensity) { - float redchannel = getValueAtCoords(DMXChannel + 1, _OSCGridRenderTextureRAW); - float greenchannel = getValueAtCoords(DMXChannel + 2, _OSCGridRenderTextureRAW); - float bluechannel = getValueAtCoords(DMXChannel + 3, _OSCGridRenderTextureRAW); + float redchannel = getValueAtCoords(DMXChannel + 1, _Udon_DMXGridRenderTexture); + float greenchannel = getValueAtCoords(DMXChannel + 2, _Udon_DMXGridRenderTexture); + float bluechannel = getValueAtCoords(DMXChannel + 3, _Udon_DMXGridRenderTexture); #if defined(PROJECTION_YES) redchannel = redchannel * _RedMultiplier; @@ -30,7 +30,7 @@ float4 GetDMXRGB(uint DMXChannel, float intensity) #endif - //return IF(isOSC() == 1,lerp(fixed4(0,0,0,1), float4(redchannel,greenchannel,bluechannel,1), GetOSCIntensity(DMXChannel, _FixtureMaxIntensity)), float4(redchannel,greenchannel,bluechannel,1) * GetOSCIntensity(DMXChannel, _FixtureMaxIntensity)); + //return IF(isDMX() == 1,lerp(fixed4(0,0,0,1), float4(redchannel,greenchannel,bluechannel,1), GetDMXIntensity(DMXChannel, _FixtureMaxIntensity)), float4(redchannel,greenchannel,bluechannel,1) * GetDMXIntensity(DMXChannel, _FixtureMaxIntensity)); return lerp(fixed4(0,0,0,1), float4(redchannel,greenchannel,bluechannel,1), intensity); } @@ -38,17 +38,17 @@ float4 GetDMXRGB(uint DMXChannel, float intensity) float GetDMX12CH(uint DMXChannel, int dimmerChannel) { int startChannel = (int)DMXChannel + 2 + dimmerChannel; - float dimmer = getValueAtCoords(startChannel, _OSCGridRenderTextureRAW); + float dimmer = getValueAtCoords(startChannel, _Udon_DMXGridRenderTexture); return dimmer; - // float redchannel = getValueAtCoords(DMXChannel + 1, _OSCGridRenderTextureRAW); - // float greenchannel = getValueAtCoords(DMXChannel + 2, _OSCGridRenderTextureRAW); - // float bluechannel = getValueAtCoords(DMXChannel + 3, _OSCGridRenderTextureRAW); + // float redchannel = getValueAtCoords(DMXChannel + 1, _Udon_DMXGridRenderTexture); + // float greenchannel = getValueAtCoords(DMXChannel + 2, _Udon_DMXGridRenderTexture); + // float bluechannel = getValueAtCoords(DMXChannel + 3, _Udon_DMXGridRenderTexture); // #if defined(PROJECTION_YES) // redchannel = redchannel * _RedMultiplier; // bluechannel = bluechannel * _BlueMultiplier; // greenchannel = greenchannel * _GreenMultiplier; // #endif - //return IF(isOSC() == 1,lerp(fixed4(0,0,0,1), float4(redchannel,greenchannel,bluechannel,1), GetOSCIntensity(DMXChannel, _FixtureMaxIntensity)), float4(redchannel,greenchannel,bluechannel,1) * GetOSCIntensity(DMXChannel, _FixtureMaxIntensity)); + //return IF(isDMX() == 1,lerp(fixed4(0,0,0,1), float4(redchannel,greenchannel,bluechannel,1), GetDMXIntensity(DMXChannel, _FixtureMaxIntensity)), float4(redchannel,greenchannel,bluechannel,1) * GetDMXIntensity(DMXChannel, _FixtureMaxIntensity)); // return lerp(fixed4(0,0,0,1), float4(redchannel,greenchannel,bluechannel,1), intensity); } @@ -58,13 +58,13 @@ float GetDMX12CH(uint DMXChannel, int dimmerChannel) float4 GetDMXEmission(float2 EmissionUV) { uint dmx = getDMXChannel(); - float dmxIntensity = getValueAtCoords(dmx, _OSCGridRenderTextureRAW); + float dmxIntensity = getValueAtCoords(dmx, _Udon_DMXGridRenderTexture); float strobe = IF(isStrobe() == 1, GetSurfaceStrobe(dmx), 1); - float4 OSCcol = GetDMXRGB(dmx, dmxIntensity) * getEmissionColor(); - //OSCcol *= GetOSCColor(dmx); - float4 col = IF(isOSC() == 1, OSCcol * (_CurveMod), getEmissionColor()); + float4 DMXcol = GetDMXRGB(dmx, dmxIntensity) * getEmissionColor(); + //DMXcol *= GetDMXColor(dmx); + float4 col = IF(isDMX() == 1, DMXcol * (_CurveMod), getEmissionColor()); half4 e = col * strobe; - // e = IF(isOSC() == 1,lerp(half4(-_CurveMod,-_CurveMod,-_CurveMod,1), e, pow(GetOSCIntensity(dmx, 1.0), 1.0)), e); + // e = IF(isDMX() == 1,lerp(half4(-_CurveMod,-_CurveMod,-_CurveMod,1), e, pow(GetDMXIntensity(dmx, 1.0), 1.0)), e); // e = clamp(e, half4(0,0,0,1), half4(_FixtureMaxIntensity*2,_FixtureMaxIntensity*2,_FixtureMaxIntensity*2,1)); e *= tex2D(_EmissionMask, EmissionUV).r; //e*= _FixutreIntensityMultiplier; @@ -138,16 +138,16 @@ int GetCurrent12CH(float2 uv) float4 GetDMXEmission12Ch(float2 EmissionUV) { uint dmx = getDMXChannel(); - //float dmxIntensity = getValueAtCoords(dmx, _OSCGridRenderTextureRAW); + //float dmxIntensity = getValueAtCoords(dmx, _Udon_DMXGridRenderTexture); float dmxIntensity = GetDMX12CH(dmx, GetCurrent12CH(EmissionUV)); //float strobe = IF(isStrobe() == 1, GetSurfaceStrobe(dmx), 1); - float4 OSCcol = GetDMXRGB(dmx-1, dmxIntensity) * getEmissionColor(); - //OSCcol *= GetOSCColor(dmx); - float4 col = IF(isOSC() == 1, OSCcol * _CurveMod, getEmissionColor()); + float4 DMXcol = GetDMXRGB(dmx-1, dmxIntensity) * getEmissionColor(); + //DMXcol *= GetDMXColor(dmx); + float4 col = IF(isDMX() == 1, DMXcol * _CurveMod, getEmissionColor()); half4 e = col; - // e = IF(isOSC() == 1,lerp(half4(-_CurveMod,-_CurveMod,-_CurveMod,1), e, pow(GetOSCIntensity(dmx, 1.0), 1.0)), e); + // e = IF(isDMX() == 1,lerp(half4(-_CurveMod,-_CurveMod,-_CurveMod,1), e, pow(GetDMXIntensity(dmx, 1.0), 1.0)), e); // e = clamp(e, half4(0,0,0,1), half4(_FixtureMaxIntensity*2,_FixtureMaxIntensity*2,_FixtureMaxIntensity*2,1)); e *= tex2D(_EmissionMask, EmissionUV).r; //e*= _FixutreIntensityMultiplier; @@ -164,7 +164,7 @@ float4 GetDMXEmission12Ch(float2 EmissionUV) #ifdef SURF_ALPHA float GetDMXAlpha() { - return UNITY_ACCESS_INSTANCED_PROP(Props, _EnableDMXAlpha) == 1 && isOSC() == 1 ? getValueAtCoords((getDMXChannel() + 5), _OSCGridRenderTextureRAW) : 1.0; + return UNITY_ACCESS_INSTANCED_PROP(Props, _EnableDMXAlpha) == 1 && isDMX() == 1 ? getValueAtCoords((getDMXChannel() + 5), _Udon_DMXGridRenderTexture) : 1.0; } #endif \ No newline at end of file diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-Opaque 12 Channel Bar.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-Opaque 12 Channel Bar.shader index 39db8fc..356fc8c 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-Opaque 12 Channel Bar.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-Opaque 12 Channel Bar.shader @@ -2,18 +2,18 @@ { Properties { - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [HideInInspector][Toggle] _NineUniverseMode ("Extended Universe Mode", Int) = 0 _DMXChannel ("DMX Fixture Number/Sector (Per 13 Channels)", Int) = 0 [Toggle] _UseRawGrid("Use Raw Grid For Light Intensity", Int) = 0 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} - [NoScaleOffset] _OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} - [NoScaleOffset] _OSCGridStrobeTimer ("OSC Grid Render Texture (For Strobe Timings", 2D) = "white" {} + //[NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + //[NoScaleOffset] _Udon_DMXGridRenderTextureMovement("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + //[NoScaleOffset] _Udon_DMXGridStrobeTimer("DMX Grid Render Texture (For Strobe Timings", 2D) = "white" {} [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 [Toggle] _EnableStrobe ("Enable Strobe", Int) = 0 - //[HideInInspector][Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + //[HideInInspector][Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [HideInInspector]_StrobeFreq("Strobe Frequency", Range(0,25)) = 1 [HideInInspector][Toggle] _EnableSpin("Enable Auto Spinning", Float) = 0 @@ -84,7 +84,7 @@ o.Emission = GetDMXEmission12Ch(IN.uv_EmissionMask) * _CurveMod; - // o.Emission = OSCcol; + // o.Emission = DMXcol; fixed4 ms = tex2D (_MetallicSmoothness, IN.uv_MetallicSmoothness); fixed4 c = tex2D (_MainTex, IN.uv_MainTex) * _Color; diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-Opaque.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-Opaque.shader index d2f36c2..bb3e48f 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-Opaque.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-Opaque.shader @@ -2,18 +2,18 @@ { Properties { - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 _DMXChannel ("DMX Fixture Number/Sector (Per 13 Channels)", Int) = 0 [HideInInspector][Toggle] _NineUniverseMode ("Extended Universe Mode", Int) = 0 [Toggle] _UseRawGrid("Use Raw Grid For Light Intensity", Int) = 0 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} - [NoScaleOffset] _OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} - [NoScaleOffset] _OSCGridStrobeTimer ("OSC Grid Render Texture (For Strobe Timings", 2D) = "white" {} + //[NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + //[NoScaleOffset] _Udon_DMXGridRenderTextureMovement("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + //[NoScaleOffset] _Udon_DMXGridStrobeTimer("DMX Grid Render Texture (For Strobe Timings", 2D) = "white" {} [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 [Toggle] _EnableStrobe ("Enable Strobe", Int) = 0 - //[HideInInspector][Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + //[HideInInspector][Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [HideInInspector]_StrobeFreq("Strobe Frequency", Range(0,25)) = 1 [HideInInspector][Toggle] _EnableSpin("Enable Auto Spinning", Float) = 0 @@ -84,7 +84,7 @@ o.Emission = GetDMXEmission(IN.uv_EmissionMask) * _CurveMod; - // o.Emission = OSCcol; + // o.Emission = DMXcol; fixed4 ms = tex2D (_MetallicSmoothness, IN.uv_MetallicSmoothness); fixed4 c = tex2D (_MainTex, IN.uv_MainTex) * _Color; diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-Transparent.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-Transparent.shader index ccfe122..da5581c 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-Transparent.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Basic Surface Shaders/VRSL-StandardSurface-Transparent.shader @@ -2,19 +2,19 @@ { Properties { - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 _DMXChannel ("DMX Fixture Number/Sector (Per 13 Channels)", Int) = 0 [HideInInspector][Toggle] _NineUniverseMode ("Extended Universe Mode", Int) = 0 [Toggle] _UseRawGrid("Use Raw Grid For Light Intensity", Int) = 0 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} - [NoScaleOffset] _OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} - [NoScaleOffset] _OSCGridStrobeTimer ("OSC Grid Render Texture (For Strobe Timings", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTextureMovement("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridStrobeTimer("DMX Grid Render Texture (For Strobe Timings", 2D) = "white" {} [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 [Toggle] _EnableDMXAlpha ("Allow Alpha to be controlled by DMX (Channel 6)", Int) = 0 [Toggle] _EnableStrobe ("Enable Strobe", Int) = 0 - //[HideInInspector][Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + //[HideInInspector][Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [HideInInspector]_StrobeFreq("Strobe Frequency", Range(0,25)) = 1 [HideInInspector][Toggle] _EnableSpin("Enable Auto Spinning", Float) = 0 @@ -86,7 +86,7 @@ o.Emission = GetDMXEmission(IN.uv_EmissionMask); - // o.Emission = OSCcol; + // o.Emission = DMXcol; fixed4 ms = tex2D (_MetallicSmoothness, IN.uv_MetallicSmoothness); fixed4 c = tex2D (_MainTex, IN.uv_MainTex) * _Color; diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-DMXInterpolation.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-DMXInterpolation.shader index 7d1d842..1ac44fc 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-DMXInterpolation.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-DMXInterpolation.shader @@ -4,13 +4,13 @@ Shader "VRSL/DMX CRTs/Interpolation" { _DMXChannel ("DMX Channel (for legacy global movement speed)", Int) = 0 [Toggle] _EnableLegacyGlobalMovementSpeedChannel ("Enable Legacy Global Movement Speed Channel (disables individiual movement speed per sector)", Int) = 0 - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [Toggle] _NineUniverseMode ("Extended Universe Mode", Int) = 0 - [Toggle] _EnableCompatibilityMode ("Enable Stream OSC/DMX Control", Int) = 0 - [NoScaleOffset]_OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} + [Toggle] _EnableCompatibilityMode ("Enable Stream DMX/DMX Control", Int) = 0 + [NoScaleOffset]_DMXTexture("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} _SmoothValue ("Smoothness Level (0 to 1, 0 = max)", Range(0,1)) = 0.5 - _MinimumSmoothnessOSC ("Minimum Smoothness Value for OSC", Float) = 0 - _MaximumSmoothnessOSC ("Maximum Smoothness Value for OSc", Float) = 0 + _MinimumSmoothnessDMX ("Minimum Smoothness Value for DMX", Float) = 0 + _MaximumSmoothnessDMX ("Maximum Smoothness Value for OSc", Float) = 0 } SubShader @@ -27,11 +27,11 @@ Shader "VRSL/DMX CRTs/Interpolation" #pragma fragment frag #pragma target 3.0 - float _SmoothValue, _MinimumSmoothnessOSC, _MaximumSmoothnessOSC; + float _SmoothValue, _MinimumSmoothnessDMX, _MaximumSmoothnessDMX; sampler2D _Tex; - sampler2D _OSCGridRenderTexture; + sampler2D _DMXTexture; SamplerState sampler_point_repeat; - int _IsEven, _DMXChannel, _EnableOSC, _EnableLegacyGlobalMovementSpeedChannel; + int _IsEven, _DMXChannel, _EnableDMX, _EnableLegacyGlobalMovementSpeedChannel; uint _EnableCompatibilityMode, _NineUniverseMode; float oscSmoothnessRAW; float3 rgbSmoothnessRaw; @@ -47,13 +47,13 @@ Shader "VRSL/DMX CRTs/Interpolation" //1 sector is every 13 channels //the grid is 26x26 aka 2 sectors per row - //TRAVERSING THE Y AXIS OF THE OSC GRID + //TRAVERSING THE Y AXIS OF THE DMX GRID float ymod = floor(sector / 2); float originalx = x; float originaly = y; - //TRAVERSING THE X AXIS OF THE OSC GRID + //TRAVERSING THE X AXIS OF THE DMX GRID float xmod = sector % 2; @@ -75,7 +75,7 @@ Shader "VRSL/DMX CRTs/Interpolation" { float2 recoords = getSectorCoordinates(x, y, sector); float4 uvcoords = float4(recoords.x, recoords.y, 0,0); - float4 c = tex2D(_OSCGridRenderTexture, uvcoords); + float4 c = tex2D(_DMXTexture, uvcoords); float3 cRGB = float3(c.r, c.g, c.b); float value = LinearRgbToLuminance(cRGB); value = LinearToGammaSpaceExact(value); @@ -87,14 +87,14 @@ Shader "VRSL/DMX CRTs/Interpolation" { float2 recoords = getSectorCoordinates(x, y, sector); float4 uvcoords = float4(recoords.x, recoords.y, 0,0); - float4 c = tex2D(_OSCGridRenderTexture, uvcoords); + float4 c = tex2D(_DMXTexture, uvcoords); float3 col = float3(LinearToGammaSpaceExact(c.r), LinearToGammaSpaceExact(c.g), LinearToGammaSpaceExact(c.b)); return col; } float getValueAtUV(float2 uv) { - float4 c = tex2D(_OSCGridRenderTexture, uv); + float4 c = tex2D(_DMXTexture, uv); float3 cRGB = float3(c.r, c.g, c.b); float value = LinearRgbToLuminance(cRGB); value = LinearToGammaSpaceExact(value); @@ -104,7 +104,7 @@ Shader "VRSL/DMX CRTs/Interpolation" float3 getValueAtUVRGB(float2 uv) { - float4 c = tex2D(_OSCGridRenderTexture, uv); + float4 c = tex2D(_DMXTexture, uv); float3 col = float3(LinearToGammaSpaceExact(c.r), LinearToGammaSpaceExact(c.g), LinearToGammaSpaceExact(c.b)); return col; } @@ -123,8 +123,8 @@ Shader "VRSL/DMX CRTs/Interpolation" { oscSmoothnessRAW = IF(_EnableCompatibilityMode == 1, getValueAtCoords(0.096151, 0.019231, _DMXChannel), getValueAtUV(float2(0.960, uv.y))); } - float oscSmoothness = lerp(_MinimumSmoothnessOSC, _MaximumSmoothnessOSC, oscSmoothnessRAW); - return IF(_EnableOSC == 1, oscSmoothness, _SmoothValue); + float oscSmoothness = lerp(_MinimumSmoothnessDMX, _MaximumSmoothnessDMX, oscSmoothnessRAW); + return IF(_EnableDMX == 1, oscSmoothness, _SmoothValue); } @@ -141,11 +141,11 @@ Shader "VRSL/DMX CRTs/Interpolation" rgbSmoothnessRaw = getValueAtUVRGB(float2(0.960, uv.y)); } - float3 rgbSmoothness = float3(lerp(_MinimumSmoothnessOSC, _MaximumSmoothnessOSC, rgbSmoothnessRaw.r), - lerp(_MinimumSmoothnessOSC, _MaximumSmoothnessOSC, rgbSmoothnessRaw.g), - lerp(_MinimumSmoothnessOSC, _MaximumSmoothnessOSC, rgbSmoothnessRaw.b)); + float3 rgbSmoothness = float3(lerp(_MinimumSmoothnessDMX, _MaximumSmoothnessDMX, rgbSmoothnessRaw.r), + lerp(_MinimumSmoothnessDMX, _MaximumSmoothnessDMX, rgbSmoothnessRaw.g), + lerp(_MinimumSmoothnessDMX, _MaximumSmoothnessDMX, rgbSmoothnessRaw.b)); - return IF(_EnableOSC == 1, rgbSmoothness, float3(_SmoothValue, _SmoothValue, _SmoothValue)); + return IF(_EnableDMX == 1, rgbSmoothness, float3(_SmoothValue, _SmoothValue, _SmoothValue)); } @@ -154,13 +154,13 @@ Shader "VRSL/DMX CRTs/Interpolation" if (_Time.y > 3.0) { float4 previousFrame = tex2D(_SelfTexture2D, IN.localTexcoord.xy); - float4 currentFrame = tex2D(_OSCGridRenderTexture, IN.localTexcoord.xy); + float4 currentFrame = tex2D(_DMXTexture, IN.localTexcoord.xy); // if(IN.localTexcoord.y > 0.90) // { // oscSmoothnessRAW = IF(_EnableCompatibilityMode == 1, getValueAtCoords(0.096151, 0.019231, _DMXChannel), getValueAtCoords(0.189936, 0.00762, _DMXChannel)); // return oscSmoothnessRAW; // } - if(_NineUniverseMode && _EnableOSC) + if(_NineUniverseMode && _EnableDMX) { float3 s = getSmoothnessValueRGB(IN.localTexcoord.xy); s = lerp(clamp(lerp(previousFrame.rgb, currentFrame.rgb,smoothstep(0.0, 1.0, clamp(unity_DeltaTime.z,0.0,1.0))) , 0.0, 400.0), currentFrame.rgb, s); @@ -174,7 +174,7 @@ Shader "VRSL/DMX CRTs/Interpolation" } else { - return tex2D(_OSCGridRenderTexture, IN.localTexcoord.xy); + return tex2D(_DMXTexture, IN.localTexcoord.xy); } } ENDCG diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-SpinnerTimer.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-SpinnerTimer.shader index 4ee924e..010c470 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-SpinnerTimer.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-SpinnerTimer.shader @@ -3,7 +3,7 @@ //THIS IS A TIMER, TO KEEP TRACK OF HOW MUCH TIME HAS PASSED FOR THE NEXT ROTATION Properties { - [NoScaleOffset]_OSCGridRenderTexture("DMX Grid Texture", 2D) = "white" {} + [NoScaleOffset]_DMXTexture("DMX Grid Texture", 2D) = "white" {} [Toggle] _NineUniverseMode ("Extended Universe Mode", Int) = 0 } @@ -23,8 +23,8 @@ #pragma target 4.0 sampler2D _Tex; - Texture2D _OSCGridRenderTexture; - uniform float4 _OSCGridRenderTexture_TexelSize; + Texture2D _DMXTexture; + uniform float4 _DMXTexture_TexelSize; SamplerState sampler_point_repeat; uint _NineUniverseMode; // half _MaxStrobeFreq; @@ -51,7 +51,7 @@ if (_Time.y > 1.0) { float4 previousFrame = tex2D(_SelfTexture2D, IN.localTexcoord.xy); - float4 currentFrame = _OSCGridRenderTexture.SampleLevel(sampler_point_repeat, IN.localTexcoord.xy, 0); + float4 currentFrame = _DMXTexture.SampleLevel(sampler_point_repeat, IN.localTexcoord.xy, 0); float dt = clamp(unity_DeltaTime.x, 0.0, 2.0); if(_NineUniverseMode) @@ -123,7 +123,7 @@ else { - return _OSCGridRenderTexture.SampleLevel(sampler_point_repeat, IN.localTexcoord.xy, 0); + return _DMXTexture.SampleLevel(sampler_point_repeat, IN.localTexcoord.xy, 0); } } ENDCG diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-StrobeTimings.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-StrobeTimings.shader index 34ae3c3..2535eb5 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-StrobeTimings.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/CRTShaders/DMXRTShader-StrobeTimings.shader @@ -3,7 +3,7 @@ //THIS IS A TIMER, TO KEEP TRACK OF HOW MUCH TIME HAS PASSED FOR THE STROBE Properties { - [NoScaleOffset]_OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} + [NoScaleOffset]_DMXTexture("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} _MaxStrobeFreq("Maximum Strobe Frequency", Range(1,100)) = 25 [Toggle] _NineUniverseMode ("Extended Universe Mode", Int) = 0 } @@ -23,8 +23,8 @@ #pragma target 4.5 sampler2D _Tex; - Texture2D _OSCGridRenderTexture; - uniform float4 _OSCGridRenderTexture_TexelSize; + Texture2D _DMXTexture; + uniform float4 _DMXTexture_TexelSize; SamplerState sampler_point_repeat; half _MaxStrobeFreq; uint _NineUniverseMode; @@ -68,7 +68,7 @@ if (_Time.y > 1.0) { float4 previousFrame = tex2D(_SelfTexture2D, IN.localTexcoord.xy); - float4 currentFrame = _OSCGridRenderTexture.SampleLevel(sampler_point_repeat, IN.localTexcoord.xy, 0); + float4 currentFrame = _DMXTexture.SampleLevel(sampler_point_repeat, IN.localTexcoord.xy, 0); float dt = clamp(unity_DeltaTime.x, 0.0, 2.0); //T = CURRENT PHASE @@ -110,7 +110,7 @@ else { - return _OSCGridRenderTexture.SampleLevel(sampler_point_repeat, IN.localTexcoord.xy, 0); + return _DMXTexture.SampleLevel(sampler_point_repeat, IN.localTexcoord.xy, 0); } } ENDCG diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Discoball/VRSL-Discoball.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Discoball/VRSL-Discoball.shader index f58357c..9c7b294 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Discoball/VRSL-Discoball.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Discoball/VRSL-Discoball.shader @@ -7,8 +7,8 @@ [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 + // [NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} _GlobalIntensity("Global Intensity", Range(0,1)) = 1 _FinalIntensity("Final Intensity", Range(0,1)) = 1 _UniversalIntensity ("Universal Intensity", Range (0,1)) = 1 @@ -113,8 +113,8 @@ // pack correction factor into direction w component to save space o.worldDirection.w = dot(o.vertex, CalculateFrustumCorrection()); uint dmx = getDMXChannel(); - o.dmxIntensity = IF(_EnableCompatibilityMode == 1, float2(dmx, getValueAtCoords(dmx, _OSCGridRenderTextureRAW)), float2(dmx, getValueAtCoords(dmx, _OSCGridRenderTextureRAW))); - if(o.dmxIntensity.y <= 0.05 && _EnableOSC == 1) + o.dmxIntensity = IF(_EnableCompatibilityMode == 1, float2(dmx, getValueAtCoords(dmx, _Udon_DMXGridRenderTexture)), float2(dmx, getValueAtCoords(dmx, _Udon_DMXGridRenderTexture))); + if(o.dmxIntensity.y <= 0.05 && _EnableDMX == 1) { v.vertex = float4(0,0,0,0); o.vertex = UnityObjectToClipPos(v.vertex); @@ -128,7 +128,7 @@ fixed4 frag(v2f i) : SV_Target { - if(i.dmxIntensity.y <= 0.05 && _EnableOSC == 1) + if(i.dmxIntensity.y <= 0.05 && _EnableDMX == 1) { return half4(0,0,0,0); } @@ -154,7 +154,7 @@ projPos = Rotation(float4(projPos, 0)).xyz; float4 col = (texCUBE (_Cube, projPos)); col = col *(_Emission * (4*UVscale)); - col = IF(_EnableOSC == 1, col * i.dmxIntensity.y, col); + col = IF(_EnableDMX == 1, col * i.dmxIntensity.y, col); col = (col * _Multiplier)*((col * getGlobalIntensity()) * getFinalIntensity()); col = col * _UniversalIntensity; return col; 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 85cb024..f785805 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 @@ -16,7 +16,7 @@ [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 [Toggle] _EnableStrobe ("Enable Strobe", Int) = 0 - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [Toggle] _LegacyGoboRange ("Enable Legacy GOBO Range", Int) = 0 _FixtureRotationX("Mover Tilt Offset (Blue)", Range(-94,4)) = 0 _FinalIntensity("Final Intensity", Range(0,1)) = 1 @@ -47,9 +47,9 @@ _FixutreIntensityMultiplier ("Intensity Multipler (For Bloom Scaling)", Range(0,500)) = 1 _FixtureRotationOrigin("Fixture Pivot Origin", Float) = (0, 0.014709, -1.02868, 0) [Toggle] _UseRawGrid("Use Raw Grid For Light Intensity And Color", Int) = 0 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} - [NoScaleOffset] _OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} - [NoScaleOffset] _OSCGridStrobeTimer ("OSC Grid Render Texture (For Strobe Timings", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTextureMovement("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridStrobeTimer("DMX Grid Render Texture (For Strobe Timings", 2D) = "white" {} _MaxMinPanAngle("Max/Min Pan Angle (-x, x)", Float) = 180 _MaxMinTiltAngle("Max/Min Tilt Angle (-y, y)", Float) = 180 _FixtureMaxIntensity ("Maximum Cone Intensity",Range (0,0.5)) = 0.5 @@ -67,8 +67,8 @@ #pragma target 3.0 sampler2D _MainTex, _MetallicMap, _BumpMap, _EmissionMask; - sampler2D _OSCGridRenderTexture, _OSCGridRenderTextureRAW, _OSCGridStrobeTimer; - uniform float4 _OSCGridRenderTextureRAW_TexelSize; + sampler2D _Udon_DMXGridRenderTexture, _Udon_DMXGridRenderTextureMovement, _Udon_DMXGridStrobeTimer; + uniform float4 _Udon_DMXGridRenderTexture_TexelSize; float4 _FixtureRotationOrigin; float _FixtureMaxIntensity, _FixutreIntensityMultiplier; float _MaxMinPanAngle; @@ -95,7 +95,7 @@ UNITY_DEFINE_INSTANCED_PROP(uint, _NineUniverseMode) UNITY_DEFINE_INSTANCED_PROP(uint, _PanInvert) UNITY_DEFINE_INSTANCED_PROP(uint, _TiltInvert) - UNITY_DEFINE_INSTANCED_PROP(uint, _EnableOSC) + UNITY_DEFINE_INSTANCED_PROP(uint, _EnableDMX) UNITY_DEFINE_INSTANCED_PROP(uint, _EnableStrobe) UNITY_DEFINE_INSTANCED_PROP(uint, _EnableSpin) UNITY_DEFINE_INSTANCED_PROP(float, _StrobeFreq) 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 4a05b9f..27f637b 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 @@ -14,7 +14,7 @@ [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 [Toggle] _EnableStrobe ("Enable Strobe", Int) = 0 - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [Toggle] _LegacyGoboRange ("Enable Legacy GOBO Range", Int) = 0 _FixtureRotationX("Mover Tilt Offset (Blue)", Range(-94,4)) = 0 _FinalIntensity("Final Intensity", Range(0,1)) = 1 @@ -49,9 +49,9 @@ _FixtureRotationOrigin("Fixture Pivot Origin", Float) = (0, 0.014709, -1.02868, 0) _FixtureLensCenter("Fixture Lens Center", Float) = (-0.001864, 0.258346, -0.159662, 0) [Toggle] _UseRawGrid("Use Raw Grid For Light Intensity And Color", Int) = 0 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} - [NoScaleOffset] _OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} - [NoScaleOffset] _OSCGridStrobeTimer ("OSC Grid Render Texture (For Strobe Timings", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTextureMovement("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridStrobeTimer("DMX Grid Render Texture (For Strobe Timings", 2D) = "white" {} _MaxMinPanAngle("Max/Min Pan Angle (-x, x)", Float) = 180 _MaxMinTiltAngle("Max/Min Tilt Angle (-y, y)", Float) = 180 _FixtureMaxIntensity ("Maximum Cone Intensity",Range (0,0.5)) = 0.5 @@ -124,8 +124,8 @@ float4 _Emission1, _Emission2, _Emission3, _Emission4, _Emission5, _Emission6, _Emission7, _Emission8, _Emission9, _Emission10; half _EStart1, _EStart2, _EStart3, _EStart4, _EStart5, _EStart6, _EStart7, _EStart8, _EStart9, _Offset; - sampler2D _OSCGridRenderTexture, _OSCGridRenderTextureRAW, _OSCGridStrobeTimer; - uniform float4 _OSCGridRenderTextureRAW_TexelSize; + sampler2D _Udon_DMXGridRenderTexture, _Udon_DMXGridRenderTextureMovement, _Udon_DMXGridStrobeTimer; + uniform float4 _Udon_DMXGridRenderTexture_TexelSize; float4 _FixtureLensCenter; float4 _FixtureRotationOrigin; float _FixtureMaxIntensity, _FixutreIntensityMultiplier; @@ -139,7 +139,7 @@ UNITY_DEFINE_INSTANCED_PROP(uint, _NineUniverseMode) UNITY_DEFINE_INSTANCED_PROP(uint, _PanInvert) UNITY_DEFINE_INSTANCED_PROP(uint, _TiltInvert) - UNITY_DEFINE_INSTANCED_PROP(uint, _EnableOSC) + UNITY_DEFINE_INSTANCED_PROP(uint, _EnableDMX) UNITY_DEFINE_INSTANCED_PROP(uint, _EnableStrobe) UNITY_DEFINE_INSTANCED_PROP(uint, _EnableSpin) UNITY_DEFINE_INSTANCED_PROP(float, _StrobeFreq) @@ -291,7 +291,7 @@ float gi = getGlobalIntensity(); float fi = getFinalIntensity(); - // if(((all(i.rgbColor <= float4(0.005,0.005,0.005,1)) || i.intensityStrobeGOBOSpinSpeed.x <= 0.005) && isOSC() == 1) || gi <= 0.005 || fi <= 0.005) + // if(((all(i.rgbColor <= float4(0.005,0.005,0.005,1)) || i.intensityStrobeGOBOSpinSpeed.x <= 0.005) && isDMX() == 1) || gi <= 0.005 || fi <= 0.005) // { // return half4(0,0,0,0); // } diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-BasicLaser-DMX.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-BasicLaser-DMX.shader index b1e8f6d..317e044 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-BasicLaser-DMX.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-BasicLaser-DMX.shader @@ -2,6 +2,9 @@ { Properties { + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 + [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 + [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 _DMXChannel ("DMX Channel Number)", Int) = 0 [HideInInspector][Toggle] _NineUniverseMode ("Extended Universe Mode", Int) = 0 _UniversalIntensity ("Universal Intensity", Range (0,1)) = 1 @@ -25,12 +28,12 @@ _InternalShine ("Internal Shine Strength", Range(0,5)) = 1 _InternalShineLength ("Internal Shine Length", Range(0.001,500)) = 12.1 _Scroll ("Scroll", Range(-1, 1)) = 1 - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + _ScrollOffset ("Scroll Offset", Range(0.00001, 0.00003)) = 0.00001 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} - [NoScaleOffset] _OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} - [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 - [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 + + // [NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTextureMovement("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + } SubShader @@ -78,9 +81,9 @@ float4 vertex : SV_POSITION; float4 worldPos : TEXCOORD3; float3 viewDir : TEXCOORD4; - float4 panTiltLengthWidth : TEXCOORD5; //ch 1,2,3,4 - float4 flatnessBeamCountSpinThickness : TEXCOORD6; //ch 5,6,7,12 - float4 rgbIntensity : TEXCOORD7;// ch 8,9,10,11 + nointerpolation float4 panTiltLengthWidth : TEXCOORD5; //ch 1,2,3,4 + nointerpolation float4 flatnessBeamCountSpinThickness : TEXCOORD6; //ch 5,6,7,12 + nointerpolation float4 rgbIntensity : TEXCOORD7;// ch 8,9,10,11 UNITY_VERTEX_INPUT_INSTANCE_ID UNITY_VERTEX_OUTPUT_STEREO }; @@ -89,9 +92,10 @@ float4 _MainTex_ST, _MainColor; half _XConeFlatness, _ZRotation, _UniversalIntensity; half _EndFade, _FadeStrength, _InternalShine, _LaserSoftening, _InternalShineLength; + float _ScrollOffset; uint _EnableCompatibilityMode, _EnableVerticalMode; - sampler2D _OSCGridRenderTexture, _OSCGridRenderTextureRAW; - uniform float4 _OSCGridRenderTextureRAW_TexelSize; + sampler2D _Udon_DMXGridRenderTexture, _Udon_DMXGridRenderTextureMovement, _Udon_DMXGridSpinTimer; + uniform float4 _Udon_DMXGridRenderTexture_TexelSize; uniform const half compatSampleYAxis = 0.019231; uniform const half standardSampleYAxis = 0.00762; @@ -100,7 +104,7 @@ UNITY_DEFINE_INSTANCED_PROP(uint, _NineUniverseMode) UNITY_DEFINE_INSTANCED_PROP(uint, _EnableColorTextureSample) UNITY_DEFINE_INSTANCED_PROP(uint, _LaserCount) - UNITY_DEFINE_INSTANCED_PROP(uint, _EnableOSC) + UNITY_DEFINE_INSTANCED_PROP(uint, _EnableDMX) UNITY_DEFINE_INSTANCED_PROP(float, _Scroll) UNITY_DEFINE_INSTANCED_PROP(float, _XRotation) UNITY_DEFINE_INSTANCED_PROP(float, _YRotation) @@ -208,6 +212,14 @@ //LOCALROTXY IS COMBINED ROTATION } + float GetSpin(uint DMXChannel) + { + float status = getValueAtCoords(DMXChannel, _Udon_DMXGridRenderTexture); + float phase = getValueAtCoordsRaw(DMXChannel, _Udon_DMXGridSpinTimer); + //phase = checkPanInvertY() == 1 ? -phase : phase; + return status > 0.5 ? -phase : phase; + } + v2f vert (appdata v) { v2f o; @@ -217,17 +229,17 @@ UNITY_TRANSFER_INSTANCE_ID(v, o); uint dmx = getDMXChannel(); - o.rgbIntensity.w = getValueAtCoords(dmx + (uint) 10, _OSCGridRenderTexture); - o.rgbIntensity.w = IF(isOSC() > 0, o.rgbIntensity.w, 1); + o.rgbIntensity.w = getValueAtCoords(dmx + (uint) 10, _Udon_DMXGridRenderTexture); + o.rgbIntensity.w = IF(isDMX() > 0, o.rgbIntensity.w, 1); if(getGlobalIntensity() <= 0.01 || getFinalIntensity() <= 0.05 || _UniversalIntensity <= 0.05 || o.rgbIntensity.w <= 0.05) { o.vertex = UnityObjectToClipPos(float4(0,0,0,0)); return o; } - o.panTiltLengthWidth.x = lerp(-90,90,clamp(getValueAtCoords(dmx, _OSCGridRenderTexture), 0.0,0.9999)); // ch 1 - o.panTiltLengthWidth.y = lerp(-90,90,clamp(getValueAtCoords(dmx + (uint) 1, _OSCGridRenderTexture), 0.0,0.9999)); // ch 2 - o.panTiltLengthWidth.z = lerp(-0.5,5,clamp(getValueAtCoords(dmx + (uint) 2, _OSCGridRenderTextureRAW), 0.0,0.9999)); // ch 3 - o.panTiltLengthWidth.w = lerp(-3.75,20,clamp(getValueAtCoords(dmx + (uint) 3, _OSCGridRenderTextureRAW), 0.0,0.9999)); // ch 4 + o.panTiltLengthWidth.x = lerp(-90,90,clamp(getValueAtCoords(dmx, _Udon_DMXGridRenderTextureMovement), 0.0,0.9999)); // ch 1 + o.panTiltLengthWidth.y = lerp(-90,90,clamp(getValueAtCoords(dmx + (uint) 1, _Udon_DMXGridRenderTextureMovement), 0.0,0.9999)); // ch 2 + o.panTiltLengthWidth.z = lerp(-0.5,5,clamp(getValueAtCoords(dmx + (uint) 2, _Udon_DMXGridRenderTexture), 0.0,0.9999)); // ch 3 + o.panTiltLengthWidth.w = lerp(-3.75,20,clamp(getValueAtCoords(dmx + (uint) 3, _Udon_DMXGridRenderTexture), 0.0,0.9999)); // ch 4 @@ -242,22 +254,22 @@ //Cone Length - float length = IF(isOSC() > 0, o.panTiltLengthWidth.z, getConeLength()); + float length = IF(isDMX() > 0, o.panTiltLengthWidth.z, getConeLength()); v.vertex.y = lerp(v.vertex.y, v.vertex.y *2, length); //Cone Width - float width = IF(isOSC() > 0, o.panTiltLengthWidth.w, getConeWidth()); + float width = IF(isDMX() > 0, o.panTiltLengthWidth.w, getConeWidth()); float4 vert = lerp(v.vertex ,float4(v.vertex.xyz + v.normal * width, 1), v.uv2.y); vert.y = v.vertex.y; //Prevent the cone from elongating when changing width. // Cone Flatness for X and Z - float flatness = lerp(0,1.999,getValueAtCoords(dmx+ (uint) 4, _OSCGridRenderTextureRAW)); - flatness = IF(isOSC() > 0, flatness, getConeFlatness()); + float flatness = lerp(0,1.999,getValueAtCoords(dmx+ (uint) 4, _Udon_DMXGridRenderTexture)); + flatness = IF(isDMX() > 0, flatness, getConeFlatness()); vert.z = lerp(vert.z, vert.z/2, flatness); // vert.x = lerp(vert.x, vert.x/2, _XConeFlatness); - float xRot = IF(isOSC() > 0, o.panTiltLengthWidth.x, getPan()); - float yRot = IF(isOSC() > 0, o.panTiltLengthWidth.y, getTilt()); + float xRot = IF(isDMX() > 0, o.panTiltLengthWidth.x, getPan()); + float yRot = IF(isDMX() > 0, o.panTiltLengthWidth.y, getTilt()); vert = CalculateRotations(v, vert, _ZRotation, xRot, yRot); o.viewDir = normalize(wpos - mul(unity_ObjectToWorld, vert).xyz); @@ -265,6 +277,16 @@ o.normal = normalize(mul(float4(v.normal, 0.0), unity_WorldToObject).xyz); o.worldPos = mul(unity_ObjectToWorld, vert); o.vertex = UnityObjectToClipPos(vert); + + o.flatnessBeamCountSpinThickness.x = lerp(0,1.999,getValueAtCoords(dmx+ (uint) 4, _Udon_DMXGridRenderTexture)); //5 + o.flatnessBeamCountSpinThickness.y = lerp(4,68,getValueAtCoords(dmx+ (uint) 5, _Udon_DMXGridRenderTexture));//6 + o.flatnessBeamCountSpinThickness.z = GetSpin(dmx+ (uint) 6) * _ScrollOffset; //7 + o.flatnessBeamCountSpinThickness.w = lerp(0.001, 0.05,getValueAtCoords(dmx+ (uint) 11, _Udon_DMXGridRenderTexture)); //12 + o.rgbIntensity.x = getValueAtCoords(dmx+ (uint) 7, _Udon_DMXGridRenderTexture); //8 + o.rgbIntensity.y = getValueAtCoords(dmx+ (uint) 8, _Udon_DMXGridRenderTexture); //9 + o.rgbIntensity.z = getValueAtCoords(dmx+ (uint) 9, _Udon_DMXGridRenderTexture); //10 + o.rgbIntensity.w = getValueAtCoords(dmx+ (uint) 10, _Udon_DMXGridRenderTexture); //11 + return o; } @@ -274,15 +296,8 @@ UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(i); UNITY_SETUP_INSTANCE_ID(i); uint dmx = getDMXChannel(); - i.flatnessBeamCountSpinThickness.x = lerp(0,1.999,getValueAtCoords(dmx+ (uint) 4, _OSCGridRenderTextureRAW)); //5 - i.flatnessBeamCountSpinThickness.y = lerp(4,68,getValueAtCoords(dmx+ (uint) 5, _OSCGridRenderTextureRAW));//6 - i.flatnessBeamCountSpinThickness.z = lerp(0,1,getValueAtCoords(dmx+ (uint) 6, _OSCGridRenderTextureRAW)); //7 - i.flatnessBeamCountSpinThickness.w = lerp(0.003, 0.1,getValueAtCoords(dmx+ (uint) 11, _OSCGridRenderTextureRAW)); //12 - i.rgbIntensity.x = getValueAtCoords(dmx+ (uint) 7, _OSCGridRenderTextureRAW); //8 - i.rgbIntensity.y = getValueAtCoords(dmx+ (uint) 8, _OSCGridRenderTextureRAW); //9 - i.rgbIntensity.z = getValueAtCoords(dmx+ (uint) 9, _OSCGridRenderTextureRAW); //10 - i.rgbIntensity.w = getValueAtCoords(dmx+ (uint) 10, _OSCGridRenderTextureRAW); //11 - i.rgbIntensity.w = IF(isOSC() > 0, i.rgbIntensity.w, 1); + + i.rgbIntensity.w = IF(isDMX() > 0, i.rgbIntensity.w, 1); if(getGlobalIntensity() <= 0.001 || getFinalIntensity() <= 0.001 || _UniversalIntensity <= 0.001 || i.rgbIntensity.w <= 0.001) { return half4(0,0,0,0); @@ -293,7 +308,7 @@ // fade = pow(fade, pow(_FadeStrength, _FadeAmt)) * fade; // sample the texture float4 dmxcol = float4(i.rgbIntensity.x,i.rgbIntensity.y, i.rgbIntensity.z, _MainColor.a); - float4 actualcolor = IF(isOSC() > 0, dmxcol *_MainColor * getEmissionColor(), _MainColor * getEmissionColor()); + float4 actualcolor = IF(isDMX() > 0, dmxcol *_MainColor * getEmissionColor(), _MainColor * getEmissionColor()); float4 color = lerp(float4(0,0,0,_MainColor.a), actualcolor, getGlobalIntensity()); // float3 newColor = RGB2HSV(color.rgb); // newColor.y -= 0.1; @@ -308,12 +323,12 @@ col *= color; //Draw Beams - float scroll = IF(isOSC() > 0, i.flatnessBeamCountSpinThickness.z, getScrollSpeed()); - laserUV.x = laserUV.x += _Time.y * scroll; - float beamcount = IF(isOSC() > 0, round(i.flatnessBeamCountSpinThickness.y), getLaserCount()); + float scroll = IF(isDMX() > 0, i.flatnessBeamCountSpinThickness.z, getScrollSpeed()); + laserUV.x += _Time.y * scroll; + float beamcount = IF(isDMX() > 0, round(i.flatnessBeamCountSpinThickness.y), getLaserCount()); laserUV.x = frac(laserUV.x * beamcount); laserUV.x = laserUV.x - 0.5; - float thiknes = IF(isOSC() > 0, i.flatnessBeamCountSpinThickness.w, getLaserThickness()); + float thiknes = IF(isDMX() > 0, i.flatnessBeamCountSpinThickness.w, getLaserThickness()); // Transparency (with gradation) @@ -352,7 +367,7 @@ // col = col * col *; // float4 flatCol = col * flatEdgeMask.r; - float flatness = IF(isOSC() > 0, i.flatnessBeamCountSpinThickness.x, getConeFlatness()); + float flatness = IF(isDMX() > 0, i.flatnessBeamCountSpinThickness.x, getConeFlatness()); float4 flatCol = col * edgeMask; col = lerp(flatCol, col, pow(((flatness/2.0) - 1.0)*-1, 0.95)); diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-FixtureMesh.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-FixtureMesh.shader index 199c8be..9ec40c2 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-FixtureMesh.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-FixtureMesh.shader @@ -14,7 +14,7 @@ [Toggle] _EnableStrobe ("Enable Strobe", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 [HideInInspector]_FixtureBaseRotationY("Mover Pan Offset (Blue + Green)", Range(-540,540)) = 0 [HideInInspector]_FixtureRotationX("Mover Tilt Offset (Blue)", Range(-180,180)) = 0 @@ -36,8 +36,8 @@ _ConeSync ("Cone Scale Sync", Range(0,1)) = 0.2 _FixutreIntensityMultiplier ("Intensity Multipler (For Bloom Scaling)", Range(1,100)) = 1 - // _BlockLengthX("OSC Block Base Distance X", Float) = 0.019231 - // _BlockLengthY("OSC Block Base Distance Y", Float) = 0 + // _BlockLengthX("DMX Block Base Distance X", Float) = 0.019231 + // _BlockLengthY("DMX Block Base Distance Y", Float) = 0 // [Enum(UnityEngine.Rendering.BlendMode)] _BlendSrc ("Source Blend mode", Float) = 2 // [Enum(UnityEngine.Rendering.BlendMode)] _BlendDst ("Destination Blend mode", Float) = 1 @@ -49,9 +49,9 @@ _FixtureRotationOrigin("Fixture Pivot Origin", Float) = (0, 0.014709, -1.02868, 0) [Toggle] _UseRawGrid("Use Raw Grid For Light Intensity And Color", Int) = 0 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} - [NoScaleOffset] _OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} - [NoScaleOffset] _OSCGridStrobeTimer ("OSC Grid Render Texture (For Strobe Timings", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTextureMovement("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridStrobeTimer("DMX Grid Render Texture (For Strobe Timings", 2D) = "white" {} _MaxMinPanAngle("Max/Min Pan Angle (-x, x)", Float) = 180 _MaxMinTiltAngle("Max/Min Tilt Angle (-y, y)", Float) = 180 _FixtureMaxIntensity ("Maximum Cone Intensity",Range (0,0.5)) = 0.5 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-ProjectionFrag.cginc b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-ProjectionFrag.cginc index cab05c8..f36ab19 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-ProjectionFrag.cginc +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-ProjectionFrag.cginc @@ -95,7 +95,7 @@ inline float CorrectedLinearEyeDepth(float z, float B) float4 ChooseProjection(float2 uv, float projChooser) { - //float chooser = IF(isOSC() == 1, selection, instancedGOBOSelection()); + //float chooser = IF(isDMX() == 1, selection, instancedGOBOSelection()); float2 addition = float2(0.0, 0.0); uv*= float2(0.25, 0.5); //uv.x+= getOffsetX(); @@ -121,7 +121,7 @@ inline float CorrectedLinearEyeDepth(float z, float B) } float ChooseProjectionScalar(float coneWidth, float projChooser) { - //float chooser = IF(isOSC() == 1, selection, instancedGOBOSelection()); + //float chooser = IF(isDMX() == 1, selection, instancedGOBOSelection()); float result = _ProjectionUVMod; result = IF((projChooser) == 1.0, _ProjectionUVMod, result); #if !defined(WASH) @@ -155,7 +155,7 @@ inline float CorrectedLinearEyeDepth(float z, float B) float gi = getGlobalIntensity(); float fi = getFinalIntensity(); float4 emissionTint = i.emissionColor; - if(((all(i.rgbColor <= float4(0.01,0.01,0.01,1)) || i.intensityStrobeWidth.x <= 0.01) && isOSC() == 1) || gi <= 0.005 || fi <= 0.005 || all(emissionTint <= float4(0.005, 0.005, 0.005, 1))) + if(((all(i.rgbColor <= float4(0.01,0.01,0.01,1)) || i.intensityStrobeWidth.x <= 0.01) && isDMX() == 1) || gi <= 0.005 || fi <= 0.005 || all(emissionTint <= float4(0.005, 0.005, 0.005, 1))) { return half4(0,0,0,0); } @@ -216,7 +216,7 @@ inline float CorrectedLinearEyeDepth(float z, float B) } float distanceFromOrigin = abs(distance(objectOrigin , wpos)); - float projChooser = IF(isOSC() == 1, selection, instancedGOBOSelection()); + float projChooser = IF(isDMX() == 1, selection, instancedGOBOSelection()); //Get distance of intersection from the origin in world space float UVscale = 1/(0 + (distanceFromOrigin * ChooseProjectionScalar(i.intensityStrobeWidth.z, projChooser) + (0 * (distanceFromOrigin * distanceFromOrigin)))); distanceFromOrigin = lerp(distanceFromOrigin*0.6 +0.65,distanceFromOrigin, saturate(i.intensityStrobeWidth.z)); @@ -237,7 +237,7 @@ inline float CorrectedLinearEyeDepth(float z, float B) _SpinSpeed = IF(checkPanInvertY() == 1, -_SpinSpeed, _SpinSpeed); - _SpinSpeed = IF(isOSC() == 1, _SpinSpeed, _SpinSpeed); + _SpinSpeed = IF(isDMX() == 1, _SpinSpeed, _SpinSpeed); // uvCoords = IF(isGOBOSpin() == 1 && projChooser > 1.0, RotateUV(uvCoords, _Time.w * ( 10* _SpinSpeed)), RotateUV(uvCoords, _ProjectionRotation)); uvCoords = IF(isGOBOSpin() == 1 && projChooser > 1.0, RotateUV(uvCoords, degrees(i.goboPlusSpinPanTilt.y)), RotateUV(uvCoords, _ProjectionRotation)); @@ -261,7 +261,7 @@ inline float CorrectedLinearEyeDepth(float z, float B) col = lerp(col, float4(0,0,0,0), clamp(pow(distFromUVOrigin * _ProjectionFade,_ProjectionFadeCurve),0.0,1.0)); float strobe = IF(isStrobe() == 1, i.intensityStrobeWidth.y, 1); - col = IF(isOSC() == 1 & _EnableStaticEmissionColor == 0, col * i.rgbColor, col); + col = IF(isDMX() == 1 & _EnableStaticEmissionColor == 0, col * i.rgbColor, col); //col = IF(_EnableStaticEmissionColor == 1, col * float4(_StaticEmission.r * _RedMultiplier,_StaticEmission.g * _GreenMultiplier,_StaticEmission.b * _BlueMultiplier,_StaticEmission.a), col); 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 85587f3..76ae637 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 @@ -14,7 +14,7 @@ [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 [Toggle] _EnableStrobe ("Enable Strobe", Int) = 0 - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [Toggle] _LegacyGoboRange ("Enable Legacy GOBO Range", Int) = 0 [HideInInspector]_FixtureBaseRotationY("Mover Pan Offset (Blue + Green)", Range(-540,540)) = 0 [HideInInspector]_FixtureRotationX("Mover Tilt Offset (Blue)", Range(-180,180)) = 0 @@ -35,8 +35,8 @@ _ConeWidth("Cone Width", Range(0,5.5)) = 0 _ConeLength("Cone Length", Range(1,10)) = 1 _ConeSync ("Cone Scale Sync", Range(0,1)) = 0.2 - // _BlockLengthX("OSC Block Base Distance X", Float) = 0.019231 - // _BlockLengthY("OSC Block Base Distance Y", Float) = 0 + // _BlockLengthX("DMX Block Base Distance X", Float) = 0.019231 + // _BlockLengthY("DMX Block Base Distance Y", Float) = 0 [Enum(UnityEngine.Rendering.BlendMode)] _BlendSrc ("Source Blend mode", Float) = 2 [Enum(UnityEngine.Rendering.BlendMode)] _BlendDst ("Destination Blend mode", Float) = 1 @@ -48,10 +48,10 @@ _FixtureRotationOrigin("Fixture Pivot Origin", Float) = (0, 0.014709, -1.02868, 0) [Toggle] _UseRawGrid("Use Raw Grid For Light Intensity And Color", Int) = 0 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} - [NoScaleOffset] _OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} - [NoScaleOffset] _OSCGridStrobeTimer ("OSC Grid Render Texture (For Strobe Timings", 2D) = "white" {} - [NoScaleOffset] _OSCGridSpinTimer ("OSC Grid Render Texture (For GOBO Spin Timings", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTextureMovement("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridStrobeTimer("DMX Grid Render Texture (For Strobe Timings", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridSpinTimer("DMX Grid Render Texture (For GOBO Spin Timings", 2D) = "white" {} [Toggle] _EnableAudioReact ("Enable AudioLink Audio React", Int) = 0 [NoScaleOffset] _AudioSpectrum("AudioSpectrum", 2D) = "black" {} _MaxMinPanAngle("Max/Min Pan Angle (-x, x)", Float) = 180 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-Vertex.cginc b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-Vertex.cginc index be703c2..1e61bd1 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-Vertex.cginc +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-Vertex.cginc @@ -296,7 +296,7 @@ v2f vert (appdata v) uint dmx = getDMXChannel(); - float oscConeWidth = getOSCConeWidth(dmx); + float oscConeWidth = getDMXConeWidth(dmx); float oscPanValue = GetPanValue(dmx); float oscTiltValue = GetTiltValue(dmx); v.vertex = CalculateConeWidth(v, v.vertex, oscConeWidth, dmx); @@ -391,16 +391,16 @@ v2f vert (appdata v) //o.viewDir = normalize(mul(UNITY_MATRIX_MV, v.vertex).xyz); // get normalized view dir o.viewDir = normalize(UnityObjectToViewPos(v.vertex.xyz)); o.viewDir /= o.viewDir.z; // rescale vector so z is 1.0 - //GET OSC/DMX VALUES - o.intensityStrobeWidth = float3(GetOSCIntensity(dmx, 1.0), GetStrobeOutput(dmx), oscConeWidth); + //GET DMX/DMX VALUES + o.intensityStrobeWidth = float3(GetDMXIntensity(dmx, 1.0), GetStrobeOutput(dmx), oscConeWidth); #ifdef WASH float spinSpeed = 0.0; #else float spinSpeed = getGoboSpinSpeed(dmx); #endif - o.goboPlusSpinPanTilt = float4(getOSCGoboSelection(dmx), spinSpeed, oscPanValue, oscTiltValue); - o.rgbColor = GetOSCColor(dmx); - if(((all(o.rgbColor <= float4(0.01,0.01,0.01,1)) || o.intensityStrobeWidth.x <= 0.01) && isOSC() == 1) || getGlobalIntensity() <= 0.005 || getFinalIntensity() <= 0.005 || all(o.emissionColor <= float4(0.005, 0.005, 0.005, 1.0))) + o.goboPlusSpinPanTilt = float4(getDMXGoboSelection(dmx), spinSpeed, oscPanValue, oscTiltValue); + o.rgbColor = GetDMXColor(dmx); + if(((all(o.rgbColor <= float4(0.01,0.01,0.01,1)) || o.intensityStrobeWidth.x <= 0.01) && isDMX() == 1) || getGlobalIntensity() <= 0.005 || getFinalIntensity() <= 0.005 || all(o.emissionColor <= float4(0.005, 0.005, 0.005, 1.0))) { v.vertex = float4(0,0,0,0); o.pos = UnityObjectToClipPos(v.vertex); @@ -443,15 +443,15 @@ v2f vert (appdata v) //o.tan = tangent; //o.norm = worldNormal; - //GETTING DATA FROM OSC TEXTURE - o.intensityStrobeGOBOSpinSpeed = float4(GetOSCIntensity(dmx, 1.0),GetStrobeOutput(dmx), getGoboSpinSpeed(dmx), getOSCGoboSelection(dmx)); - o.intensityStrobeGOBOSpinSpeed.x = isOSC() == 1 ? o.intensityStrobeGOBOSpinSpeed.x : 1.0; + //GETTING DATA FROM DMX TEXTURE + o.intensityStrobeGOBOSpinSpeed = float4(GetDMXIntensity(dmx, 1.0),GetStrobeOutput(dmx), getGoboSpinSpeed(dmx), getDMXGoboSelection(dmx)); + o.intensityStrobeGOBOSpinSpeed.x = isDMX() == 1 ? o.intensityStrobeGOBOSpinSpeed.x : 1.0; #if !defined(WASH) - uint gobo = isOSC() > 0 ? ceil(o.intensityStrobeGOBOSpinSpeed.w) : instancedGOBOSelection(); + uint gobo = isDMX() > 0 ? ceil(o.intensityStrobeGOBOSpinSpeed.w) : instancedGOBOSelection(); o.stripeInfo = GetStripeInfo(gobo); #endif - o.rgbColor = GetOSCColor(dmx); - if(((all(o.rgbColor <= float4(0.005,0.005,0.005,1)) || o.intensityStrobeGOBOSpinSpeed.x <= 0.01) && isOSC() == 1) || getGlobalIntensity() <= 0.005 || getFinalIntensity() <= 0.005) + o.rgbColor = GetDMXColor(dmx); + if(((all(o.rgbColor <= float4(0.005,0.005,0.005,1)) || o.intensityStrobeGOBOSpinSpeed.x <= 0.01) && isDMX() == 1) || getGlobalIntensity() <= 0.005 || getFinalIntensity() <= 0.005) { v.vertex = float4(0,0,0,0); o.pos = UnityObjectToClipPos(v.vertex); @@ -470,8 +470,8 @@ v2f vert (appdata v) o.worldPos = mul(unity_ObjectToWorld, v.vertex); o.objPos = v.vertex; o.objNormal = v.normal; - o.intensityStrobe = float2(GetOSCIntensity(dmx, 1.0),GetStrobeOutput(dmx)); - o.rgbColor = GetOSCColor(dmx); + o.intensityStrobe = float2(GetDMXIntensity(dmx, 1.0),GetStrobeOutput(dmx)); + o.rgbColor = GetDMXColor(dmx); o.btn[0] = bitangent; o.btn[1] = tangent; o.btn[2] = worldNormal; diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-VolumetricFrag.cginc b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-VolumetricFrag.cginc index 0acca94..40c00f7 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-VolumetricFrag.cginc +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-VolumetricFrag.cginc @@ -36,7 +36,7 @@ float4 VolumetricLightingBRDF(v2f i, fixed facePos) float gi = getGlobalIntensity(); float fi = getFinalIntensity(); - if(((all(i.rgbColor <= float4(0.005,0.005,0.005,1)) || i.intensityStrobeGOBOSpinSpeed.x <= 0.005) && isOSC() == 1) || gi <= 0.005 || fi <= 0.005) + if(((all(i.rgbColor <= float4(0.005,0.005,0.005,1)) || i.intensityStrobeGOBOSpinSpeed.x <= 0.005) && isDMX() == 1) || gi <= 0.005 || fi <= 0.005) { return half4(0,0,0,0); } @@ -239,7 +239,7 @@ float4 VolumetricLightingBRDF(v2f i, fixed facePos) result *= edgeFade; - if(isOSC() == 1) + if(isDMX() == 1) { result = lerp(fixed4(0,0,0,result.w), (result * i.rgbColor * strobe), i.intensityStrobeGOBOSpinSpeed.x * _FixtureMaxIntensity); result = lerp(half4(0,0,0,result.w), result, i.intensityStrobeGOBOSpinSpeed.x * i.intensityStrobeGOBOSpinSpeed.x * 2); @@ -249,14 +249,14 @@ float4 VolumetricLightingBRDF(v2f i, fixed facePos) result *= strobe; } result *= (_FixtureMaxIntensity - (lerp(0.15, _FixtureMaxIntensity * 0.95, pow(widthNormalized,0.4)))); - // result = isOSC() == 1 ? + // result = isDMX() == 1 ? // lerp(fixed4(0,0,0,result.w), (result * i.rgbColor * strobe), i.intensityStrobeGOBOSpinSpeed.x * _FixtureMaxIntensity) : // result * strobe; - // result = isOSC() == 1 ? + // result = isDMX() == 1 ? // lerp(half4(0,0,0,result.w), result, i.intensityStrobeGOBOSpinSpeed.x * i.intensityStrobeGOBOSpinSpeed.x * 2) : result; - result = (i.intensityStrobeGOBOSpinSpeed.x <= _IntensityCutoff && isOSC() == 1) ? half4(0,0,0,result.w) : result; + result = (i.intensityStrobeGOBOSpinSpeed.x <= _IntensityCutoff && isDMX() == 1) ? half4(0,0,0,result.w) : result; //Fixture lens is now apart of Volumetrics, calculation for lens strenght is here //float maxBrightness = lerp(1.0, _LensMaxBrightness) diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-VolumetricMesh.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-VolumetricMesh.shader index 4dc1984..c256a17 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-VolumetricMesh.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-StandardMover-VolumetricMesh.shader @@ -14,7 +14,7 @@ [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 [Toggle] _EnableStrobe ("Enable Strobe", Int) = 0 - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [Toggle] _EnableExtraChannels ("Enable Cone Length Via DMX", Int) = 0 [HideInInspector]_FixtureBaseRotationY("Mover Pan Offset (Blue + Green)", Range(-540,540)) = 0 [HideInInspector]_FixtureRotationX("Mover Tilt Offset (Blue)", Range(-180,180)) = 0 @@ -35,8 +35,8 @@ _ConeLength("Cone Length", Range(1,10)) = 1 _MaxConeLength("Max Cone Length", Range(1,10)) = 1 _ConeSync ("Cone Scale Sync", Range(0,1)) = 0.2 - // _BlockLengthX("OSC Block Base Distance X", Float) = 0.019231 - // _BlockLengthY("OSC Block Base Distance Y", Float) = 0 + // _BlockLengthX("DMX Block Base Distance X", Float) = 0.019231 + // _BlockLengthY("DMX Block Base Distance Y", Float) = 0 [Enum(UnityEngine.Rendering.BlendMode)] _BlendSrc ("Source Blend mode", Float) = 2 [Enum(UnityEngine.Rendering.BlendMode)] _BlendDst ("Destination Blend mode", Float) = 1 [Enum(UnityEngine.Rendering.BlendOp)] _BlendOp ("Blend Operation", Float) = 0 @@ -48,10 +48,10 @@ _FixtureRotationOrigin("Fixture Pivot Origin", Float) = (0, 0.014709, -1.02868, 0) [Toggle] _UseRawGrid("Use Raw Grid For Light Intensity And Color", Int) = 0 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} - [NoScaleOffset] _OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} - [NoScaleOffset] _OSCGridStrobeTimer ("OSC Grid Render Texture (For Strobe Timings", 2D) = "white" {} - [NoScaleOffset] _OSCGridSpinTimer ("OSC Grid Render Texture (For GOBO Spin Timings", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTextureMovement("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridStrobeTimer("DMX Grid Render Texture (For Strobe Timings", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridSpinTimer("DMX Grid Render Texture (For GOBO Spin Timings", 2D) = "white" {} _MaxMinPanAngle("Max/Min Pan Angle (-x, x)", Float) = 180 _MaxMinTiltAngle("Max/Min Tilt Angle (-y, y)", Float) = 180 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-WashMover-FixtureMesh.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-WashMover-FixtureMesh.shader index dab0573..e565d6a 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-WashMover-FixtureMesh.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-WashMover-FixtureMesh.shader @@ -14,7 +14,7 @@ [Toggle] _EnableStrobe ("Enable Strobe", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 [HideInInspector]_FixtureBaseRotationY("Mover Pan Offset (Blue + Green)", Range(-540,540)) = 0 [HideInInspector]_FixtureRotationX("Mover Tilt Offset (Blue)", Range(-180,180)) = 0 @@ -36,8 +36,8 @@ _ConeSync ("Cone Scale Sync", Range(0,1)) = 0.2 _FixutreIntensityMultiplier ("Intensity Multipler (For Bloom Scaling)", Range(1,10)) = 1 - // _BlockLengthX("OSC Block Base Distance X", Float) = 0.019231 - // _BlockLengthY("OSC Block Base Distance Y", Float) = 0 + // _BlockLengthX("DMX Block Base Distance X", Float) = 0.019231 + // _BlockLengthY("DMX Block Base Distance Y", Float) = 0 // [Enum(UnityEngine.Rendering.BlendMode)] _BlendSrc ("Source Blend mode", Float) = 2 // [Enum(UnityEngine.Rendering.BlendMode)] _BlendDst ("Destination Blend mode", Float) = 1 @@ -49,9 +49,9 @@ _FixtureRotationOrigin("Fixture Pivot Origin", Float) = (0, 0.014709, -1.02868, 0) [Toggle] _UseRawGrid("Use Raw Grid For Light Intensity And Color", Int) = 0 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} - [NoScaleOffset] _OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} - [NoScaleOffset] _OSCGridStrobeTimer ("OSC Grid Render Texture (For Strobe Timings", 2D) = "white" {} + //[NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + //[NoScaleOffset] _Udon_DMXGridRenderTextureMovement("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + //[NoScaleOffset] _Udon_DMXGridStrobeTimer("DMX Grid Render Texture (For Strobe Timings", 2D) = "white" {} _MaxMinPanAngle("Max/Min Pan Angle (-x, x)", Float) = 180 _MaxMinTiltAngle("Max/Min Tilt Angle (-y, y)", Float) = 180 _FixtureMaxIntensity ("Maximum Cone Intensity",Range (0,0.5)) = 0.5 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-WashMover-ProjectionMesh.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-WashMover-ProjectionMesh.shader index 219b75e..e6b152d 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-WashMover-ProjectionMesh.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-WashMover-ProjectionMesh.shader @@ -14,7 +14,7 @@ [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 [Toggle] _EnableStrobe ("Enable Strobe", Int) = 0 - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [Toggle] _LegacyGoboRange ("Enable Legacy GOBO Range", Int) = 0 [HideInInspector]_FixtureBaseRotationY("Mover Pan Offset (Blue + Green)", Range(-540,540)) = 0 [HideInInspector]_FixtureRotationX("Mover Tilt Offset (Blue)", Range(-180,180)) = 0 @@ -35,8 +35,8 @@ _ConeWidth("Cone Width", Range(0,5.5)) = 0 _ConeLength("Cone Length", Range(1,10)) = 1 _ConeSync ("Cone Scale Sync", Range(0,1)) = 0.2 - // _BlockLengthX("OSC Block Base Distance X", Float) = 0.019231 - // _BlockLengthY("OSC Block Base Distance Y", Float) = 0 + // _BlockLengthX("DMX Block Base Distance X", Float) = 0.019231 + // _BlockLengthY("DMX Block Base Distance Y", Float) = 0 [Enum(UnityEngine.Rendering.BlendMode)] _BlendSrc ("Source Blend mode", Float) = 2 [Enum(UnityEngine.Rendering.BlendMode)] _BlendDst ("Destination Blend mode", Float) = 1 @@ -48,10 +48,10 @@ _FixtureRotationOrigin("Fixture Pivot Origin", Float) = (0, 0.014709, -1.02868, 0) [Toggle] _UseRawGrid("Use Raw Grid For Light Intensity And Color", Int) = 0 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} - [NoScaleOffset] _OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} - [NoScaleOffset] _OSCGridStrobeTimer ("OSC Grid Render Texture (For Strobe Timings", 2D) = "white" {} - [NoScaleOffset] _OSCGridSpinTimer ("OSC Grid Render Texture (For GOBO Spin Timings", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTextureMovement("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridStrobeTimer("DMX Grid Render Texture (For Strobe Timings", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridSpinTimer("DMX Grid Render Texture (For GOBO Spin Timings", 2D) = "white" {} [Toggle] _EnableAudioReact ("Enable AudioLink Audio React", Int) = 0 [NoScaleOffset] _AudioSpectrum("AudioSpectrum", 2D) = "black" {} _MaxMinPanAngle("Max/Min Pan Angle (-x, x)", Float) = 180 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-WashMover-VolumetricMesh.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-WashMover-VolumetricMesh.shader index 1d74d33..c166139 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-WashMover-VolumetricMesh.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/MovingLights/VRSL-WashMover-VolumetricMesh.shader @@ -14,7 +14,7 @@ [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 [Toggle] _EnableStrobe ("Enable Strobe", Int) = 0 - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [HideInInspector]_FixtureBaseRotationY("Mover Pan Offset (Blue + Green)", Range(-540,540)) = 0 [HideInInspector]_FixtureRotationX("Mover Tilt Offset (Blue)", Range(-180,180)) = 0 [HideInInspector]_ProjectionSelection ("GOBO Selection", Range(0,6)) = 0 @@ -34,8 +34,8 @@ _ConeLength("Cone Length", Range(1,10)) = 1 _MaxConeLength("Max Cone Length", Range(1,10)) = 1 _ConeSync ("Cone Scale Sync", Range(0,1)) = 0.2 - // _BlockLengthX("OSC Block Base Distance X", Float) = 0.019231 - // _BlockLengthY("OSC Block Base Distance Y", Float) = 0 + // _BlockLengthX("DMX Block Base Distance X", Float) = 0.019231 + // _BlockLengthY("DMX Block Base Distance Y", Float) = 0 [Enum(UnityEngine.Rendering.BlendMode)] _BlendSrc ("Source Blend mode", Float) = 2 [Enum(UnityEngine.Rendering.BlendMode)] _BlendDst ("Destination Blend mode", Float) = 1 [Enum(UnityEngine.Rendering.BlendOp)] _BlendOp ("Blend Operation", Float) = 0 @@ -46,10 +46,10 @@ _FixtureRotationOrigin("Fixture Pivot Origin", Float) = (0, 0.014709, -1.02868, 0) [Toggle] _UseRawGrid("Use Raw Grid For Light Intensity And Color", Int) = 0 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} - [NoScaleOffset] _OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} - [NoScaleOffset] _OSCGridStrobeTimer ("OSC Grid Render Texture (For Strobe Timings", 2D) = "white" {} - [NoScaleOffset] _OSCGridSpinTimer ("OSC Grid Render Texture (For GOBO Spin Timings", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTextureMovement("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridStrobeTimer("DMX Grid Render Texture (For Strobe Timings", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridSpinTimer("DMX Grid Render Texture (For GOBO Spin Timings", 2D) = "white" {} _MaxMinPanAngle("Max/Min Pan Angle (-x, x)", Float) = 180 _MaxMinTiltAngle("Max/Min Tilt Angle (-y, y)", Float) = 180 diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Other.meta similarity index 77% rename from Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental.meta rename to Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Other.meta index 22eaac1..54ac71c 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental.meta +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Other.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8ba4b8979e74b1849aa9f0dce67fd89b +guid: 988053001c1e5c34f927c434979405ab folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Other/GenericUnlitTexture.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Other/GenericUnlitTexture.shader new file mode 100644 index 0000000..5aa86d4 --- /dev/null +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Other/GenericUnlitTexture.shader @@ -0,0 +1,98 @@ +Shader "Unlit/GenericUnlitTexture" +{ + Properties + { + _EmissionMap ("Texture", 2D) = "white" {} + [Toggle(_)]_IsAVProInput("Is AV Pro Input", Int) = 0 + _TargetAspectRatio("Target Aspect Ratio", Float) = 1.7777777 + } + SubShader + { + Tags { "RenderType"="Opaque" } + LOD 100 + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + // make fog work + #pragma multi_compile_fog + + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct v2f + { + float2 uv : TEXCOORD0; + UNITY_FOG_COORDS(1) + float4 vertex : SV_POSITION; + }; + + sampler2D _EmissionMap; + float4 _EmissionMap_ST; + int _IsAVProInput; + float _TargetAspectRatio; + float4 _EmissionMap_TexelSize; + + v2f vert (appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = TRANSFORM_TEX(v.uv, _EmissionMap); + UNITY_TRANSFER_FOG(o,o.vertex); + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + float2 uv = i.uv; + float2 emissionRes = _EmissionMap_TexelSize.zw; + + float currentAspectRatio = emissionRes.x / emissionRes.y; + + float visibility = 1.0; + + // If the aspect ratio does not match the target ratio, then we fit the UVs to maintain the aspect ratio while fitting the range 0-1 + if (abs(currentAspectRatio - _TargetAspectRatio) > 0.001) + { + float2 normalizedVideoRes = float2(emissionRes.x / _TargetAspectRatio, emissionRes.y); + float2 correctiveScale; + + // Find which axis is greater, we will clamp to that + if (normalizedVideoRes.x > normalizedVideoRes.y) + correctiveScale = float2(1, normalizedVideoRes.y / normalizedVideoRes.x); + else + correctiveScale = float2(normalizedVideoRes.x / normalizedVideoRes.y, 1); + + uv = ((uv - 0.5) / correctiveScale) + 0.5; + + // Antialiasing on UV clipping + float2 uvPadding = (1 / emissionRes) * 0.1; + float2 uvfwidth = fwidth(uv.xy); + float2 maxFactor = smoothstep(uvfwidth + uvPadding + 1, uvPadding + 1, uv.xy); + float2 minFactor = smoothstep(-uvfwidth - uvPadding, -uvPadding, uv.xy); + + visibility = maxFactor.x * maxFactor.y * minFactor.x * minFactor.y; + + //if (any(uv <= 0) || any(uv >= 1)) + // return float3(0, 0, 0); + } + // sample the texture + float3 texColor = tex2D(_EmissionMap, _IsAVProInput ? float2(uv.x, 1 - uv.y) : uv).rgb; + + if (_IsAVProInput) + texColor = pow(texColor, 2.2f); + // apply fog + UNITY_APPLY_FOG(i.fogCoord, float4(texColor,1)); + return float4(texColor,1); + } + ENDCG + } + } +} diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/TestAvatarShader.shader.meta b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Other/GenericUnlitTexture.shader.meta similarity index 80% rename from Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/TestAvatarShader.shader.meta rename to Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Other/GenericUnlitTexture.shader.meta index 5a6c8df..a56cff7 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Experimental/AvatarDMXSupport/Content/TestAvatarShader.shader.meta +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Other/GenericUnlitTexture.shader.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5c7bbfccd7987e34cbd3be7802a5949c +guid: d3f1403d8eeadc943ab8db6b21fb67d7 ShaderImporter: externalObjects: {} defaultTextures: [] 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 cc28341..71c6c98 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 @@ -30,10 +30,10 @@ float2 LegacyRead(int channel, int sector) //1 sector is every 13 channels float x = 0.02000; float y = 0.02000; - //TRAVERSING THE Y AXIS OF THE OSC GRID + //TRAVERSING THE Y AXIS OF THE DMX GRID float ymod = floor(sector / 2.0); - //TRAVERSING THE X AXIS OF THE OSC GRID + //TRAVERSING THE X AXIS OF THE DMX GRID float xmod = sector % 2.0; x+= (xmod * 0.50); @@ -49,11 +49,11 @@ float2 LegacyRead(int channel, int sector) float2 IndustryRead(int x, int y) { - float resMultiplierX = (_OSCGridRenderTextureRAW_TexelSize.z / 13); + float resMultiplierX = (_Udon_DMXGridRenderTexture_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.x = ((x * resMultiplierX) * _Udon_DMXGridRenderTexture_TexelSize.x); + xyUV.y = (y * resMultiplierX) * _Udon_DMXGridRenderTexture_TexelSize.y; xyUV.y -= 0.001915; xyUV.x -= 0.015; // xyUV.x = DMXChannel == 15 ? xyUV.x + 0.0769 : xyUV.x; @@ -66,7 +66,7 @@ int getTargetRGBValue(uint universe) //returns 0 for red, 1 for green, 2, for blue } -//function for getting the value on the OSC Grid in the bottom right corner configuration +//function for getting the value on the DMX Grid in the bottom right corner configuration float getValueAtCoords(uint DMXChannel, sampler2D _Tex) { uint universe = ceil(((int) DMXChannel)/512.0); @@ -153,9 +153,9 @@ float getValueAtCoordsRaw(uint DMXChannel, sampler2D _Tex) } #endif -uint isOSC() +uint isDMX() { - return UNITY_ACCESS_INSTANCED_PROP(Props,_EnableOSC); + return UNITY_ACCESS_INSTANCED_PROP(Props,_EnableDMX); } #ifndef LASER uint isStrobe() @@ -207,7 +207,7 @@ float getMaxConeLength(uint DMXChannel) { #ifdef VOLUMETRIC_YES float mcl = UNITY_ACCESS_INSTANCED_PROP(Props, _MaxConeLength); - return isOSC() == 1 && _EnableExtraChannels == 1 ? mcl + (getValueAtCoords(DMXChannel+1, _OSCGridRenderTextureRAW) * 4) : mcl; + return isDMX() == 1 && _EnableExtraChannels == 1 ? mcl + (getValueAtCoords(DMXChannel+1, _Udon_DMXGridRenderTexture) * 4) : mcl; #else return UNITY_ACCESS_INSTANCED_PROP(Props, _MaxConeLength); #endif @@ -226,8 +226,8 @@ float getFinalIntensity() float GetStrobeOutput(uint DMXChannel) { - float phase = getValueAtCoordsRaw(DMXChannel + 6, _OSCGridStrobeTimer); - float status = getValueAtCoords(DMXChannel + 6, _OSCGridRenderTextureRAW); + 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 @@ -236,7 +236,7 @@ float GetStrobeOutput(uint DMXChannel) strobe = IF(status > 0.2, strobe, 1); //minimum channel threshold set //check if we should even be strobing at all. - strobe = IF(isOSC() == 1, strobe, 1); + strobe = IF(isDMX() == 1, strobe, 1); strobe = IF(isStrobe() == 1, strobe, 1); return strobe; @@ -245,8 +245,8 @@ float GetStrobeOutput(uint DMXChannel) float GetStrobeOutputFiveCH(uint DMXChannel) { - float phase = getValueAtCoordsRaw(DMXChannel + 4, _OSCGridStrobeTimer); - float status = getValueAtCoords(DMXChannel + 4, _OSCGridRenderTextureRAW); + 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 @@ -255,13 +255,13 @@ float GetStrobeOutputFiveCH(uint DMXChannel) strobe = IF(status > 0.2, strobe, 1); //minimum channel threshold set //check if we should even be strobing at all. - strobe = IF(isOSC() == 1, strobe, 1); + strobe = IF(isDMX() == 1, strobe, 1); strobe = IF(isStrobe() == 1, strobe, 1); return strobe; } -float getOSCGoboSelection(uint DMXChannel) +float getDMXGoboSelection(uint DMXChannel) { float goboSelect = 30.0; @@ -269,20 +269,16 @@ float getOSCGoboSelection(uint DMXChannel) goboSelect = IF(UNITY_ACCESS_INSTANCED_PROP(Props, _LegacyGoboRange) > 0, 42.5, goboSelect); #endif - uint value = round(((getValueAtCoords(DMXChannel + 11, _OSCGridRenderTextureRAW))*255)/goboSelect); - value = isOSC() > 0.0 ? value : instancedGOBOSelection(); + uint value = round(((getValueAtCoords(DMXChannel + 11, _Udon_DMXGridRenderTexture))*255)/goboSelect); + value = isDMX() > 0.0 ? value : instancedGOBOSelection(); return clamp(value, 1, 8) -0.1; } float getGoboSpinSpeed (uint DMXChannel) { - // float speed = getValueAtCoords(DMXChannel + 10, _OSCGridRenderTextureRAW); - // speed = speed > 0.5 ? -(speed - 0.5) : speed; - // speed = abs(speed) < 0.05 ? 0 : speed; - // return speed * 8; #if defined(PROJECTION_YES) || defined(VOLUMETRIC_YES) - float status = getValueAtCoords(DMXChannel + 10, _OSCGridRenderTextureRAW); - float phase = getValueAtCoordsRaw(DMXChannel + 10, _OSCGridSpinTimer); + float status = getValueAtCoords(DMXChannel + 10, _Udon_DMXGridRenderTexture); + float phase = getValueAtCoordsRaw(DMXChannel + 10, _Udon_DMXGridSpinTimer); phase = checkPanInvertY() == 1 ? -phase : phase; return status > 0.5 ? -phase : phase; #endif @@ -290,52 +286,52 @@ float getGoboSpinSpeed (uint DMXChannel) } //function for getting the Intensity Value (Channel 6) -float GetOSCIntensity(uint DMXChannel, float multiplier) +float GetDMXIntensity(uint DMXChannel, float multiplier) { - return getValueAtCoords(DMXChannel + 5, _OSCGridRenderTextureRAW) * multiplier; + return getValueAtCoords(DMXChannel + 5, _Udon_DMXGridRenderTexture) * multiplier; } //function for getting the Pan Value (Channel 2) float GetFinePanValue(uint DMXChannel) { - return getValueAtCoords(DMXChannel+1, _OSCGridRenderTexture); + return getValueAtCoords(DMXChannel+1, _Udon_DMXGridRenderTextureMovement); } float GetPanValue(uint DMXChannel) { - float inputValue = getValueAtCoords(DMXChannel, _OSCGridRenderTexture); + float inputValue = getValueAtCoords(DMXChannel, _Udon_DMXGridRenderTextureMovement); //inputValue = (inputValue + (GetFinePanValue(DMXChannel) * 0.01)); #if defined(VOLUMETRIC_YES) || defined(PROJECTION_YES) || defined(FIXTURE_EMIT) || defined(FIXTURE_SHADOWCAST) - return IF(isOSC() == 1, ((getMinMaxPan() * 2) * (inputValue)) - getMinMaxPan(), 0.0); + return IF(isDMX() == 1, ((getMinMaxPan() * 2) * (inputValue)) - getMinMaxPan(), 0.0); #else - return IF(isOSC() == 1, ((_MaxMinPanAngle * 2) * (inputValue)) - _MaxMinPanAngle, 0.0); + return IF(isDMX() == 1, ((_MaxMinPanAngle * 2) * (inputValue)) - _MaxMinPanAngle, 0.0); #endif } float GetFineTiltValue(uint DMXChannel) { - return getValueAtCoords(DMXChannel+3, _OSCGridRenderTexture); + return getValueAtCoords(DMXChannel+3, _Udon_DMXGridRenderTextureMovement); } //function for getting the Tilt Value (Channel 3) float GetTiltValue(uint DMXChannel) { - float inputValue = getValueAtCoords(DMXChannel + 2, _OSCGridRenderTexture); + float inputValue = getValueAtCoords(DMXChannel + 2, _Udon_DMXGridRenderTextureMovement); //inputValue = (inputValue + (GetFineTiltValue(DMXChannel) * 0.01)); #if defined(VOLUMETRIC_YES) || defined(PROJECTION_YES) || defined(FIXTURE_EMIT) || defined(FIXTURE_SHADOWCAST) - return IF(isOSC() == 1, ((getMinMaxTilt() * 2) * (inputValue)) - getMinMaxTilt(), 0.0); + return IF(isDMX() == 1, ((getMinMaxTilt() * 2) * (inputValue)) - getMinMaxTilt(), 0.0); #else - return IF(isOSC() == 1, ((_MaxMinTiltAngle * 2) * (inputValue)) - _MaxMinTiltAngle, 0.0); + return IF(isDMX() == 1, ((_MaxMinTiltAngle * 2) * (inputValue)) - _MaxMinTiltAngle, 0.0); #endif } //Function for getting the RGB Color Value (Channels 4, 5, and 6) -float4 GetOSCColor(uint DMXChannel) +float4 GetDMXColor(uint DMXChannel) { - float redchannel = getValueAtCoords(DMXChannel + 7, _OSCGridRenderTextureRAW); - float greenchannel = getValueAtCoords(DMXChannel + 8, _OSCGridRenderTextureRAW); - float bluechannel = getValueAtCoords(DMXChannel + 9, _OSCGridRenderTextureRAW); + float redchannel = getValueAtCoords(DMXChannel + 7, _Udon_DMXGridRenderTexture); + float greenchannel = getValueAtCoords(DMXChannel + 8, _Udon_DMXGridRenderTexture); + float bluechannel = getValueAtCoords(DMXChannel + 9, _Udon_DMXGridRenderTexture); #if defined(PROJECTION_YES) redchannel = redchannel * _RedMultiplier; @@ -344,15 +340,15 @@ float4 GetOSCColor(uint DMXChannel) #endif - //return IF(isOSC() == 1,lerp(fixed4(0,0,0,1), float4(redchannel,greenchannel,bluechannel,1), GetOSCIntensity(DMXChannel, _FixtureMaxIntensity)), float4(redchannel,greenchannel,bluechannel,1) * GetOSCIntensity(DMXChannel, _FixtureMaxIntensity)); - return lerp(fixed4(0,0,0,1), float4(redchannel,greenchannel,bluechannel,1), GetOSCIntensity(DMXChannel, _FixtureMaxIntensity)); + //return IF(isDMX() == 1,lerp(fixed4(0,0,0,1), float4(redchannel,greenchannel,bluechannel,1), GetDMXIntensity(DMXChannel, _FixtureMaxIntensity)), float4(redchannel,greenchannel,bluechannel,1) * GetDMXIntensity(DMXChannel, _FixtureMaxIntensity)); + return lerp(fixed4(0,0,0,1), float4(redchannel,greenchannel,bluechannel,1), GetDMXIntensity(DMXChannel, _FixtureMaxIntensity)); } -float getOSCConeWidth(uint DMXChannel) //Motor Speed Channel// CHANNEL 5 +float getDMXConeWidth(uint DMXChannel) //Motor Speed Channel// CHANNEL 5 { - float inputvalue = getValueAtCoords(DMXChannel + 4, _OSCGridRenderTextureRAW); - float OSCWidth = lerp(0, 5.5, inputvalue) - 1.5; - return IF(isOSC() == 1, OSCWidth, getConeWidth()); + float inputvalue = getValueAtCoords(DMXChannel + 4, _Udon_DMXGridRenderTexture); + float DMXWidth = lerp(0, 5.5, inputvalue) - 1.5; + return IF(isDMX() == 1, DMXWidth, getConeWidth()); } 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 abe63cd..b08ad4a 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 @@ -1,6 +1,6 @@ //MOVER LIGHT SYSTEM DEFINES sampler2D _MainTex; float4 _MainTex_ST; -sampler2D _OSCGridRenderTexture, _OSCGridRenderTextureRAW, _OSCGridStrobeTimer, _OSCGridSpinTimer; +sampler2D _Udon_DMXGridRenderTexture, _Udon_DMXGridRenderTextureMovement, _Udon_DMXGridStrobeTimer, _Udon_DMXGridSpinTimer; //SamplerState sampler_point_repeat; int _IsEven; #if !defined(VOLUMETRIC_YES) && !defined(PROJECTION_YES) @@ -46,7 +46,7 @@ uint _GoboBeamSplitEnable; uniform const half compatSampleYAxis = 0.019231; uniform const half standardSampleYAxis = 0.00762; -uniform float4 _OSCGridRenderTextureRAW_TexelSize; +uniform float4 _Udon_DMXGridRenderTexture_TexelSize; //float _FixtureRotationX; //float _FixtureBaseRotationY; float4 _FixtureRotationOrigin; @@ -60,7 +60,7 @@ float _ProjectionFade, _ProjectionFadeCurve, _ProjectionDistanceFallOff; //float _FinalStrobeFreq, _NewTimer; -// int _EnableOSC; +// int _EnableDMX; // int _EnableStrobe; UNITY_DECLARE_DEPTH_TEXTURE(_CameraDepthTexture); sampler2D _LightMainTex, _ProjectionMainTex; @@ -89,7 +89,7 @@ UNITY_INSTANCING_BUFFER_START(Props) UNITY_DEFINE_INSTANCED_PROP(uint, _NineUniverseMode) UNITY_DEFINE_INSTANCED_PROP(uint, _PanInvert) UNITY_DEFINE_INSTANCED_PROP(uint, _TiltInvert) - UNITY_DEFINE_INSTANCED_PROP(uint, _EnableOSC) + UNITY_DEFINE_INSTANCED_PROP(uint, _EnableDMX) UNITY_DEFINE_INSTANCED_PROP(uint, _EnableStrobe) UNITY_DEFINE_INSTANCED_PROP(uint, _EnableSpin) UNITY_DEFINE_INSTANCED_PROP(float, _StrobeFreq) diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Shared/VRSL-StandardLighting.cginc b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Shared/VRSL-StandardLighting.cginc index 97c4ac9..109a4c2 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Shared/VRSL-StandardLighting.cginc +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/Shared/VRSL-StandardLighting.cginc @@ -17,7 +17,7 @@ float4 CustomStandardLightingBRDF( // { // //Color Light Bulb Itself // float strobe = IF(isStrobe() == 1, GetStrobeOutput(getChannelSectorX()), 1); - // return IF(isOSC() == 1, (getEmissionColor() * GetOSCColor(getChannelSectorX())) * strobe, getEmissionColor() * strobe); + // return IF(isDMX() == 1, (getEmissionColor() * GetDMXColor(getChannelSectorX())) * strobe, getEmissionColor() * strobe); // } if ((((i.uv.x) == 0.9 && (i.uv.y) == 0.9) || (5.0 <= ceil(i.color.g * 10)) <= 7.0 && ceil(i.color.r) != 0 && ceil(i.color.b) != 0)) @@ -104,8 +104,8 @@ float4 CustomStandardLightingBRDF( //Color Light Bulb Itself float strobe = IF(isStrobe() == 1, i.intensityStrobe.y, 1); - float4 emission = IF(isOSC() == 1, (getEmissionColor() * i.rgbColor) * strobe, getEmissionColor() * strobe); - // if((all(i.rgbColor <= float4(0.01,0.01,0.01,1)) || i.intensityStrobe.x <= 0.01) && isOSC() == 1) + float4 emission = IF(isDMX() == 1, (getEmissionColor() * i.rgbColor) * strobe, getEmissionColor() * strobe); + // if((all(i.rgbColor <= float4(0.01,0.01,0.01,1)) || i.intensityStrobe.x <= 0.01) && isDMX() == 1) // { // return float4(lighting, al); // } @@ -113,16 +113,16 @@ float4 CustomStandardLightingBRDF( emission *=(_FixtureMaxIntensity)*1500; emission = clamp(emission, 0, _LensMaxBrightness*100); //lighting += emission; - //lighting = lerp(lighting, emission, GetOSCIntensity(getChannelSectorX(), _FixtureMaxIntensity)); + //lighting = lerp(lighting, emission, GetDMXIntensity(getChannelSectorX(), _FixtureMaxIntensity)); half limit = 0.025; - if((all(i.rgbColor >=half4(limit,limit,limit,1)) || i.intensityStrobe.x >= limit) && isOSC() == 1) + if((all(i.rgbColor >=half4(limit,limit,limit,1)) || i.intensityStrobe.x >= limit) && isDMX() == 1) { float4 potentialBrightness = emission * _FixutreIntensityMultiplier; emission = lerp(emission, potentialBrightness, pow(i.intensityStrobe.x, 1.9)); } else { - if(isOSC() == 1) + if(isDMX() == 1) { emission = half4(0,0,0,1.0f); } @@ -132,11 +132,11 @@ float4 CustomStandardLightingBRDF( emission = lerp((half4(0,0,0,emission.w)), emission, getFinalIntensity()); emission = emission * _UniversalIntensity; //emission = clamp(emission, half4(0,0,0,1), half4(_FixtureMaxIntensity*2,_FixtureMaxIntensity*2,_FixtureMaxIntensity*2,1)); - //lighting = IF(isOSC() == 1, lerp(lighting, emission, pow(0.1, (GetOSCIntensity(sector, _FixtureMaxIntensity)))) ,lighting + emission); + //lighting = IF(isDMX() == 1, lerp(lighting, emission, pow(0.1, (GetDMXIntensity(sector, _FixtureMaxIntensity)))) ,lighting + emission); #ifdef WASH emission = i.uv1.y > 0.0 ? saturate(emission) - 0.25 : emission; #endif - lighting = IF(isOSC() == 1,lerp(lighting, emission, pow(i.intensityStrobe.x, 1.0)), emission); + lighting = IF(isDMX() == 1,lerp(lighting, emission, pow(i.intensityStrobe.x, 1.0)), emission); float lightingAVG = (lighting.x + lighting.y + lighting.z)/3; lighting = lerp(lighting,float3(lightingAVG, lightingAVG, lightingAVG), pow(_Saturation,2)); diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-FlasherFixtureMesh-Defines.cginc b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-FlasherFixtureMesh-Defines.cginc index 4c79fb2..9be757a 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-FlasherFixtureMesh-Defines.cginc +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-FlasherFixtureMesh-Defines.cginc @@ -1,6 +1,6 @@ //MOVER LIGHT SYSTEM DEFINES sampler2D _MainTex; -sampler2D _OSCGridRenderTexture, _OSCGridRenderTextureRAW, _OSCGridStrobeTimer; +sampler2D _Udon_DMXGridRenderTexture, _Udon_DMXGridRenderTextureMovement, _Udon_DMXGridStrobeTimer; //SamplerState sampler_point_repeat; int _IsEven; sampler2D _MetallicGlossMap; @@ -48,11 +48,11 @@ float _ProjectionFade, _ProjectionFadeCurve, _ProjectionDistanceFallOff; uniform const half compatSampleYAxis = 0.019231; uniform const half standardSampleYAxis = 0.00762; -uniform float4 _OSCGridRenderTextureRAW_TexelSize; +uniform float4 _Udon_DMXGridRenderTexture_TexelSize; //float _FinalStrobeFreq, _NewTimer; -// int _EnableOSC; +// int _EnableDMX; // int _EnableStrobe; uint _EnableCompatibilityMode, _EnableVerticalMode; UNITY_DECLARE_DEPTH_TEXTURE(_CameraDepthTexture); @@ -79,7 +79,7 @@ UNITY_INSTANCING_BUFFER_START(Props) UNITY_DEFINE_INSTANCED_PROP(uint, _Channel) UNITY_DEFINE_INSTANCED_PROP(uint, _PanInvert) UNITY_DEFINE_INSTANCED_PROP(uint, _TiltInvert) - UNITY_DEFINE_INSTANCED_PROP(uint, _EnableOSC) + UNITY_DEFINE_INSTANCED_PROP(uint, _EnableDMX) UNITY_DEFINE_INSTANCED_PROP(uint, _EnableStrobe) UNITY_DEFINE_INSTANCED_PROP(uint, _EnableSpin) UNITY_DEFINE_INSTANCED_PROP(float, _StrobeFreq) diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-FlasherStatic-FixtureMesh.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-FlasherStatic-FixtureMesh.shader index d1ead3d..fe8340d 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-FlasherStatic-FixtureMesh.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-FlasherStatic-FixtureMesh.shader @@ -4,7 +4,7 @@ { //[Header (INSTANCED PROPERITES)] _Sector ("DMX Fixture Number/Sector (Per 13 Channels)", Int) = 0 - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [Toggle] _NineUniverseMode ("Extended Universe Mode", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 @@ -21,7 +21,7 @@ _CurveMod ("Light Intensity Curve Modifier", Range (-3,8)) = 5.0 // _EmissionMask ("Emission Mask", 2D) = "white" {} _FixtureMaxIntensity ("Maximum Light Intensity",Range (0,15)) = 1 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} } SubShader { @@ -50,11 +50,11 @@ #include "../Shared/VRSL-DMXFunctions.cginc" // float GetTextureSampleScrollValue(uint dmx) // { - // return getValueAtCoords(0.960, standardSampleYAxis, dmx, _OSCGridRenderTextureRAW); + // return getValueAtCoords(0.960, standardSampleYAxis, dmx, _Udon_DMXGridRenderTexture); // } float GetChannelIntensity(uint DMXChannel) { - float value = getValueAtCoords(DMXChannel, _OSCGridRenderTextureRAW); + float value = getValueAtCoords(DMXChannel, _Udon_DMXGridRenderTexture); value = IF(value <= 0.1, 0.0, value); return value; } @@ -65,13 +65,13 @@ void surf (Input IN, inout SurfaceOutputStandard o) { uint dmx = getDMXChannel(); - float4 OSCcol = float4(0,0,0,0); - float4 col = IF(isOSC() == 1, GetChannelIntensity(dmx) * getEmissionColor(), getEmissionColor()); + float4 DMXcol = float4(0,0,0,0); + float4 col = IF(isDMX() == 1, GetChannelIntensity(dmx) * getEmissionColor(), getEmissionColor()); fixed4 c = tex2D (_MainTex, IN.uv_MainTex) * _Color; half4 e = col; o.Albedo = c.rgb; o.Normal = UnpackNormal (tex2D (_NormalMap, IN.uv_NormalMap)); - //e = IF(isOSC() == 1,lerp(half4(-_CurveMod,-_CurveMod,-_CurveMod,1), e, pow(GetOSCIntensity(dmx, 1.0), 1.0)), e); + //e = IF(isDMX() == 1,lerp(half4(-_CurveMod,-_CurveMod,-_CurveMod,1), e, pow(GetDMXIntensity(dmx, 1.0), 1.0)), e); e = clamp(e, half4(0,0,0,1), half4(_FixtureMaxIntensity*2,_FixtureMaxIntensity*2,_FixtureMaxIntensity*2,1)); float2 maskUVs = float2(IN.uv_MainTex.x + (_Time.y * _ScrollIncrement), IN.uv_MainTex.y); float mask = IF(IN.uv_MainTex.y > 0.5, 1, 0); diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-FlasherStatic-LensFlare.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-FlasherStatic-LensFlare.shader index 2b35ab3..89a6f5c 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-FlasherStatic-LensFlare.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-FlasherStatic-LensFlare.shader @@ -2,7 +2,7 @@ { Properties { - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [Toggle] _NineUniverseMode ("Extended Universe Mode", Int) = 0 _FinalIntensity("Final Intensity", Range(0,1)) = 1 _GlobalIntensity("Global Intensity", Range(0,1)) = 1 @@ -18,9 +18,9 @@ _Channel ("Individual Channel", Int) = 0 _FixtureMaxIntensity ("Maximum Light Intensity",Range (0,15)) = 1 [Toggle] _UseRawGrid("Use Raw Grid For Light Intensity", Int) = 0 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} - [NoScaleOffset] _OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} - [NoScaleOffset] _OSCGridStrobeTimer ("OSC Grid Render Texture (For Strobe Timings", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTextureMovement("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridStrobeTimer("DMX Grid Render Texture (For Strobe Timings", 2D) = "white" {} _CurveMod ("Light Intensity Curve Modifier", Range (-3,8)) = 5.0 [Toggle] _EnableStrobe ("Enable Strobe", Int) = 0 @@ -28,7 +28,7 @@ [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 _FixutreIntensityMultiplier ("Intensity Multipler (For Bloom Scaling)", Range(1,150)) = 1 _RemoveTextureArtifact("RemoveTextureArtifact", Range(0,0.1)) = 0 @@ -177,7 +177,7 @@ } float4 GetChannelIntensity(uint _DMXChannel) { - float value = getValueAtCoords(_DMXChannel, _OSCGridRenderTextureRAW); + float value = getValueAtCoords(_DMXChannel, _Udon_DMXGridRenderTexture); value = IF(value <= 0.1, 0.0, value); return value; } @@ -191,8 +191,8 @@ UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); //Insert uint dmx = getDMXChannel(); - float4 OSCcol = float4(0,0,0,0); - float4 col = IF(isOSC() == 1, GetChannelIntensity(dmx) * getEmissionColor(), getEmissionColor()); + float4 DMXcol = float4(0,0,0,0); + float4 col = IF(isDMX() == 1, GetChannelIntensity(dmx) * getEmissionColor(), getEmissionColor()); half4 e = col; e = clamp(e, half4(0,0,0,1), half4(_FixtureMaxIntensity*2,_FixtureMaxIntensity*2,_FixtureMaxIntensity*2,1)); e*= _FixutreIntensityMultiplier; diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-FixtureMesh-Defines.cginc b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-FixtureMesh-Defines.cginc index f0c0963..16a8d19 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-FixtureMesh-Defines.cginc +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-FixtureMesh-Defines.cginc @@ -1,6 +1,6 @@ //MOVER LIGHT SYSTEM DEFINES sampler2D _MainTex; -sampler2D _OSCGridRenderTexture, _OSCGridRenderTextureRAW, _OSCGridStrobeTimer; +sampler2D _Udon_DMXGridRenderTexture, _Udon_DMXGridRenderTextureMovement, _Udon_DMXGridStrobeTimer; //SamplerState sampler_point_repeat; int _IsEven; sampler2D _MetallicGlossMap; @@ -48,11 +48,11 @@ float _ProjectionFade, _ProjectionFadeCurve, _ProjectionDistanceFallOff; uniform const half compatSampleYAxis = 0.019231; uniform const half standardSampleYAxis = 0.00762; -uniform float4 _OSCGridRenderTextureRAW_TexelSize; +uniform float4 _Udon_DMXGridRenderTexture_TexelSize; //float _FinalStrobeFreq, _NewTimer; -// int _EnableOSC; +// int _EnableDMX; // int _EnableStrobe; uint _EnableCompatibilityMode, _EnableVerticalMode; UNITY_DECLARE_DEPTH_TEXTURE(_CameraDepthTexture); @@ -77,7 +77,7 @@ UNITY_INSTANCING_BUFFER_START(Props) UNITY_DEFINE_INSTANCED_PROP(uint, _NineUniverseMode) UNITY_DEFINE_INSTANCED_PROP(uint, _PanInvert) UNITY_DEFINE_INSTANCED_PROP(uint, _TiltInvert) - UNITY_DEFINE_INSTANCED_PROP(uint, _EnableOSC) + UNITY_DEFINE_INSTANCED_PROP(uint, _EnableDMX) UNITY_DEFINE_INSTANCED_PROP(uint, _EnableStrobe) UNITY_DEFINE_INSTANCED_PROP(uint, _EnableSpin) UNITY_DEFINE_INSTANCED_PROP(float, _StrobeFreq) diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-FixtureMesh.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-FixtureMesh.shader index ec2155b..47e653d 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-FixtureMesh.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-FixtureMesh.shader @@ -7,13 +7,13 @@ [Toggle] _NineUniverseMode ("Extended Universe Mode", Int) = 0 [Toggle] _EnableStrobe ("Enable Strobe", Int) = 0 - //[HideInInspector][Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + //[HideInInspector][Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [HideInInspector]_StrobeFreq("Strobe Frequency", Range(0,25)) = 1 [HideInInspector][Toggle] _EnableSpin("Enable Auto Spinning", Float) = 0 [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 _FixutreIntensityMultiplier ("Intensity Multipler (For Bloom Scaling)", Range(1,15)) = 1 _Color ("Color", Color) = (1,1,1,1) _MainTex ("Albedo (RGB)", 2D) = "white" {} @@ -28,9 +28,9 @@ _EmissionMask ("Emission Mask", 2D) = "white" {} _FixtureMaxIntensity ("Maximum Light Intensity",Range (0,15)) = 1 [Toggle] _UseRawGrid("Use Raw Grid For Light Intensity", Int) = 0 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} - [NoScaleOffset] _OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} - [NoScaleOffset] _OSCGridStrobeTimer ("OSC Grid Render Texture (For Strobe Timings", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTextureMovement("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridStrobeTimer("DMX Grid Render Texture (For Strobe Timings", 2D) = "white" {} //[NoScaleOffset] _SceneAlbedo ("Scene Albedo Render Texture", 2D) = "white" {} } SubShader @@ -71,16 +71,16 @@ uint dmx = getDMXChannel(); float strobe = IF(isStrobe() == 1, GetStrobeOutput(dmx), 1); - float4 OSCcol = getEmissionColor(); - OSCcol *= GetOSCColor(dmx); - float4 col = IF(isOSC() == 1, OSCcol, getEmissionColor()); + float4 DMXcol = getEmissionColor(); + DMXcol *= GetDMXColor(dmx); + float4 col = IF(isDMX() == 1, DMXcol, getEmissionColor()); // Albedo comes from a texture tinted by color fixed4 c = tex2D (_MainTex, IN.uv_MainTex) * _Color; half4 e = col * strobe; o.Albedo = c.rgb; o.Normal = UnpackNormal (tex2D (_NormalMap, IN.uv_NormalMap)); - e = IF(isOSC() == 1,lerp(half4(-_CurveMod,-_CurveMod,-_CurveMod,1), e, pow(GetOSCIntensity(dmx, 1.0), 1.0)), e); + e = IF(isDMX() == 1,lerp(half4(-_CurveMod,-_CurveMod,-_CurveMod,1), e, pow(GetDMXIntensity(dmx, 1.0), 1.0)), e); e = clamp(e, half4(0,0,0,1), half4(_FixtureMaxIntensity*2,_FixtureMaxIntensity*2,_FixtureMaxIntensity*2,1)); e *= tex2D(_EmissionMask, IN.uv_MainTex).r; e*= _FixutreIntensityMultiplier; diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-LensFlare-5CH.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-LensFlare-5CH.shader index 3ae2c50..43f8c8e 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-LensFlare-5CH.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-LensFlare-5CH.shader @@ -2,7 +2,7 @@ { Properties { - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [Toggle] _NineUniverseMode ("Extended Universe Mode", Int) = 0 _FinalIntensity("Final Intensity", Range(0,1)) = 1 _GlobalIntensity("Global Intensity", Range(0,1)) = 1 @@ -17,9 +17,9 @@ _DMXChannel ("DMX Fixture Number/Sector (Per 13 Channels)", Int) = 0 _FixtureMaxIntensity ("Maximum Light Intensity",Range (0,15)) = 1 [Toggle] _UseRawGrid("Use Raw Grid For Light Intensity", Int) = 0 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} - [NoScaleOffset] _OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} - [NoScaleOffset] _OSCGridStrobeTimer ("OSC Grid Render Texture (For Strobe Timings", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTextureMovement("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridStrobeTimer("DMX Grid Render Texture (For Strobe Timings", 2D) = "white" {} _CurveMod ("Light Intensity Curve Modifier", Range (-3,8)) = 5.0 [Toggle] _EnableStrobe ("Enable Strobe", Int) = 0 @@ -27,7 +27,7 @@ [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 _FixutreIntensityMultiplier ("Intensity Multipler (For Bloom Scaling)", Range(1,150)) = 1 _RemoveTextureArtifact("RemoveTextureArtifact", Range(0,0.1)) = 0 @@ -173,11 +173,11 @@ uint dmx = getDMXChannel(); float strobe = IF(isStrobe() == 1, GetStrobeOutputFiveCH(dmx), 1); - float4 OSCcol = getEmissionColor(); - OSCcol *= float4(getValueAtCoords(dmx+1, _OSCGridRenderTextureRAW), getValueAtCoords(dmx+2, _OSCGridRenderTextureRAW), getValueAtCoords(dmx+3, _OSCGridRenderTextureRAW), 1); - float4 coll = IF(isOSC() == 1, OSCcol, getEmissionColor()); + float4 DMXcol = getEmissionColor(); + DMXcol *= float4(getValueAtCoords(dmx+1, _Udon_DMXGridRenderTexture), getValueAtCoords(dmx+2, _Udon_DMXGridRenderTexture), getValueAtCoords(dmx+3, _Udon_DMXGridRenderTexture), 1); + float4 coll = IF(isDMX() == 1, DMXcol, getEmissionColor()); half4 e = coll * strobe; - e = IF(isOSC() == 1,lerp(half4(-_CurveMod,-_CurveMod,-_CurveMod,1), e, pow(getValueAtCoords(dmx, _OSCGridRenderTextureRAW), 1.0)), e); + e = IF(isDMX() == 1,lerp(half4(-_CurveMod,-_CurveMod,-_CurveMod,1), e, pow(getValueAtCoords(dmx, _Udon_DMXGridRenderTexture), 1.0)), e); e = clamp(e, half4(0,0,0,1), half4(_FixtureMaxIntensity*2,_FixtureMaxIntensity*2,_FixtureMaxIntensity*2,1)); e*= _FixutreIntensityMultiplier; e = float4(((e.rgb * _FixtureMaxIntensity) * getGlobalIntensity()) * getFinalIntensity(), e.w); diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-LensFlare.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-LensFlare.shader index 14a4128..a67f6cd 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-LensFlare.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-LensFlare.shader @@ -2,7 +2,7 @@ { Properties { - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [Toggle] _NineUniverseMode ("Extended Universe Mode", Int) = 0 _FinalIntensity("Final Intensity", Range(0,1)) = 1 _GlobalIntensity("Global Intensity", Range(0,1)) = 1 @@ -17,9 +17,9 @@ _DMXChannel ("DMX Fixture Number/Sector (Per 13 Channels)", Int) = 0 _FixtureMaxIntensity ("Maximum Light Intensity",Range (0,15)) = 1 [Toggle] _UseRawGrid("Use Raw Grid For Light Intensity", Int) = 0 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} - [NoScaleOffset] _OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} - [NoScaleOffset] _OSCGridStrobeTimer ("OSC Grid Render Texture (For Strobe Timings", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTextureMovement("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridStrobeTimer("DMX Grid Render Texture (For Strobe Timings", 2D) = "white" {} _CurveMod ("Light Intensity Curve Modifier", Range (-3,8)) = 5.0 [Toggle] _EnableStrobe ("Enable Strobe", Int) = 0 @@ -27,7 +27,7 @@ [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 _FixutreIntensityMultiplier ("Intensity Multipler (For Bloom Scaling)", Range(1,150)) = 1 _RemoveTextureArtifact("RemoveTextureArtifact", Range(0,0.1)) = 0 @@ -179,11 +179,11 @@ uint dmx = getDMXChannel(); float strobe = IF(isStrobe() == 1, GetStrobeOutput(dmx), 1); - float4 OSCcol = getEmissionColor(); - OSCcol *= GetOSCColor(dmx); - float4 coll = IF(isOSC() == 1, OSCcol, getEmissionColor()); + float4 DMXcol = getEmissionColor(); + DMXcol *= GetDMXColor(dmx); + float4 coll = IF(isDMX() == 1, DMXcol, getEmissionColor()); half4 e = coll * strobe; - e = IF(isOSC() == 1,lerp(half4(-_CurveMod,-_CurveMod,-_CurveMod,1), e, pow(GetOSCIntensity(dmx, 1.0), 1.0)), e); + e = IF(isDMX() == 1,lerp(half4(-_CurveMod,-_CurveMod,-_CurveMod,1), e, pow(GetDMXIntensity(dmx, 1.0), 1.0)), e); e = clamp(e, half4(0,0,0,1), half4(_FixtureMaxIntensity*2,_FixtureMaxIntensity*2,_FixtureMaxIntensity*2,1)); e*= _FixutreIntensityMultiplier; e = float4(((e.rgb * _FixtureMaxIntensity) * getGlobalIntensity()) * getFinalIntensity(), e.w); diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-ProjectionFrag.cginc b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-ProjectionFrag.cginc index 6989ada..6543b6c 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-ProjectionFrag.cginc +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-ProjectionFrag.cginc @@ -34,12 +34,12 @@ float fi = i.globalFinalIntensity.y; float4 emissionTint = i.emissionColor; #ifdef FIVECH - if(((all(i.rgbColor <= float4(0.01,0.01,0.01,1)) || i.intensityStrobe.x <= 0.01) && isOSC() == 1) || gi <= 0.005 || fi <= 0.005 || all(emissionTint <= float4(0.005, 0.005, 0.005, 1.0))) + if(((all(i.rgbColor <= float4(0.01,0.01,0.01,1)) || i.intensityStrobe.x <= 0.01) && isDMX() == 1) || gi <= 0.005 || fi <= 0.005 || all(emissionTint <= float4(0.005, 0.005, 0.005, 1.0))) { return float4(0,0,0,0); } #else - if(((all(i.rgbColor <= float4(0.05,0.05,0.05,1)) || i.intensityStrobe.x <= 0.05) && isOSC() == 1) || gi <= 0.005 || fi <= 0.005 || all(emissionTint <= float4(0.005, 0.005, 0.005, 1.0))) + if(((all(i.rgbColor <= float4(0.05,0.05,0.05,1)) || i.intensityStrobe.x <= 0.05) && isDMX() == 1) || gi <= 0.005 || fi <= 0.005 || all(emissionTint <= float4(0.005, 0.005, 0.005, 1.0))) { return float4(0,0,0,0); } @@ -118,9 +118,9 @@ float strobe = IF(isStrobe() == 1, i.intensityStrobe.y, 1); - float4 OSCcol = col; - OSCcol *= i.rgbColor; - col = IF(isOSC() == 1, OSCcol, col); + float4 DMXcol = col; + DMXcol *= i.rgbColor; + col = IF(isDMX() == 1, DMXcol, col); float4 result = ((col * UVscale * _ProjectionMaxIntensity) * emissionTint) * strobe; diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-ProjectionMesh-5CH.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-ProjectionMesh-5CH.shader index 30265af..b9b7d34 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-ProjectionMesh-5CH.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-ProjectionMesh-5CH.shader @@ -13,12 +13,12 @@ [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [Enum(UnityEngine.Rendering.BlendMode)] _BlendSrc ("Source Blend mode", Float) = 2 [Enum(UnityEngine.Rendering.BlendMode)] _BlendDst ("Destination Blend mode", Float) = 1 [Enum(UnityEngine.Rendering.BlendOp)] _BlendOp ("Blend Operation", Float) = 0 - // _BlockLengthX("OSC Block Base Distance X", Float) = 0.019231 - // _BlockLengthY("OSC Block Base Distance Y", Float) = 0 + // _BlockLengthX("DMX Block Base Distance X", Float) = 0.019231 + // _BlockLengthY("DMX Block Base Distance Y", Float) = 0 [HideInInspector]_StrobeFreq("Strobe Frequency", Range(0,25)) = 1 //[Header(LIGHTING CONTROLS)] @@ -29,9 +29,9 @@ _FixtureMaxIntensity ("Maximum Light Intensity",Range (0,6)) = 1 [Toggle] _UseRawGrid("Use Raw Grid For Light Intensity", Int) = 0 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} - [NoScaleOffset] _OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} - [NoScaleOffset] _OSCGridStrobeTimer ("OSC Grid Render Texture (For Strobe Timings", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTextureMovement("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridStrobeTimer("DMX Grid Render Texture (For Strobe Timings", 2D) = "white" {} //[NoScaleOffset] _SceneAlbedo ("Scene Albedo Render Texture", 2D) = "white" {} @@ -180,8 +180,8 @@ // UNITY_TRANSFER_INSTANCE_ID(v, o); uint dmx = getDMXChannel(); - o.intensityStrobe = float2(getValueAtCoords(dmx, _OSCGridRenderTextureRAW),GetStrobeOutputFiveCH(dmx)); - o.rgbColor = float4(getValueAtCoords(dmx+1, _OSCGridRenderTextureRAW), getValueAtCoords(dmx+2, _OSCGridRenderTextureRAW), getValueAtCoords(dmx+3, _OSCGridRenderTextureRAW), 1); + o.intensityStrobe = float2(getValueAtCoords(dmx, _Udon_DMXGridRenderTexture),GetStrobeOutputFiveCH(dmx)); + o.rgbColor = float4(getValueAtCoords(dmx+1, _Udon_DMXGridRenderTexture), getValueAtCoords(dmx+2, _Udon_DMXGridRenderTexture), getValueAtCoords(dmx+3, _Udon_DMXGridRenderTexture), 1); o.rgbColor *= o.intensityStrobe.x; o.emissionColor = getEmissionColor(); o.globalFinalIntensity.x = getGlobalIntensity(); @@ -205,7 +205,7 @@ o.worldDirection.xyz = o.worldPos.xyz - _WorldSpaceCameraPos; // pack correction factor into direction w component to save space o.worldDirection.w = dot(o.pos, CalculateFrustumCorrection()); - if(((all(o.rgbColor <= float4(0.01,0.01,0.01,1)) || o.intensityStrobe.x <= 0.01) && isOSC() == 1) || o.globalFinalIntensity.x <= 0.005 || o.globalFinalIntensity.y <= 0.005 || all(o.emissionColor <= float4(0.005, 0.005, 0.005, 1.0))) + if(((all(o.rgbColor <= float4(0.01,0.01,0.01,1)) || o.intensityStrobe.x <= 0.01) && isDMX() == 1) || o.globalFinalIntensity.x <= 0.005 || o.globalFinalIntensity.y <= 0.005 || all(o.emissionColor <= float4(0.005, 0.005, 0.005, 1.0))) { v.vertex = float4(0,0,0,0); o.pos = UnityObjectToClipPos(v.vertex); diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-ProjectionMesh.shader b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-ProjectionMesh.shader index f4d0eda..68a1573 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-ProjectionMesh.shader +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/StaticLights/VRSL-StaticLight-ProjectionMesh.shader @@ -12,12 +12,12 @@ [Toggle] _EnableCompatibilityMode ("Enable Compatibility Mode", Int) = 0 [Toggle] _EnableVerticalMode ("Enable Vertical Mode", Int) = 0 - [Toggle] _EnableOSC ("Enable Stream OSC/DMX Control", Int) = 0 + [Toggle] _EnableDMX ("Enable Stream DMX/DMX Control", Int) = 0 [Enum(UnityEngine.Rendering.BlendMode)] _BlendSrc ("Source Blend mode", Float) = 2 [Enum(UnityEngine.Rendering.BlendMode)] _BlendDst ("Destination Blend mode", Float) = 1 [Enum(UnityEngine.Rendering.BlendOp)] _BlendOp ("Blend Operation", Float) = 0 - // _BlockLengthX("OSC Block Base Distance X", Float) = 0.019231 - // _BlockLengthY("OSC Block Base Distance Y", Float) = 0 + // _BlockLengthX("DMX Block Base Distance X", Float) = 0.019231 + // _BlockLengthY("DMX Block Base Distance Y", Float) = 0 [HideInInspector]_StrobeFreq("Strobe Frequency", Range(0,25)) = 1 //[Header(LIGHTING CONTROLS)] @@ -28,9 +28,9 @@ _FixtureMaxIntensity ("Maximum Light Intensity",Range (0,6)) = 1 [Toggle] _UseRawGrid("Use Raw Grid For Light Intensity", Int) = 0 - [NoScaleOffset] _OSCGridRenderTextureRAW("OSC Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} - [NoScaleOffset] _OSCGridRenderTexture("OSC Grid Render Texture (To Control Lights)", 2D) = "white" {} - [NoScaleOffset] _OSCGridStrobeTimer ("OSC Grid Render Texture (For Strobe Timings", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTexture("DMX Grid Render Texture (RAW Unsmoothed)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridRenderTextureMovement("DMX Grid Render Texture (To Control Lights)", 2D) = "white" {} + // [NoScaleOffset] _Udon_DMXGridStrobeTimer("DMX Grid Render Texture (For Strobe Timings", 2D) = "white" {} //[NoScaleOffset] _SceneAlbedo ("Scene Albedo Render Texture", 2D) = "white" {} @@ -178,8 +178,8 @@ // UNITY_TRANSFER_INSTANCE_ID(v, o); uint dmx = getDMXChannel(); - o.intensityStrobe = float2(GetOSCIntensity(dmx, 1.0),GetStrobeOutput(dmx)); - o.rgbColor = GetOSCColor(dmx); + o.intensityStrobe = float2(GetDMXIntensity(dmx, 1.0),GetStrobeOutput(dmx)); + o.rgbColor = GetDMXColor(dmx); o.emissionColor = getEmissionColor(); o.globalFinalIntensity.x = getGlobalIntensity(); o.globalFinalIntensity.y = getFinalIntensity(); @@ -202,7 +202,7 @@ o.worldDirection.xyz = o.worldPos.xyz - _WorldSpaceCameraPos; // pack correction factor into direction w component to save space o.worldDirection.w = dot(o.pos, CalculateFrustumCorrection()); - if(((all(o.rgbColor <= float4(0.05,0.05,0.05,1)) || o.intensityStrobe.x <= 0.05) && isOSC() == 1) || o.globalFinalIntensity.x <= 0.005 || o.globalFinalIntensity.y <= 0.005 || all(o.emissionColor <= float4(0.005, 0.005, 0.005, 1.0))) + if(((all(o.rgbColor <= float4(0.05,0.05,0.05,1)) || o.intensityStrobe.x <= 0.05) && isDMX() == 1) || o.globalFinalIntensity.x <= 0.005 || o.globalFinalIntensity.y <= 0.005 || all(o.emissionColor <= float4(0.005, 0.005, 0.005, 1.0))) { v.vertex = float4(0,0,0,0); o.pos = UnityObjectToClipPos(v.vertex); 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 c6b0570..30051e2 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/VRSLDMX.cginc +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Shaders/VRSLDMX.cginc @@ -9,9 +9,10 @@ UNITY_INSTANCING_BUFFER_START(Props) UNITY_DEFINE_INSTANCED_PROP(uint, _EnableStrobe) UNITY_INSTANCING_BUFFER_END(Props) -sampler2D _DMXGridRenderTexture; -uniform float4 _DMXGridRenderTexture_TexelSize; -sampler2D _DMXGridStrobeTimer, _DMXGridSpinTimer; +sampler2D _Udon_DMXGridRenderTexture; +uniform float4 _Udon_DMXGridRenderTexture_TexelSize; +sampler2D _Udon_DMXGridStrobeTimer, _Udon_DMXGridSpinTimer; +uniform float4 _Udon_DMXGridStrobeTimer_TexelSize, _Udon_DMXGridSpinTimer_TexelSize; uint _EnableCompatibilityMode, _EnableVerticalMode; float invLerp(float from, float to, float value) @@ -89,11 +90,11 @@ float2 LegacyRead(int channel, int sector) float2 IndustryRead(int x, int y) { - float resMultiplierX = (_DMXGridRenderTexture_TexelSize.z / 13); + float resMultiplierX = (_Udon_DMXGridRenderTexture_TexelSize.z / 13); float2 xyUV = float2(0.0,0.0); - xyUV.x = ((x * resMultiplierX) * _DMXGridRenderTexture_TexelSize.x); - xyUV.y = (y * resMultiplierX) * _DMXGridRenderTexture_TexelSize.y; + xyUV.x = ((x * resMultiplierX) * _Udon_DMXGridRenderTexture_TexelSize.x); + xyUV.y = (y * resMultiplierX) * _Udon_DMXGridRenderTexture_TexelSize.y; xyUV.y -= 0.001915; xyUV.x -= 0.015; // xyUV.x = DMXChannel == 15 ? xyUV.x + 0.0769 : xyUV.x; @@ -187,8 +188,8 @@ float ReadDMXRaw(uint DMXChannel, sampler2D _Tex) float GetStrobeOutput(uint DMXChannel) { - float phase = ReadDMXRaw(DMXChannel, _DMXGridStrobeTimer); - float status = ReadDMX(DMXChannel, _DMXGridRenderTexture); + float phase = ReadDMXRaw(DMXChannel, _Udon_DMXGridStrobeTimer); + float status = ReadDMX(DMXChannel, _Udon_DMXGridRenderTexture); half strobe = (sin(phase));//Get sin wave strobe = IF(strobe > 0.0, 1.0, 0.0);//turn to square wave @@ -207,9 +208,9 @@ float GetStrobeOutput(uint DMXChannel) //Function for getting the RGB Color Value (Channels 4, 5, and 6) float4 GetDMXColor(uint DMXChannel) { - float redchannel = ReadDMX(DMXChannel, _DMXGridRenderTexture); - float greenchannel = ReadDMX(DMXChannel + 1, _DMXGridRenderTexture); - float bluechannel = ReadDMX(DMXChannel + 2, _DMXGridRenderTexture); + float redchannel = ReadDMX(DMXChannel, _Udon_DMXGridRenderTexture); + float greenchannel = ReadDMX(DMXChannel + 1, _Udon_DMXGridRenderTexture); + float bluechannel = ReadDMX(DMXChannel + 2, _Udon_DMXGridRenderTexture); #if defined(PROJECTION_YES) redchannel = redchannel * _RedMultiplier; diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/AudioLink/rt_AudioLink_VRSL_Interpolation.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/AudioLink/rt_AudioLink_VRSL_Interpolation.asset index cd24f46..7bed7d2 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/AudioLink/rt_AudioLink_VRSL_Interpolation.asset +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/AudioLink/rt_AudioLink_VRSL_Interpolation.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-Color+Intensity-Horizontal.asset b/Packages/com.acchosen.vr-stage-lighting/Runtime/Textures/RTs/DMXRTViewer-Interpolated-Color+Intensity-Horizontal.asset index 4891bd1..362e886 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: 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 7bcbbe5..c026f25 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: 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 6fed95a..06ac055 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: 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 04bf0ac..55ff584 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: 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 c6775ee..682d08b 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: 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 b6736ce..5f99f6a 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: 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 3a96fd6..9b02cf3 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: 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 d8faef0..750e6d4 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: 2 + m_UpdateMode: 1 m_InitializationMode: 0 m_UpdateZoneSpace: 0 m_CurrentUpdateZoneSpace: 0 diff --git a/uDesktopDuplication.log b/uDesktopDuplication.log index b2235f5..0a00f85 100644 --- a/uDesktopDuplication.log +++ b/uDesktopDuplication.log @@ -1,29 +1,36 @@ -[uDD::Log][2022-11-23 09:30:58] Start -[uDD::Log][2022-11-23 09:30:58] OS Version : 10.0 -[uDD::Log][2022-11-23 09:30:58] Build Number : 19045 -[uDD::Log][2022-11-23 09:30:58] Service Pack : -[uDD::Log][2022-11-23 09:30:58] Graphics Card [0] : NVIDIA GeForce RTX 3090 -[uDD::Log][2022-11-23 09:30:58] > Monitor[0] : \\.\DISPLAY3 -[uDD::Log][2022-11-23 09:30:58] > Monitor[1] : \\.\DISPLAY1 -[uDD::Log][2022-11-23 09:30:58] > Monitor[2] : \\.\DISPLAY2 -[uDD::Log][2022-11-23 09:30:58] Graphics Card [1] : Microsoft Basic Render Driver -[uDD::Log][2022-11-23 09:30:58] Monitor::Initialized() => -[uDD::Log][2022-11-23 09:30:58] ID : 0 -[uDD::Log][2022-11-23 09:30:58] Size : (3840, 2160) -[uDD::Log][2022-11-23 09:30:58] DPI : (157, 160) -[uDD::Log][2022-11-23 09:30:58] Rot : Landscape -[uDD::Log][2022-11-23 09:30:58] Duplicator::Initialize() => OK. -[uDD::Err][2022-11-23 09:30:58] Monitor::Initialize() => GetDpiForMonitor() failed. -[uDD::Log][2022-11-23 09:30:58] Monitor::Initialized() => -[uDD::Log][2022-11-23 09:30:58] ID : 1 -[uDD::Log][2022-11-23 09:30:58] Size : (1920, 1080) -[uDD::Log][2022-11-23 09:30:58] DPI : (0, 0) -[uDD::Log][2022-11-23 09:30:58] Rot : Landscape -[uDD::Log][2022-11-23 09:30:58] Duplicator::Initialize() => OK. -[uDD::Log][2022-11-23 09:30:58] Monitor::Initialized() => -[uDD::Log][2022-11-23 09:30:58] ID : 2 -[uDD::Log][2022-11-23 09:30:58] Size : (1920, 1080) -[uDD::Log][2022-11-23 09:30:58] DPI : (81, 81) -[uDD::Log][2022-11-23 09:30:58] Rot : Landscape -[uDD::Log][2022-11-23 09:30:58] Duplicator::Initialize() => OK. -[uDD::Log][2022-11-23 09:31:03] Stop +[uDD::Log][2023-02-14 14:14:38] Start +[uDD::Log][2023-02-14 14:14:38] OS Version : 10.0 +[uDD::Log][2023-02-14 14:14:38] Build Number : 19045 +[uDD::Log][2023-02-14 14:14:38] Service Pack : +[uDD::Log][2023-02-14 14:14:38] Graphics Card [0] : NVIDIA GeForce RTX 3090 +[uDD::Log][2023-02-14 14:14:38] > Monitor[0] : \\.\DISPLAY2 +[uDD::Log][2023-02-14 14:14:38] > Monitor[1] : \\.\DISPLAY1 +[uDD::Log][2023-02-14 14:14:38] > Monitor[2] : \\.\DISPLAY3 +[uDD::Log][2023-02-14 14:14:38] > Monitor[3] : \\.\DISPLAY4 +[uDD::Log][2023-02-14 14:14:38] Graphics Card [1] : Microsoft Basic Render Driver +[uDD::Log][2023-02-14 14:14:38] Monitor::Initialized() => +[uDD::Log][2023-02-14 14:14:38] ID : 0 +[uDD::Log][2023-02-14 14:14:38] Size : (3840, 2160) +[uDD::Log][2023-02-14 14:14:38] DPI : (157, 160) +[uDD::Log][2023-02-14 14:14:38] Rot : Landscape +[uDD::Log][2023-02-14 14:14:38] Duplicator::Initialize() => OK. +[uDD::Log][2023-02-14 14:14:38] Monitor::Initialized() => +[uDD::Log][2023-02-14 14:14:38] ID : 1 +[uDD::Log][2023-02-14 14:14:38] Size : (1920, 1080) +[uDD::Log][2023-02-14 14:14:38] DPI : (81, 81) +[uDD::Log][2023-02-14 14:14:38] Rot : Landscape +[uDD::Log][2023-02-14 14:14:38] Duplicator::Initialize() => OK. +[uDD::Log][2023-02-14 14:14:38] Monitor::Initialized() => +[uDD::Log][2023-02-14 14:14:38] ID : 2 +[uDD::Log][2023-02-14 14:14:38] Size : (1920, 1080) +[uDD::Log][2023-02-14 14:14:38] DPI : (88, 88) +[uDD::Log][2023-02-14 14:14:38] Rot : Landscape +[uDD::Log][2023-02-14 14:14:38] Duplicator::Initialize() => OK. +[uDD::Err][2023-02-14 14:14:38] Monitor::Initialize() => GetDpiForMonitor() failed. +[uDD::Log][2023-02-14 14:14:38] Monitor::Initialized() => +[uDD::Log][2023-02-14 14:14:38] ID : 3 +[uDD::Log][2023-02-14 14:14:38] Size : (1920, 1080) +[uDD::Log][2023-02-14 14:14:38] DPI : (0, 0) +[uDD::Log][2023-02-14 14:14:38] Rot : Landscape +[uDD::Log][2023-02-14 14:14:38] Duplicator::Initialize() => OK. +[uDD::Log][2023-02-14 14:14:57] Stop