Refactored brushes, gradients, effects and the keyboard to uncouple them

Brushes/AbstractBrush.cs

@@ -1,7 +1,7 @@
 using System.Drawing;
 using CUE.NET.Helper;
 
-namespace CUE.NET.Devices.Keyboard.Brushes
+namespace CUE.NET.Brushes
 {
     /// <summary>
     /// Represents a basic brush.

Brushes/IBrush.cs

@@ -1,6 +1,6 @@
 using System.Drawing;
 
-namespace CUE.NET.Devices.Keyboard.Brushes
+namespace CUE.NET.Brushes
 {
     /// <summary>
     /// Represents a basic brush.

Brushes/LinearGradientBrush.cs

@@ -4,10 +4,10 @@
 // ReSharper disable AutoPropertyCanBeMadeGetOnly.Global
 
 using System.Drawing;
-using CUE.NET.Devices.Keyboard.Brushes.Gradient;
+using CUE.NET.Gradients;
 using CUE.NET.Helper;
 
-namespace CUE.NET.Devices.Keyboard.Brushes
+namespace CUE.NET.Brushes
 {
     /// <summary>
     /// Represents a brush drawing a linear gradient.

Brushes/RadialGradientBrush.cs

@@ -3,10 +3,10 @@
 
 using System;
 using System.Drawing;
-using CUE.NET.Devices.Keyboard.Brushes.Gradient;
+using CUE.NET.Gradients;
 using CUE.NET.Helper;
 
-namespace CUE.NET.Devices.Keyboard.Brushes
+namespace CUE.NET.Brushes
 {
     /// <summary>
     /// Represents a brush drawing a radial gradient around a center point.

Brushes/RandomColorBrush.cs

@@ -2,7 +2,7 @@
 using System.Drawing;
 using CUE.NET.Helper;
 
-namespace CUE.NET.Devices.Keyboard.Brushes
+namespace CUE.NET.Brushes
 {
     //TODO DarthAffe 30.09.2015: Like this the brush seems kinda useless. Think about making it cool.
 

Brushes/SolidColorBrush.cs

@@ -3,7 +3,7 @@
 
 using System.Drawing;
 
-namespace CUE.NET.Devices.Keyboard.Brushes
+namespace CUE.NET.Brushes
 {
     /// <summary>
     /// Represents a brush drawing only a single color.

CUE.NET.csproj

@@ -46,20 +46,20 @@
     <Compile Include="Devices\Generic\Enums\CorsairDeviceCaps.cs" />
     <Compile Include="Devices\Generic\Enums\CorsairDeviceType.cs" />
     <Compile Include="Devices\Generic\OnExceptionEventArgs.cs" />
-    <Compile Include="Devices\Keyboard\Brushes\AbstractBrush.cs" />
+    <Compile Include="Brushes\AbstractBrush.cs" />
-    <Compile Include="Devices\Keyboard\Brushes\Gradient\AbstractGradient.cs" />
+    <Compile Include="Gradients\AbstractGradient.cs" />
-    <Compile Include="Devices\Keyboard\Brushes\Gradient\GradientStop.cs" />
+    <Compile Include="Gradients\GradientStop.cs" />
-    <Compile Include="Devices\Keyboard\Brushes\Gradient\IGradient.cs" />
+    <Compile Include="Gradients\IGradient.cs" />
-    <Compile Include="Devices\Keyboard\Brushes\Gradient\RainbowGradient.cs" />
+    <Compile Include="Gradients\RainbowGradient.cs" />
-    <Compile Include="Devices\Keyboard\Brushes\IBrush.cs" />
+    <Compile Include="Brushes\IBrush.cs" />
-    <Compile Include="Devices\Keyboard\Brushes\LinearGradientBrush.cs" />
+    <Compile Include="Brushes\LinearGradientBrush.cs" />
-    <Compile Include="Devices\Keyboard\Brushes\RadialGradientBrush.cs" />
+    <Compile Include="Brushes\RadialGradientBrush.cs" />
-    <Compile Include="Devices\Keyboard\Brushes\RandomColorBrush.cs" />
+    <Compile Include="Brushes\RandomColorBrush.cs" />
-    <Compile Include="Devices\Keyboard\Brushes\SolidColorBrush.cs" />
+    <Compile Include="Brushes\SolidColorBrush.cs" />
-    <Compile Include="Devices\Keyboard\Effects\AbstractEffect.cs" />
+    <Compile Include="Effects\AbstractEffect.cs" />
-    <Compile Include="Devices\Keyboard\Effects\FlashEffect.cs" />
+    <Compile Include="Effects\FlashEffect.cs" />
-    <Compile Include="Devices\Keyboard\Effects\IEffect.cs" />
+    <Compile Include="Effects\IEffect.cs" />
-    <Compile Include="Devices\Keyboard\Effects\EffectTimeContainer.cs" />
+    <Compile Include="Effects\EffectTimeContainer.cs" />
     <Compile Include="Devices\Keyboard\Enums\CorsairLogicalKeyboardLayout.cs" />
     <Compile Include="Devices\Headset\Enums\CorsairHeadsetLedId.cs" />
     <Compile Include="Devices\Keyboard\Enums\CorsairKeyboardKeyId.cs" />
@@ -85,7 +85,7 @@
     <Compile Include="Devices\Mouse\CorsairMouse.cs" />
     <Compile Include="Devices\Keyboard\Extensions\KeyGroupExtension.cs" />
     <Compile Include="Helper\ColorHelper.cs" />
-    <Compile Include="Devices\Keyboard\Brushes\Gradient\LinearGradient.cs" />
+    <Compile Include="Gradients\LinearGradient.cs" />
     <Compile Include="Helper\GradientHelper.cs" />
     <Compile Include="Helper\RectangleHelper.cs" />
     <Compile Include="Native\_CorsairDeviceInfo.cs" />

Devices/Generic/Enums/UpdateMode.cs

@@ -1,4 +1,6 @@
-namespace CUE.NET.Devices.Generic.Enums
+using CUE.NET.Effects;
+
+namespace CUE.NET.Devices.Generic.Enums
 {
     /// <summary>
     /// Contains list of available update modes.
@@ -12,7 +14,7 @@
 
         /// <summary>
         /// The device will perform automatic updates at the rate set in <see cref="CUE.NET.Devices.ICueDevice.UpdateFrequency" />
-        /// as long as an <see cref="CUE.NET.Devices.Keyboard.Effects.IEffect" /> is attached.
+        /// as long as an <see cref="IEffect" /> is attached.
         /// </summary>
         AutoOnEffect,
 

Devices/Keyboard/CorsairKeyboard.cs

@@ -9,11 +9,11 @@ using System.Collections.ObjectModel;
 using System.Drawing;
 using System.Linq;
 using System.Runtime.InteropServices;
+using CUE.NET.Brushes;
 using CUE.NET.Devices.Generic;
-using CUE.NET.Devices.Keyboard.Brushes;
-using CUE.NET.Devices.Keyboard.Effects;
 using CUE.NET.Devices.Keyboard.Enums;
 using CUE.NET.Devices.Keyboard.Keys;
+using CUE.NET.Effects;
 using CUE.NET.Helper;
 using CUE.NET.Native;
 
@@ -188,7 +188,9 @@ namespace CUE.NET.Devices.Keyboard
                         effect.TicksAtLastUpdate = currentTicks;
                         effect.Effect.Update(deltaTime);
 
-                        ApplyBrush((effect.Effect.KeyList ?? this).ToList(), effect.Effect.EffectBrush);
+                        //TODO DarthAffe 18.10.2015: This is really dirty and might have a really negative performance impact - find a better solution.
+                        IEnumerable<CorsairKey> keys = effect.Effect?.LedList?.Select(x => this.FirstOrDefault(y => y.Led == x));
+                        ApplyBrush((keys ?? this).ToList(), effect.Effect.EffectBrush);
 
                         if (effect.Effect.IsDone)
                             effectsToRemove.Add(effect.Effect);
@@ -215,6 +217,11 @@ namespace CUE.NET.Devices.Keyboard
             catch (Exception ex) { ManageException(ex); }
         }
 
+        public IEnumerable<CorsairLed> GetLeds()
+        {
+            return this.Select(x => x.Led);
+        }
+
         #endregion
 
         /// <summary>

Devices/Keyboard/Keys/BaseKeyGroup.cs

@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using CUE.NET.Devices.Keyboard.Brushes;
+using System.Linq;
+using CUE.NET.Brushes;
+using CUE.NET.Devices.Generic;
 using CUE.NET.Devices.Keyboard.Extensions;
 
 namespace CUE.NET.Devices.Keyboard.Keys
@@ -49,6 +51,15 @@ namespace CUE.NET.Devices.Keyboard.Keys
                 this.Attach();
         }
 
+        #endregion
+
+        #region Methods
+
+        public IEnumerable<CorsairLed> GetLeds()
+        {
+            return GetGroupKeys().Select(x => x.Led);
+        }
+
         /// <summary>
         /// Gets a list containing the keys from this group.
         /// </summary>

Devices/Keyboard/Keys/IKeyGroup.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
-using CUE.NET.Devices.Keyboard.Brushes;
+using CUE.NET.Brushes;
+using CUE.NET.Devices.Generic;
 
 namespace CUE.NET.Devices.Keyboard.Keys
 {
@@ -19,5 +20,11 @@ namespace CUE.NET.Devices.Keyboard.Keys
         /// Gets or sets the z-index of this keygroup to allow ordering them before drawing. (lowest first) (default: 0)
         /// </summary>
         int ZIndex { get; set; }
+
+        /// <summary>
+        /// Gets a list containing all LEDs of this group.
+        /// </summary>
+        /// <returns>The list containing all LEDs of this group.</returns>
+        IEnumerable<CorsairLed> GetLeds();
     }
 }

Effects/AbstractEffect.cs

@@ -1,11 +1,10 @@
 // ReSharper disable MemberCanBePrivate.Global
 
 using System.Collections.Generic;
-using System.Linq;
+using CUE.NET.Brushes;
-using CUE.NET.Devices.Keyboard.Brushes;
+using CUE.NET.Devices.Generic;
-using CUE.NET.Devices.Keyboard.Keys;
 
-namespace CUE.NET.Devices.Keyboard.Effects
+namespace CUE.NET.Effects
 {
     /// <summary>
     /// Represents a basic effect.
@@ -15,9 +14,9 @@ namespace CUE.NET.Devices.Keyboard.Effects
         #region Properties & Fields
 
         /// <summary>
-        /// Gets or sets the list of keys to which the effect applies.
+        /// Gets or sets the list of LEDSs to which the effect applies.
         /// </summary>
-        public IEnumerable<CorsairKey> KeyList { get; protected set; }
+        public IEnumerable<CorsairLed> LedList { get; set; }
 
         /// <summary>
         /// Gets the brush which is drawn by the effect.
@@ -38,15 +37,6 @@ namespace CUE.NET.Devices.Keyboard.Effects
 
         #region Methods
 
-        /// <summary>
-        /// Sets the list of keys to which the effect applies.
-        /// </summary>
-        /// <param name="keyGroup"></param>
-        public void SetTarget(IKeyGroup keyGroup)
-        {
-            KeyList = keyGroup.Keys.ToList();
-        }
-
         /// <summary>
         /// Updates the effect.
         /// </summary>
@@ -54,13 +44,13 @@ namespace CUE.NET.Devices.Keyboard.Effects
         public abstract void Update(float deltaTime);
 
         /// <summary>
-        /// Hook which is called when the effect is attached to a keyboard.
+        /// Hook which is called when the effect is attached to a device.
         /// </summary>
         public virtual void OnAttach()
         { }
 
         /// <summary>
-        /// Hook which is called when the effect is detached from a keyboard.
+        /// Hook which is called when the effect is detached from a device.
         /// </summary>
         public virtual void OnDetach()
         { }

Effects/EffectTimeContainer.cs

@@ -1,7 +1,7 @@
 // ReSharper disable MemberCanBePrivate.Global
 // ReSharper disable AutoPropertyCanBeMadeGetOnly.Global
 
-namespace CUE.NET.Devices.Keyboard.Effects
+namespace CUE.NET.Effects
 {
     /// <summary>
     /// Represents a wrapped effect with additional time information.

Effects/FlashEffect.cs

@@ -3,9 +3,9 @@
 
 using System;
 using System.Drawing;
-using CUE.NET.Devices.Keyboard.Brushes;
+using CUE.NET.Brushes;
 
-namespace CUE.NET.Devices.Keyboard.Effects
+namespace CUE.NET.Effects
 {
     /// <summary>
     /// Represents an effect which allows to flash an brush by modifying his opacity.

Effects/IEffect.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using CUE.NET.Devices.Keyboard.Brushes;
+using CUE.NET.Brushes;
-using CUE.NET.Devices.Keyboard.Keys;
+using CUE.NET.Devices.Generic;
 
-namespace CUE.NET.Devices.Keyboard.Effects
+namespace CUE.NET.Effects
 {
     /// <summary>
     /// Represents a basic effect.
@@ -12,9 +12,9 @@ namespace CUE.NET.Devices.Keyboard.Effects
         #region Properties & Fields
 
         /// <summary>
-        /// Gets or sets the list of keys to which the effect applies.
+        /// Gets or sets the list of LEDs to which the effect applies.
         /// </summary>
-        IEnumerable<CorsairKey> KeyList { get; }
+        IEnumerable<CorsairLed> LedList { get; set; }
 
         /// <summary>
         /// Gets the brush which is drawn by the effect.
@@ -42,12 +42,12 @@ namespace CUE.NET.Devices.Keyboard.Effects
         void Update(float deltaTime);
 
         /// <summary>
-        /// Hook which is called when the effect is attached to a keyboard.
+        /// Hook which is called when the effect is attached to a device.
         /// </summary>
         void OnAttach();
 
         /// <summary>
-        /// Hook which is called when the effect is detached from a keyboard.
+        /// Hook which is called when the effect is detached from a device.
         /// </summary>
         void OnDetach();
 

Gradients/AbstractGradient.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 
-namespace CUE.NET.Devices.Keyboard.Brushes.Gradient
+namespace CUE.NET.Gradients
 {
     /// <summary>
     /// Represents a basic gradient.

Gradients/GradientStop.cs

@@ -3,7 +3,7 @@
 
 using System.Drawing;
 
-namespace CUE.NET.Devices.Keyboard.Brushes.Gradient
+namespace CUE.NET.Gradients
 {
     /// <summary>
     /// Represents a stop on a gradient.

Gradients/IGradient.cs

@@ -1,6 +1,6 @@
 using System.Drawing;
 
-namespace CUE.NET.Devices.Keyboard.Brushes.Gradient
+namespace CUE.NET.Gradients
 {
     /// <summary>
     /// Represents a basic gradient.

Gradients/LinearGradient.cs

@@ -1,7 +1,7 @@
 using System.Drawing;
 using System.Linq;
 
-namespace CUE.NET.Devices.Keyboard.Brushes.Gradient
+namespace CUE.NET.Gradients
 {
     /// <summary>
     /// Represents a linear interpolated gradient with n stops.

Gradients/RainbowGradient.cs

@@ -3,7 +3,7 @@
 using System.Drawing;
 using CUE.NET.Helper;
 
-namespace CUE.NET.Devices.Keyboard.Brushes.Gradient
+namespace CUE.NET.Gradients
 {
     /// <summary>
     /// Represents a rainbow gradient which circles through all color colors of the HUE-color-space.<br />