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

Meteor palette fix.

Browse Source 
Akemi optimisation.
Fire2012 remove cooling adjustment.
This commit is contained in:
Blaz Kristan 2022-09-12 22:31:55 +02:00
parent c9fd69ceb7
commit 51a2fa47c9
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wled00/FX.cpp
View File

@ -1982,7 +1982,7 @@ uint16_t mode_fire_2012()
uint8_t cool = random8((((20 + SEGMENT.speed/3) * 16) / SEGLEN)+2); uint8_t cool = random8((((20 + SEGMENT.speed/3) * 16) / SEGLEN)+2);
uint8_t minTemp = 0; uint8_t minTemp = 0;
if (i<ignition) { if (i<ignition) {
cool /= (ignition-i)/3 + 1; // ignition area cools slower //cool /= (ignition-i)/3 + 1; // ignition area cools slower
minTemp = (ignition-i)/4 + 16; // and should not become black minTemp = (ignition-i)/4 + 16; // and should not become black
} }
uint8_t temp = qsub8(heat[i], cool); uint8_t temp = qsub8(heat[i], cool);
@ -2290,7 +2290,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(trail[i], false, true, 255)); SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(i, true, false, 0, trail[i]));
} }
} }
@ -2298,16 +2298,15 @@ uint16_t mode_meteor() {
for (int j = 0; j < meteorSize; j++) { for (int j = 0; j < meteorSize; j++) {
uint16_t index = in + j; uint16_t index = in + j;
if (index >= SEGLEN) { if (index >= SEGLEN) {
index = (in + j - SEGLEN); index -= SEGLEN;
} }
trail[index] = 240; trail[index] = 240;
SEGMENT.setPixelColor(index, SEGMENT.color_from_palette(trail[index], false, true, 255)); SEGMENT.setPixelColor(index, SEGMENT.color_from_palette(index, true, false, 0, 255));
} }
return FRAMETIME; return FRAMETIME;
} }
static const char _data_FX_MODE_METEOR[] PROGMEM = "Meteor@!,Trail length;!,!,;!;1d"; static const char _data_FX_MODE_METEOR[] PROGMEM = "Meteor@!,Trail length;!,,;!;1d";
// smooth meteor effect // smooth meteor effect
@ -2329,24 +2328,24 @@ 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(trail[i], false, true, 255)); SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(i, true, false, 0, trail[i]));
} }
} }
// draw meteor // draw meteor
for (int j = 0; j < meteorSize; j++) { for (int j = 0; j < meteorSize; j++) {
uint16_t index = in + j; uint16_t index = in + j;
if(in + j >= SEGLEN) { if (index >= SEGLEN) {
index = (in + j - SEGLEN); index -= SEGLEN;
} }
SEGMENT.setPixelColor(index, color_blend(SEGMENT.getPixelColor(index), SEGMENT.color_from_palette(240, false, true, 255), 48));
trail[index] = 240; trail[index] = 240;
SEGMENT.setPixelColor(index, SEGMENT.color_from_palette(index, true, false, 0, 255));
} }
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;!,!,;!;1d"; static const char _data_FX_MODE_METEOR_SMOOTH[] PROGMEM = "Meteor Smooth@!,Trail length;!,,;!;1d";
//Railway Crossing / Christmas Fairy lights //Railway Crossing / Christmas Fairy lights
@ -7259,7 +7258,6 @@ uint16_t mode_2DAkemi(void) {
CRGB armsAndLegsColor = SEGCOLOR(1) > 0 ? SEGCOLOR(1) : 0xFFE0A0; //default warmish white 0xABA8FF; //0xFF52e5;// CRGB armsAndLegsColor = SEGCOLOR(1) > 0 ? SEGCOLOR(1) : 0xFFE0A0; //default warmish white 0xABA8FF; //0xFF52e5;//
uint8_t ak = pgm_read_byte_near(akemi + ((y * 32)/rows) * 32 + (x * 32)/cols); // akemi[(y * 32)/rows][(x * 32)/cols] uint8_t ak = pgm_read_byte_near(akemi + ((y * 32)/rows) * 32 + (x * 32)/cols); // akemi[(y * 32)/rows][(x * 32)/cols]
switch (ak) { switch (ak) {
case 0: color = BLACK; break;
case 3: armsAndLegsColor.r *= lightFactor; armsAndLegsColor.g *= lightFactor; armsAndLegsColor.b *= lightFactor; color = armsAndLegsColor; break; //light arms and legs 0x9B9B9B case 3: armsAndLegsColor.r *= lightFactor; armsAndLegsColor.g *= lightFactor; armsAndLegsColor.b *= lightFactor; color = armsAndLegsColor; break; //light arms and legs 0x9B9B9B
case 2: armsAndLegsColor.r *= normalFactor; armsAndLegsColor.g *= normalFactor; armsAndLegsColor.b *= normalFactor; color = armsAndLegsColor; break; //normal arms and legs 0x888888 case 2: armsAndLegsColor.r *= normalFactor; armsAndLegsColor.g *= normalFactor; armsAndLegsColor.b *= normalFactor; color = armsAndLegsColor; break; //normal arms and legs 0x888888
case 1: color = armsAndLegsColor; break; //dark arms and legs 0x686868 case 1: color = armsAndLegsColor; break; //dark arms and legs 0x686868
@ -7268,7 +7266,7 @@ uint16_t mode_2DAkemi(void) {
case 4: color = faceColor; break; //dark face 0x007DC6 case 4: color = faceColor; break; //dark face 0x007DC6
case 7: color = SEGCOLOR(2) > 0 ? SEGCOLOR(2) : 0xFFFFFF; break; //eyes and mouth default white case 7: color = SEGCOLOR(2) > 0 ? SEGCOLOR(2) : 0xFFFFFF; break; //eyes and mouth default white
case 8: if (base > 0.4) {soundColor.r *= base; soundColor.g *= base; soundColor.b *= base; color=soundColor;} else color = armsAndLegsColor; break; case 8: if (base > 0.4) {soundColor.r *= base; soundColor.g *= base; soundColor.b *= base; color=soundColor;} else color = armsAndLegsColor; break;
default: color = BLACK; default: color = BLACK; break;
} }
if (SEGMENT.intensity > 128 && fftResult && fftResult[0] > 128) { //dance if base is high if (SEGMENT.intensity > 128 && fftResult && fftResult[0] > 128) { //dance if base is high