added constant velocity mode to Emitter_Fountain

added globalBrightness to FastLEDRenderer
added constructor with x,y position to Particle_Fixed

Author: fuse314

Emitter_Fountain.cpp

@@ -23,6 +23,19 @@ Emitter_Fountain::Emitter_Fountain(int16_t vx, int16_t vy, byte var, Particle_Ab
     this->var = var;
     this->_hVar = (var>>1);
     this->source = source;
+    _constVel = 0;
+    counter = 0;
+    
+}
+Emitter_Fountain::Emitter_Fountain(uint16_t constVel, Particle_Abstract *source)
+{
+    this->vx = 0;
+    this->vy = 0;
+    this->var = 0;
+    if(constVel > 32767) { constVel = 32767; }
+    _constVel = constVel;
+    this->_hVar = (_constVel<<1);
+    this->source = source;
     counter = 0;
 }
 
@@ -38,8 +51,14 @@ void Emitter_Fountain::emit(Particle_Abstract *particle, ParticleSysConfig *g)
 
     particle->x = source->x;
     particle->y = source->y;
-    particle->vx = vx + random(var)-_hVar;
-    particle->vy = vy + random(var)-_hVar;
+    if(_constVel > 0) {
+        particle->vx = random(_hVar)-_constVel;
+        particle->vy = sqrt(pow(_constVel,2)-pow(particle->vx,2));
+        if(random(8)<3) { particle->vy=-particle->vy; }
+    } else {
+        particle->vx = vx + random(var)-_hVar;
+        particle->vy = vy + random(var)-_hVar;
+    }
     particle->ttl = random(minLife, maxLife);
     particle->hue = counter%255;
     particle->isAlive = true;

Emitter_Fountain.h

@@ -29,10 +29,12 @@ class Emitter_Fountain : public Emitter_Abstract {
     unsigned int counter;
 
     Emitter_Fountain(int16_t vx, int16_t vy, byte var, Particle_Abstract *source);
+    Emitter_Fountain(uint16_t constVel, Particle_Abstract *source);
     void emit(Particle_Abstract *particle, ParticleSysConfig *g);
     void update(ParticleSysConfig *g);
 private:
-    byte _hVar;
+    uint16_t _hVar;
+    uint16_t _constVel;
 };
 
 #endif /* emitter_fountain_h */

FastLEDRenderer.cpp

@@ -42,14 +42,15 @@ void FastLEDRenderer::init(ParticleSysConfig *g, uint8_t left, uint8_t top, uint
 	this->height = height;
 	this->crop_left = crop_left;
 	this->crop_top = crop_top;
+    this->globalBrightness = 255;
 }
 
 /* GMA hier - change below ########################################################## */
 
 void FastLEDRenderer::render(ParticleSysConfig *g, Particle_Abstract particles[], byte numParticles, CRGB *_leds) {
     byte row, col;
     uint16_t dx, dy;
-    unsigned long tempVal;
+    uint8_t tempVal;
     CRGB baseRGB;
 
     //go over particles and update matrix cells on the way
@@ -74,36 +75,42 @@ void FastLEDRenderer::render(ParticleSysConfig *g, Particle_Abstract particles[]
         //bottom left
         col = part_x / g->res_x;
         row = part_y / g->res_y;
-        tempVal = ((unsigned long)dx*dy*particles[i].ttl)/g->res_area;
-        if(tempVal > 255) {tempVal = 255;}
+        tempVal = calcTempVal(g,dx,dy,particles[i].ttl);
         addColor(col, row, &baseRGB, tempVal, _leds);
 
         //bottom right;
         col++;
         if (col < g->width) {
-            tempVal = ((unsigned long)(g->res_x-dx)*dy*particles[i].ttl)/g->res_area;
-            if(tempVal > 255) {tempVal = 255;}
+            tempVal = calcTempVal(g,(g->res_x-dx),dy,particles[i].ttl);
             addColor(col, row, &baseRGB, tempVal, _leds);
         }
 
         //top right
         row++;
         if (col < g->width && row < g->height) {
-            tempVal = ((unsigned long)(g->res_x-dx)*(g->res_y-dy)*particles[i].ttl)/g->res_area;
-            if(tempVal > 255) {tempVal = 255;}
+            tempVal = calcTempVal(g,(g->res_x-dx),(g->res_y-dy),particles[i].ttl);
             addColor(col, row, &baseRGB, tempVal, _leds);
         }
 
         //top left
         col--;
         if (row < g->height) {
-            tempVal = ((unsigned long)dx*(g->res_y-dy)*particles[i].ttl)/g->res_area;
-            if(tempVal > 255) {tempVal = 255;}
+            tempVal = calcTempVal(g,dx,(g->res_y-dy),particles[i].ttl);
             addColor(col, row, &baseRGB, tempVal, _leds);
         }
     }
 }
 
+uint8_t FastLEDRenderer::calcTempVal(ParticleSysConfig *g, uint16_t dx, uint16_t dy, uint8_t ttl) {
+    uint8_t _ttl = ttl;
+    if(globalBrightness < 255) {
+        _ttl = scale8(_ttl,globalBrightness);
+    }
+    unsigned long r = ((unsigned long)dx*dy*_ttl)/g->res_area;
+    if(r > 255)
+        return 255;
+    return r;
+}
 
 void FastLEDRenderer::addColor(byte col, byte row, CRGB *colorRGB, byte value, CRGB *_leds) {
     if(col >= width || row >= height) // check if pixel is outside of the render area

FastLEDRenderer.h

@@ -29,11 +29,12 @@ class FastLEDRenderer {
     void reset(CRGB *_leds);    //set each pixel to 0
     void fade(CRGB *_leds);     //divide each pixel by half
     void fadeBy(byte amount, CRGB *_leds); //substract amount from each pixel
-
+    uint8_t globalBrightness;
 private:
 	uint8_t left,top,width,height,crop_left,crop_top;
 	void init(ParticleSysConfig *g, uint8_t left, uint8_t top, uint8_t width, uint8_t height, uint8_t crop_left, uint8_t crop_top);
     void addColor(byte col, byte row, CRGB *rgb, byte value, CRGB *_leds);
+    uint8_t calcTempVal(ParticleSysConfig *g, uint16_t dx, uint16_t dy, uint8_t ttl);
 };
 
 // we need to declare this function here, otherwise there are errors while compiling...

Particle_Fixed.cpp

@@ -19,6 +19,13 @@ Particle_Fixed::Particle_Fixed()
 {
     isAlive = 0;
 }
+Particle_Fixed::Particle_Fixed(uint16_t x, uint16_t y) {
+    this->x = x;
+    this->y = y;
+    this->vx = 0;
+    this->vy = 0;
+    this->isAlive = 0;
+}
 
 void Particle_Fixed::update(ParticleSysConfig *g)
 {

Particle_Fixed.h

@@ -20,6 +20,7 @@ class Particle_Fixed : public Particle_Abstract {
 public:
     static byte decayFactor;
     Particle_Fixed();
+    Particle_Fixed(uint16_t x, uint16_t y);
     void update(ParticleSysConfig *g);
 };