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

rework for slightly better visuals

Browse Source
This commit is contained in:
fishbone-git 2019-12-30 00:08:49 +01:00
parent 5efd1f3a91
commit f187d7258b
1 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
wled00/FX.cpp
View File

@ -2360,7 +2360,7 @@ typedef struct Particle {
uint32_t birth =0; uint32_t birth =0;
uint32_t last =0; uint32_t last =0;
double vel =0; double vel =0;
uint16_t pos =0; uint16_t pos =-1;
float fragment[40]; float fragment[40];
} star; } star;
@ -2368,34 +2368,36 @@ uint16_t WS2812FX::mode_starburst(void) {
uint32_t it = millis(); uint32_t it = millis();
boolean Blend = true; boolean Blend = true;
const uint8_t numStars = 10; const uint8_t numStars = 12;
const uint8_t maxFrag = 15; const uint8_t maxFrag = 20;
static star stars[numStars]; static star stars[numStars];
float MaxSpeed = 375.0f; // Max velocity float MaxSpeed = 375.0f; // Max velocity
int NewParticleProbability = 2; // Odds of new particle (out of 255) int NewParticleProbability = 2; // Odds of new particle (out of 255)
float ParticlePreignitonTime = 0.0f; // How long to "wink" float ParticlePreignitonTime = 0.0f; // How long to "wink"
float ParticleIgnition = 0.15f; // How long to "flash" float ParticleIgnition = 0.06f; // How long to "flash"
float ParticleHoldTime = 0.0f; // Main lifecycle time float ParticleHoldTime = 0.0f; // Main lifecycle time
float ParticleFadeTime = 1.4f; // Fade out time float ParticleFadeTime = 2.6f; // Fade out time
float ParticleSize = 0.00f; // Size of the particle float ParticleSize = 0.00f; // Size of the particle
for (int j = 0; j < numStars; j++) for (int j = 0; j < numStars; j++)
{ {
if (random8((265-SEGMENT.speed)/2) < NewParticleProbability && stars[j].birth==0) // speed to adjust chance of a burst, max is nearly always.
if (random8((263-SEGMENT.speed)/2) < NewParticleProbability && stars[j].birth==0)
{ {
// Pick a random color and location. // Pick a random color and location.
uint16_t startPos = random8(SEGLEN-1); uint16_t startPos = random8(SEGLEN-1);
CRGB color = col_to_crgb(color_wheel(random8())); CRGB color = col_to_crgb(color_wheel(random8()));
double multiplier = (double)(random8())/255.0 * 0.5; double multiplier = (float)(random8())/255.0 * 1.0;
stars[j].color = color; stars[j].color = color;
stars[j].pos = startPos; stars[j].pos = startPos;
stars[j].vel = MaxSpeed * (double)(random16())/65535.0 * multiplier; stars[j].vel = MaxSpeed * (float)(random8())/255.0 * multiplier;
stars[j].birth = it; stars[j].birth = it;
stars[j].last = it; stars[j].last = it;
int num = 10+SEGMENT.intensity * random8(5,maxFrag)/255; // more fragments means larger burst effect
int num = random8(5,10 + (SEGMENT.intensity * maxFrag/255));
for (int i=0; i<=maxFrag; i++) { for (int i=0; i<40; i++) {
if (i < num) stars[j].fragment[i] = startPos; if (i < num) stars[j].fragment[i] = startPos;
else stars[j].fragment[i] = -1; else stars[j].fragment[i] = -1;
} }
@ -2406,12 +2408,14 @@ uint16_t WS2812FX::mode_starburst(void) {
for (int j=0; j<numStars; j++) for (int j=0; j<numStars; j++)
{ {
if (stars[j].pos > 0) { if (stars[j].birth != 0) {
float dt = (it-stars[j].last)/1000.0; float dt = (it-stars[j].last)/1000.0;
for (int i=0; i<=maxFrag; i++) { for (int i=0; i<=maxFrag; i++) {
int var = i/2; int var = i/2;
if (stars[j].fragment[i] > 0) { if (stars[j].fragment[i] > 0) {
// spplit fragments half to each side with some travelling further
if (i % 2) { if (i % 2) {
stars[j].fragment[i] -= stars[j].vel * dt * (float)var/6.0; stars[j].fragment[i] -= stars[j].vel * dt * (float)var/6.0;
} else { } else {
@ -2420,8 +2424,8 @@ uint16_t WS2812FX::mode_starburst(void) {
} }
} }
stars[j].last = it; stars[j].last = it;
stars[j].vel -= 2*stars[j].vel*dt; stars[j].vel -= 3*stars[j].vel*dt;
stars[j].color = stars[j].color.nscale8_video(235); stars[j].color = stars[j].color.nscale8(235);
} }
CRGB c = stars[j].color; CRGB c = stars[j].color;
@ -2450,23 +2454,22 @@ uint16_t WS2812FX::mode_starburst(void) {
fade = (age / ParticleFadeTime); // Fading star fade = (age / ParticleFadeTime); // Fading star
} }
} }
c = c.nscale8_video(255-int(255.0*fade));
c = c.nscale8(255-int(255.0*fade)/2);
} }
ParticleSize = (1 - fade) * 5; ParticleSize = (1 - fade) * 4;
for (int i=0; i<=maxFrag; i++) { for (int i=0; i<=maxFrag; i++) {
if (stars[j].fragment[i] > 0) { if (stars[j].fragment[i] > 0) {
int start = stars[j].fragment[i] - int(ParticleSize/2); int start = int(stars[j].fragment[i]) - int(ParticleSize/2);
if (start<0) start = 0; if (start<0) start = 0;
int end = stars[j].fragment[i] + int(ParticleSize/2); int end = int(stars[j].fragment[i]) + int(ParticleSize/2);
if (end>SEGLEN-1) end = SEGLEN-1; if (end>SEGLEN-1) end = SEGLEN-1;
for (int p=start; p<=end; p++) { for (int p=start; p<=end; p++) {
setPixelColor(SEGMENT.start+p, c.r, c.g, c.b); setPixelColor(SEGMENT.start+p, c.r, c.g, c.b);
} }
} }
} }
} }
return FRAMETIME; return FRAMETIME;
} }