Sternenlabor/WLED
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

make getPixelColor matrix (mapping) aware

Browse Source 
And change some mapping defaults of effects useing getPixelColor
This commit is contained in:
ewowi
2022-07-13 15:40:40 +02:00
parent 615f807909
commit aeb8fd6fda
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
wled00/FX_fcn.cpp
View File

@@ -276,7 +276,30 @@ void Segment::setPixelColor(float i, uint32_t col, bool aa)
uint32_t Segment::getPixelColor(uint16_t i)
{
if (getOption(SEG_OPTION_REVERSED)) i = virtualLength() - i - 1;
if (strip.isMatrix) {
switch (SEGMENT.mapping12) {
case M12_Pixels:
return getPixelColorXY(i%SEGMENT.virtualWidth(), i/SEGMENT.virtualWidth());
break;
case M12_VerticalBar:
// map linear pixel into 2D segment area (even for 1D segments, expanding vertically)
return getPixelColorXY(i, 0);
break;
case M12_Circle:
{
int x = roundf(roundf((SEGMENT.virtualWidth() / 2) * 10)/10);
int y = roundf(roundf((i + SEGMENT.virtualHeight() / 2) * 10)/10);
return getPixelColorXY(x,y);
}
break;
case M12_Block:
return getPixelColorXY(SEGMENT.virtualWidth() / 2, SEGMENT.virtualHeight() / 2 - i - 1);
break;
}
return 0;
}
if (getOption(SEG_OPTION_REVERSED)) i = strip.getMappingLength() - i - 1;
i *= groupLength();
i += start;
/* offset/phase */