frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Reorder Transform and Adjustment (#636)

Browse Source 
Change order from "Adjustment -> Transform" to "Transform -> Adjustment"

Former-commit-id: 5b63d0bce98a80b5a2604e43772574ec6bbfd2a5
This commit is contained in:
Funatiq 2016-05-22 00:30:53 +02:00 committed by brindosch
parent 4afd730954
commit 82f3fbdb20
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libsrc/hyperion/Hyperion.cpp
View File

@ -860,9 +860,9 @@ void Hyperion::update()
// Apply the correction and the transform to each led and color-channel // Apply the correction and the transform to each led and color-channel
// Avoid applying correction, the same task is performed by adjustment // Avoid applying correction, the same task is performed by adjustment
// std::vector<ColorRgb> correctedColors = _raw2ledCorrection->applyCorrection(priorityInfo.ledColors); // std::vector<ColorRgb> correctedColors = _raw2ledCorrection->applyCorrection(priorityInfo.ledColors);
std::vector<ColorRgb> adjustedColors = _raw2ledAdjustment->applyAdjustment(priorityInfo.ledColors); std::vector<ColorRgb> transformColors =_raw2ledTransform->applyTransform(priorityInfo.ledColors);
std::vector<ColorRgb> transformColors =_raw2ledTransform->applyTransform(adjustedColors); std::vector<ColorRgb> adjustedColors = _raw2ledAdjustment->applyAdjustment(transformColors);
std::vector<ColorRgb> ledColors = _raw2ledTemperature->applyCorrection(transformColors); std::vector<ColorRgb> ledColors = _raw2ledTemperature->applyCorrection(adjustedColors);
const std::vector<Led>& leds = _ledString.leds(); const std::vector<Led>& leds = _ledString.leds();
int i = 0; int i = 0;
for (ColorRgb& color : ledColors) for (ColorRgb& color : ledColors)
@ -885,18 +885,14 @@ void Hyperion::update()
break; break;
case ORDER_GBR: case ORDER_GBR:
{ {
uint8_t temp = color.red; std::swap(color.red, color.green);
color.red = color.green; std::swap(color.green, color.blue);
color.green = color.blue;
color.blue = temp;
break; break;
} }
case ORDER_BRG: case ORDER_BRG:
{ {
uint8_t temp = color.red; std::swap(color.red, color.blue);
color.red = color.blue; std::swap(color.green, color.blue);
color.blue = color.green;
color.green = temp;
break; break;
} }
} }