Add Aqua Shader support, add AudioLink Theme Colors.

Author: Thorinair

README.md

@@ -1,24 +1,28 @@
 # LumaDriver
 
-The world-side [Furality Luma Glow Shader](https://furality.org/lumaglow) and [Furality Legendary Shader](https://furality.org/legendaryshader) support you have been waiting for! Built up from scratch, inspired by workings of [AudioLink](https://github.com/llealloo/vrc-udon-audio-link).
+An unofficial VRChat world-side plugin designed to drive the various [Furality](https://furality.org/) shaders. Built up from scratch and inspired by workings of [AudioLink](https://github.com/llealloo/vrc-udon-audio-link). Capable of powering the following:
+
+* [Furality Luma Glow Shader](https://furality.org/lumaglow)
+* [Furality Legendary Shader](https://furality.org/legendaryshader)
+* [Furality Aqua Shader](https://furality.org/aqua-shader-info)
 
 **NOTE: This project is a derivative work and is not part of Furality Online Xperience or created by Furality, Inc.**
 
 A live demo is available in the [Luminescent Ledge](https://vrchat.com/home/world/wrld_fb4edc80-6c48-43f2-9bd1-2fa9f1345621) VRChat world!
 
 ## Features
 * Four Luma Glow / Hero and Villain zones for the respective shaders.
-* Three gradients for Legendary Shader.
-* Audio Reactivity for Legendary Shader.
-* AudioLink integration, using ColorChord and bands to control the glow.
+* Three gradients for Legendary and Aqua Shader.
+* Audio Reactivity for Legendary and Aqua Shader.
+* AudioLink integration, using Theme Colors and ColorChord for controlling the colors and bands to control the flashing.
 * VR Stage Lighting (VRSL) integration, with a dedicated fixture definition.
 * Possibility to set custom colors using Udon.
 * Debug functionalities.
 * Extreme level of customization.
 
 **Requires:** [AudioLink](https://github.com/llealloo/vrc-udon-audio-link) v0.2.6+ for the integration to properly function.
 
-**Optional:** [VR Stage Lighting](https://github.com/AcChosen/VR-Stage-Lighting) v1.10+ for DMX functionality.
+**Optional:** [VR Stage Lighting](https://github.com/AcChosen/VR-Stage-Lighting) v1.10+ for DMX functionality. (NOTE: Currently doesn't support horizontal layout.)
 
 ## Usage
 1. Import the Unity package.
@@ -64,7 +68,7 @@ This page allows for adjusting the behavior of idle animations. These are the sl
 
 ![alt text](https://raw.githubusercontent.com/Thorinair/LumaDriver/master/img/LumaDriverUI_2.png "LumaDriver AudioLink")
 
-This page allows for adjusting the way how [AudioLink](https://github.com/llealloo/vrc-udon-audio-link) interfaces with the driver. All Color Control options can use AudioLink's ColorChord feature in order to have interesting and dynamic colors when music is playing. In order to enable AudioLink integration, follow the steps:
+This page allows for adjusting the way how [AudioLink](https://github.com/llealloo/vrc-udon-audio-link) interfaces with the driver. All Color Control options can use either AudioLink's Theme Colors or ColorChord feature in order to have interesting and dynamic colors when music is playing. In order to enable AudioLink integration, follow the steps:
 
 1. Import AudioLink package and set it up in the world following official instructions.
 2. Check the **Enabled** checkbox on AudioLink page in LumaDriver's configuration.
@@ -73,15 +77,16 @@ Below are explanations for different configuration options:
 
 * **Enabled** - Enables AudioLink integration.
 * **Automatic Switchover** - Monitors the audio throughput in AudioLink in order to decide whether idle animations should be playing instead when there is no audio.
-* **Maximize Colors** - Increases the intensity of ColorChord generated colors.
+* **Maximize Colors** - Maximizes the intensity of Theme Colors and ColorChord generated colors.
+* **Use Theme Colors** - Enables the usage of AudioLink Theme Colors for all Color Control options. Themes can be customized programatically on AudioLink or adjusted directly on the AudioLink Controller. By default, Theme Colors act as ColorChord. Disabling this option **forces** ColorChord instead.
 * **Reactive Pixel Enabled** - Enables the AudioLink integration with the Legendary Shader Audio Reactivity features.
 * **Reactive Pixel Lows Band** - Defines AudioLink band to use for the Lows audio reactivity.
 * **Reactive Pixel Highs Band** - Defines AudioLink band to use for the Highs audio reactivity.
-* **Zone X Color Control** - Defines source of colors for the zone. Can be either the idle animation or one of the ColorChord colors.
+* **Zone X Color Control** - Defines source of colors for the zone. Can be the idle animation, a Theme Color, or one of the ColorChord colors.
 * **Zone X Audio Band** - Defines AudioLink band to use for the zone.
-* **Enable Gradient X Color Control** - Enables the ColorChord control of the gradient.
-* **Gradient X Stop A Color Control** - Defines ColorChord source for the first color stop.
-* **Gradient X Stop C Color Control** - Defines ColorChord source for the end color stop.
+* **Enable Gradient X Color Control** - Enables the Theme Color or ColorChord control of the gradient.
+* **Gradient X Stop A Color Control** - Defines Theme Color or ColorChord source for the first color stop.
+* **Gradient X Stop C Color Control** - Defines Theme Color or ColorChord source for the end color stop.
 * **Gradient X Audio Band** - Defines AudioLink band to use for the gradient.
 * **Reverse Gradient X Audio** - Reverses the animation of the AudioLink flowing animation on the gradient.
 * **Gradient X Audio Length** - Shortens or lengthens the AudioLink flowing animation on the gradient.
@@ -155,7 +160,7 @@ Below is a table which lists locations of individual pixels and gradients, along
 
 | Data | Location | Channels | Description |
 | ---- | -------- | -------- | ----------- |
-| **Luma ON** | `0.629, 0.511` | Red | Controls whether old Luma Glow Shader is running. Always 255 red. |
+| **Luma ON** | `0.629, 0.511` | Red | Controls whether old Luma Glow Shader and Aqua Shader are running. Always 255 red. |
 | **Zone 1 (Heros 1)** | `0.856, 0.522` | RGB | Applies color for the Luma Glow Zone 1. Also counts as Heros 1. |
 | **Zone 2 (Villains 1)** | `0.856, 0.507` | RGB | Applies color for the Luma Glow Zone 2. Also counts as Villains 1. |
 | **Zone 3 (Heros 2)** | `0.864, 0.522` | RGB | Applies color for the Luma Glow Zone 3. Also counts as Heros 2. |

img/LumaDriverUI_2.png

@@ -10,8 +10,8 @@ Material:
   m_Name: LumaDriver_Driver
   m_Shader: {fileID: 4800000, guid: 26be09cd3367da94b85b01d138cb2e7a, type: 3}
   m_ShaderKeywords: _ALAUTOMATIC_ON _ALCCG1_ON _ALCOLORCHORD_ON _ALMAXIMIZE_ON _ALREACTIVEPIXEL_ON
-    _COLOROVERRIDE_ON _DMXCCZ1ENABLE_ON _DMXINTG1_ON _DMXINTZ1_ON _DMXINTZ2_ON _DMXINTZ3_ON
-    _DMXINTZ4_ON _DMXSTROBE_ON _ISENABLED_ON _LUMAPIXEL_ON _REACTIVEIDLE_ON
+    _ALTHEMES_ON _COLOROVERRIDE_ON _DMXCCZ1ENABLE_ON _DMXINTG1_ON _DMXINTZ1_ON _DMXINTZ2_ON
+    _DMXINTZ3_ON _DMXINTZ4_ON _DMXSTROBE_ON _ISENABLED_ON _LUMAPIXEL_ON _REACTIVEIDLE_ON
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -30,6 +30,7 @@ Material:
     - _ALMaximize: 1
     - _ALOverride: 0
     - _ALReactivePixel: 1
+    - _ALThemes: 1
     - _ALccG1: 1
     - _ALccG1StopA: 0.1992
     - _ALccG1StopB: 0.5
@@ -46,6 +47,16 @@ Material:
     - _ALccZ2: 0.207
     - _ALccZ3: 0.2148
     - _ALccZ4: 0.2227
+    - _ALttG1StopA: 0.0039
+    - _ALttG1StopC: 0.0117
+    - _ALttG2StopA: 0.0195
+    - _ALttG2StopC: 0.0273
+    - _ALttG3StopA: 0.0039
+    - _ALttG3StopC: 0.0039
+    - _ALttZ1: 0.0039
+    - _ALttZ2: 0.0117
+    - _ALttZ3: 0.0195
+    - _ALttZ4: 0.0273
     - _BandG1: 0.0078
     - _BandG1Length: 0.2
     - _BandG1Reverse: 0

src/LumaDriver/Materials/LumaDriver_Driver.mat

@@ -68,37 +68,69 @@ void ShowPage_AudioLink() {
         ShowProperty("_ALOverride");
         ShowProperty("_ALAutomatic");
         ShowProperty("_ALMaximize");
+        MaterialProperty _ALThemes = FindProperty("_ALThemes", properties);
+        editor.ShaderProperty(_ALThemes, _ALThemes.displayName);
 
         ShowProperty("_ALReactivePixel");
         ShowProperty("_ReactiveBandLows");
         ShowProperty("_ReactiveBandHighs");
 
-        ShowProperty("_ALccZ1");
+        if (_ALThemes.floatValue == 0)
+            ShowProperty("_ALccZ1");
+        else
+            ShowProperty("_ALttZ1");
         ShowProperty("_BandZ1");
-        ShowProperty("_ALccZ2");
+        if (_ALThemes.floatValue == 0)
+            ShowProperty("_ALccZ2");
+        else
+            ShowProperty("_ALttZ2");
         ShowProperty("_BandZ2");
-        ShowProperty("_ALccZ3");
+        if (_ALThemes.floatValue == 0)
+            ShowProperty("_ALccZ3");
+        else
+            ShowProperty("_ALttZ3");
         ShowProperty("_BandZ3");
-        ShowProperty("_ALccZ4");
+        if (_ALThemes.floatValue == 0)
+            ShowProperty("_ALccZ4");
+        else
+            ShowProperty("_ALttZ4");
         ShowProperty("_BandZ4");
 
         ShowProperty("_ALccG1");
-        ShowProperty("_ALccG1StopA");
-        ShowProperty("_ALccG1StopC");
+        if (_ALThemes.floatValue == 0)  {
+            ShowProperty("_ALccG1StopA");
+            ShowProperty("_ALccG1StopC");
+        }
+        else {
+            ShowProperty("_ALttG1StopA");
+            ShowProperty("_ALttG1StopC");
+        }
         ShowProperty("_BandG1");
         ShowProperty("_BandG1Reverse");
         ShowProperty("_BandG1Length");
 
         ShowProperty("_ALccG2");
-        ShowProperty("_ALccG2StopA");
-        ShowProperty("_ALccG2StopC");
+        if (_ALThemes.floatValue == 0)  {
+            ShowProperty("_ALccG2StopA");
+            ShowProperty("_ALccG2StopC");
+        }
+        else {
+            ShowProperty("_ALttG2StopA");
+            ShowProperty("_ALttG2StopC");
+        }
         ShowProperty("_BandG2");
         ShowProperty("_BandG2Reverse");
         ShowProperty("_BandG2Length");
 
         ShowProperty("_ALccG3");
-        ShowProperty("_ALccG3StopA");
-        ShowProperty("_ALccG3StopC");
+        if (_ALThemes.floatValue == 0)  {
+            ShowProperty("_ALccG3StopA");
+            ShowProperty("_ALccG3StopC");
+        }
+        else {
+            ShowProperty("_ALttG3StopA");
+            ShowProperty("_ALttG3StopC");
+        }
         ShowProperty("_BandG3");
         ShowProperty("_BandG3Reverse");
         ShowProperty("_BandG3Length");