repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Few tiny cleanups
[SugarCubes.git]
/
DanKaminsky.pde
diff --git
a/DanKaminsky.pde
b/DanKaminsky.pde
index 87bfa3b60da7436c0ca339f587ae95afd18d1eaa..c4ca005970aa093a6762faca7a6568d6d98ab1e0 100644
(file)
--- a/
DanKaminsky.pde
+++ b/
DanKaminsky.pde
@@
-3,15
+3,15
@@
class GenericController {
public void RotateKnob(int type, int num, float val){
LXParameter p = null;
if(type==0) {
public void RotateKnob(int type, int num, float val){
LXParameter p = null;
if(type==0) {
- p = g
lucose.g
etPattern().getParameters().get(num);
+ p = getPattern().getParameters().get(num);
if(p!=null) { p.setValue(val); }
}
if(type==1) {
if(p!=null) { p.setValue(val); }
}
if(type==1) {
- p =
glucose.getSelected
Transition().getParameters().get(num);
+ p =
lx.engine.getDeck(RIGHT_DECK).getFader
Transition().getParameters().get(num);
if(p!=null) { p.setValue(val); }
}
if(type==2) {
if(p!=null) { p.setValue(val); }
}
if(type==2) {
- p = g
lucose.g
etSelectedEffect().getParameters().get(num);
+ p = getSelectedEffect().getParameters().get(num);
if(p!=null) { p.setValue(val); }
}
}
if(p!=null) { p.setValue(val); }
}
}
@@
-146,7
+146,7
@@
import oscP5.*;
abstract class OSCPattern extends SCPattern {
abstract class OSCPattern extends SCPattern {
- public OSCPattern(
GLucose glucose){super(glucose
);}
+ public OSCPattern(
LX lx){super(lx
);}
public abstract void oscEvent(OscMessage msg);
}
public abstract void oscEvent(OscMessage msg);
}
@@
-160,8
+160,8
@@
class Ball {
class OSC_Balls extends OSCPattern {
Ball[] balls;
class OSC_Balls extends OSCPattern {
Ball[] balls;
- public OSC_Balls(
GLucose glucose
){
- super(
glucose
);
+ public OSC_Balls(
LX lx
){
+ super(
lx
);
balls = new Ball[20];
for(int i=0; i<balls.length; i++) { balls[i] = new Ball(); }
}
balls = new Ball[20];
for(int i=0; i<balls.length; i++) { balls[i] = new Ball(); }
}
@@
-193,8
+193,8
@@
import processing.serial.*;
/*class ScreenScrape extends SCPattern {
PImage pret;
ScreenShot ss;
/*class ScreenScrape extends SCPattern {
PImage pret;
ScreenShot ss;
- public ScreenScrape(
GLucose glucose
) {
- super(
glucose
);
+ public ScreenScrape(
LX lx
) {
+ super(
lx
);
System.loadLibrary("ScreenShot");
pret = new PImage(8, 128, ARGB);
ss = new ScreenShot();
System.loadLibrary("ScreenShot");
pret = new PImage(8, 128, ARGB);
ss = new ScreenShot();