VRChat Creator Companion VPM Update

- Restructured file system to be VPM compatible
- Added stencil mask prefabs.
- Added audiolink 0.3.0 support.
- Added audiolink theme color support.

CHANGELOG.md

@@ -0,0 +1,18 @@
+# VR Stage Lighting - Changelog
+## v2.2.0 - November 30th, 2022
+### New Features
+- Created this changelog!
+- VR Stage Lighting is now a VPM package to be used with the VRChat creator companion. This is now the officially supported way of installing VR Stage Lighting.
+- Added scene based depth light dependency toggle in control panel. Allows VR Stage Lighting shaders to become "Quest Compatible" by removing the reliance on the depth texture to function. This feature is also functional with PC.
+- Added scene based 3D noise toggle in control panel. Allows ability to toggle the 3D and 2D noise features of volumetric shaders to reduce overhead on the fragment shaders. Useful for improving performance on Quest.
+- Added support for AudioLink Theme Colors on all audiolink compatible lights.
+- Added color chord support for audiolink disco ball.
+- Added VRSL Stencil Masks. These 3D meshs will block or "mask" any and all VRSL projection and volumetric shaders. This is useful for preventing VRSL lights from leaking into adjacent rooms and hallways.
+
+### Changes and Bugfixes
+- This version of VRSL now requires AudioLink 0.3.0 or newer.
+- Fixed the audiolink washlight volumetric from clipping into the fixture.
+- Added a proper spawn button for the "VRSL Edition" of the AudioLink Prefab.
+
+
+

CHANGELOG.md.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f8bbdcad4b336f54c9a7f317e47257e5
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Editor.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e76abdaadaf4d854ca3e597f2769f7c3
+guid: 435bc749c8f099b409956fa004727890
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Editor/Scripts.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d22f06c38609ed84d94b0da883aa80de
+guid: 5e584f4447c54b9428042d679908b6e9
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Editor/Scripts/Resources.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: def30e3b1b908334fadf0b515b956a0a
+guid: 121833ff7c66a194ab23aada7ca18cf0
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Editor/Scripts/VRSLInspector.cs

@@ -172,6 +172,8 @@ public class VRSLInspector : ShaderGUI
     MaterialProperty _TextureColorSampleY = null;
     MaterialProperty _SamplingTexture = null;
     MaterialProperty _EnableColorTextureSample = null;
+    MaterialProperty _EnableThemeColorSampling = null;
+    MaterialProperty _ThemeColorTarget = null;
 
 
 
@@ -327,8 +329,10 @@ public class VRSLInspector : ShaderGUI
                 matEditor.ShaderProperty(_NumBands, new GUIContent("Number of Bands", "The number of frequency bands the texture supports."));
                 matEditor.ShaderProperty(_Delay, new GUIContent("Delay", "How much delay between each sample"));
                 matEditor.ShaderProperty(_BandMultiplier, new GUIContent("Band Multiplier", "The frequency band to sample from"));
-                if(!isDiscoBall)
-                    matEditor.ShaderProperty(_EnableColorChord, new GUIContent("Enable Color Chord", "Enables or disables Color Chord tinting. \nThis will tint the final color of the light after texture tinting."));
+                //if(!isDiscoBall)
+                matEditor.ShaderProperty(_EnableColorChord, new GUIContent("Enable Color Chord", "Enables or disables Color Chord tinting. \nThis will tint the final color of the light after texture tinting."));
+                matEditor.ShaderProperty(_EnableThemeColorSampling, new GUIContent("Enable Theme Color Sampling", "Enables or disables AudioLink Theme Color Sampling. \nThis will tint the final color of the light after texture tinting."));
+                matEditor.ShaderProperty(_ThemeColorTarget, new GUIContent("Theme Color Target", "Choose which theme color to sample from."));
                 EditorGUI.indentLevel--;
                 GUILayout.Space(5);
             }

Editor/Scripts/VRSLStyles.cs

