lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2D Ripple effect tweak

Browse Source 
for #3370
This commit is contained in:
Blaz Kristan 2023-09-16 00:21:10 +02:00
parent 282d58a6fe
commit 87cc3fd714
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wled00/FX.cpp
View File

@ -2400,9 +2400,10 @@ uint16_t ripple_base()
#ifndef WLED_DISABLE_2D #ifndef WLED_DISABLE_2D
if (SEGMENT.is2D()) { if (SEGMENT.is2D()) {
propI /= 2;
uint16_t cx = rippleorigin >> 8; uint16_t cx = rippleorigin >> 8;
uint16_t cy = rippleorigin & 0xFF; uint16_t cy = rippleorigin & 0xFF;
uint8_t mag = scale8(cubicwave8((propF>>2)), amp); uint8_t mag = scale8(sin8((propF>>2)), amp);
if (propI > 0) SEGMENT.draw_circle(cx, cy, propI, color_blend(SEGMENT.getPixelColorXY(cx + propI, cy), col, mag)); if (propI > 0) SEGMENT.draw_circle(cx, cy, propI, color_blend(SEGMENT.getPixelColorXY(cx + propI, cy), col, mag));
} else } else
#endif #endif
@ -2418,7 +2419,7 @@ uint16_t ripple_base()
ripplestate += rippledecay; ripplestate += rippledecay;
ripples[i].state = (ripplestate > 254) ? 0 : ripplestate; ripples[i].state = (ripplestate > 254) ? 0 : ripplestate;
} else {//randomly create new wave } else {//randomly create new wave
if (random16(IBN + 10000) <= SEGMENT.intensity) { if (random16(IBN + 10000) <= (SEGMENT.intensity >> (SEGMENT.is2D()*3))) {
ripples[i].state = 1; ripples[i].state = 1;
ripples[i].pos = SEGMENT.is2D() ? ((random8(SEGENV.virtualWidth())<<8) | (random8(SEGENV.virtualHeight()))) : random16(SEGLEN); ripples[i].pos = SEGMENT.is2D() ? ((random8(SEGENV.virtualWidth())<<8) | (random8(SEGENV.virtualHeight()))) : random16(SEGLEN);
ripples[i].color = random8(); //color ripples[i].color = random8(); //color
@ -2434,6 +2435,7 @@ uint16_t ripple_base()
uint16_t mode_ripple(void) { uint16_t mode_ripple(void) {
if (SEGLEN == 1) return mode_static(); if (SEGLEN == 1) return mode_static();
if (!SEGMENT.check2) SEGMENT.fill(SEGCOLOR(1)); if (!SEGMENT.check2) SEGMENT.fill(SEGCOLOR(1));
else SEGMENT.fade_out(250);
return ripple_base(); return ripple_base();
} }
static const char _data_FX_MODE_RIPPLE[] PROGMEM = "Ripple@!,Wave #,,,,,Overlay;,!;!;12"; static const char _data_FX_MODE_RIPPLE[] PROGMEM = "Ripple@!,Wave #,,,,,Overlay;,!;!;12";