made particles 3d and slowed things down

Author: mpinner

bin/build-latest.sh

@@ -3,5 +3,7 @@
 cd $ACTIVE_HOME/src;
 make
 
+sudo cp $ACTIVE_HOME/bin/env.sh /boot/uboot/
+
 cd $OPC_SERVER_HOME
 make

src/dot.h

@@ -6,11 +6,6 @@
 #include "lib/effect.h"
 #include "lib/texture.h"
 
-#ifndef __APPLE
-  #include "lib/BlackLib.h"
-  #include "lib/BlackDef.h"
-#endif
-
 class DotEffect : public Effect
 {
 public:
@@ -27,25 +22,28 @@ class DotEffect : public Effect
 
     virtual void beginFrame(const FrameInfo &f)
     {
-        const float speed = 1.0;
+        
+      const float speed = 0.01; // SLOW
+//    const float speed = 1.01; // FAST
 
         // Several bounded state variables, rotating at different rates
-     /*
+     ///*
         angle1 = fmodf(angle1 + f.timeDelta * speed, 2 * M_PI);
         angle2 = fmodf(angle2 + f.timeDelta * speed * 0.2f, 2 * M_PI);
         angle3 = fmodf(angle3 + f.timeDelta * speed * 0.7f, 2 * M_PI);
-*/
+//*/
         // Several bounded state variables, rotating at different rates
+   /*
         angle1 = fmodf(angle1  * speed, 2 * M_PI);
         angle2 = fmodf(angle2  * speed , 2 * M_PI);
         angle3 = fmodf(angle3 + f.timeDelta  * speed , 2 * M_PI);
+    */
     }
 
     virtual void shader(Vec3& rgb, const PixelInfo &p) const
     {
         // Project onto the XZ plane
-      //  Vec2 plane = Vec2(p.point[0]*0.5f, p.point[2]);
-        Vec2 plane = Vec2(p.point[0], p.point[2]);
+        Vec2 plane = Vec2(p.point[0]*-0.5f, p.point[1]);
 
 // rotate this
 //        plane
@@ -61,4 +59,5 @@ class DotEffect : public Effect
 
 //        rgb = dot.sample( (plane - position) / size + center );
     }
+
 };

src/images.cpp

@@ -5,7 +5,7 @@
 #include "lib/effect_mixer.h"
 
 #include "dot.h"
-
+#include "particle_trail.h"
 #include "rings.h"
 
 int main(int argc, char **argv)
@@ -16,15 +16,18 @@ int main(int argc, char **argv)
     DotEffect img2("external/img2.png");
     DotEffect img3("external/img3.png");
     DotEffect img4("external/img4.png");
+    ParticleTrailEffect e;
 
 
     EffectMixer mixer;
-    mixer.add(&rings);
+
     mixer.add(&img0);
     mixer.add(&img1);
     mixer.add(&img2);
     mixer.add(&img3);
     mixer.add(&img4);
+    mixer.add(&rings);
+    mixer.add(&e);
 
     EffectRunner r;
     r.setEffect(&mixer);
@@ -37,13 +40,31 @@ int main(int argc, char **argv)
 
     while (true) {
         EffectRunner::FrameStatus frame = r.doFrame();
-        const float speed = 0.1f;
+       // const float speed = 1.01f; //FAST
+        const float speed = 0.001f; //SLOW
 
         // Animate the mixer's fader controls
         state = fmod(state + frame.timeDelta * speed, 2 * M_PI);
         for (int i = 0; i < mixer.numChannels(); i++) {
-            float theta = state + i * (2 * M_PI) / mixer.numChannels();
-            mixer.setFader(i, std::max(0.0f, sinf(theta)));
+
+ mixer.setFader(i, 0.0);
+
+            float remainder = state - i;
+            // is this state
+            if ( i == (int)state) {
+                mixer.setFader(i, remainder);
+            }
+
+            // is next state
+            int nextState = (int) state;
+            nextState += 1;
+            nextState % mixer.numChannels();
+            if (i == nextState) {
+                mixer.setFader(i, 1-remainder);
+            }
+
+     //       float theta = state + i * (2 * M_PI) / mixer.numChannels();
+      //      mixer.setFader(i, std::max(0.0f, sinf(theta)));
         }
 
         // Main loops and Effects can both generate verbose debug output (-v command line option)

src/particle_trail.h

@@ -16,37 +16,43 @@ class ParticleTrailEffect : public ParticleEffect
 
     float angle1;
     float angle2;
+    float angle3;
+
     float baseHue;
 
     virtual void beginFrame(const FrameInfo &f)
     {
         const float tailLength = 8.0f;
-        const float speed = 9.0f;
+        const float speed = 0.04f;  //SLOW
+      //  const float speed = 5.09f;  //FAST
         const float lfoRatio = 0.15f;
+        const float notLfoRatio = 0.01f;
         const float hueRate = 0.01f;
         const float brightness = 40.0f;
         const unsigned numParticles = 200;
 
         // Low frequency oscillators
         angle1 = fmodf(angle1 + f.timeDelta * speed, 2 * M_PI);
         angle2 = fmodf(angle2 + f.timeDelta * speed * lfoRatio, 2 * M_PI);
+        angle3 = fmodf(angle3 + f.timeDelta * speed * notLfoRatio, 2 * M_PI);
         baseHue = fmodf(baseHue + f.timeDelta * speed * hueRate, 1.0f);
 
         appearance.resize(numParticles);
         for (unsigned i = 0; i < numParticles; i++) {
             float s = float(i) / numParticles;
             float tail = s * tailLength;
 
-            float radius = 0.2 + 1.5 * s;
-            float x = radius * cos(angle1 + tail);
+            float radius = 0.2 + 2.0 * s;
+            float x = radius * cos(angle1 + tail) * 2.0 + 1.0;
             float y = radius * sin(angle1 + tail + 10.0 * sin(angle2 + tail * lfoRatio));
+            float z = radius * cos(angle3 + tail);   
             float hue = baseHue + s * 0.4;
 
             ParticleAppearance& p = appearance[i];
-            p.point = Vec3(x, 0, y);
+            p.point = Vec3(x, y, z);
             p.intensity = (brightness / numParticles) * s;
-            p.radius = 0.1 + 0.4f * s;
-            hsv2rgb(p.color, hue, 0.5, 0.8);
+            p.radius = 0.1 + 1.2f * s;  //MADE BIG
+            hsv2rgb(p.color, hue, 0.5, 1.0);
         }
 
         ParticleEffect::beginFrame(f);