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

rework sinelon, bouncing, popcorn to remove some unnecessary statics

Browse Source
This commit is contained in:
fishbone-git 2019-12-30 00:20:05 +01:00
parent 3083ccddcc
commit 67758b4980
1 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
wled00/FX.cpp
View File

@ -2343,34 +2343,28 @@ uint16_t WS2812FX::mode_spots_fade()
/* /*
* Bouncing Balls Effect * Bouncing Balls Effect
* Adapted from: https://www.tweaking4all.com/hardware/arduino/adruino-led-strip-effects/
*/ */
uint16_t WS2812FX::mode_BouncingBalls(void) { uint16_t WS2812FX::mode_BouncingBalls(void) {
// number of balls based on intensity setting to max of 7 (cycles colors) // number of balls based on intensity setting to max of 7 (cycles colors)
// non-chosen color is a random color // non-chosen color is a random color
int balls = int(((SEGMENT.intensity * 6.2) / 255) + 1); int balls = int(((SEGMENT.intensity * 6.2) / 255) + 1);
// ideally use speed for gravity effect on the bounce const int maxBallCount = 7;
float Gravity = -9.81;
float Gravity = -9.81; // standard value of gravity
int Position[maxBallCount]; // current position of the ball normalized to segment size
float TimeSinceLastBounce[maxBallCount] = {0}; // time difference for physics calculations
int StartHeight = 1; // height in metres (strip length)
float Dampening[maxBallCount] = {0}; // Coefficient of Restitution (bounce damping)
float ImpactVelocityStart = sqrt( -2 * Gravity * StartHeight);
const int maxBallCount = 7; static float ImpactVelocity[maxBallCount] = {ImpactVelocityStart};
static long ClockTimeSinceLastBounce[maxBallCount] = {millis()};
static float Height[maxBallCount]; static float Height[maxBallCount];
static float ImpactVelocity[maxBallCount];
static int Position[maxBallCount]; //set up variable damping for better effect using multiple balls
static float TimeSinceLastBounce[maxBallCount]; for (int i = 0 ; i < maxBallCount ; i++) {
static long ClockTimeSinceLastBounce[maxBallCount]; Dampening[i] = 0.90 - float(i)/pow(maxBallCount,2);
static int StartHeight = 1; // height in metres (strip length)
static float Dampening[maxBallCount] = {0}; // Coefficient of Restitution (bounce damping)
static float ImpactVelocityStart=sqrt( -2 * Gravity * StartHeight);
// Different from the examples, to allow for initialisation of the first bounce
if (Dampening[0] == 0) {
for (int i = 0 ; i < maxBallCount ; i++) {
ClockTimeSinceLastBounce[i] = millis();
ImpactVelocity[i] = ImpactVelocityStart;
TimeSinceLastBounce[i] = 0;
Dampening[i] = 0.90 - float(i)/pow(maxBallCount,2);
}
} }
for (int i = 0 ; i < balls ; i++) { for (int i = 0 ; i < balls ; i++) {
@ -2410,7 +2404,7 @@ uint16_t WS2812FX::sinelon_base(bool dual, bool rainbow=false) {
fade_out(SEGMENT.intensity); fade_out(SEGMENT.intensity);
int pos = beatsin16(SEGMENT.speed/10,0,SEGLEN-1); int pos = beatsin16(SEGMENT.speed/10,0,SEGLEN-1);
static int prevpos = 0; int prevpos = SEGENV.aux0;
uint32_t color1 = color_from_palette(pos, true, false, 0); uint32_t color1 = color_from_palette(pos, true, false, 0);
if (rainbow) { if (rainbow) {
@ -2418,13 +2412,11 @@ uint16_t WS2812FX::sinelon_base(bool dual, bool rainbow=false) {
} }
if( pos < prevpos ) { if( pos < prevpos ) {
for (uint16_t i = pos; i < prevpos; i++) for (uint16_t i = pos; i < prevpos; i++) {
{
setPixelColor(i, color1); setPixelColor(i, color1);
} }
} else { } else {
for (uint16_t i = prevpos; i < pos; i++) for (uint16_t i = prevpos; i < pos; i++) {
{
setPixelColor(SEGMENT.start + i, color1); setPixelColor(SEGMENT.start + i, color1);
} }
} }
@ -2438,19 +2430,18 @@ uint16_t WS2812FX::sinelon_base(bool dual, bool rainbow=false) {
if (rainbow) { if (rainbow) {
color2 = color_wheel((pos % 8) * 32); color2 = color_wheel((pos % 8) * 32);
} }
if( pos < prevpos ) { if ( pos < prevpos ) {
for (uint16_t i = pos; i < prevpos; i++) for (uint16_t i = pos; i < prevpos; i++) {
{
setPixelColor(SEGMENT.start + SEGLEN-1-i, color2); setPixelColor(SEGMENT.start + SEGLEN-1-i, color2);
} }
} else { } else {
for (uint16_t i = prevpos; i < pos; i++) for (uint16_t i = prevpos; i < pos; i++) {
{
setPixelColor(SEGMENT.start + SEGLEN-1-i, color2); setPixelColor(SEGMENT.start + SEGLEN-1-i, color2);
} }
} }
} }
prevpos = pos;
SEGENV.aux0 = pos;
return FRAMETIME; return FRAMETIME;
} }
@ -2497,12 +2488,9 @@ uint16_t WS2812FX::mode_popcorn(void) {
uint32_t popcornColor = SEGCOLOR(0); uint32_t popcornColor = SEGCOLOR(0);
uint32_t bgColor = SEGCOLOR(1); uint32_t bgColor = SEGCOLOR(1);
if(popcornColor == bgColor) popcornColor = color_wheel(random8()); if(popcornColor == bgColor) popcornColor = color_wheel(random8());
static kernel popcorn[MAX_NUM_POPCORN]; static kernel popcorn[MAX_NUM_POPCORN];
static float coeff = 0.0f; float coeff = pow((float)SEGLEN, 0.5223324f) * 0.3944296f;
if(coeff == 0.0f) { // calculate the velocity coeff once (the secret sauce)
coeff = pow((float)SEGLEN, 0.5223324f) * 0.3944296f;
}
fill(SEGCOLOR(1)); fill(SEGCOLOR(1));
@ -2513,6 +2501,7 @@ uint16_t WS2812FX::mode_popcorn(void) {
if(isActive) { // if kernel is active, update its position if(isActive) { // if kernel is active, update its position
popcorn[i].position += popcorn[i].velocity; popcorn[i].position += popcorn[i].velocity;
popcorn[i].velocity -= (GRAVITY * ((255-SEGMENT.speed)*8/256 + 1)); popcorn[i].velocity -= (GRAVITY * ((255-SEGMENT.speed)*8/256 + 1));
ledIndex = SEGMENT.start + popcorn[i].position; ledIndex = SEGMENT.start + popcorn[i].position;
if(ledIndex >= SEGMENT.start && ledIndex <= SEGMENT.stop) setPixelColor(ledIndex, popcorn[i].color); if(ledIndex >= SEGMENT.start && ledIndex <= SEGMENT.stop) setPixelColor(ledIndex, popcorn[i].color);
} else { // if kernel is inactive, randomly pop it } else { // if kernel is inactive, randomly pop it
@ -2520,6 +2509,7 @@ uint16_t WS2812FX::mode_popcorn(void) {
popcorn[i].position = 0.0f; popcorn[i].position = 0.0f;
popcorn[i].velocity = coeff * (random(66, 100) / 100.0f); popcorn[i].velocity = coeff * (random(66, 100) / 100.0f);
popcorn[i].color = popcornColor; popcorn[i].color = popcornColor;
ledIndex = SEGMENT.start; ledIndex = SEGMENT.start;
setPixelColor(ledIndex, popcorn[i].color); setPixelColor(ledIndex, popcorn[i].color);
} }