Skip to content

Commit

Permalink
added 'perpetual' flag to particles
Browse files Browse the repository at this point in the history
  • Loading branch information
@DedeHai
DedeHai committed May 1, 2024
1 parent 5472f76 commit 06ae14c
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 38 deletions.
51 changes: 18 additions & 33 deletions wled00/FX.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7945,7 +7945,7 @@ uint16_t mode_particlevortex(void)
PartSys->particles[PartSys->numParticles - i].x = (PartSys->maxX + 1) >> 1; // center
PartSys->particles[PartSys->numParticles - i].y = (PartSys->maxY + 1) >> 1; // center
PartSys->particles[PartSys->numParticles - i].sat = 230;
PartSys->particles[PartSys->numParticles - i].ttl = 100; //set alive
PartSys->particles[PartSys->numParticles - i].ttl = 255; //set alive
}
#endif
if (SEGMENT.check1 != (SEGMENT.aux1 & 0x01) || SEGMENT.call == 0) //state change
Expand Down Expand Up @@ -8250,7 +8250,8 @@ uint16_t mode_particlevolcano(void)
PartSys->sources[i].source.x = PartSys->maxX / (numSprays + 1) * (i + 1); //distribute evenly
PartSys->sources[i].maxLife = 300; // lifetime in frames
PartSys->sources[i].minLife = 250;
PartSys->sources[i].source.collide = true; // seeded particles will collide (if enabled)
PartSys->sources[i].source.collide = true; // seeded particles will collide (if enabled)
PartSys->sources[i].source.perpetural = true; // source never dies
}
}
else
Expand Down Expand Up @@ -8287,8 +8288,7 @@ uint16_t mode_particlevolcano(void)
PartSys->sources[i].source.vx > 0 ? SEGMENT.custom1 >> 4 : -(SEGMENT.custom1 >> 4); // set moving speed but keep the direction
PartSys->sources[i].vy = SEGMENT.speed >> 2; // emitting speed
PartSys->sources[i].vx = 0;
PartSys->sources[i].var = SEGMENT.custom3 | 0x01; // emiting variation = nozzle size (custom 3 goes from 0-31), only use odd numbers
PartSys->sources[i].source.ttl = 255; // source never dies, replenish its lifespan
PartSys->sources[i].var = SEGMENT.custom3 | 0x01; // emiting variation = nozzle size (custom 3 goes from 0-31), only use odd numbers
// spray[j].source.hue = random16(); //set random color for each particle (using palette) -> does not look good
PartSys->sprayEmit(PartSys->sources[i]);
PartSys->particleMoveUpdate(PartSys->sources[i].source, PartSys->particlesettings); //move the source (also applies gravity, which is corrected for above, that is a hack but easier than creating more particlesettings)
Expand Down Expand Up @@ -8321,7 +8321,6 @@ uint16_t mode_particlefire(void)
if (!initParticleSystem(PartSys, 25, false, 4)) //maximum number of source (PS will determine the exact number based on segment size) and need 4 additional bytes for time keeping (uint32_t lastcall)
return mode_static(); // allocation failed; //allocation failed
SEGMENT.aux0 = rand(); // aux0 is wind position (index) in the perlin noise
// initialize the flame sprays
numFlames = PartSys->numSources;
DEBUG_PRINTF_P(PSTR("segment data ptr in fireFX %p\n"), SEGMENT.data);
}
Expand Down Expand Up @@ -8706,7 +8705,6 @@ uint16_t mode_particlewaterfall(void)
PartSys->sources[i].vy = -SEGMENT.speed >> 3; // emitting speed, down
PartSys->sources[i].source.x = map(SEGMENT.custom3, 0, 31, 0, (PartSys->maxXpixel - numSprays * 2) * PS_P_RADIUS) + i * PS_P_RADIUS * 2; // emitter position
PartSys->sources[i].source.y = PartSys->maxY + (PS_P_RADIUS * ((i<<2) + 4)); // source y position, few pixels above the top to increase spreading before entering the matrix
//PartSys->sources[i].source.ttl = 255; // source never dies, replenish its lifespan TODO: source is not moved?
PartSys->sources[i].var = (SEGMENT.custom1 >> 3) | 0x01; // emiting variation 0-32, only use odd numbers
}

