Add Syphon back in and update for Entwined model.

oldlx/Trees/Patterns_MattStone.pde

@@ -19,42 +19,43 @@ class SyphonPattern extends TSPattern {
     super(lx);
     addParameter(getWidth);
     addParameter(mode);
-    client = new SyphonClient(applet, "Modul8", "Main View");
+    client = new SyphonClient(applet);
     xpoints = new int[model.baseCubes.size()];
     ypoints = new int[model.baseCubes.size()];
   }
 
   void generateMap(int buffWidth, int buffHeight) {
     this.xscale = buffWidth / model.xRange;
     this.yscale = buffHeight / model.yRange;
-    int cubeIdx = 0;    
+    int cubeIdx = 0;
     for (BaseCube cube : model.baseCubes) {
       xpoints[cubeIdx] = int((cube.cx - model.xMin) * this.xscale);
-      ypoints[cubeIdx] = buffHeight - int((cube.cy - model.yMin) * this.yscale);    
+      ypoints[cubeIdx] = buffHeight - int((cube.cy - model.yMin) * this.yscale);
       cubeIdx++;
     }
   }
 
-  private int mode1(Cube cube, int cubeIdx) {    
+  private int mode1(BaseCube cube, int cubeIdx) {
     return weighted_get(imgbuffer, int(this.buffWidth * (cube.transformedTheta / 360.0)), this.buffHeight - int(this.buffHeight * (cube.transformedY/model.yMax)), getWidth.getValuei());
   }
-  
-  private int mode2(Cube cube, int cubeIdx) {
+
+  private int mode2(BaseCube cube, int cubeIdx) {
     boolean reverse = false;
     if (cube.transformedTheta > (360.0 / 2))
       reverse = true;
     if (reverse) {
-      return weighted_get(imgbuffer, int(this.buffWidth * ((((360.0 - cube.transformedTheta) * 2)) / 360.0)), this.buffHeight - int(this.buffHeight * (cube.transformedY/model.yMax)), getWidth.getValuei());      
+      return weighted_get(imgbuffer, int(this.buffWidth * ((((360.0 - cube.transformedTheta) * 2)) / 360.0)), this.buffHeight - int(this.buffHeight * (cube.transformedY/model.yMax)), getWidth.getValuei());
     }
     return weighted_get(imgbuffer, int(this.buffWidth * ((cube.transformedTheta * 2.0) / 360.0)), this.buffHeight - int(this.buffHeight * (cube.transformedY/model.yMax)), getWidth.getValuei());
   }
-  
-  private int mode3(Cube cube, int cubeIdx) {
+
+  private int mode3(BaseCube cube, int cubeIdx) {
     return weighted_get(imgbuffer, xpoints[cubeIdx], ypoints[cubeIdx], getWidth.getValuei());
   }
-        
+
   public void run(double deltaMs) {
     if (client.available()) {
+      System.out.println("syphon client available!\r");
 
       buffer = client.getGraphics(buffer);
       imgbuffer = buffer.get();
@@ -67,35 +68,37 @@ class SyphonPattern extends TSPattern {
       int c = 0;
       // NOTE: This is no longer correct because we need to account
       // for BaseCube, not bothering to fix because syphon is required
-      for (Cube cube : model.cubes) {
+      for (BaseCube cube : model.baseCubes) {
         switch (mode.getValuei()) {
           case 1: c = mode1(cube, cubeIdx);
                   break;
           case 2: c = mode2(cube, cubeIdx);
-                  break;    
+                  break;
           case 3: c = mode3(cube, cubeIdx);
-                  break;      
+                  break;
         }
-        
+
         setColor(cube, c);
         cubeIdx++;
       }
+    } else {
+      System.out.println("No syphon client available during run().\r");
     }
   }
-  
+
   private boolean restoreThreaded = false;
   private int syphonCount = 0;
-  
+
   public void onActive() {
     if (syphonCount == 0) {
       if (restoreThreaded = lx.engine.isThreaded()) {
         println("Turning off threading for Syphon");
         lx.engine.setThreaded(false);
       }
     }
-    ++syphonCount; 
+    ++syphonCount;
   }
-  
+
   public void onInactive() {
     --syphonCount;
     if ((syphonCount == 0) && restoreThreaded) {

oldlx/Trees/Trees.pde

@@ -121,7 +121,7 @@ class ProcessingEngine extends Engine {
   void addPatterns(ArrayList<LXPattern> patterns) {
     super.addPatterns(patterns);
     if (Config.enableSoundSyphon) {
-      try { patterns.add(new SyphonPattern(lx, Trees.this)); } catch (Throwable e) {}
+      try { patterns.add(new SyphonPattern(lx, Trees.this)); } catch (Throwable e) { throw e;}
     }
   }
 }