2.4.3 Update

- Added Global Intensity Blend Property - Removed Blend and Blend1 Files
AcChosen · Sep 22, 2023 · 49bfe80 · 49bfe80
1 parent e67854f
commit 49bfe80
Show file tree

Hide file tree

Showing 130 changed files with 1,506 additions and 1,958 deletions.
diff --git a/Packages/com.acchosen.vr-stage-lighting/Editor/VRSLInspector.cs b/Packages/com.acchosen.vr-stage-lighting/Editor/VRSLInspector.cs
diff --git a/Packages/com.acchosen.vr-stage-lighting/Editor/VRSL_ManagerWindow.cs b/Packages/com.acchosen.vr-stage-lighting/Editor/VRSL_ManagerWindow.cs
@@ -283,7 +283,7 @@ public class AudioLinkListItem
     public VRStageLighting_AudioLink_Laser laser;
     //////////////////////////////////////////////////////////////////////////
     private bool Z_enableAudioLink; public bool P_enableAudioLink;
-    private int Z_band; public int P_band;
+    private AudioLinkBandState Z_band; public AudioLinkBandState P_band;
     private int Z_delay; public int P_delay;
     private float Z_bandMultiplier; public float P_bandMultiplier;
     private bool Z_enableColorChord; public bool P_enableColorChord;
@@ -457,7 +457,7 @@ public void ApplyChanges(VRStageLighting_AudioLink_Static li)
 
         var so = new SerializedObject(light);
         so.FindProperty("enableAudioLink").boolValue = P_enableAudioLink;
-        so.FindProperty("band").intValue = P_band;
+        so.FindProperty("band").enumValueIndex = (int) P_band;
         so.FindProperty("delay").intValue = P_delay;
         so.FindProperty("bandMultiplier").floatValue = P_bandMultiplier;
         so.FindProperty("enableColorChord").boolValue = P_enableColorChord; 
@@ -520,7 +520,7 @@ public void ApplyChanges(VRStageLighting_AudioLink_Laser li)
 
         var so = new SerializedObject(laser);
         so.FindProperty("enableAudioLink").boolValue = P_enableAudioLink;
-        so.FindProperty("band").intValue = P_band;
+        so.FindProperty("band").enumValueIndex = (int) P_band;
         so.FindProperty("delay").intValue = P_delay;
         so.FindProperty("bandMultiplier").floatValue = P_bandMultiplier;
         so.FindProperty("enableColorChord").boolValue = P_enableColorChord; 
