Draw a cute logo on front of the box, gotta have a logo in the UI!

[SugarCubes.git] / DanUtil.pde

diff --git a/DanUtil.pde b/DanUtil.pde
old mode 100755 (executable)
new mode 100644 (file)
index d9990dd..7bcd56a
--- a/DanUtil.pde
+++ b/DanUtil.pde
@@ -80,14 +80,14 @@ public class DPat extends SCPattern
        int             unmapRow (int a)                                        { return btwn(a,0 , 4) ? a+53 : a;                      }
        void            SetLight (int row, int col, int clr){ if (midiout != null) midiout.sendNoteOn(col, unmapRow(row), clr); }
        void            keypad   (int row, int col)                     { println(row + " " + col); }
-       void            onInactive()                                            { bIsActive=false; DanTextLine1 = ""; DanTextLine2 = "";}
+       void            onInactive()                                            { bIsActive=false; DanTextLine1 = ""; DanTextLine2 = ""; uiDebugText.setText(""); }
        void            onActive  ()                                            { bIsActive=true;
                zSpinHue = 0;
                for (int i=0; i<paramlist.size(); i++) ((_DhP)paramlist.get(i)).reset();
                while (lx.tempo.bpm() > 40) lx.tempo.setBpm(lx.tempo.bpm()/2);
                UpdateLights();
        }
-       void    StartRun(int deltaMs)                           {       }
+       void    StartRun(double deltaMs)                                {       }
        color   CalcPoint(xyz p)                                        { return color(0,0,0); }
        float   CalcCone (xyz v1, xyz v2, xyz c)        {
                return degrees( acos ( v1.minus(c).dot(v2.minus(c)) / (sqrt(v1.minus(c).dot(v1.minus(c))) * sqrt(v2.minus(c).dot(v2.minus(c))) ) ));
@@ -105,9 +105,11 @@ public class DPat extends SCPattern
 
                DanTextLine2  = "SLIDERS: ";
                for (int i=0; i<8; i++) if (SliderText[i] != "") { DanTextLine2 += SliderText[i] + ": " + Sliders[i] + "     "; }
+
+               uiDebugText.setText(DanTextLine1, DanTextLine2);
        }
 
-       void    run(int deltaMs) {
+       void    run(double deltaMs) {
                NoiseMove   += deltaMs;
                xdMax           =  model.xMax;
                ydMax           =  model.yMax;
@@ -152,7 +154,7 @@ public class DPat extends SCPattern
 
                        cNew = color( (hue(cNew) + modhue + zSpinHue - noizhue) % 360,
                                                saturation(cNew) + 100*s_Saturate(),
-                                               100 *  (s_Trails()==0 ? b : max(b, brightness(cOld)/100. - (1-s_Trails()) * deltaMs/200.))
+                                               100 *  (s_Trails()==0 ? b : max(b, (float) (brightness(cOld)/100. - (1-s_Trails()) * deltaMs/200.)))
                                                        *  (s_Dim   ()==0 ? 1 : 1-s_Dim())
                                                );
                                                   
@@ -183,7 +185,7 @@ public class DPat extends SCPattern
                xyz0    = new xyz(0,0,0);
                pSharp  = addParam("Shrp", 0);
                
-           for (MidiInputDevice  input  : RWMidi.getInputDevices ()) { if (input.toString().contains("APC")) input .createInput (this);}
+           // for (MidiInputDevice  input  : RWMidi.getInputDevices ()) { if (input.toString().contains("APC")) input .createInput (this);}
            for (MidiOutputDevice output : RWMidi.getOutputDevices()) {
                        if (midiout == null && output.toString().contains("APC")) midiout = output.createOutput();
                }
@@ -259,4 +261,4 @@ public class DPat extends SCPattern
                return P;
        }
 }
-//----------------------------------------------------------------------------------------------------------------------------------\r
+//----------------------------------------------------------------------------------------------------------------------------------