weird merge shit

[SugarCubes.git] / DanUtil.pde

diff --git a/DanUtil.pde b/DanUtil.pde
index 78dc6d717c4c5b2d9535ea0cc3e8e3c39768c8fe..d2cb5689768d07bd1acd1bb06cc66d587b8647f2 100644 (file)
--- a/DanUtil.pde
+++ b/DanUtil.pde
@@ -124,8 +124,8 @@ public class DPat extends SCPattern
                updateLights(); 
        }
 
-       DPat(GLucose glucose) {
-               super(glucose);
+       DPat(LX lx) {
+               super(lx);
 
                pSpark          =       addParam("Sprk",  0);
                pWave           =       addParam("Wave",  0);
@@ -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; } }