X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=TobySegaran.pde;h=443be5b053b8bbdf3c333a3ec9b247774c064580;hb=c2f643bd6cf077c1b8bb0a6566a57228937160e6;hp=4334ff81219e0d8bb835b851a884c97abce5b27c;hpb=dbf92ceedc8acfc45d21811c40b8c4c9df1970c3;p=SugarCubes.git

diff --git a/TobySegaran.pde b/TobySegaran.pde
old mode 100644
new mode 100755
index 4334ff8..443be5b
--- a/TobySegaran.pde
+++ b/TobySegaran.pde
@@ -137,16 +137,23 @@ class SoundRain extends SCPattern {
   private LinearEnvelope[] bandVals = null;
   private float[] lightVals = null;
   private int avgSize;
+  private float gain = 25;
   SawLFO pos = new SawLFO(0, 9, 8000);
   SinLFO col1 = new SinLFO(0, model.xMax, 5000);
-
+  BasicParameter gainParameter = new BasicParameter("GAIN", 0.5);
   
   public SoundRain(GLucose glucose) {
     super(glucose);
     addModulator(pos).trigger();
     addModulator(col1).trigger();
+    addParameter(gainParameter);
   }
 
+  public void onParameterChanged(LXParameter parameter) {
+    if (parameter == gainParameter) {
+      gain = 50*parameter.getValuef();
+    }
+  }
   protected void onActive() {
     if (this.fft == null) {
       this.fft = new FFT(lx.audioInput().bufferSize(), lx.audioInput().sampleRate());
@@ -166,9 +173,9 @@ class SoundRain extends SCPattern {
     for (int i = 0; i < avgSize; ++i) {
       float value = this.fft.getAvg(i);
       this.bandVals[i].setEndVal(value,40).trigger();
-      float lv = min(value*25,100);
+      float lv = min(value*gain,100);
       if (lv>lightVals[i]) {
-        lightVals[i]=min(lightVals[i]+10,lv,100);
+        lightVals[i]=min(lightVals[i]+15,lv,100);
       } else {
         lightVals[i]=max(lv,lightVals[i]-5,0);
       }
@@ -178,8 +185,8 @@ class SoundRain extends SCPattern {
         Strip s = c.strips.get(j);
         if (j%4!=0 && j%4!=2) {
           for (Point p : s.points) {
-            int seq = int(p.fy*avgSize/model.yMax+pos.getValuef())%avgSize;
-            seq=abs(seq-(avgSize/2));
+            int seq = int(p.fy*avgSize/model.yMax+pos.getValuef()+sin(p.fx+p.fz)*2)%avgSize;
+            seq=min(abs(seq-(avgSize/2)),avgSize-1);
             colors[p.index] = color(200,max(0,100-abs(p.fx-col1.getValuef())/2),lightVals[seq]);
           }
         }
@@ -206,16 +213,16 @@ class FaceSync extends SCPattern {
 
   public void run(int deltaMs) {
     int i=0;
-    for (Cube c : model.cubes) {
+    for (Strip s : model.strips) {
       i++;
-      for (Point p : c.points) {
+      for (Point p : s.points) {
         float dx, dz;
-        if (i%2==0) {
-          dx = p.fx - (c.cx+xosc.getValuef());
-          dz = p.fz - (c.cz+zosc.getValuef());
+        if (i%32 < 16) {
+          dx = p.fx - (s.cx+xosc.getValuef());
+          dz = p.fz - (s.cz+zosc.getValuef());
         } else {
-          dx = p.fx - (c.cx+zosc.getValuef());
-          dz = p.fz - (c.cz+xosc.getValuef());
+          dx = p.fx - (s.cx+zosc.getValuef());
+          dz = p.fz - (s.cz+xosc.getValuef());
         }                
         //println(dx);
         float a1=max(0,100-abs(p.fx-col1.getValuef()));
@@ -227,3 +234,69 @@ class FaceSync extends SCPattern {
     }
   }
 }
+
+class SoundSpikes extends SCPattern {
+  private FFT fft = null; 
+  private LinearEnvelope[] bandVals = null;
+  private float[] lightVals = null;
+  private int avgSize;
+  private float gain = 25;
+  BasicParameter gainParameter = new BasicParameter("GAIN", 0.5);
+  SawLFO pos = new SawLFO(0, model.xMax, 8000);
+
+  public SoundSpikes(GLucose glucose) {
+    super(glucose);
+    addParameter(gainParameter);
+    addModulator(pos).trigger();
+  }
+
+  public void onParameterChanged(LXParameter parameter) {
+    if (parameter == gainParameter) {
+      gain = 50*parameter.getValuef();
+    }
+  }
+  protected void onActive() {
+    if (this.fft == null) {
+      this.fft = new FFT(lx.audioInput().bufferSize(), lx.audioInput().sampleRate());
+      this.fft.window(FFT.HAMMING);
+      this.fft.logAverages(40, 1);
+      this.avgSize = this.fft.avgSize();
+      this.bandVals = new LinearEnvelope[this.avgSize];
+      for (int i = 0; i < this.bandVals.length; ++i) {
+        this.addModulator(this.bandVals[i] = (new LinearEnvelope(0, 0, 700+i*4))).trigger();
+      }
+      lightVals = new float[avgSize];
+    }
+  }
+  
+  public void run(int deltaMs) {
+    this.fft.forward(this.lx.audioInput().mix);
+    for (int i = 0; i < avgSize; ++i) {
+      float value = this.fft.getAvg(i);
+      this.bandVals[i].setEndVal(value,40).trigger();
+      float lv = min(value*gain,model.yMax+10);
+      if (lv>lightVals[i]) {
+        lightVals[i]=min(lightVals[i]+30,lv,model.yMax+10);
+      } else {
+        lightVals[i]=max(lv,lightVals[i]-10,0);
+      }
+    }
+    int i = 0;
+    for (Cube c : model.cubes) {
+      for (int j=0; j<c.strips.size(); j++) {
+        Strip s = c.strips.get(j);
+        if (j%4!=0 && j%4!=2) {
+          for (Point p : s.points) {
+            float dis = (abs(p.fx-model.xMax/2)+pos.getValuef())%model.xMax/2;
+            int seq = int((dis*avgSize*2)/model.xMax);
+            if (seq>avgSize) seq=avgSize-seq;
+            seq=constrain(seq,0,avgSize-1);
+            float br=max(0, lightVals[seq]-p.fy);
+            colors[p.index] = color((dis*avgSize*65)/model.xMax,90,br);
+          }
+        }
+      }
+    }
+  }  
+}
+