removed comments

wled00/FXparticleSystem.cpp

@@ -105,9 +105,6 @@ void Particle_Bounce_update(PSparticle *part) //bounces a particle on the matrix
 		//age
 		part->ttl--;
 
-		//apply acceleration
-		//  vx = min(vx + ax, PS_MAX_X);
-		//  vy = min(vy + ay, PS_MAX_Y);
 
 		//apply velocity
 		int16_t newX, newY;
@@ -203,11 +200,6 @@ void Particle_Gravity_update(PSparticle *part, bool wrapX) //particle moves, dec
 		else
 			part->outofbounds = 0;
 
-
-		//newX = max(newX, (int16_t)-PS_MAX_X); //limit to double matrix size
-		//newY = max(newY, (int16_t)-PS_MAX_Y);
-		//part->x = min(newX, (int16_t)(PS_MAX_X<<1)); //limit to double the space boundaries
-		//part->y = min(newY, (int16_t)(PS_MAX_Y<<1));
 		part->x = newX;
 		part->y = newY;
 	}

wled00/FXparticleSystem.h

@@ -31,10 +31,7 @@
 
 //particle dimensions (subpixel division)
 #define PS_P_RADIUS 64 //subpixel size, each pixel is divided by this for particle movement
-<<<<<<< Updated upstream
-=======
 #define PS_P_HARDRADIUS 100 //hard surface radius of a particle, in collisions, this is forbidden to be entered by another particle (for stacking) 
->>>>>>> Stashed changes
 #define PS_P_SURFACE 12  //shift: 2^PS_P_SURFACE = (PS_P_RADIUS)^2
 
 
@@ -76,13 +73,6 @@ typedef struct {
 #define GRAVITYCOUNTER 2 //the higher the value the lower the gravity (speed is increased every n'th particle update call), values of 2 to 4 give good results
 #define MAXGRAVITYSPEED 40 //particle terminal velocity
 
-/*
-//todo: make these local variables
-uint8_t vortexspeed; //speed around vortex
-uint8_t vortexdirection; //1 or 0
-int8_t vortexpull; //if positive, vortex pushes, if negative it pulls
-*/
-
 void Emitter_Flame_emit(PSpointsource *emitter, PSsimpleparticle *part);
 void Emitter_Fountain_emit(PSpointsource *emitter, PSparticle *part);
 void Particle_Move_update(PSparticle *part);