Expand Down Expand Up @@ -8770,6 +8768,7 @@ uint16_t mode_particlebox(void)
for (i = 0; i < maxnumParticles; i++)
{
PartSys->particles[i].ttl = 500; //set all particles alive (not all are rendered though)
PartSys->particles[i].perpetural = true; //never dies
PartSys->particles[i].hue = i * 5; // color range
PartSys->particles[i].x = map(i, 0, maxnumParticles, 1, PartSys->maxX); // distribute along x according to color
PartSys->particles[i].y = random16(PartSys->maxY); // randomly in y direction
Expand All @@ -8791,16 +8790,12 @@ uint16_t mode_particlebox(void)
{
xgravity = ((int16_t)inoise8(SEGMENT.aux0) - 127);
ygravity = ((int16_t)inoise8(SEGMENT.aux0 + 10000) - 127);
// scale the gravity force
//xgravity /= 1 + ((256 - SEGMENT.custom1) >> 5);
//ygravity /= 1 + ((256 - SEGMENT.custom1) >> 5);
// scale the gravity force
xgravity = (xgravity * SEGMENT.custom1) / 50;
ygravity = (ygravity * SEGMENT.custom1) / 50;
}
else //go in a circle
{
// PartSys->applyAngleForce(PartSys->particles, PartSys->usedParticles, SEGMENT.custom1>>2, SEGMENT.aux0<<8);//not used, calculate here directly as perlin noise force is in x and y, not angle
{
xgravity = ((int32_t)(SEGMENT.custom1) * cos16(SEGMENT.aux0 << 8)) / 0xFFFF;
ygravity = ((int32_t)(SEGMENT.custom1) * sin16(SEGMENT.aux0 << 8)) / 0xFFFF;
}
Expand All @@ -8811,15 +8806,6 @@ uint16_t mode_particlebox(void)
}

PartSys->applyForce(xgravity, ygravity);

// reset particle TTL so they never die
for (i = 0; i < PartSys->usedParticles; i++)
{
if (PartSys->particles[i].ttl > 0)
{
PartSys->particles[i].ttl = 500; // particles never die
}
}
}

