From 6f1f119b686801dfd22b641893fc9ef5bb693e03 Mon Sep 17 00:00:00 2001
From: Matt Mets <matt.mets@cibomahto.com>
Date: Wed, 29 Aug 2012 03:43:09 -0700
Subject: [PATCH] Wednesday morning, burning man.

---
 Bursts.pde          | 37 ++++++++++++++++++++++++++-----------
 Chase.pde           |  7 ++++++-
 ColorDrop.pde       |  4 ++++
 Seizure.pde         |  4 +++-
 WarpSpeedMrSulu.pde | 23 ++++++++++++++++++-----
 Waves.pde           | 24 ++++++++++++++++++------
 domeTransmitter.pde | 15 +++++++--------
 7 files changed, 82 insertions(+), 32 deletions(-)

diff --git a/Bursts.pde b/Bursts.pde
index 36ee559..6245c52 100644
--- a/Bursts.pde
+++ b/Bursts.pde
@@ -37,6 +37,7 @@ class Burst {
   float maxd;
   float speed;
   int intensity;
+  
   float r;
   float g;
   float b;
@@ -48,14 +49,21 @@ class Burst {
 
   public void reset()
   {
-    r = random(128)+128;
-    g = random(128)+128;
-    b = random(128)+128;
-
+    //r = random(128)+128;
+    //g = random(128)+128;
+    //b = random(128)+128;
+    // naim hack (PORNJ Pink: RGB 252/23/218) 
+    r = random(220,255);
+    g = random(0,55);
+    b = random(210,230);
+    //r = random(128);
+    //g = random(118);
+    //b = random(128);
+   
     x = random(WIDTH);
     y = random(HEIGHT);
 
-    float max_speed = 3;
+    float max_speed = 2;
     xv = random(max_speed) - max_speed/2;
     yv = random(max_speed) - max_speed/2;
     
@@ -78,12 +86,19 @@ class Burst {
     ellipse(x-WIDTH, y, d*(.5-.3*y/HEIGHT), d*3);
     ellipse(x+WIDTH, y, d*(.5-.3*y/HEIGHT), d*3);
     d+= speed;
-    if (d > maxd)
-      r -= 15;
-      g -= 15;
-      b -= 15;
-      intensity -= 15;
-      
+    if (d > maxd) {
+      // day
+      r -= 2;
+      g -= 2;
+      b -= 2;
+      intensity -= 4;
+      //night
+//      r -= 1;
+//      g -= 1;
+//      b -= 1;
+//      intensity -= 3;
+    }
+    
     x +=xv;
     y +=yv;
 
diff --git a/Chase.pde b/Chase.pde
index 02682f0..ec572f7 100644
--- a/Chase.pde
+++ b/Chase.pde
@@ -1,7 +1,12 @@
 class Chase extends Routine {
   void draw() {
+
+    // naim hack (PORNJ Pink: RGB 252/23/218) 
+    float r = random(220,255)/2;
+    float g = random(0,55)/2;
+    float b = random(210,230)/2;
     background(0);
-    stroke(255);
+    stroke(color(r,g,b));
   
     long frame = frameCount - modeFrameStart;
     line(frame/3.0%width, 0, frame/3.0%width, height);
diff --git a/ColorDrop.pde b/ColorDrop.pde
index f54e72c..bf20b3b 100644
--- a/ColorDrop.pde
+++ b/ColorDrop.pde
@@ -4,8 +4,12 @@ class ColorDrop extends Routine {
   
     float frame_mult = 3;  // speed adjustment
   
+    // lets add some jitter
+    modeFrameStart = modeFrameStart - min(0,int(random(-5,12)));
+    
     long frame = frameCount - modeFrameStart;
     
+    
     for(int row = 0; row < height; row++) {
       float phase = sin((float)((row+frame*frame_mult)%height)/height*3.146);
       
diff --git a/Seizure.pde b/Seizure.pde
index b6ca73c..90fc750 100644
--- a/Seizure.pde
+++ b/Seizure.pde
@@ -6,7 +6,9 @@ class Seizure extends Routine {
       background(0,0,0);
     }
     else {
-      background(130,130,130);
+      //RGB 252/23/218
+      //background(130,130,130);
+      background(252,23,218);
     }
     
     count = (count + 1) % 4;
diff --git a/WarpSpeedMrSulu.pde b/WarpSpeedMrSulu.pde
index 9205801..7b5f440 100644
--- a/WarpSpeedMrSulu.pde
+++ b/WarpSpeedMrSulu.pde
@@ -32,6 +32,10 @@ class WarpStar {
   float y;
   float len;
   float v;
+  
+  float r;
+  float g;
+  float b;
 
   public WarpStar() {
     this.reset();
@@ -47,17 +51,26 @@ class WarpStar {
 
   public void draw() {
     y = y + v; 
-
-    int r = int(map(y, 0, HEIGHT, 0, 255));
-    int g = 0;
-    int b = 0;
+    //RGB 252/23/218 
+    //r = int(map(y, 0, HEIGHT, 0, 255));
+    //g = 0;
+    //b = 0;
+    //r = 252;
+    //g = 23;
+    //b = 218;
+    r = random(232,255);
+    g = random(03,43);
+    b = random(198,238);
 
     stroke(r, g, b);
     point(x, y);
 
     for (int i=0; i<len; i++) {
       float intensity = 255 >> i / 2;
-      stroke(intensity);
+      
+      fill(color(r,g,b));
+      stroke(color(r,g,b));
+      //stroke(intensity);
       point(x, y - i);
     }
 
diff --git a/Waves.pde b/Waves.pde
index 92548d9..e5a392c 100644
--- a/Waves.pde
+++ b/Waves.pde
@@ -50,17 +50,27 @@ class Wave {
   }
 
   public void init() {
-    r = 24;//random(TWO_PI);
+    r = 40;//random(TWO_PI);
     f = PI/32 + random(PI/32);
-    a = HEIGHT/3 + random(HEIGHT/3);
+    a = HEIGHT/4 + random(HEIGHT/4);
     y = HEIGHT/8 + int(random(HEIGHT - HEIGHT/8));
-    s = PI/128 + random(PI/64);
+    s = PI/128 + random(PI/16);
 
     if (random(10)<5) { 
       s = -s;
     }
     
-    c = color(random(255), random(255), random(255));
+    //c = color(random(255), random(255), random(255));
+    // naim hack (PORNJ Pink: RGB 252/23/218)
+    if(random(0,2) > 1) {
+      // pink
+      c = color(int(random(220,255)), int(random(0,55)), int(random(210,230)));
+    }
+    else {
+      // orange
+      c = color(int(random(230,255)), int(random(160,180)), int(random(0,1)));
+    }
+    //c = color(int(random(255)), int(random(255)), int(random(255)));
   }
 
   public void draw() {
@@ -74,12 +84,14 @@ class Wave {
 
     g.beginDraw();
     g.background(0);
-    g.stroke(c);
+    
+    float bright_mult = .5 + (1+sin(step))/4;
+    g.stroke(color(red(c)*bright_mult, green(c)*bright_mult, blue(c)*bright_mult));
 
     for (int x=0; x<WIDTH; x++) {
       h = sin(step) * a;
       step = step + f;          
-      g.line(x, y, x, y+h);
+      g.line(x, y+h*.1, x, y+h*random(1,1.2));
     }
 
     g.endDraw();
diff --git a/domeTransmitter.pde b/domeTransmitter.pde
index 4934948..f37613c 100644
--- a/domeTransmitter.pde
+++ b/domeTransmitter.pde
@@ -17,24 +17,24 @@ int transmit_port       = 58082;
 int WIDTH = 40;
 int HEIGHT = 160;
 boolean VERTICAL = false;
-int FRAMERATE = 40;
+int FRAMERATE = 45;
 int TYPICAL_MODE_TIME = 300;
 
+float bright = 0.05;  // Global brightness modifier
 
-Routine drop = new DropTheBomb();
+Routine drop = new Seizure();
 Routine pong = new Pong();
 
-
 Routine[] enabledRoutines = new Routine[] {
-//  new Warp(new WarpSpeedMrSulu(), false, true, 0.5, 0.5), 
+  new Warp(new WarpSpeedMrSulu(), false, true, 0.5, 0.5), 
 //  new Warp(null, true, false, 0.5, 0.5), 
   new Bursts(),
 //  new Chase(), 
+  new ColorDrop(), 
 //  new Fire(), 
-  //  new NightSky(),
 //  new RGBRoutine(), 
-//  new RainbowColors(), 
-//  new Waves(),
+//  new RainbowColors(),
+  new Waves(),
 };
 
 int w = 0;
@@ -45,7 +45,6 @@ int ZOOM = 1;
 long modeFrameStart;
 int mode = 0;
 
-float bright = .5;  // Global brightness modifier
 
 int direction = 1;
 int position = 0;