From: greena1re <alexandergreen22@gmail.com>
Date: Wed, 22 Jan 2014 10:11:53 +0000 (-0800)
Subject: added JGraphT to code folder, seems to be working but it's possible I screwed somethi... 
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=ab65d40b549a354ba5f70b08c29d35d0971243cf;p=SugarCubes.git

added JGraphT to code folder, seems to be working but it's possible I screwed something up. While compiling .jar eclipse gave me a warning regarding DS_Store
---

diff --git a/AlexGreen.pde b/AlexGreen.pde
index 3e164d8..2ea6fde 100644
--- a/AlexGreen.pde
+++ b/AlexGreen.pde
@@ -589,6 +589,17 @@ float cfloor = c.y;
    }
   }
  }
+  JGraphAdapterDemo graph1; 
+  
+
+// class SpinningCube extends SCPattern{
+// LXProjection spin1, spin2, spin3; 
+// SawLFO 
+
+//}
+
+
+
 
  class HueTestHSB extends SCPattern{
   BasicParameter HueT = new BasicParameter("Hue", .5);
diff --git a/DanUtil.pde b/DanUtil.pde
index 382cf97..c3e8990 100644
--- a/DanUtil.pde
+++ b/DanUtil.pde
@@ -250,7 +250,7 @@ class dVertex {
 
 	dVertex(Strip _s, LXPoint _p)  { s = _s; ci  = _p.index; }
 	LXPoint 	getPoint(int i) 	 { return s.points.get(dir>0 ? i : 15-i);  }
-	void 	setOpp(dVertex _opp) { opp = _opp; dir = (ci < opp.ci ? 1 : -1); }
+	void 	setOpp( dVertex _opp) { opp = _opp; dir = (ci < opp.ci ? 1 : -1); }
 }
 //----------------------------------------------------------------------------------------------------------------------------------
 class dPixel   { dVertex v; int pos; dPixel(dVertex _v, int _pos) { v=_v; pos=_pos; } }
diff --git a/SugarCubes.pde b/SugarCubes.pde
index ff85065..e8b1573 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -28,7 +28,12 @@ LXPattern[] patterns(GLucose glucose) {
 
     new SineSphere(glucose),
     //new CubeCurl(glucose), 
-     
+     // DanH
+    new Noise(glucose),
+    new Play (glucose),
+    new Pong (glucose),
+    new Worms(glucose),
+
     // Slee
     // new Cathedrals(glucose),
      new Swarm(glucose),
@@ -43,23 +48,25 @@ LXPattern[] patterns(GLucose glucose) {
     new Blinders(glucose),
     new CrossSections(glucose),
     new Psychedelia(glucose),
-
+     new TimRaindrops(glucose),
+    new TimCubes(glucose),
     new MultipleCubes(glucose),
     
     new Traktor(glucose).setEligible(false),
     new BassPod(glucose).setEligible(false),
     new CubeEQ(glucose).setEligible(false),
     new PianoKeyPattern(glucose).setEligible(false),
+    
+     new StripBounce(glucose),
 
 	// AntonK
-	new AKPong(glucose),
-
-    // DanH
-    new Noise(glucose),
-    new Play (glucose),
-    new Pong (glucose),
-    new Worms(glucose),
+	//new AKPong(glucose),
+    new Swim(glucose),
+    new Balance(glucose),
+    
 
+    
+    
     // JR
     new Gimbal(glucose),
     
@@ -69,8 +76,7 @@ LXPattern[] patterns(GLucose glucose) {
     new TimMetronome(glucose),
     new TimPlanes(glucose),
     new TimPinwheels(glucose),
-    new TimRaindrops(glucose),
-    new TimCubes(glucose),
+    
     // new TimTrace(glucose),
     new TimSpheres(glucose),
 
@@ -90,16 +96,12 @@ LXPattern[] patterns(GLucose glucose) {
     // Toby
     new GlitchPlasma(glucose),
     new FireEffect(glucose).setEligible(false),
-    new StripBounce(glucose),
+   
     new SoundRain(glucose).setEligible(false),
     new SoundSpikes(glucose).setEligible(false),
     new FaceSync(glucose),
 
     // Jack
-    new Swim(glucose),
-    new Balance(glucose),
-    
-
     
     // Ben
     // new Sandbox(glucose),
diff --git a/_Mappings.pde b/_Mappings.pde
index 171ff13..817601e 100644
--- a/_Mappings.pde
+++ b/_Mappings.pde
@@ -83,11 +83,11 @@ public Model buildModel() {
                  - ((i % 2 == 0) ? 11 : 0) + 80          ,   // z
                  -45, (i % 2 == 0) ? MaxCubeHeight : MaxCubeHeight) );         // num cubes
         
-//        for (int i=0; i<NumBackTowers/2; i++) scubes.add(new StaggeredTower(
-//                  (i+1)*CW,                                                                 // x
-//                  (i % 2 == 0) ? 0 : CH * 2./3.                ,   // y
-//                 - ((i % 2 == 0) ? 0 : 11) + 80 - pow(CH*CH + CW*CW, .5),   // z
-//                 225, (i % 2 == 0) ? MaxCubeHeight : MaxCubeHeight-1) ); 
+       for (int i=0; i<NumBackTowers/2; i++) scubes.add(new StaggeredTower(
+                 (i+1)*CW,                                                                 // x
+                 (i % 2 == 0) ? 0 : CH * 2./3.                ,   // y
+                - ((i % 2 == 0) ? 0 : 11) + 80 - pow(CH*CH + CW*CW, .5),   // z
+                225, (i % 2 == 0) ? MaxCubeHeight : MaxCubeHeight-1) ); 
 
       // for (int i=0; i<2 ; i++) scubes.add(new StaggeredTower(
       //             (i+1)*CW,                                                                 // x
diff --git a/code/JGraphT.jar b/code/JGraphT.jar
new file mode 100644
index 0000000..1db92e6
Binary files /dev/null and b/code/JGraphT.jar differ