@@ -3697,7 +3697,7 @@ void OnGUI() {
 
                                 if(fixture.isLaser)
                                 {
-                                    if(fixture.laser.Band == i)
+                                    if((int) fixture.laser.Band == i)
                                     {
                                         EditorGUILayout.BeginHorizontal();
                                         GUILayout.Space(15f);
@@ -3784,7 +3784,9 @@ void OnGUI() {
                                             GUILayout.Label("AudioLink Settings", SecLabel());
                                             GUILayout.Space(8.0f);
                                             fixture.P_enableAudioLink = EditorGUILayout.Toggle("Enable AudioLink", fixture.P_enableAudioLink);
-                                            fixture.P_band = EditorGUILayout.IntField("Band", fixture.P_band, GUILayout.MaxWidth(sectionWidth - 10));
+                                            //fixture.P_band = EditorGUILayout.IntField("Band", fixture.P_band, GUILayout.MaxWidth(sectionWidth - 10));
+                                            fixture.P_band = (AudioLinkBandState) EditorGUILayout.EnumPopup("Band", fixture.P_band, GUILayout.MaxWidth(sectionWidth - 10));
+
                                             fixture.P_delay = EditorGUILayout.IntSlider("Delay",fixture.P_delay, 0, 31, GUILayout.MaxWidth(sectionWidth - 10));
                                             fixture.P_bandMultiplier = EditorGUILayout.Slider("Band Multiplier",fixture.P_bandMultiplier, 1f, 15f, GUILayout.MaxWidth(sectionWidth - 10));
                                             fixture.P_enableColorChord = EditorGUILayout.Toggle("Enable Color Chord", fixture.P_enableColorChord);
@@ -3825,7 +3827,7 @@ void OnGUI() {
                                 }
                                 else
                                 {
-                                    if(fixture.light.Band == i)
+                                    if((int) fixture.light.Band == i)
                                     {
                                         EditorGUILayout.BeginHorizontal();
                                         GUILayout.Space(15f);
@@ -3913,7 +3915,9 @@ void OnGUI() {
                                             GUILayout.Label("AudioLink Settings", SecLabel());
                                             GUILayout.Space(8.0f);
                                             fixture.P_enableAudioLink = EditorGUILayout.Toggle("Enable AudioLink", fixture.P_enableAudioLink);
-                                            fixture.P_band = EditorGUILayout.IntField("Band", fixture.P_band, GUILayout.MaxWidth(sectionWidth - 10));
+                                           // fixture.P_band = EditorGUILayout.IntField("Band", fixture.P_band, GUILayout.MaxWidth(sectionWidth - 10));
+                                            fixture.P_band = (AudioLinkBandState) EditorGUILayout.EnumPopup("Band", fixture.P_band, GUILayout.MaxWidth(sectionWidth - 10));
+
                                             fixture.P_delay = EditorGUILayout.IntSlider("Delay",fixture.P_delay, 0, 31, GUILayout.MaxWidth(sectionWidth - 10));
                                             fixture.P_bandMultiplier = EditorGUILayout.Slider("Band Multiplier",fixture.P_bandMultiplier, 1f, 15f, GUILayout.MaxWidth(sectionWidth - 10));
                                             fixture.P_enableColorChord = EditorGUILayout.Toggle("Enable Color Chord", fixture.P_enableColorChord);

diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/Animations/Gobo Anims/Mover-Anim-Gobo0.anim b/Packages/com.acchosen.vr-stage-lighting/Runtime/Animations/Gobo Anims/Mover-Anim-Gobo0.anim
@@ -0,0 +1,305 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Mover-Anim-Gobo0
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.016666668
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: material._ProjectionSelection
+    path: MoverLightMesh-LampFixture-Base/MoverLightMesh-LampFixture-Head/MoverLightMesh-ProjectionPassMesh
+    classID: 23
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.016666668
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: material._EnableSpin
+    path: MoverLightMesh-LampFixture-Base/MoverLightMesh-LampFixture-Head/MoverLightMesh-ProjectionPassMesh
+    classID: 23
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.016666668
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: material._EnableSpin
+    path: MoverLightMesh-LampFixture-Base/MoverLightMesh-LampFixture-Head/MoverLightMesh-VolumetricPassMesh
+    classID: 23
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.016666668
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: material._ProjectionSelection
+    path: MoverLightMesh-LampFixture-Base/MoverLightMesh-LampFixture-Head/MoverLightMesh-VolumetricPassMesh
+    classID: 23
+    script: {fileID: 0}
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 2925474676
+      attribute: 2365277936
+      script: {fileID: 0}
+      typeID: 23
+      customType: 22
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2925474676
+      attribute: 2164494468
+      script: {fileID: 0}
+      typeID: 23
+      customType: 22
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2127841482
+      attribute: 2164494468
+      script: {fileID: 0}
+      typeID: 23
+      customType: 22
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2127841482
+      attribute: 2365277936
+      script: {fileID: 0}
+      typeID: 23
+      customType: 22
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.016666668
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.016666668
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: material._ProjectionSelection
+    path: MoverLightMesh-LampFixture-Base/MoverLightMesh-LampFixture-Head/MoverLightMesh-ProjectionPassMesh
+    classID: 23
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.016666668
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: material._EnableSpin
+    path: MoverLightMesh-LampFixture-Base/MoverLightMesh-LampFixture-Head/MoverLightMesh-ProjectionPassMesh
+    classID: 23
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.016666668
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: material._EnableSpin
+    path: MoverLightMesh-LampFixture-Base/MoverLightMesh-LampFixture-Head/MoverLightMesh-VolumetricPassMesh
+    classID: 23
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.016666668
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: material._ProjectionSelection
+    path: MoverLightMesh-LampFixture-Base/MoverLightMesh-LampFixture-Head/MoverLightMesh-VolumetricPassMesh
+    classID: 23
+    script: {fileID: 0}
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
diff --git a/...tage-lighting/Runtime/Meshes/Backups.meta → ...ons/Gobo Anims/Mover-Anim-Gobo0.anim.meta b/...tage-lighting/Runtime/Meshes/Backups.meta → ...ons/Gobo Anims/Mover-Anim-Gobo0.anim.meta