@@ -9,7 +9,7 @@ public class VRSLStyles : MonoBehaviour
 {
     public static Texture logo = Resources.Load("VRStageLighting-Logo") as Texture;
 
-    public static string ver = "VR Stage Lighting ver:" + " <b><color=#6a15ce> 2.1</color></b>";
+    public static string ver = "VR Stage Lighting ver:" + " <b><color=#6a15ce> 2.2</color></b>";
 
     public static void DepthPassWarning()
     {

Editor/Scripts/VRSL_ManagerWindow.cs

@@ -285,7 +285,9 @@ class AudioLinkListItem
     private float Z_finalIntensity; public float P_finalIntensity;
     private Color Z_lightColorTint; public Color P_lightColorTint;
     private bool Z_enableColorTextureSampling; public bool P_enableColorTextureSampling;
+    private bool Z_enableThemeColorSampling; public bool P_enableThemeColorSampling;
     private Vector2 Z_textureSamplingCoordinates; public Vector2 P_textureSamplingCoordinates;
+    private int Z_themeColorTarget; public int P_themeColorTarget;
     private Transform Z_targetToFollow; public Transform P_targetToFollow;
     private float Z_spinSpeed; public float P_spinSpeed;
     private bool Z_enableAutoSpin; public bool P_enableAutoSpin;
@@ -317,6 +319,8 @@ class AudioLinkListItem
         Z_lightColorTint = P_lightColorTint = this.light.LightColorTint;
         Z_enableColorTextureSampling = P_enableColorTextureSampling = this.light.ColorTextureSampling;
         Z_textureSamplingCoordinates = P_textureSamplingCoordinates = this.light.TextureSamplingCoordinates;
+        Z_enableThemeColorSampling = P_enableThemeColorSampling = this.light.ThemeColorSampling;
+        Z_themeColorTarget = P_themeColorTarget = this.light.ThemeColorTarget;
         Z_targetToFollow = P_targetToFollow = this.light.targetToFollow;
         Z_spinSpeed = P_spinSpeed = this.light.SpinSpeed;
         Z_enableAutoSpin = P_enableAutoSpin =  this.light.ProjectionSpin;
@@ -342,6 +346,8 @@ class AudioLinkListItem
         Z_lightColorTint = P_lightColorTint = this.laser.LightColorTint;
         Z_enableColorTextureSampling = P_enableColorTextureSampling = this.laser.ColorTextureSampling;
         Z_textureSamplingCoordinates = P_textureSamplingCoordinates = this.laser.TextureSamplingCoordinates;
+        Z_enableThemeColorSampling = P_enableThemeColorSampling = this.laser.ThemeColorSampling;
+        Z_themeColorTarget = P_themeColorTarget = this.laser.ThemeColorTarget;
         Z_coneFlatness = P_coneFlatness = this.laser.ConeFlatness;
         Z_coneXRotation = P_coneXRotation =  this.laser.ConeXRotation;
         Z_coneYRotation = P_coneYRotation = this.laser.ConeYRotation;
@@ -381,6 +387,8 @@ class AudioLinkListItem
         light.LightColorTint = P_lightColorTint = Z_lightColorTint;
         light.ColorTextureSampling = P_enableColorTextureSampling = Z_enableColorTextureSampling;
         light.TextureSamplingCoordinates = P_textureSamplingCoordinates = Z_textureSamplingCoordinates;
+        light.ThemeColorSampling = P_enableThemeColorSampling = Z_enableThemeColorSampling;
+        light.ThemeColorTarget = P_themeColorTarget = Z_themeColorTarget;
         light.targetToFollow = P_targetToFollow = Z_targetToFollow;
         light.ProjectionSpin = P_enableAutoSpin = Z_enableAutoSpin;
         light.SpinSpeed = P_spinSpeed = Z_spinSpeed;
@@ -421,6 +429,8 @@ class AudioLinkListItem
         laser.LightColorTint = P_lightColorTint = Z_lightColorTint;
         laser.ColorTextureSampling = P_enableColorTextureSampling = Z_enableColorTextureSampling;
         laser.TextureSamplingCoordinates = P_textureSamplingCoordinates = Z_textureSamplingCoordinates;
+        laser.ThemeColorSampling = P_enableThemeColorSampling = Z_enableThemeColorSampling;
+        laser.ThemeColorTarget = P_themeColorTarget = Z_themeColorTarget;
         laser.ConeXRotation = P_coneXRotation = Z_coneXRotation;
         laser.ConeYRotation = P_coneYRotation = Z_coneYRotation;
         laser.ConeZRotation = P_coneZRotation = Z_coneZRotation;
@@ -450,6 +460,8 @@ class AudioLinkListItem
         so.FindProperty("lightColorTint").colorValue = P_lightColorTint;
         so.FindProperty("enableColorTextureSampling").boolValue = P_enableColorTextureSampling;
         so.FindProperty("textureSamplingCoordinates").vector2Value = P_textureSamplingCoordinates;
+        so.FindProperty("enableThemeColorSampling").boolValue = P_enableThemeColorSampling;
+        so.FindProperty("themeColorTarget").intValue = P_themeColorTarget;
         so.FindProperty("targetToFollow").objectReferenceValue = P_targetToFollow;
         so.FindProperty("enableAutoSpin").boolValue = P_enableAutoSpin;
         so.FindProperty("spinSpeed").floatValue = P_spinSpeed;
@@ -476,6 +488,8 @@ class AudioLinkListItem
         light.LightColorTint = Z_lightColorTint = P_lightColorTint;
         light.ColorTextureSampling = Z_enableColorTextureSampling = P_enableColorTextureSampling;
         light.TextureSamplingCoordinates = Z_textureSamplingCoordinates = P_textureSamplingCoordinates;
+        light.ThemeColorSampling = Z_enableThemeColorSampling = P_enableThemeColorSampling;
+        light.ThemeColorTarget = Z_themeColorTarget = P_themeColorTarget;
         light.targetToFollow = Z_targetToFollow = P_targetToFollow;
         light.ProjectionSpin = Z_enableAutoSpin = P_enableAutoSpin;
         light.SpinSpeed = Z_spinSpeed = P_spinSpeed;
@@ -505,6 +519,8 @@ class AudioLinkListItem
         so.FindProperty("lightColorTint").colorValue = P_lightColorTint;
         so.FindProperty("enableColorTextureSampling").boolValue = P_enableColorTextureSampling;
         so.FindProperty("textureSamplingCoordinates").vector2Value = P_textureSamplingCoordinates;
+        so.FindProperty("enableThemeColorSampling").boolValue = P_enableThemeColorSampling;
+        so.FindProperty("themeColorTarget").intValue = P_themeColorTarget;
 
         so.FindProperty("coneXRotation").floatValue = P_coneXRotation;
         so.FindProperty("coneYRotation").floatValue = P_coneYRotation;
@@ -534,6 +550,8 @@ class AudioLinkListItem
         laser.LightColorTint = Z_lightColorTint = P_lightColorTint;
         laser.ColorTextureSampling = Z_enableColorTextureSampling = P_enableColorTextureSampling;
         laser.TextureSamplingCoordinates = Z_textureSamplingCoordinates = P_textureSamplingCoordinates;
+        laser.ThemeColorSampling = Z_enableThemeColorSampling = P_enableThemeColorSampling;
+        laser.ThemeColorTarget = Z_themeColorTarget = P_themeColorTarget;
 
         laser.ConeXRotation = Z_coneXRotation = P_coneXRotation;
         laser.ConeYRotation = Z_coneYRotation = P_coneYRotation;
@@ -569,7 +587,7 @@ class VRSL_ManagerWindow : EditorWindow {
     static float tiltRangeOff = -180f;
     public static Texture logo, github, twitter, discord;
     public bool legacyFixtures;
-    public static string ver = "VR Stage Lighting ver:" + " <b><color=#6a15ce> 2.1</color></b>";
+    public static string ver = "VR Stage Lighting ver:" + " <b><color=#6a15ce> 2.2</color></b>";
 
     public static bool hasLocalPanel, hasDepthLight;
     private static VRSL_LocalUIControlPanel panel;
@@ -591,8 +609,8 @@ class VRSL_ManagerWindow : EditorWindow {
     private string[] dmxModes = new string[]{"Horizontal", "Vertical", "Legacy"};
     private string [] dmxGizmoInfo = new string[]{"None", "Channel Only", "Universe + Channel"};
     private static UnityEngine.Object controlPanelUiPrefab, directionalLightPrefab, uDesktopHorizontalPrefab, uDesktopVerticalPrefab, uDesktopLegacyPrefab, uVidHorizontalPrefab, uVidVerticalPrefab, uVidLegacyPrefab,
-    audioLinkPrefab, audioLinkControllerPrefab, standardAudioLinkControllerPrefab, oscGridReaderHorizontalPrefab, oscGridReaderVerticalPrefab;
-    private static bool dmxSpawnsFoldout, audioLinkSpawnsFoldout, mainOptionsFoldout;
+    audioLinkPrefab, audioLinkControllerPrefab, standardAudioLinkControllerPrefab, oscGridReaderHorizontalPrefab, oscGridReaderVerticalPrefab, audioLinkVRSLPrefab, cubeMask, cylinderMask, capsuleMask, sphereMask;
+    private static bool dmxSpawnsFoldout, audioLinkSpawnsFoldout, mainOptionsFoldout, stencilFoldout;
     Vector2 dmxScrollPos, audioLinkScrollPos, mainScrollPos;
     private static bool dmxHover, audioLinkHover;
     private static bool last9UniverseStatus;
@@ -663,96 +681,134 @@ class VRSL_ManagerWindow : EditorWindow {
     static bool LoadPrefabs()
     {
         bool result = true;
-        string controlPanelPath = "Assets/VR-Stage-Lighting/Prefabs/VRSL-LocalUIControlPanel.prefab";
-        string directionalLightPath = "Assets/VR-Stage-Lighting/Prefabs/Directional Light (For Depth).prefab";
-        string udeskHorizontalPath = "Assets/VR-Stage-Lighting/Prefabs/DMX/Horizontal Mode/DMX Reader Screens/VRSL-DMX-uDesktopDuplicationReaderScreen-Horizontal.prefab";
-        string udeskVerticalPath = "Assets/VR-Stage-Lighting/Prefabs/DMX/Vertical Mode/DMX Reader Screens/VRSL-DMX-uDesktopDuplicationReaderScreen-Vertical.prefab";
-        string udeskLegacyPath = "Assets/VR-Stage-Lighting/Prefabs/DMX/Legacy Mode/DMX Reader Screens/VRSL-DMX-uDesktopDuplicationReader-Legacy.prefab";
-        string vidHorizontalPath = "Assets/VR-Stage-Lighting/Prefabs/DMX/Horizontal Mode/DMX Reader Screens/VRSL-DMX-USharpVideoReaderScreen-Horizontal.prefab";
-        string vidVerticalPath = "Assets/VR-Stage-Lighting/Prefabs/DMX/Vertical Mode/DMX Reader Screens/VRSL-DMX-USharpVideoReaderScreen-Vertical.prefab";
-        string vidLegacyPath = "Assets/VR-Stage-Lighting/Prefabs/DMX/Legacy Mode/DMX Reader Screens/VRSL-DMX-USharpVideoReaderScreen-Legacy.prefab";
-        string audioLinkPath = "Assets/AudioLink/Audiolink.prefab";
-        string audioLinkControllerPath = "Assets/VR-Stage-Lighting/Prefabs/AudioLink/VRSL-AudioLinkControllerWithSmoothing/AudioLinkController-WithVRSLSmoothing.prefab";
-        string standardAudioLinkControllerPath = "Assets/AudioLink/AudioLinkController.prefab";
-        string oscGridReadHPath = "Assets/VR-Stage-Lighting/Prefabs/DMX/GridReader/VRSL-DMX-TekOSCGridReader-H.prefab";
-        string oscGridReadVPath = "Assets/VR-Stage-Lighting/Prefabs/DMX/GridReader/VRSL-DMX-TekOSCGridReader-V.prefab";
-        controlPanelUiPrefab = AssetDatabase.LoadAssetAtPath(controlPanelPath, typeof(GameObject));
-        directionalLightPrefab = AssetDatabase.LoadAssetAtPath(directionalLightPath, typeof(GameObject));
-        oscGridReaderHorizontalPrefab = AssetDatabase.LoadAssetAtPath(oscGridReadHPath, typeof(GameObject));
-        oscGridReaderVerticalPrefab = AssetDatabase.LoadAssetAtPath(oscGridReadVPath, typeof(GameObject));
-        uDesktopHorizontalPrefab = AssetDatabase.LoadAssetAtPath(udeskHorizontalPath, typeof(GameObject));
-        uDesktopVerticalPrefab = AssetDatabase.LoadAssetAtPath(udeskVerticalPath, typeof(GameObject));
-        uDesktopLegacyPrefab = AssetDatabase.LoadAssetAtPath(udeskLegacyPath, typeof(GameObject));
-        uVidHorizontalPrefab = AssetDatabase.LoadAssetAtPath(vidHorizontalPath, typeof(GameObject));
-        uVidVerticalPrefab = AssetDatabase.LoadAssetAtPath(vidVerticalPath, typeof(GameObject));
-        uVidLegacyPrefab = AssetDatabase.LoadAssetAtPath(vidLegacyPath, typeof(GameObject));
-        audioLinkPrefab = AssetDatabase.LoadAssetAtPath(audioLinkPath, typeof(GameObject));
-        audioLinkControllerPrefab = AssetDatabase.LoadAssetAtPath(audioLinkControllerPath, typeof(GameObject));
-        standardAudioLinkControllerPrefab = AssetDatabase.LoadAssetAtPath(standardAudioLinkControllerPath, typeof(GameObject));
+        // string controlPanelPath = "Assets/VR-Stage-Lighting/Runtime/Prefabs/VRSL-LocalUIControlPanel.prefab";
+        // string directionalLightPath = "Assets/VR-Stage-Lighting/Runtime/Prefabs/Directional Light (For Depth).prefab";
+        // string udeskHorizontalPath = "Assets/VR-Stage-Lighting/Runtime/Prefabs/DMX/Horizontal Mode/DMX Reader Screens/VRSL-DMX-uDesktopDuplicationReaderScreen-Horizontal.prefab";
+        // string udeskVerticalPath = "Assets/VR-Stage-Lighting/Runtime/Prefabs/DMX/Vertical Mode/DMX Reader Screens/VRSL-DMX-uDesktopDuplicationReaderScreen-Vertical.prefab";
+        // string udeskLegacyPath = "Assets/VR-Stage-Lighting/Runtime/Prefabs/DMX/Legacy Mode/DMX Reader Screens/VRSL-DMX-uDesktopDuplicationReader-Legacy.prefab";
+        // string vidHorizontalPath = "Assets/VR-Stage-Lighting/Runtime/Prefabs/DMX/Horizontal Mode/DMX Reader Screens/VRSL-DMX-USharpVideoReaderScreen-Horizontal.prefab";
+        // string vidVerticalPath = "Assets/VR-Stage-Lighting/Runtime/Prefabs/DMX/Vertical Mode/DMX Reader Screens/VRSL-DMX-USharpVideoReaderScreen-Vertical.prefab";
+        // string vidLegacyPath = "Assets/VR-Stage-Lighting/Runtime/Prefabs/DMX/Legacy Mode/DMX Reader Screens/VRSL-DMX-USharpVideoReaderScreen-Legacy.prefab";
+        // string audioLinkPath = "Assets/AudioLink/Audiolink.prefab";
+        // string audioLinkPathAlt = "Packages/com.llealloo.audiolink/Runtime/Audiolink.prefab";
+        // string audioLinkControllerPath = "Assets/VR-Stage-Lighting/Runtime/Prefabs/AudioLink/VRSL-AudioLinkControllerWithSmoothing/AudioLinkController-WithVRSLSmoothing.prefab";
+        // string standardAudioLinkControllerPath = "Assets/AudioLink/AudioLinkController.prefab";
+        // string standardAudioLinkControllerPathAlt = "Packages/com.llealloo.audiolink/Runtime/AudioLinkController.prefab";
+        // string oscGridReadHPath = "Assets/VR-Stage-Lighting/Runtime/Prefabs/DMX/GridReader/VRSL-DMX-TekOSCGridReader-H.prefab";
+        // string oscGridReadVPath = "Assets/VR-Stage-Lighting/Runtime/Prefabs/DMX/GridReader/VRSL-DMX-TekOSCGridReader-V.prefab";
+        // controlPanelUiPrefab = AssetDatabase.LoadAssetAtPath(controlPanelPath, typeof(GameObject));
+        // directionalLightPrefab = AssetDatabase.LoadAssetAtPath(directionalLightPath, typeof(GameObject));
+        // oscGridReaderHorizontalPrefab = AssetDatabase.LoadAssetAtPath(oscGridReadHPath, typeof(GameObject));
+        // oscGridReaderVerticalPrefab = AssetDatabase.LoadAssetAtPath(oscGridReadVPath, typeof(GameObject));
+        // uDesktopHorizontalPrefab = AssetDatabase.LoadAssetAtPath(udeskHorizontalPath, typeof(GameObject));
+        // uDesktopVerticalPrefab = AssetDatabase.LoadAssetAtPath(udeskVerticalPath, typeof(GameObject));
+        // uDesktopLegacyPrefab = AssetDatabase.LoadAssetAtPath(udeskLegacyPath, typeof(GameObject));
+        // uVidHorizontalPrefab = AssetDatabase.LoadAssetAtPath(vidHorizontalPath, typeof(GameObject));
+        // uVidVerticalPrefab = AssetDatabase.LoadAssetAtPath(vidVerticalPath, typeof(GameObject));
+        // uVidLegacyPrefab = AssetDatabase.LoadAssetAtPath(vidLegacyPath, typeof(GameObject));
+        // audioLinkPrefab = AssetDatabase.LoadAssetAtPath(audioLinkPath, typeof(GameObject));
+        // audioLinkControllerPrefab = AssetDatabase.LoadAssetAtPath(audioLinkControllerPath, typeof(GameObject));
+        // standardAudioLinkControllerPrefab = AssetDatabase.LoadAssetAtPath(standardAudioLinkControllerPath, typeof(GameObject));
+        controlPanelUiPrefab = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath("dedfba01424b93148b3d9a42e95ed2f7"), typeof(GameObject));
+        directionalLightPrefab = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath("dc2b8d13712a0f3488413e49afae73ef"), typeof(GameObject));
+        oscGridReaderHorizontalPrefab = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath("f37d8aba2d9398d4aa2fc86f7d8c0cd4"), typeof(GameObject));
+        oscGridReaderVerticalPrefab = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath("2ed7323806c632f4294ff51d8af9a2b2"), typeof(GameObject));
+        uDesktopHorizontalPrefab = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath("d8bedad6090068740a8d3d9de3c84ea4"), typeof(GameObject));
+        uDesktopVerticalPrefab = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath("b55309c416955b044a48bbced977331d"), typeof(GameObject));
+        uDesktopLegacyPrefab = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath("a6013d8268c98274386159517c50aa09"), typeof(GameObject));
+        uVidHorizontalPrefab = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath("e62fe963d8da32147bbd2f1caa73a0de"), typeof(GameObject));
+        uVidVerticalPrefab = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath("91a099dcf3cff864a9bc08584904554a"), typeof(GameObject));
+        uVidLegacyPrefab = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath("dd476adc52e8f374da7dd7e4e9274f71"), typeof(GameObject));
+        audioLinkPrefab = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath("8c1f201f848804f42aa401d0647f8902"), typeof(GameObject));
+        audioLinkVRSLPrefab = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath("c341366b553ad354198357faa3169627"), typeof(GameObject));
+        audioLinkControllerPrefab = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath("7156b82dc87d72144bdec0dc4f32a78a"), typeof(GameObject));
+        standardAudioLinkControllerPrefab = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath("385ac04e8d2b6f84ea93cb8392fad970"), typeof(GameObject));
+        cubeMask = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath("14fd9d71e91903d4eb44d5289d78eba4"), typeof(GameObject));
+        cylinderMask = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath("de5b252ed1e43b14a9f655ac98144fff"), typeof(GameObject));
+        capsuleMask = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath("29158ac9808b32541ba787435bdfa109"), typeof(GameObject));
+        sphereMask = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath("fa0972d9c823bcf4293febe61ff79da6"), typeof(GameObject));
+
         if(controlPanelUiPrefab == null)
         {
-            Debug.LogError("VRSL Control Panel: Failed to load " + controlPanelPath);
+            Debug.LogError("VRSL Control Panel: Failed to load " + AssetDatabase.GUIDToAssetPath("dedfba01424b93148b3d9a42e95ed2f7"));
             result = false;
         }
         if(directionalLightPrefab == null)
         {
-            Debug.LogError("VRSL Control Panel: Failed to load " + directionalLightPath);
+            Debug.LogError("VRSL Control Panel: Failed to load " + AssetDatabase.GUIDToAssetPath("dc2b8d13712a0f3488413e49afae73ef"));
             result = false;
         }
         if(oscGridReaderHorizontalPrefab == null)
         {
-            Debug.LogError("VRSL Control Panel: Failed to load  " + oscGridReadHPath);
+            Debug.LogError("VRSL Control Panel: Failed to load  " + AssetDatabase.GUIDToAssetPath("f37d8aba2d9398d4aa2fc86f7d8c0cd4"));
             result = false;
         }
         if(oscGridReaderVerticalPrefab == null)
         {
-            Debug.LogError("VRSL Control Panel: Failed to load  " + oscGridReadVPath);
+            Debug.LogError("VRSL Control Panel: Failed to load  " + AssetDatabase.GUIDToAssetPath("2ed7323806c632f4294ff51d8af9a2b2"));
             result = false;
         }
         if(uDesktopHorizontalPrefab == null)
         {
-            Debug.LogError("VRSL Control Panel: Failed to load  " + udeskHorizontalPath);
+            Debug.LogError("VRSL Control Panel: Failed to load  " + AssetDatabase.GUIDToAssetPath("d8bedad6090068740a8d3d9de3c84ea4"));
             result = false;
         }
         if(uDesktopVerticalPrefab == null)
         {
-            Debug.LogError("VRSL Control Panel: Failed to load " + udeskVerticalPath);
+            Debug.LogError("VRSL Control Panel: Failed to load " + AssetDatabase.GUIDToAssetPath("b55309c416955b044a48bbced977331d"));
             result = false;
         }
         if(uDesktopLegacyPrefab == null)
         {
-            Debug.LogError("VRSL Control Panel: Failed to load " + udeskLegacyPath);
+            Debug.LogError("VRSL Control Panel: Failed to load " + AssetDatabase.GUIDToAssetPath("a6013d8268c98274386159517c50aa09"));
             result = false;
         }
         if(uVidHorizontalPrefab == null)
         {
-            Debug.LogError("VRSL Control Panel: Failed to load " + vidHorizontalPath);
+            Debug.LogError("VRSL Control Panel: Failed to load " + AssetDatabase.GUIDToAssetPath("e62fe963d8da32147bbd2f1caa73a0de"));
             result = false;
         }
         if(uVidVerticalPrefab == null)
         {
-            Debug.LogError("VRSL Control Panel: Failed to load " + vidVerticalPath);
+            Debug.LogError("VRSL Control Panel: Failed to load " + AssetDatabase.GUIDToAssetPath("91a099dcf3cff864a9bc08584904554a"));
             result = false;
         }
         if(uVidLegacyPrefab == null)
         {
-            Debug.LogError("VRSL Control Panel: Failed to load " + vidLegacyPath);
+            Debug.LogError("VRSL Control Panel: Failed to load " + AssetDatabase.GUIDToAssetPath("dd476adc52e8f374da7dd7e4e9274f71"));
             result = false;
         }
         if(audioLinkPrefab == null)
         {
-            Debug.LogError("VRSL Control Panel: Failed to load " + audioLinkPath);
-            result = false;
+            // audioLinkPrefab = AssetDatabase.LoadAssetAtPath(audioLinkPathAlt, typeof(GameObject));
+            // if(audioLinkPrefab == null)
+            // {
+                Debug.LogError("VRSL Control Panel: Failed to load " + AssetDatabase.GUIDToAssetPath("8c1f201f848804f42aa401d0647f8902"));
+                result = false;
+            // }
+        }
+        if(audioLinkVRSLPrefab == null)
+        {
+            // audioLinkPrefab = AssetDatabase.LoadAssetAtPath(audioLinkPathAlt, typeof(GameObject));
+            // if(audioLinkPrefab == null)
+            // {
+                Debug.LogError("VRSL Control Panel: Failed to load " + AssetDatabase.GUIDToAssetPath("c341366b553ad354198357faa3169627"));
+                result = false;
+            // }
         }
         if(audioLinkControllerPrefab == null)
         {
-            Debug.LogError("VRSL Control Panel: Failed to load " + audioLinkControllerPath);
+            Debug.LogError("VRSL Control Panel: Failed to load " + AssetDatabase.GUIDToAssetPath("7156b82dc87d72144bdec0dc4f32a78a"));
             result = false;
         }
         if(standardAudioLinkControllerPrefab == null)
         {
-            Debug.LogError("VRSL Control Panel: Failed to load " + standardAudioLinkControllerPath);
-            result = false;
+            // standardAudioLinkControllerPrefab = AssetDatabase.LoadAssetAtPath(standardAudioLinkControllerPathAlt, typeof(GameObject));
+            // if(standardAudioLinkControllerPrefab == null)
+            // {
+                Debug.LogError("VRSL Control Panel: Failed to load " + AssetDatabase.GUIDToAssetPath("385ac04e8d2b6f84ea93cb8392fad970"));
+                result = false;
+            // }
         }
         return result;
     }
