DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-01-02 10:43:31 +00:00
Code Issues Releases Wiki Activity

Mouse animation fixes

Browse Source
This commit is contained in:
SpoinkyNL 2016-07-06 20:57:01 +02:00
parent 8d9272f47c
commit 8b09e180c6
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Artemis/Artemis/DeviceProviders/Corsair/CorsairHeadsets.cs
View File

@ -49,11 +49,11 @@ namespace Artemis.DeviceProviders.Corsair
// Color each LED according to one of the pixels // Color each LED according to one of the pixels
foreach (var corsairLed in CueSDK.HeadsetSDK.Leds) foreach (var corsairLed in CueSDK.HeadsetSDK.Leds)
{ {
if (ledIndex == 0) var col = ledIndex == 0
corsairLed.Color = bitmap.GetPixel(0, 0); ? bitmap.GetPixel(0, 0)
else : bitmap.GetPixel((int)((ledIndex + 1) * step - 1), (int)((ledIndex + 1) * step - 1));
corsairLed.Color = bitmap.GetPixel((int) ((ledIndex + 1)*step - 1),
(int) ((ledIndex + 1)*step - 1)); corsairLed.Color = col;
ledIndex++; ledIndex++;
} }
} }

10
Artemis/Artemis/DeviceProviders/Corsair/CorsairMice.cs
View File

@ -49,11 +49,11 @@ namespace Artemis.DeviceProviders.Corsair
// Color each LED according to one of the pixels // Color each LED according to one of the pixels
foreach (var corsairLed in CueSDK.MouseSDK.Leds) foreach (var corsairLed in CueSDK.MouseSDK.Leds)
{ {
if (ledIndex == 0) var col = ledIndex == 0
corsairLed.Color = bitmap.GetPixel(0, 0); ? bitmap.GetPixel(0, 0)
else : bitmap.GetPixel((int) ((ledIndex + 1)*step - 1), (int) ((ledIndex + 1)*step - 1));
corsairLed.Color = bitmap.GetPixel((int) ((ledIndex + 1)*step - 1),
(int) ((ledIndex + 1)*step - 1)); corsairLed.Color = col;
ledIndex++; ledIndex++;
} }
} }

4
Artemis/Artemis/Models/EffectModel.cs
View File

@ -69,6 +69,8 @@ namespace Artemis.Models
mouse = new Bitmap(40, 40); mouse = new Bitmap(40, 40);
using (var g = Graphics.FromImage(mouse)) using (var g = Graphics.FromImage(mouse))
{ {
// Not all SDK's handle transparency
g.Clear(Color.Black);
Profile.DrawLayers(g, renderLayers.Where(rl => rl.LayerType is MouseType), DataModel, smallRect, Profile.DrawLayers(g, renderLayers.Where(rl => rl.LayerType is MouseType), DataModel, smallRect,
false, true); false, true);
} }
@ -77,6 +79,8 @@ namespace Artemis.Models
headset = new Bitmap(40, 40); headset = new Bitmap(40, 40);
using (var g = Graphics.FromImage(headset)) using (var g = Graphics.FromImage(headset))
{ {
// Not all SDK's handle transparency
g.Clear(Color.Black);
Profile.DrawLayers(g, renderLayers.Where(rl => rl.LayerType is HeadsetType), DataModel, smallRect, Profile.DrawLayers(g, renderLayers.Where(rl => rl.LayerType is HeadsetType), DataModel, smallRect,
false, true); false, true);
} }

3
Artemis/Artemis/Modules/Effects/WindowsProfile/WindowsProfileDataModel.cs
View File

@ -9,6 +9,7 @@ namespace Artemis.Modules.Effects.WindowsProfile
Spotify = new Spotify(); Spotify = new Spotify();
Cpu = new CpuDataModel(); Cpu = new CpuDataModel();
Performance = new PerformanceDataModel(); Performance = new PerformanceDataModel();
CurrentTime = new CurrentTime();
} }
public CpuDataModel Cpu { get; set; } public CpuDataModel Cpu { get; set; }
@ -17,7 +18,7 @@ namespace Artemis.Modules.Effects.WindowsProfile
public CurrentTime CurrentTime { get; set; } public CurrentTime CurrentTime { get; set; }
} }
class CurrentTime public class CurrentTime
{ {
public int Hours24 { get; set; } public int Hours24 { get; set; }
public int Hours12 { get; set; } public int Hours12 { get; set; }

2
Artemis/Artemis/ViewModels/Profiles/Layers/MousePropertiesViewModel.cs
View File

@ -20,7 +20,7 @@ namespace Artemis.ViewModels.Profiles.Layers
new BindableCollection<GeneralHelpers.PropertyCollection>(GeneralHelpers.GenerateTypeMap(dataModel)), new BindableCollection<GeneralHelpers.PropertyCollection>(GeneralHelpers.GenerateTypeMap(dataModel)),
layerModel.Properties); layerModel.Properties);
SelectedLayerAnimation = LayerAnimations.FirstOrDefault(l => l.Name == layerModel.LayerAnimation.Name) ?? SelectedLayerAnimation = LayerAnimations.FirstOrDefault(l => l.Name == layerModel.LayerAnimation?.Name) ??
LayerAnimations.First(l => l.Name == "None"); LayerAnimations.First(l => l.Name == "None");
} }