From efd716835d2a684861ea7396ecc66741a4cf06d4 Mon Sep 17 00:00:00 2001
From: Diogo Trindade <diogotr7@gmail.com>
Date: Sat, 30 May 2020 17:48:43 +0100
Subject: [PATCH 1/2] made color adjust sliders apply to the average color

---
 .../Settings/Layers/AmbilightLayerHandler.cs        | 13 ++++++++++++-
 .../Settings/Layers/Control_AmbilightLayer.xaml     |  4 ++--
 Project-Aurora/Project-Aurora/Utils/BitmapUtils.cs  | 12 ++++++------
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Settings/Layers/AmbilightLayerHandler.cs b/Project-Aurora/Project-Aurora/Settings/Layers/AmbilightLayerHandler.cs
index d35f95781..3110dd8c7 100644
--- a/Project-Aurora/Project-Aurora/Settings/Layers/AmbilightLayerHandler.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Layers/AmbilightLayerHandler.cs
@@ -346,7 +346,18 @@ public override EffectLayer Render(IGameState gamestate)
                     break;
 
                 case AmbilightType.AverageColor:
-                    ambilight_layer.Set(Properties.Sequence, BitmapUtils.GetAverageColor(screen));
+                    var average = BitmapUtils.GetAverageColor(screen);
+
+                    if (Properties.BrightenImage)
+                        average = ColorUtils.ChangeBrightness(average,  Properties.BrightnessChange);
+
+                    if (Properties.SaturateImage)
+                        average = ColorUtils.ChangeSaturation(average, Properties.SaturationChange);
+
+                    if (Properties.HueShiftImage)
+                        average = ColorUtils.ChangeHue(average, Properties.HueShiftAngle);
+
+                    ambilight_layer.Set(Properties.Sequence, average);
                     break;
             }
 
diff --git a/Project-Aurora/Project-Aurora/Settings/Layers/Control_AmbilightLayer.xaml b/Project-Aurora/Project-Aurora/Settings/Layers/Control_AmbilightLayer.xaml
index c55876a54..d2d7b7c87 100644
--- a/Project-Aurora/Project-Aurora/Settings/Layers/Control_AmbilightLayer.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Layers/Control_AmbilightLayer.xaml
@@ -157,11 +157,11 @@
                         <RowDefinition/>
                     </Grid.RowDefinitions>
                     <CheckBox IsChecked="{Binding Properties._BrightenImage}" x:Name="EnableBrightnessMod" Content="Brightness:" Grid.Row="0" Grid.Column="0"/>
-                    <Slider Value="{Binding Properties._BrightnessChange}" x:Name="BrightnessSlider" IsEnabled="{Binding ElementName=EnableBrightnessMod, Path=IsChecked}" Minimum="-0.5" Maximum="0.5" TickFrequency="0.1" Grid.Row="0" Grid.Column="1"/>
+                    <Slider Value="{Binding Properties._BrightnessChange}" x:Name="BrightnessSlider" IsEnabled="{Binding ElementName=EnableBrightnessMod, Path=IsChecked}" Minimum="0" Maximum="3" TickFrequency="0.1" Grid.Row="0" Grid.Column="1"/>
                     <Label Content="{Binding ElementName=BrightnessSlider, Path=Value}" ContentStringFormat="N1" Grid.Row="0" Grid.Column="2" />
 
                     <CheckBox IsChecked="{Binding Properties._SaturateImage}" x:Name="EnableSaturationMod" Content="Saturation:"  Grid.Row="1" Grid.Column="0"/>
-                    <Slider Value="{Binding Properties._SaturationChange}" x:Name="SaturationSlider" IsEnabled="{Binding ElementName=EnableSaturationMod, Path=IsChecked}" Minimum="0" Maximum="4" TickFrequency="0.1" Grid.Row="1" Grid.Column="1"/>
+                    <Slider Value="{Binding Properties._SaturationChange}" x:Name="SaturationSlider" IsEnabled="{Binding ElementName=EnableSaturationMod, Path=IsChecked}" Minimum="0" Maximum="3" TickFrequency="0.1" Grid.Row="1" Grid.Column="1"/>
                     <Label Content="{Binding ElementName=SaturationSlider, Path=Value}" ContentStringFormat="N1" Grid.Row="1" Grid.Column="2"/>
 
                     <CheckBox IsChecked="{Binding Properties._HueShiftImage}" x:Name="EnableHueMod" Content="Hue:" Grid.Row="2" Grid.Column="0"/>
diff --git a/Project-Aurora/Project-Aurora/Utils/BitmapUtils.cs b/Project-Aurora/Project-Aurora/Utils/BitmapUtils.cs
index 482eeafae..f97cf2ea4 100644
--- a/Project-Aurora/Project-Aurora/Utils/BitmapUtils.cs
+++ b/Project-Aurora/Project-Aurora/Utils/BitmapUtils.cs
@@ -83,21 +83,21 @@ public static Color GetAverageColor(Image screenshot)
         /// Returns a color matrix that when applied to an image alters its brightness.
         /// Taken from https://docs.rainmeter.net/tips/colormatrix-guide/
         /// </summary>
-        /// <param name="b">Brightness (-1..1)</param>
+        /// <param name="b">Brightness (0..4)</param>
         /// <returns></returns>
         public static float[][] GetBrightnessColorMatrix(float b) => new float[][] {
-                new float[] {1, 0, 0, 0, 0},//red
-                new float[] {0, 1, 0, 0, 0},//green
-                new float[] {0, 0, 1, 0, 0},//blue
+                new float[] {b, 0, 0, 0, 0},//red
+                new float[] {0, b, 0, 0, 0},//green
+                new float[] {0, 0, b, 0, 0},//blue
                 new float[] {0, 0, 0, 1, 0},//alpha
-                new float[] {b, b, b, 0, 1}
+                new float[] {0, 0, 0, 0, 1}
         };
 
         /// <summary>
         /// Returns a color matrix that when applied to an image alters its saturation.
         /// Taken from https://docs.rainmeter.net/tips/colormatrix-guide/
         /// </summary>
-        /// <param name="s">Saturation (0..~5)</param>
+        /// <param name="s">Saturation (0..4)</param>
         /// <returns></returns>
         public static float[][] GetSaturationColorMatrix(float s)
         {

From 26f3fb2809e0c5b0583b7429301ef3f82ade28cd Mon Sep 17 00:00:00 2001
From: Diogo Trindade <diogotr7@gmail.com>
Date: Thu, 28 May 2020 15:14:27 +0100
Subject: [PATCH 2/2] plugin error logging

---
 Project-Aurora/Project-Aurora/Settings/PluginManager.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Project-Aurora/Project-Aurora/Settings/PluginManager.cs b/Project-Aurora/Project-Aurora/Settings/PluginManager.cs
index c5f57356c..56132ad83 100644
--- a/Project-Aurora/Project-Aurora/Settings/PluginManager.cs
+++ b/Project-Aurora/Project-Aurora/Settings/PluginManager.cs
@@ -145,7 +145,14 @@ public void ProcessManager(object manager)
         {
             foreach (var plugin in this.Plugins)
             {
-                plugin.Value.ProcessManager(manager);
+                try
+                {
+                    plugin.Value.ProcessManager(manager);
+                }
+                catch(Exception e)
+                {
+                    Global.logger.Error($"Failed to load plugin {plugin.Key}: {e.Message}");
+                }
             }
         }