if (SEGMENT.call % (32-SEGMENT.custom3) == 0)
Expand Down Expand Up @@ -9016,15 +9002,15 @@ uint16_t mode_particleimpact(void)
}
}
}
else if ( PartSys->sources[i].source.vy > 0) // meteor is exploded and time is up (ttl==0 and positive speed), relaunch it
else if (PartSys->sources[i].source.vy > 0) // meteor is exploded and time is up (ttl==0 and positive speed), relaunch it
{
// reinitialize meteor
PartSys->sources[i].source.y = PartSys->maxY + (PS_P_RADIUS << 2); // start 4 pixels above the top
PartSys->sources[i].source.x = random(PartSys->maxX);
PartSys->sources[i].source.vy = -random16(30) - 30; // meteor downward speed
PartSys->sources[i].source.vx = random(30) - 15;
PartSys->sources[i].source.hue = random16(); // random color
PartSys->sources[i].source.ttl = 2000; // long life, will explode at bottom
PartSys->sources[i].source.ttl = 500; // long life, will explode at bottom
PartSys->sources[i].source.collide = false; // trail particles will not collide
PartSys->sources[i].maxLife = 60; // spark particle life
PartSys->sources[i].minLife = 20;
Expand Down Expand Up @@ -9063,7 +9049,8 @@ uint16_t mode_particleattractor(void)
PartSys->sources[0].source.hue = random16();
PartSys->sources[0].source.vx = -7;
PartSys->sources[0].source.collide = true; // seeded particles will collide
PartSys->sources[0].source.ttl = 100; //is replenished below, it never dies
//PartSys->sources[0].source.ttl = 100; //TODO: remove, is now done in PS init
PartSys->sources[0].source.perpetural = true; //source does not age
#ifdef ESP8266
PartSys->sources[0].maxLife = 200; // lifetime in frames (ESP8266 has less particles)
PartSys->sources[0].minLife = 30;
Expand Down Expand Up @@ -9103,25 +9090,23 @@ uint16_t mode_particleattractor(void)
{
attractor->vx = PartSys->sources[0].source.vy; // set to spray movemement but reverse x and y
attractor->vy = PartSys->sources[0].source.vx;
attractor->ttl = 100;
attractor->perpetural = true;
}
//set attractor properties
if (SEGMENT.check2)
{
if((SEGMENT.call % 3) == 0) // move slowly
{
attractor->ttl = 100; //must be alive to move
PartSys->particleMoveUpdate(*attractor, sourcesettings); // move the attractor
}
PartSys->particleMoveUpdate(*attractor, sourcesettings); // move the attractor

}
else{
attractor->x = PartSys->maxX >> 1; // set to center
attractor->y = PartSys->maxY >> 1;
}
if (SEGMENT.call % 5 == 0)
{
if (SEGMENT.call % 5 == 0)
PartSys->sources[0].source.hue++;
PartSys->sources[0].source.ttl = 100; //spray never dies
}

SEGMENT.aux0 += 256; //emitting angle, one full turn in 255 frames (0xFFFF is 360°)
if (SEGMENT.call % 2 == 0) // alternate direction of emit
PartSys->angleEmit(PartSys->sources[0], SEGMENT.aux0, 12);
Expand Down Expand Up @@ -9479,7 +9464,7 @@ uint16_t mode_particlghostrider(void)
//PartSys->setColorByAge(SEGMENT.check1);
PartSys->sources[0].var = (1 + (SEGMENT.custom3>>1)) | 0x01; //odd numbers only

//color by age (PS always starts with hue = 255 so cannot use that)
//color by age (PS color by age always starts with hue = 255 so cannot use that)
if(SEGMENT.check1)
{
for(int i = 0; i < PartSys->usedParticles; i++)
Expand All @@ -9504,7 +9489,7 @@ uint16_t mode_particlghostrider(void)
//set head (steal one of the particles)
PartSys->particles[PartSys->usedParticles-1].x = PartSys->sources[0].source.x;
PartSys->particles[PartSys->usedParticles-1].y = PartSys->sources[0].source.y;
PartSys->particles[PartSys->usedParticles-1].ttl = PartSys->sources[0].source.ttl;
PartSys->particles[PartSys->usedParticles-1].ttl = 255;
PartSys->particles[PartSys->usedParticles-1].sat = 0;
//emit two particles
PartSys->angleEmit(PartSys->sources[0], emitangle, speed);
Expand Down
6 changes: 4 additions & 2 deletions wled00/FXparticleSystem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ ParticleSystem::ParticleSystem(uint16_t width, uint16_t height, uint16_t numbero
for (int i = 0; i < numSources; i++)
{
sources[i].source.sat = 255; //set saturation to max by default
sources[i].source.ttl = 1; //set source alive
}
for (int i = 0; i < numParticles; i++)
{
Expand Down Expand Up @@ -304,8 +305,9 @@ void ParticleSystem::particleMoveUpdate(PSparticle &part, PSsettings &options, P

if (part.ttl > 0)
{
// age
part.ttl--;

if(!part.perpetural)
part.ttl--; // age
if (particlesettings.colorByAge)
part.hue = part.ttl > 255 ? 255 : part.ttl; //set color to ttl

Expand Down
5 changes: 2 additions & 3 deletions wled00/FXparticleSystem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,13 @@ typedef struct {
uint16_t ttl : 12; // time to live, 12 bit or 4095 max (which is 50s at 80FPS)
bool outofbounds : 1; //out of bounds flag, set to true if particle is outside of display area
bool collide : 1; //if set, particle takes part in collisions
bool flag3 : 1; // unused flags...
bool flag4 : 1;
bool perpetural : 1; //if set, particle does not age (TTL is not decremented in move function, it still dies from killoutofbounds)
bool flag4 : 1; // unused flag
} PSparticle;

// struct for additional particle settings (optional)
typedef struct
{

uint8_t size; //particle size, 255 means 10 pixels in diameter
uint8_t forcecounter; //counter for applying forces to individual particles

Expand Down

0 comments on commit 06ae14c

Please sign in to comment.