@@ -1122,6 +1178,16 @@ class VRSL_ManagerWindow : EditorWindow {
         g.normal.textColor = Color.white;
         g.alignment = TextAnchor.MiddleCenter;
         return g;
+    }
+        public static GUIStyle Title4()
+    {
+        GUIStyle g = new GUIStyle(EditorStyles.label);
+        g.fontSize = 14;
+       // g.fixedHeight = 35;
+      //  g.fontStyle = FontStyle.Italic;
+        g.normal.textColor = Color.white;
+        g.alignment = TextAnchor.MiddleLeft;
+        return g;
     }
     public static GUIStyle Title1Foldout()
     {
@@ -1652,6 +1718,7 @@ class VRSL_ManagerWindow : EditorWindow {
       //  copyTofixture.P_laserScroll = copyFromfixture.P_laserScroll;
       //  copyTofixture.P_laserThickness = copyFromfixture.P_laserThickness;
         copyTofixture.P_textureSamplingCoordinates = copyFromfixture.P_textureSamplingCoordinates;
+        copyTofixture.P_themeColorTarget = copyFromfixture.P_themeColorTarget;
         //copyTofixture.P_spinSpeed = copyFromfixture.P_spinSpeed;
         Debug.Log("VRSL Control Panel: Applying Changes!");
         ApplyChangesToFixtures(true, false, false);
@@ -1694,6 +1761,7 @@ class VRSL_ManagerWindow : EditorWindow {
        // copyTofixture.P_laserScroll = copyFromfixture.P_laserScroll;
        // copyTofixture.P_laserThickness = copyFromfixture.P_laserThickness;
         copyTofixture.P_textureSamplingCoordinates = copyFromfixture.P_textureSamplingCoordinates;
+        copyTofixture.P_themeColorTarget = copyFromfixture.P_themeColorTarget;
 
         Debug.Log("VRSL Control Panel: Applying Changes!");
         ApplyChangesToFixtures(true, false, false);
@@ -1734,6 +1802,7 @@ class VRSL_ManagerWindow : EditorWindow {
         //copyTofixture.P_selectGOBO = copyFromfixture.P_selectGOBO;
 
         copyTofixture.P_textureSamplingCoordinates = copyFromfixture.P_textureSamplingCoordinates;
+        copyTofixture.P_themeColorTarget = copyFromfixture.P_themeColorTarget;
       //  copyTofixture.P_spinSpeed = copyFromfixture.P_spinSpeed;
         Debug.Log("VRSL Control Panel: Applying Changes!");
         ApplyChangesToFixtures(true, false, false);
@@ -1777,6 +1846,7 @@ class VRSL_ManagerWindow : EditorWindow {
         //copyTofixture.P_laserScroll = copyFromfixture.P_laserScroll;
        // copyTofixture.P_laserThickness = copyFromfixture.P_laserThickness;
         copyTofixture.P_textureSamplingCoordinates = copyFromfixture.P_textureSamplingCoordinates;
+        copyTofixture.P_themeColorTarget = copyFromfixture.P_themeColorTarget;
        // copyTofixture.P_spinSpeed = copyFromfixture.P_spinSpeed;
         Debug.Log("VRSL Control Panel: Applying Changes!");
         ApplyChangesToFixtures(true, false, false);
@@ -1823,20 +1893,119 @@ class VRSL_ManagerWindow : EditorWindow {
     {
         bool loadSuccessful = true;
 
-        string horizontalpath = "Assets/VR-Stage-Lighting/Prefabs/DMX/Horizontal Mode/";
-        string verticalpath = "Assets/VR-Stage-Lighting/Prefabs/DMX/Vertical Mode/";
-        string legacypath = "Assets/VR-Stage-Lighting/Prefabs/DMX/Legacy Mode/";
-        string audiopath = "Assets/VR-Stage-Lighting/Prefabs/AudioLink/";
+        // string horizontalpath = "Assets/VR-Stage-Lighting/Runtime/Prefabs/DMX/Horizontal Mode/";
+        // string verticalpath = "Assets/VR-Stage-Lighting/Runtime/Prefabs/DMX/Vertical Mode/";
+        // string legacypath = "Assets/VR-Stage-Lighting/Runtime/Prefabs/DMX/Legacy Mode/";
+        // string audiopath = "Assets/VR-Stage-Lighting/Runtime/Prefabs/AudioLink/";
+
+        // string spot_h_path = horizontalpath + "VRSL-DMX-Mover-Spotlight-H-13CH.prefab";
+        // string spot_v_path = verticalpath + "VRSL-DMX-Mover-Spotlight-V-13CH.prefab";
+        // string spot_l_path = legacypath + "VRSL-DMX-Mover-Spotlight-L-13CH.prefab";
+        // string spot_a_path = audiopath + "VRSL-AudioLink-Mover-Spotlight.prefab";
+
+        // string wash_h_path = horizontalpath + "VRSL-DMX-Mover-WashLight-H-13CH.prefab";
+        // string wash_v_path = verticalpath + "VRSL-DMX-Mover-WashLight-V-13CH.prefab";
+        // string wash_l_path = legacypath + "VRSL-DMX-Mover-WashLight-L-13CH.prefab";
+        // string wash_a_path = audiopath + "VRSL-AudioLink-Mover-Washlight.prefab";
+        // string blind_h_path, blind_v_path, blind_l_path, blind_a_path;
+        // string par_h_path, par_v_path, par_l_path, par_a_path;
+        // string bar_h_path, bar_v_path, bar_l_path, bar_a_path;
+        // string six_h_path, six_v_path, six_l_path;
+        // string multibar_h_path, multibar_v_path, multibar_l_path;
+        // if(legacyFixtures)
+        // {
+        //     blind_h_path = horizontalpath + "VRSL-DMX-Static-Blinder-H-13CH.prefab";
+        //     blind_v_path = verticalpath + "VRSL-DMX-Static-Blinder-V-13CH.prefab";
+        //     blind_l_path = legacypath + "VRSL-DMX-Static-Blinder-L-13CH.prefab";
+        //     blind_a_path = audiopath + "VRSL-AudioLink-Static-Blinder.prefab";
+
+        //     par_h_path = horizontalpath + "VRSL-DMX-Static-ParLight-H-13CH.prefab";
+        //     par_v_path = verticalpath + "VRSL-DMX-Static-ParLight-V-13CH.prefab";
+        //     par_l_path = legacypath + "VRSL-DMX-Static-ParLight-L-13CH.prefab";
+        //     par_a_path = audiopath + "VRSL-AudioLink-Static-ParLight.prefab";
+
+        //     bar_h_path = horizontalpath + "VRSL-DMX-Static-LightBar-H-13CH.prefab";
+        //     bar_v_path = verticalpath + "VRSL-DMX-Static-LightBar-V-13CH.prefab";
+        //     bar_l_path = legacypath + "VRSL-DMX-Static-LightBar-L-13CH.prefab";
+        //     bar_a_path = audiopath + "VRSL-AudioLink-Static-Lightbar.prefab";
+            
+        //     six_h_path = horizontalpath + "5-Channel Statics/" + "VRSL-DMX-Static-6x4StrobeLight-H-5CH.prefab";
+        //     six_v_path = verticalpath + "5-Channel Statics/" + "VRSL-DMX-Static-6x4StrobeLight-V-5CH.prefab";
+        //     six_l_path = legacypath + "5-Channel Statics/" + "VRSL-DMX-Static-6x4StrobeLight-L-5CH.prefab";
+
+        //     multibar_h_path = horizontalpath + "VRSL-DMX-Static-MultiLightBar-H-15CH.prefab";
+        //     multibar_v_path = verticalpath + "VRSL-DMX-Static-MultiLightBar-V-15CH.prefab";
+        //     multibar_l_path = legacypath + "VRSL-DMX-Static-MultiLightBar-L-15CH.prefab";
+        // }
+        // else
+        // {
+        //     blind_h_path = horizontalpath + "5-Channel Statics/" + "VRSL-DMX-Static-Blinder-H-5CH.prefab";
+        //     blind_v_path = verticalpath + "5-Channel Statics/" +  "VRSL-DMX-Static-Blinder-V-5CH.prefab";
+        //     blind_l_path = legacypath + "VRSL-DMX-Static-Blinder-L-13CH.prefab";
+        //     blind_a_path = audiopath + "VRSL-AudioLink-Static-Blinder.prefab";
+
+        //     par_h_path = horizontalpath + "5-Channel Statics/" +  "VRSL-DMX-Static-ParLight-H-5CH.prefab";
+        //     par_v_path = verticalpath + "5-Channel Statics/" +  "VRSL-DMX-Static-ParLight-V-5CH.prefab";
+        //     par_l_path = legacypath + "VRSL-DMX-Static-ParLight-L-13CH.prefab";
+        //     par_a_path = audiopath + "VRSL-AudioLink-Static-ParLight.prefab";
+
+        //     bar_h_path = horizontalpath + "5-Channel Statics/" +  "VRSL-DMX-Static-LightBar-H-5CH.prefab";
+        //     bar_v_path = verticalpath + "5-Channel Statics/" +  "VRSL-DMX-Static-LightBar-V-5CH.prefab";
+        //     bar_l_path = legacypath + "VRSL-DMX-Static-LightBar-L-13CH.prefab";
+        //     bar_a_path = audiopath + "VRSL-AudioLink-Static-Lightbar.prefab";
+
+        //     six_h_path = horizontalpath + "5-Channel Statics/" + "VRSL-DMX-Static-6x4StrobeLight-H-5CH.prefab";
+        //     six_v_path = verticalpath + "5-Channel Statics/" + "VRSL-DMX-Static-6x4StrobeLight-V-5CH.prefab";
+        //     six_l_path = legacypath + "5-Channel Statics/" + "VRSL-DMX-Static-6x4StrobeLight-L-5CH.prefab";
+
+        //     multibar_h_path = horizontalpath + "VRSL-DMX-Static-MultiLightBar-H-15CH.prefab";
+        //     multibar_v_path = verticalpath + "VRSL-DMX-Static-MultiLightBar-V-15CH.prefab";
+        //     multibar_l_path = legacypath + "VRSL-DMX-Static-MultiLightBar-L-15CH.prefab";
+
+        // }
+
+        // string flash_h_path = horizontalpath + "VRSL-DMX-Static-Flasher-H-1CH.prefab";
+        // string flash_v_path = verticalpath + "VRSL-DMX-Static-Flasher-V-1CH.prefab";
+        // string flash_l_path = legacypath + "VRSL-DMX-Static-Flasher-L-1CH.prefab";
+        // string flash_a_path = audiopath + "VRSL-AudioLink-Static-Flasher.prefab";
+
+        // string disco_h_path = horizontalpath + "VRSL-DMX-Static-DiscoBall-H-1CH.prefab";
+        // string disco_v_path = verticalpath + "VRSL-DMX-Static-DiscoBall-V-1CH.prefab";
+        // string disco_l_path = legacypath + "VRSL-DMX-Static-DiscoBall-L-1CH.prefab";
+        // string disco_a_path = audiopath + "VRSL-AudioLink-DiscoBall.prefab";
+
+        // string laser_h_path = horizontalpath + "VRSL-DMX-Static-Laser-H-13CH.prefab";
+        // string laser_v_path = verticalpath + "VRSL-DMX-Static-Laser-V-13CH.prefab";
+        // string laser_l_path = legacypath + "VRSL-DMX-Static-Laser-L-13CH.prefab";
+        // string laser_a_path = audiopath + "VRSL-AudioLink-BasicLaser.prefab";
+
+
+        
+
+
+
+
+
+
+
+
+
+        // string horizontalpath = "Assets/VR-Stage-Lighting/Runtime/Prefabs/DMX/Horizontal Mode/";
+        // string verticalpath = "Assets/VR-Stage-Lighting/Runtime/Prefabs/DMX/Vertical Mode/";
+        // string legacypath = "Assets/VR-Stage-Lighting/Runtime/Prefabs/DMX/Legacy Mode/";
+        // string audiopath = "Assets/VR-Stage-Lighting/Runtime/Prefabs/AudioLink/";
+
+        string spot_h_path = AssetDatabase.GUIDToAssetPath("f5be3cfe3f15bfb4e9477904c5af9daf");
+        string spot_v_path = AssetDatabase.GUIDToAssetPath("9a6d4144bda0d3c4ba95593af446b653");
+        string spot_l_path = AssetDatabase.GUIDToAssetPath("d9cab657bd2dff14ea5425c2c4c4679e");
+        string spot_a_path = AssetDatabase.GUIDToAssetPath("2aa50be2d32099842af2903a918a56f7");
+
+        string wash_h_path = AssetDatabase.GUIDToAssetPath("b3e8ff051cc2d684aa255ceccce9b96f");
+        string wash_v_path = AssetDatabase.GUIDToAssetPath("88bee1a0ddf090d4bb0721b30240c949");
+        string wash_l_path = AssetDatabase.GUIDToAssetPath("41c8453c8957aec4292212174d351a36");
+        string wash_a_path = AssetDatabase.GUIDToAssetPath("dd0fe316ce2ca824ead0901561087fd3");
 
-        string spot_h_path = horizontalpath + "VRSL-DMX-Mover-Spotlight-H-13CH.prefab";
-        string spot_v_path = verticalpath + "VRSL-DMX-Mover-Spotlight-V-13CH.prefab";
-        string spot_l_path = legacypath + "VRSL-DMX-Mover-Spotlight-L-13CH.prefab";
-        string spot_a_path = audiopath + "VRSL-AudioLink-Mover-Spotlight.prefab";
 
-        string wash_h_path = horizontalpath + "VRSL-DMX-Mover-WashLight-H-13CH.prefab";
-        string wash_v_path = verticalpath + "VRSL-DMX-Mover-WashLight-V-13CH.prefab";
-        string wash_l_path = legacypath + "VRSL-DMX-Mover-WashLight-L-13CH.prefab";
-        string wash_a_path = audiopath + "VRSL-AudioLink-Mover-Washlight.prefab";
         string blind_h_path, blind_v_path, blind_l_path, blind_a_path;
         string par_h_path, par_v_path, par_l_path, par_a_path;
         string bar_h_path, bar_v_path, bar_l_path, bar_a_path;
@@ -1844,70 +2013,71 @@ class VRSL_ManagerWindow : EditorWindow {
         string multibar_h_path, multibar_v_path, multibar_l_path;
         if(legacyFixtures)
         {
-            blind_h_path = horizontalpath + "VRSL-DMX-Static-Blinder-H-13CH.prefab";
-            blind_v_path = verticalpath + "VRSL-DMX-Static-Blinder-V-13CH.prefab";
-            blind_l_path = legacypath + "VRSL-DMX-Static-Blinder-L-13CH.prefab";
-            blind_a_path = audiopath + "VRSL-AudioLink-Static-Blinder.prefab";
+            blind_h_path = AssetDatabase.GUIDToAssetPath("e9dde3e86ccb8ca4bb4ecbe35a6fa7b1");
+            blind_v_path = AssetDatabase.GUIDToAssetPath("d7a8bacd5310e8e499962549ef931c57");
+            blind_l_path = AssetDatabase.GUIDToAssetPath("9310469001d6cdf4db2145f9fddd7933");
+            blind_a_path = AssetDatabase.GUIDToAssetPath("269647a339f4d1c47951638c83aa839b");
 
-            par_h_path = horizontalpath + "VRSL-DMX-Static-ParLight-H-13CH.prefab";
-            par_v_path = verticalpath + "VRSL-DMX-Static-ParLight-V-13CH.prefab";
-            par_l_path = legacypath + "VRSL-DMX-Static-ParLight-L-13CH.prefab";
-            par_a_path = audiopath + "VRSL-AudioLink-Static-ParLight.prefab";
+            par_h_path = AssetDatabase.GUIDToAssetPath("946b3c09cfa93244c90a4b0ac7764b44");
+            par_v_path = AssetDatabase.GUIDToAssetPath("2ff8eb277ef9d7047b12d127b2eaeb36");
+            par_l_path = AssetDatabase.GUIDToAssetPath("dd7cad5fc7f12624ea58efde5c3cd633");
+            par_a_path = AssetDatabase.GUIDToAssetPath("161d81f8a11b22d42ae4e81f522939d3");
 
-            bar_h_path = horizontalpath + "VRSL-DMX-Static-LightBar-H-13CH.prefab";
-            bar_v_path = verticalpath + "VRSL-DMX-Static-LightBar-V-13CH.prefab";
-            bar_l_path = legacypath + "VRSL-DMX-Static-LightBar-L-13CH.prefab";
-            bar_a_path = audiopath + "VRSL-AudioLink-Static-Lightbar.prefab";
+            bar_h_path = AssetDatabase.GUIDToAssetPath("96ffbd2a722ae324e892d303e2ee9a2a");
+            bar_v_path = AssetDatabase.GUIDToAssetPath("b2a0b640363bc10408fb7a3803939fa0");
+            bar_l_path = AssetDatabase.GUIDToAssetPath("b1b81594f59ca5d469ad06808051c682");
+            bar_a_path = AssetDatabase.GUIDToAssetPath("c33f8d4d996a9ba47b86d420e4cdb05b");
             
-            six_h_path = horizontalpath + "5-Channel Statics/" + "VRSL-DMX-Static-6x4StrobeLight-H-5CH.prefab";
-            six_v_path = verticalpath + "5-Channel Statics/" + "VRSL-DMX-Static-6x4StrobeLight-V-5CH.prefab";
-            six_l_path = legacypath + "5-Channel Statics/" + "VRSL-DMX-Static-6x4StrobeLight-L-5CH.prefab";
+            six_h_path = AssetDatabase.GUIDToAssetPath("46d1954298362974887b80dc3d70ee5f");
+            six_v_path = AssetDatabase.GUIDToAssetPath("51b428740444288448e19c88c64d5311");
+            six_l_path = AssetDatabase.GUIDToAssetPath("6f5c5d0af7e69e242ad56ac13882e04e");
 
-            multibar_h_path = horizontalpath + "VRSL-DMX-Static-MultiLightBar-H-15CH.prefab";
-            multibar_v_path = verticalpath + "VRSL-DMX-Static-MultiLightBar-V-15CH.prefab";
-            multibar_l_path = legacypath + "VRSL-DMX-Static-MultiLightBar-L-15CH.prefab";
+            multibar_h_path = AssetDatabase.GUIDToAssetPath("c19e8fd46b4abdf49bb7b6cdc62acdde");
+            multibar_v_path = AssetDatabase.GUIDToAssetPath("b8873da88b401dd4ab93b061c5ddf750");
+            multibar_l_path = AssetDatabase.GUIDToAssetPath("dd68d30b9f0b34442aac2fb4540ae553");
         }
         else
         {
-            blind_h_path = horizontalpath + "5-Channel Statics/" + "VRSL-DMX-Static-Blinder-H-5CH.prefab";
-            blind_v_path = verticalpath + "5-Channel Statics/" +  "VRSL-DMX-Static-Blinder-V-5CH.prefab";
-            blind_l_path = legacypath + "VRSL-DMX-Static-Blinder-L-13CH.prefab";
-            blind_a_path = audiopath + "VRSL-AudioLink-Static-Blinder.prefab";
+            //5channel modes
+            blind_h_path = AssetDatabase.GUIDToAssetPath("5ae312c8e69488842994fd62a7609adc");
+            blind_v_path = AssetDatabase.GUIDToAssetPath("94d6ff221dc5748458941750e422114f");
+            blind_l_path = AssetDatabase.GUIDToAssetPath("9310469001d6cdf4db2145f9fddd7933");
+            blind_a_path = AssetDatabase.GUIDToAssetPath("269647a339f4d1c47951638c83aa839b");
 
-            par_h_path = horizontalpath + "5-Channel Statics/" +  "VRSL-DMX-Static-ParLight-H-5CH.prefab";
-            par_v_path = verticalpath + "5-Channel Statics/" +  "VRSL-DMX-Static-ParLight-V-5CH.prefab";
-            par_l_path = legacypath + "VRSL-DMX-Static-ParLight-L-13CH.prefab";
-            par_a_path = audiopath + "VRSL-AudioLink-Static-ParLight.prefab";
+            par_h_path = AssetDatabase.GUIDToAssetPath("6a94fea4f85300a44b9e29ba54430110");
+            par_v_path = AssetDatabase.GUIDToAssetPath("3b7bdfab2bd7abf4295be3356f6f3617");
+            par_l_path = AssetDatabase.GUIDToAssetPath("dd7cad5fc7f12624ea58efde5c3cd633");
+            par_a_path = AssetDatabase.GUIDToAssetPath("161d81f8a11b22d42ae4e81f522939d3");
 
-            bar_h_path = horizontalpath + "5-Channel Statics/" +  "VRSL-DMX-Static-LightBar-H-5CH.prefab";
-            bar_v_path = verticalpath + "5-Channel Statics/" +  "VRSL-DMX-Static-LightBar-V-5CH.prefab";
-            bar_l_path = legacypath + "VRSL-DMX-Static-LightBar-L-13CH.prefab";
-            bar_a_path = audiopath + "VRSL-AudioLink-Static-Lightbar.prefab";
+            bar_h_path = AssetDatabase.GUIDToAssetPath("fbb24c41d42d23c4296c31f5aca73942");
+            bar_v_path = AssetDatabase.GUIDToAssetPath("78bf4380452cfbe4aa8154e17a189b28");
+            bar_l_path = AssetDatabase.GUIDToAssetPath("b1b81594f59ca5d469ad06808051c682");
+            bar_a_path = AssetDatabase.GUIDToAssetPath("c33f8d4d996a9ba47b86d420e4cdb05b");
 
-            six_h_path = horizontalpath + "5-Channel Statics/" + "VRSL-DMX-Static-6x4StrobeLight-H-5CH.prefab";
-            six_v_path = verticalpath + "5-Channel Statics/" + "VRSL-DMX-Static-6x4StrobeLight-V-5CH.prefab";
-            six_l_path = legacypath + "5-Channel Statics/" + "VRSL-DMX-Static-6x4StrobeLight-L-5CH.prefab";
+            six_h_path = AssetDatabase.GUIDToAssetPath("46d1954298362974887b80dc3d70ee5f");
+            six_v_path = AssetDatabase.GUIDToAssetPath("51b428740444288448e19c88c64d5311");
+            six_l_path = AssetDatabase.GUIDToAssetPath("6f5c5d0af7e69e242ad56ac13882e04e");
 
-            multibar_h_path = horizontalpath + "VRSL-DMX-Static-MultiLightBar-H-15CH.prefab";
-            multibar_v_path = verticalpath + "VRSL-DMX-Static-MultiLightBar-V-15CH.prefab";
-            multibar_l_path = legacypath + "VRSL-DMX-Static-MultiLightBar-L-15CH.prefab";
+            multibar_h_path = AssetDatabase.GUIDToAssetPath("c19e8fd46b4abdf49bb7b6cdc62acdde");
+            multibar_v_path = AssetDatabase.GUIDToAssetPath("b8873da88b401dd4ab93b061c5ddf750");
+            multibar_l_path = AssetDatabase.GUIDToAssetPath("dd68d30b9f0b34442aac2fb4540ae553");
 
         }
 
-        string flash_h_path = horizontalpath + "VRSL-DMX-Static-Flasher-H-1CH.prefab";
-        string flash_v_path = verticalpath + "VRSL-DMX-Static-Flasher-V-1CH.prefab";
-        string flash_l_path = legacypath + "VRSL-DMX-Static-Flasher-L-1CH.prefab";
-        string flash_a_path = audiopath + "VRSL-AudioLink-Static-Flasher.prefab";
+        string flash_h_path = AssetDatabase.GUIDToAssetPath("6d00d693f1608ab49ad08d18dbe1fa02");
+        string flash_v_path = AssetDatabase.GUIDToAssetPath("1c08f57da0cd0414c85f64b373431921");
+        string flash_l_path = AssetDatabase.GUIDToAssetPath("a38b2f56984259247bded9aa1b1ee149");
+        string flash_a_path = AssetDatabase.GUIDToAssetPath("092158b73b160384f904e33d35a09123");
 
-        string disco_h_path = horizontalpath + "VRSL-DMX-Static-DiscoBall-H-1CH.prefab";
-        string disco_v_path = verticalpath + "VRSL-DMX-Static-DiscoBall-V-1CH.prefab";
-        string disco_l_path = legacypath + "VRSL-DMX-Static-DiscoBall-L-1CH.prefab";
-        string disco_a_path = audiopath + "VRSL-AudioLink-DiscoBall.prefab";
+        string disco_h_path = AssetDatabase.GUIDToAssetPath("22192b7ad03f22a4db578b035fdca38d");
+        string disco_v_path = AssetDatabase.GUIDToAssetPath("8bb1407f1f0e2cc48b9bbf35ca1951a6");
+        string disco_l_path = AssetDatabase.GUIDToAssetPath("65a96b17618e51548a669749173d48ff");
+        string disco_a_path = AssetDatabase.GUIDToAssetPath("a7acda2f5fe7dfd4aaa49ec10a2d5586");
 
-        string laser_h_path = horizontalpath + "VRSL-DMX-Static-Laser-H-13CH.prefab";
-        string laser_v_path = verticalpath + "VRSL-DMX-Static-Laser-V-13CH.prefab";
-        string laser_l_path = legacypath + "VRSL-DMX-Static-Laser-L-13CH.prefab";
-        string laser_a_path = audiopath + "VRSL-AudioLink-BasicLaser.prefab";
+        string laser_h_path = AssetDatabase.GUIDToAssetPath("3d6c0b40980bcd34aba9183a62ecbd21");
+        string laser_v_path = AssetDatabase.GUIDToAssetPath("55058c5ef8c22d04991b48a99a10acfe");
+        string laser_l_path = AssetDatabase.GUIDToAssetPath("55ac9bf95dc63bb4fb6ba2095d73cde2");
+        string laser_a_path = AssetDatabase.GUIDToAssetPath("75c269de381facb4cae616c67f83f519");
         
 
         switch(a)
@@ -2208,8 +2378,49 @@ class VRSL_ManagerWindow : EditorWindow {
                 
                 EditorGUILayout.EndHorizontal();
                 EditorGUI.EndDisabledGroup();
+                //GUILayout.Label("VRSL Stencil Masks",Title4());
+                string stencilDef = "Spawn stencil masks that block out any transparent VRSL materials. Good for preventing VRSL lights from leaking into adjacent rooms and hallways.";
+                //EditorGUILayout.LabelField(Label("VRSL Stencil Masks", stencilDef));
+                string stencil = stencilFoldout ? "Hide Stencil Masks" : "Show Stencil Masks";
+                stencilFoldout = EditorGUILayout.BeginFoldoutHeaderGroup(stencilFoldout,Label(stencil, "Show/Hide VRSL Stencil Mask Prefab Spawners. " + stencilDef));
+                EditorGUILayout.EndFoldoutHeaderGroup();
+                if(stencilFoldout)
+                {
+                    
+                    EditorGUILayout.BeginHorizontal("box");
+                    float stencilMaxWidth = 100f;
 
+                    if(GUILayout.Button(Label("Cube", "Spawn a cube stencil mask. " + stencilDef), GUILayout.MaxWidth(stencilMaxWidth)))
+                    {
+                            Debug.Log("VRSL Control Panel: Spawning Cube Stencil Mask");
+                            if(LoadPrefabs())
+                                SpawnPrefabWithUndo(cubeMask, "Spawn VRSL Cube Stencil Mask", false, false);
+                            Repaint();
+                    }
+                    if(GUILayout.Button(Label("Sphere", "Spawn a sphere stencil mask. " + stencilDef), GUILayout.MaxWidth(stencilMaxWidth)))
+                    {
+                            Debug.Log("VRSL Control Panel: Spawning Sphere Stencil Mask");
+                            if(LoadPrefabs())
+                                SpawnPrefabWithUndo(sphereMask, "Spawn VRSL Sphere Stencil Mask", false, false);
+                            Repaint();
+                    }
+                    if(GUILayout.Button(Label("Cylinder", "Spawn a cylinder stencil mask. " + stencilDef), GUILayout.MaxWidth(stencilMaxWidth)))
+                    {
+                            Debug.Log("VRSL Control Panel: Spawning Cylinder Stencil Mask");
+                            if(LoadPrefabs())
+                                SpawnPrefabWithUndo(cylinderMask, "Spawn VRSL Cylinder Stencil Mask", false, false);
+                            Repaint();
+                    }
+                    if(GUILayout.Button(Label("Capusle", "Spawn a capsule stencil mask. " + stencilDef), GUILayout.MaxWidth(stencilMaxWidth)))
+                    {
+                            Debug.Log("VRSL Control Panel: Spawning Capsule Stencil Mask");
+                            if(LoadPrefabs())
+                                SpawnPrefabWithUndo(capsuleMask, "Spawn VRSL Capsule Stencil Mask", false, false);
+                            Repaint();
+                    }
 
+                    EditorGUILayout.EndHorizontal();
+                }
                 
                 EditorGUILayout.EndVertical();
                 //EditorGUILayout.Space();
@@ -2644,7 +2855,7 @@ class VRSL_ManagerWindow : EditorWindow {
                 if(audioLinkSpawnsFoldout)
                 {
                     GUILayout.Label("AudioLink Prefabs", Title3());
-                    
+                    EditorGUILayout.BeginHorizontal(GUILayout.MaxWidth((position.width/2f)));
                     if(GUILayout.Button(Label("Spawn Standard AudioLink Prefab", "Spawn the standard AudioLink prefab that comes with AudioLink."), HalfButton()))
                     {
                         Debug.Log("VRSL Control Panel: Spawning Standard AudioLink Prefab...");
@@ -2653,6 +2864,16 @@ class VRSL_ManagerWindow : EditorWindow {
                             //Selection.SetActiveObjectWithContext(PrefabUtility.InstantiatePrefab(audioLinkPrefab as GameObject), null);
                         Repaint();
                     }
+                    if(GUILayout.Button(Label("Spawn VRSL AudioLink Prefab", "Spawn the slight modified version of the AudioLink Prefab. Use this one to have the smoothing sliders work"), HalfButton()))
+                    {
+                        Debug.Log("VRSL Control Panel: Spawning VRSL AudioLink Prefab...");
+                        if(LoadPrefabs())
+                            SpawnPrefabWithUndo(audioLinkVRSLPrefab, "Spawn VRSL AudioLink Prefab", false, false);
+                            //Selection.SetActiveObjectWithContext(PrefabUtility.InstantiatePrefab(audioLinkPrefab as GameObject), null);
+                        Repaint();
+                    }
+
+                    EditorGUILayout.EndHorizontal();
 
                     GUILayout.Label("Controller Prefabs", Title3());
                     EditorGUILayout.BeginHorizontal(GUILayout.MaxWidth((position.width/2f)));
@@ -3207,6 +3428,8 @@ class VRSL_ManagerWindow : EditorWindow {
                                             fixture.P_lightColorTint = EditorGUILayout.ColorField(colorLabel,fixture.P_lightColorTint, true,true,true, GUILayout.MaxWidth(sectionWidth - 10));
                                             fixture.P_enableColorTextureSampling = EditorGUILayout.Toggle("Enable Texture Sampling", fixture.P_enableColorTextureSampling);
                                             fixture.P_textureSamplingCoordinates = EditorGUILayout.Vector2Field("Texture Sampling Coordinates", fixture.P_textureSamplingCoordinates, GUILayout.MaxWidth(sectionWidth - 10));
+                                            fixture.P_enableThemeColorSampling = EditorGUILayout.Toggle("Enable Theme Color Sampling", fixture.P_enableThemeColorSampling);
+                                            fixture.P_themeColorTarget = EditorGUILayout.IntSlider("Theme Color Target", fixture.P_themeColorTarget, 1, 4, GUILayout.MaxWidth(sectionWidth - 10));
                                             GUILayout.Space(8.0f);
                                             GUILayout.Label("Mesh Settings", SecLabel());
                                             GUILayout.Space(8.0f);
@@ -3334,6 +3557,8 @@ class VRSL_ManagerWindow : EditorWindow {
                                             fixture.P_lightColorTint = EditorGUILayout.ColorField(colorLabel,fixture.P_lightColorTint, true,true,true, GUILayout.MaxWidth(sectionWidth - 10));
                                             fixture.P_enableColorTextureSampling = EditorGUILayout.Toggle("Enable Texture Sampling", fixture.P_enableColorTextureSampling);
                                             fixture.P_textureSamplingCoordinates = EditorGUILayout.Vector2Field("Texture Sampling Coordinates", fixture.P_textureSamplingCoordinates, GUILayout.MaxWidth(sectionWidth - 10));
+                                            fixture.P_enableThemeColorSampling = EditorGUILayout.Toggle("Enable Theme Color Sampling", fixture.P_enableThemeColorSampling);
+                                            fixture.P_themeColorTarget = EditorGUILayout.IntSlider("Theme Color Target", fixture.P_themeColorTarget, 1, 4, GUILayout.MaxWidth(sectionWidth - 10));
                                             GUILayout.Space(8.0f);
                                             GUILayout.Label("Movement Settings", SecLabel());
                                             GUILayout.Space(8.0f);

Editor/Scripts/VRSL_UdonEditor.cs

@@ -21,7 +21,7 @@ namespace VRSL.EditorScripts
     public class VRSL_UdonEditor : Editor
     {
         public static Texture logo;
-        public static string ver = "VR Stage Lighting ver:" + " <b><color=#6a15ce> 2.1</color></b>";
+        public static string ver = "VR Stage Lighting ver:" + " <b><color=#6a15ce> 2.2</color></b>";
         public void OnEnable() 
         {
             logo = Resources.Load("VRStageLighting-Logo") as Texture;

Runtime.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a46fcc4440681a543b1e348cd4e784cc
+guid: 3d76ea92d99ca8643a5f02e0281bf46a
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}