repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Overhaul UI code to make it more flexible and less redrawing, little hierarchy framework
[SugarCubes.git]
/
DanKaminsky.pde
diff --git
a/DanKaminsky.pde
b/DanKaminsky.pde
index 59bde733721a99feaacfc1f495b482896a6bdd2c..3fbd86b30ca753d56f98ca5c2f1872b344414a11 100644
(file)
--- a/
DanKaminsky.pde
+++ b/
DanKaminsky.pde
@@
-215,7
+215,7
@@
import processing.serial.*;
List<LXParameter> gparams;
List<LXParameter> gparams;
-class DualBlender extends SCEffect {
+
class DualBlender extends SCEffect {
int lastSeen;
BasicParameter p1 = new BasicParameter("p1", 0);
BasicParameter p2 = new BasicParameter("p2", 0);
int lastSeen;
BasicParameter p1 = new BasicParameter("p1", 0);
BasicParameter p2 = new BasicParameter("p2", 0);
@@
-250,9
+250,9
@@
class DualBlender extends SCEffect {
if(p==p7) { gparams.get(6).setValue(p.getValuef()); }
if(p==p8) { gparams.get(7).setValue(p.getValuef()); }
}
if(p==p7) { gparams.get(6).setValue(p.getValuef()); }
if(p==p8) { gparams.get(7).setValue(p.getValuef()); }
}
-
+
void doApply(int[] colors){
void doApply(int[] colors){
- if
(doDual==true)
{
+ if
(enabled)
{
//gplay.onActive();
gplay.go(millis()-lastSeen);
lastSeen=millis();
//gplay.onActive();
gplay.go(millis()-lastSeen);
lastSeen=millis();