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

Meteor effect change

Browse Source 
- remedy for #3374
This commit is contained in:
Blaz Kristan 2023-09-16 12:30:57 +02:00
parent 87cc3fd714
commit c7d45c28cf
3 changed files with 994 additions and 995 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wled00/FX.cpp
View File

@ -2270,7 +2270,7 @@ uint16_t mode_meteor() {
{ {
byte meteorTrailDecay = 128 + random8(127); byte meteorTrailDecay = 128 + random8(127);
trail[i] = scale8(trail[i], meteorTrailDecay); trail[i] = scale8(trail[i], meteorTrailDecay);
SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(i, true, false, 0, trail[i])); SEGMENT.setPixelColor(i, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(i, true, false, 0), trail[i]));
} }
} }
@ -2281,12 +2281,12 @@ uint16_t mode_meteor() {
index -= SEGLEN; index -= SEGLEN;
} }
trail[index] = 240; trail[index] = 240;
SEGMENT.setPixelColor(index, SEGMENT.color_from_palette(index, true, false, 0, 255)); SEGMENT.setPixelColor(index, SEGMENT.color_from_palette(index, true, false, 0));
} }
return FRAMETIME; return FRAMETIME;
} }
static const char _data_FX_MODE_METEOR[] PROGMEM = "Meteor@!,Trail length;!;!"; static const char _data_FX_MODE_METEOR[] PROGMEM = "Meteor@!,Trail length;!,!;!;1";
// smooth meteor effect // smooth meteor effect
@ -2309,7 +2309,7 @@ uint16_t mode_meteor_smooth() {
trail[i] += change; trail[i] += change;
if (trail[i] > 245) trail[i] = 0; if (trail[i] > 245) trail[i] = 0;
if (trail[i] > 240) trail[i] = 240; if (trail[i] > 240) trail[i] = 240;
SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(i, true, false, 0, trail[i])); SEGMENT.setPixelColor(i, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(i, true, false, 0), trail[i]));
} }
} }
@ -2320,13 +2320,13 @@ uint16_t mode_meteor_smooth() {
index -= SEGLEN; index -= SEGLEN;
} }
trail[index] = 240; trail[index] = 240;
SEGMENT.setPixelColor(index, SEGMENT.color_from_palette(index, true, false, 0, 255)); SEGMENT.setPixelColor(index, SEGMENT.color_from_palette(index, true, false, 0));
} }
SEGENV.step += SEGMENT.speed +1; SEGENV.step += SEGMENT.speed +1;
return FRAMETIME; return FRAMETIME;
} }
static const char _data_FX_MODE_METEOR_SMOOTH[] PROGMEM = "Meteor Smooth@!,Trail length;!;!"; static const char _data_FX_MODE_METEOR_SMOOTH[] PROGMEM = "Meteor Smooth@!,Trail length;!,!;!;1";
//Railway Crossing / Christmas Fairy lights //Railway Crossing / Christmas Fairy lights

2
wled00/data/index.js
View File

@ -1248,7 +1248,7 @@ function updateSelectedPalette(s)
if (s > 1 && s < 6) { if (s > 1 && s < 6) {
cd[0].classList.remove('hide'); // * Color 1 cd[0].classList.remove('hide'); // * Color 1
if (s > 2) cd[1].classList.remove('hide'); // * Color 1 & 2 if (s > 2) cd[1].classList.remove('hide'); // * Color 1 & 2
if (s == 5) cd[2].classList.remove('hide'); // all colors if (s > 3) cd[2].classList.remove('hide'); // all colors
} else { } else {
for (let i of cd) if (i.dataset.hide == '1') i.classList.add('hide'); for (let i of cd) if (i.dataset.hide == '1') i.classList.add('hide');
} }

1975
wled00/html_ui.h
View File

File diff suppressed because it is too large Load Diff