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

Update FX.cpp

Browse Source
This commit is contained in:
pjhatch 2020-07-05 14:53:14 -05:00
parent 37cb51cfd6
commit 9cee424383
1 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
wled00/FX.cpp
View File

@ -2612,7 +2612,7 @@ uint16_t WS2812FX::mode_balltrack(void) {
for (uint8_t i = 0; i < maxNumBalls; i++) { for (uint8_t i = 0; i < maxNumBalls; i++) {
balls[i].lastBounceUpdate = time; balls[i].lastBounceUpdate = time;
balls[i].velocity = 0; balls[i].velocity = 0;
while(abs(balls[i].velocity)<.5){ while(abs(balls[i].velocity)<.5){ // at the start make sure they are all moving
balls[i].velocity=10*(-.5-float(random16(0, 10000)) / 10000.0); // time units are ms balls[i].velocity=10*(-.5-float(random16(0, 10000)) / 10000.0); // time units are ms
} }
balls[i].height=(float(random16(0, 10000)) / 10000.0); // from 0. to 1. balls[i].height=(float(random16(0, 10000)) / 10000.0); // from 0. to 1.
@ -2626,19 +2626,9 @@ uint16_t WS2812FX::mode_balltrack(void) {
fill(hasCol2 ? BLACK : SEGCOLOR(1)); fill(hasCol2 ? BLACK : SEGCOLOR(1));
for (uint8_t i = 0; i < numBalls; i++) { for (uint8_t i = 0; i < numBalls; i++) {
if(abs(balls[i].velocity)<0) { // then I am guessing we have a new ball as intensity changed float timeSinceLastUpdate = float((time - balls[i].lastBounceUpdate))/cfac;
balls[i].lastBounceUpdate = time;
balls[i].velocity = 0;
while(abs(balls[i].velocity)<.5){
balls[i].velocity=10*(-.5-float(random16(0, 10000)) / 10000.0); // time units are ms
}
balls[i].height=(float(random16(0, 10000)) / 10000.0); // from 0. to 1.
balls[i].mass=(float(random16(5000, 10000)) / 10000.0); // from .5 to 1.
}
float timeSinceLastUpdate = (time - balls[i].lastBounceUpdate)/cfac;
float thisHeight= balls[i].height + balls[i].velocity * timeSinceLastUpdate; // this method keeps higher resolution float thisHeight= balls[i].height + balls[i].velocity * timeSinceLastUpdate; // this method keeps higher resolution
// test if intensity level was increased and some balls are way off the track so put them back // test if intensity level was increased and some balls are way off the track then put them back
if(thisHeight<-.5 || thisHeight> 1.5){ if(thisHeight<-.5 || thisHeight> 1.5){
balls[i].height=(float(random16(0, 10000)) / 10000.0); // from 0. to 1. balls[i].height=(float(random16(0, 10000)) / 10000.0); // from 0. to 1.
thisHeight=balls[i].height; thisHeight=balls[i].height;
@ -2654,28 +2644,23 @@ uint16_t WS2812FX::mode_balltrack(void) {
bool docol=true; bool docol=true;
if(docol){ if(docol){
for(uint8_t j= i+1; j < numBalls; j++){ for(uint8_t j= i+1; j < numBalls; j++){
float timeSinceLastUpdate2 = (time - balls[j].lastBounceUpdate)/cfac; if(balls[j].velocity != balls[i].velocity) {
float thisHeight2= balls[j].height + balls[j].velocity * timeSinceLastUpdate2; // tcollided + balls[j].lastBounceUpdate is acutal time of collision (this keeps precision with long to float conversions)
bool collided=false; float tcollided= ( cfac*(balls[i].height-balls[j].height) +
//if((balls[i].height<=balls[j].height)&&(thisHeight>=thisHeight2)) collided=true; balls[i].velocity*float(balls[j].lastBounceUpdate-balls[i].lastBounceUpdate))/
//if((balls[i].height>balls[j].height)&&(thisHeight<=thisHeight2)) collided=true; (balls[j].velocity-balls[i].velocity);
if((balls[i].height<=thisHeight2)&&(thisHeight>=thisHeight2)) collided=true;
if((balls[i].height> thisHeight2)&&(thisHeight<=thisHeight2)) collided=true; if( (tcollided>2)&&(tcollided<float(time-balls[j].lastBounceUpdate))){
if(balls[i].velocity==balls[j].velocity) collided=false; // avoid divide by zero balls[i].height=balls[i].height + balls[i].velocity*(tcollided+float(balls[j].lastBounceUpdate-balls[i].lastBounceUpdate))/cfac;
if(collided){ balls[j].height=balls[i].height;
double tcollided=((balls[j].height*cfac-balls[j].velocity*double(balls[j].lastBounceUpdate)) balls[i].lastBounceUpdate=(unsigned long)(tcollided+.5)+balls[j].lastBounceUpdate;
- (balls[i].height*cfac-balls[i].velocity*double(balls[i].lastBounceUpdate)) )/ balls[j].lastBounceUpdate=balls[i].lastBounceUpdate;
((balls[i].velocity-balls[j].velocity));
float hcollided=balls[i].height+ balls[i].velocity*(tcollided-balls[i].lastBounceUpdate)/cfac;
balls[i].height=hcollided;
balls[j].height=hcollided;
balls[i].lastBounceUpdate=(unsigned long)tcollided;
balls[j].lastBounceUpdate=(unsigned long)tcollided;
float vtmp=balls[i].velocity; float vtmp=balls[i].velocity;
balls[i].velocity=((balls[i].mass-balls[j].mass)*vtmp+2.*balls[j].mass*balls[j].velocity)/(balls[i].mass+balls[j].mass); balls[i].velocity=((balls[i].mass-balls[j].mass)*vtmp + 2.*balls[j].mass*balls[j].velocity)/(balls[i].mass+balls[j].mass);
balls[j].velocity=((balls[j].mass-balls[i].mass)*balls[j].velocity + 2.*balls[i].mass*vtmp)/(balls[i].mass+balls[j].mass); balls[j].velocity=((balls[j].mass-balls[i].mass)*balls[j].velocity + 2.*balls[i].mass*vtmp) /(balls[i].mass+balls[j].mass);
timeSinceLastUpdate = (time - tcollided)/cfac; //balls[i].height=balls[i].height + balls[i].velocity*(time-balls[i].lastBounceUpdate)/cfac;
thisHeight= balls[i].height + balls[i].velocity * timeSinceLastUpdate; // thisHeight= balls[i].height + balls[i].velocity*(time-balls[i].lastBounceUpdate)/cfac;
}
} }
} }
} }
@ -2691,6 +2676,8 @@ uint16_t WS2812FX::mode_balltrack(void) {
if (thisHeight>1) thisHeight=1; if (thisHeight>1) thisHeight=1;
uint16_t pos = round(thisHeight * (SEGLEN - 1)); uint16_t pos = round(thisHeight * (SEGLEN - 1));
setPixelColor(pos, color); setPixelColor(pos, color);
balls[i].lastBounceUpdate=time;
balls[i].height=thisHeight;
} }
return FRAMETIME; return FRAMETIME;