added the ability to query whether certain lighting engines are supported

This commit is contained in:
Ell 2022-01-19 12:12:36 +01:00
parent 4b346e85bc
commit 1a123e5f27
8 changed files with 60 additions and 12 deletions

View file

@ -8,6 +8,11 @@ namespace Demo {
private static void Main(string[] args) {
IllumilibLighting.Initialize();
foreach (var type in Enum.GetValues<LightingType>()) {
if (IllumilibLighting.IsEnabled(type))
Console.WriteLine($"{type} lighting is enabled");
}
Console.WriteLine("Setting all lights to blue");
IllumilibLighting.SetAllLighting(r: 0, g: 0, b: 1);
Thread.Sleep(TimeSpan.FromSeconds(3));

View file

@ -12,6 +12,7 @@
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageIcon>Logo.png</PackageIcon>
<VersionPrefix>1.2.2</VersionPrefix>
<NoWarn>NU1701</NoWarn>
</PropertyGroup>
<ItemGroup>
@ -24,7 +25,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Colore" Version="6.0.0"/>
<PackageReference Include="CUESDK.NET" Version="3.0.361.2"/>
<PackageReference Include="Colore" Version="6.0.0" />
<PackageReference Include="CUESDK.NET" Version="3.0.361.2" />
</ItemGroup>
</Project>

View file

@ -18,7 +18,7 @@ namespace Illumilib {
/// </summary>
public const int KeyboardHeight = 6;
private static List<LightingSystem> systems;
private static Dictionary<LightingType, LightingSystem> systems;
/// <summary>
/// A property that returns whether Illumilib is currently initialized
/// </summary>
@ -33,10 +33,10 @@ namespace Illumilib {
public static bool Initialize() {
if (Initialized)
throw new InvalidOperationException("Illumilib has already been initialized");
systems = new List<LightingSystem>();
systems = new Dictionary<LightingType, LightingSystem>();
foreach (var system in new LightingSystem[] {new LogitechLighting(), new RazerLighting(), new CorsairLighting()}) {
if (system.Initialize())
systems.Add(system);
systems.Add(system.Type, system);
}
return systems.Count > 0;
}
@ -47,11 +47,21 @@ namespace Illumilib {
public static void Dispose() {
if (!Initialized)
return;
foreach (var system in systems)
foreach (var system in systems.Values)
system.Dispose();
systems = null;
}
/// <summary>
/// Returns whether the given <see cref="LightingType"/> has been initialized successfully and is enabled.
/// </summary>
/// <param name="type">The <see cref="LightingType"/> to query.</param>
/// <returns>Whether the given <see cref="LightingType"/> has been initialized and is enabled.</returns>
public static bool IsEnabled(LightingType type) {
EnsureInitialized();
return systems.ContainsKey(type);
}
/// <summary>
/// Sets the lighting for all keyboards and mice to the given color
/// </summary>
@ -60,7 +70,7 @@ namespace Illumilib {
/// <param name="b">The color's blue value, between 0 and 1</param>
public static void SetAllLighting(float r, float g, float b) {
EnsureInitialized();
foreach (var system in systems)
foreach (var system in systems.Values)
system.SetAllLighting(r, g, b);
}
@ -72,7 +82,7 @@ namespace Illumilib {
/// <param name="b">The color's blue value, between 0 and 1</param>
public static void SetKeyboardLighting(float r, float g, float b) {
EnsureInitialized();
foreach (var system in systems)
foreach (var system in systems.Values)
system.SetKeyboardLighting(r, g, b);
}
@ -92,7 +102,7 @@ namespace Illumilib {
throw new ArgumentOutOfRangeException(nameof(x));
if (y < 0 || y >= KeyboardHeight)
throw new ArgumentOutOfRangeException(nameof(y));
foreach (var system in systems)
foreach (var system in systems.Values)
system.SetKeyboardLighting(x, y, r, g, b);
}
@ -115,7 +125,7 @@ namespace Illumilib {
throw new ArgumentOutOfRangeException(nameof(x));
if (y < 0 || y + height > KeyboardHeight)
throw new ArgumentOutOfRangeException(nameof(y));
foreach (var system in systems)
foreach (var system in systems.Values)
system.SetKeyboardLighting(x, y, width, height, r, g, b);
}
@ -129,7 +139,7 @@ namespace Illumilib {
/// <param name="b">The color's blue value, between 0 and 1</param>
public static void SetKeyboardLighting(KeyboardKeys key, float r, float g, float b) {
EnsureInitialized();
foreach (var system in systems)
foreach (var system in systems.Values)
system.SetKeyboardLighting(key, r, g, b);
}
@ -141,7 +151,7 @@ namespace Illumilib {
/// <param name="b">The color's blue value, between 0 and 1</param>
public static void SetMouseLighting(float r, float g, float b) {
EnsureInitialized();
foreach (var system in systems)
foreach (var system in systems.Values)
system.SetMouseLighting(r, g, b);
}

24
Illumilib/LightingType.cs Normal file
View file

@ -0,0 +1,24 @@
using Illumilib.System;
namespace Illumilib {
/// <summary>
/// An enumeration of possible lighting engines that Illumilib currently supports.
/// To query whether a lighting type is available, see <see cref="IllumilibLighting.IsEnabled"/>.
/// </summary>
public enum LightingType {
/// <summary>
/// The logitech lighting type, controlled by <see cref="LogitechLighting"/>.
/// </summary>
Logitech,
/// <summary>
/// The corsair lighting type, controlled by <see cref="CorsairLighting"/>.
/// </summary>
Corsair,
/// <summary>
/// The razer lighting type, controlled by <see cref="RazerLighting"/>.
/// </summary>
Razer
}
}

View file

@ -5,6 +5,8 @@ using Corsair.CUE.SDK;
namespace Illumilib.System {
internal class CorsairLighting : LightingSystem {
public override LightingType Type => LightingType.Corsair;
private DeviceInfo[] devices;
public override bool Initialize() {

View file

@ -3,6 +3,8 @@
namespace Illumilib.System {
internal abstract class LightingSystem : IDisposable {
public abstract LightingType Type { get; }
public abstract bool Initialize();
public abstract void Dispose();

View file

@ -3,6 +3,8 @@
namespace Illumilib.System {
internal class LogitechLighting : LightingSystem {
public override LightingType Type => LightingType.Logitech;
private readonly byte[] bitmap = new byte[LogitechGsdk.LogiLedBitmapSize];
private bool bitmapDirty;

View file

@ -5,6 +5,8 @@ using Colore.Effects.Keyboard;
namespace Illumilib.System {
internal class RazerLighting : LightingSystem {
public override LightingType Type => LightingType.Razer;
private IChroma chroma;
private CustomKeyboardEffect effect = new CustomKeyboardEffect(Color.Black);
private bool effectOutdated;