Combine rainbows update tags remove projection.dim

LedFixture: remove projection.dim

LedEffects, LedModEffects: Rainbow combining and renaming

LedProjections: update tags, remove dim

src/App/LedEffects.h

@@ -99,41 +99,9 @@ class SolidEffect: public Effect {
 };
 
 class RainbowEffect: public Effect {
-public:
-  const char * name() {return "Rainbow";}
-  uint8_t dim() {return _1D;}
-  const char * tags() {return "⚡";}
-
-  void loop(Leds &leds) {
-    // FastLED's built-in rainbow generator
-    leds.fill_rainbow(sys->now/50, 7);
-  }
-
-  void controls(Leds &leds, JsonObject parentVar) {} //so no palette control is created
-};
-
-class RainbowWithGlitterEffect: public RainbowEffect {
-  const char * name() {return "Rainbow with glitter";}
-  uint8_t dim() {return _1D;}
-  const char * tags() {return "⚡";}
-
-  void loop(Leds &leds) {
-    // built-in FastLED rainbow, plus some random sparkly glitter
-    RainbowEffect::loop(leds);
-    addGlitter(leds, 80);
-  }
-  void addGlitter(Leds &leds, fract8 chanceOfGlitter) 
-  {
-    if( random8() < chanceOfGlitter) {
-      leds[ random16(leds.nrOfLeds) ] += CRGB::White;
-    }
-  }
-};
-
-class RainbowWLED: public Effect {
-  const char * name() {return "Rainbow WLED";}
+  const char * name() {return "Rainbow";} //make one rainbow? remove the fastled rainbow?
   uint8_t      dim()  {return _1D;}
-  const char * tags() {return "⚡";}
+  const char * tags() {return "💡";} //💡 means wled origin
 
   void loop(Leds &leds) {
     // UI Variables
@@ -156,11 +124,41 @@ class RainbowWLED: public Effect {
   }
 };
 
+class RainbowWithGlitterEffect: public Effect {
+  const char * name() {return "Rainbow with glitter";}
+  uint8_t dim() {return _1D;}
+  const char * tags() {return "⚡";} //⚡ means FastLED origin
+
+  void loop(Leds &leds) {
+    uint8_t glitter = leds.sharedData.read<bool>();
+
+    // built-in FastLED rainbow, plus some random sparkly glitter
+    // FastLED's built-in rainbow generator
+    leds.fill_rainbow(sys->now/50, 7);
+
+    if (glitter)
+      addGlitter(leds, 80);
+  }
+
+  void addGlitter(Leds &leds, fract8 chanceOfGlitter) 
+  {
+    if( random8() < chanceOfGlitter) {
+      leds[ random16(leds.nrOfLeds) ] += CRGB::White;
+    }
+  }
+
+  void controls(Leds &leds, JsonObject parentVar) {
+    //no palette control is created
+    ui->initCheckBox(parentVar, "glitter", leds.sharedData.write<bool>(false));
+  }
+
+};
+
 // Best of both worlds from Palette and Spot effects. By Aircoookie
-class FlowWLED: public Effect {
-  const char * name() {return "Flow WLED";}
+class FlowEffect: public Effect {
+  const char * name() {return "Flow";}
   uint8_t      dim()  {return _1D;}
-  const char * tags() {return "⚡";}
+  const char * tags() {return "💡";} //💡 means wled origin
 
   void loop(Leds &leds) {
     // UI Variables

src/App/LedFixture.h

@@ -28,7 +28,7 @@ class Projection {
 public:
   virtual const char * name() {return "noname";}
   virtual const char * tags() {return "";}
-  virtual uint8_t dim() {return _1D;};
+  // virtual uint8_t dim() {return _1D;};
 
   virtual void adjustSizeAndPixel(Coord3D &sizeAdjusted, Coord3D &pixelAdjusted, Coord3D &proCenter) {}
 

src/App/LedModEffects.h

@@ -50,8 +50,7 @@ class LedModEffects:public SysModule {
     // 1D FastLed
     effects.push_back(new RainbowEffect);
     effects.push_back(new RainbowWithGlitterEffect);
-    effects.push_back(new RainbowWLED);
-    effects.push_back(new FlowWLED);
+    effects.push_back(new FlowEffect);
     effects.push_back(new SinelonEffect);
     effects.push_back(new ConfettiEffect);
     effects.push_back(new BPMEffect);
@@ -226,7 +225,7 @@ class LedModEffects:public SysModule {
         for (Projection *projection:fixture.projections) {
           char buf[32] = "";
           strcat(buf, projection->name());
-          strcat(buf, projection->dim()==_1D?" ┊":projection->dim()==_2D?" ▦":" 🧊");
+          // strcat(buf, projection->dim()==_1D?" ┊":projection->dim()==_2D?" ▦":" 🧊");
           strcat(buf, " ");
           strcat(buf, projection->tags());
           options.add(JsonString(buf, JsonString::Copied)); //copy!

src/App/LedProjections.h

@@ -13,8 +13,8 @@
 
 class NoneProjection: public Projection {
   const char * name() {return "None";}
-  uint8_t dim() {return _1D;}
-  const char * tags() {return "💡";}
+  //uint8_t dim() {return _1D;} // every projection should work for all D
+  const char * tags() {return "💫";}
 
   void controls(Leds &leds, JsonObject parentVar) {
   }
@@ -23,15 +23,15 @@ class NoneProjection: public Projection {
 
 class DefaultProjection: public Projection {
   const char * name() {return "Default";}
-  uint8_t dim() {return _1D;}
-  const char * tags() {return "💡";}
+  //uint8_t dim() {return _1D;} // every projection should work for all D
+  const char * tags() {return "💫";}
 
 }; //DefaultProjection
 
 class MultiplyProjection: public Projection {
   const char * name() {return "Multiply";}
-  uint8_t dim() {return _1D;}
-  const char * tags() {return "💡";}
+  //uint8_t dim() {return _1D;} // every projection should work for all D
+  const char * tags() {return "💫";}
 
   public: //to use in Preset1Projection
 
@@ -83,8 +83,8 @@ class MultiplyProjection: public Projection {
 
 class TiltPanRollProjection: public Projection {
   const char * name() {return "TiltPanRoll";}
-  uint8_t dim() {return _1D;}
-  const char * tags() {return "💡";}
+  //uint8_t dim() {return _1D;} // every projection should work for all D
+  const char * tags() {return "💫";}
 
   public: //to use in Preset1Projection
 
@@ -145,8 +145,8 @@ class TiltPanRollProjection: public Projection {
 
 class DistanceFromPointProjection: public Projection {
   const char * name() {return "Distance ⌛";}
-  uint8_t dim() {return _1D;}
-  const char * tags() {return "💡";}
+  //uint8_t dim() {return _1D;} // every projection should work for all D
+  const char * tags() {return "💫";}
 
   public: //to use in Preset1Projection
 
@@ -171,8 +171,8 @@ class DistanceFromPointProjection: public Projection {
 
 class Preset1Projection: public Projection {
   const char * name() {return "Preset1";}
-  uint8_t dim() {return _1D;}
-  const char * tags() {return "💡";}
+  //uint8_t dim() {return _1D;} // every projection should work for all D
+  const char * tags() {return "💫";}
 
   void adjustSizeAndPixel(Coord3D &sizeAdjusted, Coord3D &pixelAdjusted, Coord3D &proCenter) {
     MultiplyProjection mp;
@@ -201,16 +201,16 @@ class Preset1Projection: public Projection {
 
 class RandomProjection: public Projection {
   const char * name() {return "Random";}
-  uint8_t dim() {return _1D;}
-  const char * tags() {return "💡";}
+  //uint8_t dim() {return _1D;} // every projection should work for all D
+  const char * tags() {return "💫";}
 
   void controls(Leds &leds, JsonObject parentVar) {
   }
 }; //RandomProjection
 
 class ReverseProjection: public Projection {
   const char * name() {return "Reverse WIP";}
-  uint8_t dim() {return _1D;}
+  //uint8_t dim() {return _1D;} // every projection should work for all D
   const char * tags() {return "💡";}
 
   void controls(Leds &leds, JsonObject parentVar) {
@@ -219,7 +219,7 @@ class ReverseProjection: public Projection {
 
 class MirrorProjection: public Projection {
   const char * name() {return "Mirror WIP";}
-  uint8_t dim() {return _1D;}
+  //uint8_t dim() {return _1D;} // every projection should work for all D
   const char * tags() {return "💡";}
 
   void controls(Leds &leds, JsonObject parentVar) {
@@ -228,8 +228,8 @@ class MirrorProjection: public Projection {
 
 class KaleidoscopeProjection: public Projection {
   const char * name() {return "Kaleidoscope WIP";}
-  uint8_t dim() {return _1D;}
-  const char * tags() {return "💡";}
+  //uint8_t dim() {return _1D;} // every projection should work for all D
+  const char * tags() {return "💫";}
 
   void controls(Leds &leds, JsonObject parentVar) {
   }
@@ -279,12 +279,13 @@ class PinwheelProjection: public Projection {
     // UI swirlVal
     // UI arms? arms currently 360, reduce for diff effect?
     // UI add multiply / mirror / reverse / tilt pan roll
+    //  ui->initCheckBox(parentVar, "pw test", true);
   }
 }; //PinwheelProjection
 
 class TestProjection: public Projection {
   const char * name() {return "Test";}
-  uint8_t dim() {return _1D;}
+  //uint8_t dim() {return _1D;} // every projection should work for all D
   const char * tags() {return "💡";}
 
   void controls(Leds &leds, JsonObject parentVar) {