jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use 32-bit RGBColor type (COLORREF compatible) instead of discrete red, green, and blue channels in generic RGB interface

Browse source
This commit is contained in:
Adam Honse 2019-06-14 12:24:07 -05:00
parent 90b57e1846
commit d60936b2e5
6 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
OpenAuraSDK/OpenAuraSDKDialog.cpp
View file

@ -68,11 +68,13 @@ void OpenAuraSDKDialog::OnBnClickedButtonOpenaurasdkSetColorsAll()
{
CComboBox* controller_box = (CComboBox*)GetDlgItem(IDC_COMBO_OPENAURASDK_DEVICE);
controllers[controller_box->GetCurSel()]->SetAllLEDs(
RGBColor color = ToRGBColor(
GetDlgItemInt(IDC_EDIT_OPENAURASDK_LED_0_R),
GetDlgItemInt(IDC_EDIT_OPENAURASDK_LED_0_G),
GetDlgItemInt(IDC_EDIT_OPENAURASDK_LED_0_B)
);
controllers[controller_box->GetCurSel()]->SetAllLEDs(color);
}

10
OpenAuraSDK/RGBController.h
View file

@ -12,6 +12,14 @@
#include <vector>
#include <string>
typedef unsigned int RGBColor;
#define RGBGetRValue(rgb) (rgb & 0x000000FF)
#define RGBGetGValue(rgb) ((rgb >> 8) & 0x000000FF)
#define RGBGetBValue(rgb) ((rgb >> 16) & 0x000000FF)
#define ToRGBColor(r, g, b) ((b << 16) | (g << 8) | (r))
typedef struct
{
std::string name; /* LED name */
@ -49,5 +57,5 @@ public:
virtual int GetMode() = 0;
virtual void SetMode(int mode) = 0;
virtual void SetAllLEDs(unsigned char red, unsigned char green, unsigned char blue) = 0;
virtual void SetAllLEDs(RGBColor color) = 0;
};

10
OpenAuraSDK/RGBController_Aura.cpp
View file

@ -34,15 +34,19 @@ void RGBController_Aura::SetMode(int mode)
}
}
void RGBController_Aura::SetAllLEDs(unsigned char red, unsigned char green, unsigned char blue)
void RGBController_Aura::SetAllLEDs(RGBColor color)
{
unsigned char red = RGBGetRValue(color);
unsigned char grn = RGBGetGValue(color);
unsigned char blu = RGBGetBValue(color);
if (GetMode() == 0)
{
aura->SetAllColorsDirect(red, green, blue);
aura->SetAllColorsDirect(red, grn, blu);
}
else
{
aura->SetAllColorsEffect(red, green, blue);
aura->SetAllColorsEffect(red, grn, blu);
}
}

2
OpenAuraSDK/RGBController_Aura.h
View file

@ -18,7 +18,7 @@ public:
RGBController_Aura(AuraController* aura_ptr);
int GetMode();
void SetMode(int mode);
void SetAllLEDs(unsigned char red, unsigned char green, unsigned char blue);
void SetAllLEDs(RGBColor color);
private:
AuraController* aura;

8
OpenAuraSDK/RGBController_Corsair.cpp
View file

@ -19,9 +19,13 @@ void RGBController_Corsair::SetMode(int mode)
corsair->SetMode(mode);
}
void RGBController_Corsair::SetAllLEDs(unsigned char red, unsigned char green, unsigned char blue)
void RGBController_Corsair::SetAllLEDs(RGBColor color)
{
corsair->SetAllColorsDirect(red, green, blue);
unsigned char red = RGBGetRValue(color);
unsigned char grn = RGBGetGValue(color);
unsigned char blu = RGBGetBValue(color);
corsair->SetAllColorsDirect(red, grn, blu);
}
RGBController_Corsair::RGBController_Corsair(CorsairController* corsair_ptr)

2
OpenAuraSDK/RGBController_Corsair.h
View file

@ -18,7 +18,7 @@ public:
RGBController_Corsair(CorsairController* corsair_ptr);
int GetMode();
void SetMode(int mode);
void SetAllLEDs(unsigned char red, unsigned char green, unsigned char blue);
void SetAllLEDs(RGBColor color);
private:
CorsairController* corsair;