jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-27 12:46:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

more optimizations and better readability

Browse Source
This commit is contained in:
Damian Schneider 2025-02-07 11:14:13 +01:00
parent 2fe809f15a
commit b9ceacb43d
1 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
wled00/FX.cpp
View File

@ -7469,33 +7469,39 @@ static const char _data_FX_MODE_2DDISTORTIONWAVES[] PROGMEM = "Distortion Waves@
//@Stepko //@Stepko
//Idea from https://www.youtube.com/watch?v=DiHBgITrZck&ab_channel=StefanPetrick //Idea from https://www.youtube.com/watch?v=DiHBgITrZck&ab_channel=StefanPetrick
// adapted for WLED by @blazoncek, optimization by @dedehai // adapted for WLED by @blazoncek, optimization by @dedehai
void soapProcessPixels(bool isRow, int size1, int size2, uint8_t* noise3d, int amplitude, int shift, CRGB* ledsbuff) { void soapProcessPixels(bool isRow, uint8_t* noise3d, int amplitude, int shift, CRGB* ledsbuff) { //1153477-1152873
for (int i = 0; i < size1; i++) { const int cols = SEG_W;
int amount = ((int)noise3d[isRow ? XY(0, i) : XY(i, 0)] - 128) * 2 * amplitude + 256 * shift; const int rows = SEG_H;
int delta = abs(amount) >> 8; int rowcol, colrow;
int fraction = abs(amount) & 255; rowcol = isRow ? rows : cols;
for (int j = 0; j < size2; j++) { colrow = isRow ? cols : rows;
int zD, zF;
if (amount < 0) { for (int i = 0; i < rowcol; i++) {
zD = j - delta; int amount = ((int)noise3d[isRow ? i * cols : i] - 128) * 2 * amplitude + 256 * shift;
zF = zD - 1; int delta = abs(amount) >> 8;
} else { int fraction = abs(amount) & 255;
zD = j + delta; for (int j = 0; j < colrow; j++) {
zF = zD + 1; int zD, zF;
} if (amount < 0) {
CRGB PixelA = CRGB::Black; zD = j - delta;
if ((zD >= 0) && (zD < size2)) PixelA = isRow ? SEGMENT.getPixelColorXY(zD, i) : SEGMENT.getPixelColorXY(i, zD); zF = zD - 1;
else PixelA = ColorFromPalette(SEGPALETTE, ~noise3d[isRow ? XY(abs(zD), i) : XY(i, abs(zD))] * 3); } else {
CRGB PixelB = CRGB::Black; zD = j + delta;
if ((zF >= 0) && (zF < size2)) PixelB = isRow ? SEGMENT.getPixelColorXY(zF, i) : SEGMENT.getPixelColorXY(i, zF); zF = zD + 1;
else PixelB = ColorFromPalette(SEGPALETTE, ~noise3d[isRow ? XY(abs(zF), i) : XY(i, abs(zF))] * 3); }
ledsbuff[j] = (PixelA.nscale8(ease8InOutApprox(255 - fraction))) + (PixelB.nscale8(ease8InOutApprox(fraction))); CRGB PixelA = CRGB::Black;
} if ((zD >= 0) && (zD < colrow)) PixelA = isRow ? SEGMENT.getPixelColorXY(zD, i) : SEGMENT.getPixelColorXY(i, zD);
for (int j = 0; j < size2; j++) { else PixelA = ColorFromPalette(SEGPALETTE, ~noise3d[isRow ? (abs(zD)%cols) + i*cols : i + (abs(zD)%rows)*cols] * 3);
if (isRow) SEGMENT.setPixelColorXY(j, i, ledsbuff[j]); CRGB PixelB = CRGB::Black;
else SEGMENT.setPixelColorXY(i, j, ledsbuff[j]); if ((zF >= 0) && (zF < colrow)) PixelB = isRow ? SEGMENT.getPixelColorXY(zF, i) : SEGMENT.getPixelColorXY(i, zF);
} else PixelB = ColorFromPalette(SEGPALETTE, ~noise3d[isRow ? (abs(zF)%cols) + i*cols : i + (abs(zF)%rows)*cols] * 3);
ledsbuff[j] = (PixelA.nscale8(ease8InOutApprox(255 - fraction))) + (PixelB.nscale8(ease8InOutApprox(fraction)));
} }
for (int j = 0; j < colrow; j++) {
if (isRow) SEGMENT.setPixelColorXY(j, i, ledsbuff[j]);
else SEGMENT.setPixelColorXY(i, j, ledsbuff[j]);
}
}
} }
uint16_t mode_2Dsoap() { uint16_t mode_2Dsoap() {
@ -7555,9 +7561,9 @@ uint16_t mode_2Dsoap() {
CRGB ledsbuff[MAX(cols,rows)]; CRGB ledsbuff[MAX(cols,rows)];
amplitude = (cols >= 16) ? (cols-8)/8 : 1; amplitude = (cols >= 16) ? (cols-8)/8 : 1;
soapProcessPixels(true, rows, cols, noise3d, amplitude, shiftX, ledsbuff); // rows 1166192 vs 1165634 soapProcessPixels(true, noise3d, amplitude, shiftX, ledsbuff); // rows
amplitude = (rows >= 16) ? (rows-8)/8 : 1; amplitude = (rows >= 16) ? (rows-8)/8 : 1;
soapProcessPixels(false, cols, rows, noise3d, amplitude, shiftY, ledsbuff); // cols soapProcessPixels(false, noise3d, amplitude, shiftY, ledsbuff); // cols
return FRAMETIME; return FRAMETIME;
} }