From a41f334c045811daef7e319214da557b5e48143a Mon Sep 17 00:00:00 2001
From: Mark Slee <mcslee@Mark-Slees-MacBook-Pro.local>
Date: Sun, 13 Oct 2013 21:02:20 -0700
Subject: [PATCH] Change code to use new thread-safe lx color functions
---
AlexGreen.pde | 12 +-
ArjunBanker.pde | 10 +-
BenMorrow.pde | 4 +-
DanHorwitz.pde | 1142 ++++++++++++++++++++++-----------------------
DanKaminsky.pde | 2 +-
DanUtil.pde | 16 +-
GranimPattern.pde | 8 +-
JR.pde | 14 +-
JackStahl.pde | 6 +-
MarkSlee.pde | 52 ++-
SamMorrow.pde | 2 +-
ShaheenGandhi.pde | 14 +-
TimBavaro.pde | 26 +-
TobySegaran.pde | 14 +-
_Internals.pde | 12 +-
_UIFramework.pde | 2 +-
code/HeronLX.jar | Bin 67510 -> 67726 bytes
17 files changed, 668 insertions(+), 668 deletions(-)
mode change 100755 => 100644 AlexGreen.pde
mode change 100755 => 100644 DanHorwitz.pde
diff --git a/AlexGreen.pde b/AlexGreen.pde
old mode 100755
new mode 100644
index 7403395..6ee9a39
--- a/AlexGreen.pde
+++ b/AlexGreen.pde
@@ -72,14 +72,14 @@ float distfromcirclecenter(float px, float py, float pz, float f1x, float f1y, f
color spheryvalue (float px, float py, float pz , float f1xc, float f1yc, float f1zc)
{
//switch(sShpape.cur() ) {}
- return color(constrain(huespread.getValuef()*5*px, 0, 360) , dist(px, py, pz, f1xc, f1yc, f1zc) ,
+ return lx.hsb(constrain(huespread.getValuef()*5*px, 0, 360) , dist(px, py, pz, f1xc, f1yc, f1zc) ,
max(0, 100 - 100*widthparameter.getValuef()*abs(dist(px, py, pz, f1xcenter, ybounce.getValuef(), f1zcenter)
- vibration.getValuef() ) ) );
}
color ellipsevalue(float px, float py, float pz , float f1xc, float f1yc, float f1zc, float f2xc, float f2yc, float f2zc)
{
//switch(sShpape.cur() ) {}
- return color(huespread.getValuef()*5*px, dist(model.xMax-px, model.yMax-py, model.zMax-pz, f1xc, f1yc, f1zc) ,
+ return lx.hsb(huespread.getValuef()*5*px, dist(model.xMax-px, model.yMax-py, model.zMax-pz, f1xc, f1yc, f1zc) ,
max(0, 100 - 100*widthparameter.getValuef() *
abs( (dist(px, py, pz, f1xc, ybounce.getValuef(), f1zc) +
(dist(px, py , pz, f2xc, ybounce.getValuef(), f2zc) ) )/2
@@ -159,10 +159,10 @@ final Sphery[] spherys;
// c = blendColor(c, spherys[3].ellipsevalue(Px.x, Px.y, Px.z, model.xMax/4, model.yMax/4, model.zMax/4, 3*model.xMax/4, 3*model.yMax/4, 3*model.zMax/4),ADD);
// return c;
// }
- // return color(0,0,0);
+ // return lx.hsb(0,0,0);
// // else if(spheremode ==2)
// { color c = 0;
- // return color(CalcCone( (xyz by = new xyz(0,spherys[2].ybounce.getValuef(),0) ), Px, mid) );
+ // return lx.hsb(CalcCone( (xyz by = new xyz(0,spherys[2].ybounce.getValuef(),0) ), Px, mid) );
// }
@@ -186,7 +186,7 @@ HueTestHSB(GLucose glucose) {
for (Point p : model.points) {
color c = 0;
- c = blendColor(c, color(360*HueT.getValuef(), 100*SatT.getValuef(), 100*BriT.getValuef()), ADD);
+ c = blendColor(c, lx.hsb(360*HueT.getValuef(), 100*SatT.getValuef(), 100*BriT.getValuef()), ADD);
colors[p.index]= c;
}
int now= millis();
@@ -196,4 +196,4 @@ HueTestHSB(GLucose glucose) {
}
}
- }
\ No newline at end of file
+ }
diff --git a/ArjunBanker.pde b/ArjunBanker.pde
index 12ce5b6..c8fe1a6 100644
--- a/ArjunBanker.pde
+++ b/ArjunBanker.pde
@@ -16,7 +16,7 @@ class TelevisionStatic extends SCPattern {
void run(double deltaMs) {
boolean d = direction.getValuef() > 5.0;
for (Point p : model.points) {
- colors[p.index] = color((lx.getBaseHuef() + random(hueParameter.getValuef() * 360))%360, random(saturationParameter.getValuef() * 100), random(brightParameter.getValuef() * 100));
+ colors[p.index] = lx.hsb((lx.getBaseHuef() + random(hueParameter.getValuef() * 360))%360, random(saturationParameter.getValuef() * 100), random(brightParameter.getValuef() * 100));
}
}
}
@@ -40,7 +40,7 @@ class AbstractPainting extends SCPattern {
void run(double deltaMs) {
for (Point p : model.points) {
color c = img.get((int)((p.x / model.xMax) * img.width), img.height - (int)((p.y / model.yMax) * img.height));
- colors[p.index] = color(hue(c) + colorMod.getValuef()%360, saturation(c), brightness(c) - ((p.z - brightMod.getValuef())/p.z));
+ colors[p.index] = lx.hsb(hue(c) + colorMod.getValuef()%360, saturation(c), brightness(c) - ((p.z - brightMod.getValuef())/p.z));
}
}
}
@@ -56,7 +56,7 @@ class Spirality extends SCPattern {
super(glucose);
addParameter(r);
for (Point p : model.points) {
- colors[p.index] = color(0, 0, 0);
+ colors[p.index] = lx.hsb(0, 0, 0);
}
}
@@ -70,12 +70,12 @@ class Spirality extends SCPattern {
if (b < 90) {
colors[p.index] = blendColor(
colors[p.index],
- color(lx.getBaseHuef() + 25, 10, map(b, 0, 10, 100, 0)),
+ lx.hsb(lx.getBaseHuef() + 25, 10, map(b, 0, 10, 100, 0)),
ADD);
} else {
colors[p.index] = blendColor(
colors[p.index],
- color(25, 10, map(b, 0, 10, 0, 15)),
+ lx.hsb(25, 10, map(b, 0, 10, 0, 15)),
SUBTRACT);
}
}
diff --git a/BenMorrow.pde b/BenMorrow.pde
index 1eb8ae1..afd6807 100644
--- a/BenMorrow.pde
+++ b/BenMorrow.pde
@@ -64,7 +64,7 @@ class TowerParams extends SCPattern
{
if(p.y<towerParams.get(i).getValuef()*200)
{
- colors[p.index]=color(255 * hueoff.getValuef()+colorSpan * hueSpan.getValuef() * i, 255, 255);
+ colors[p.index]=lx.hsb(255 * hueoff.getValuef()+colorSpan * hueSpan.getValuef() * i, 255, 255);
}
}
}
@@ -108,7 +108,7 @@ class Sandbox extends SCPattern
{
doDraw(c,0);
c = (c + 1) % towerrange;
- long col = color(Math.round(Math.random()*255),255,255) ;
+ long col = lx.hsb(Math.round(Math.random()*255),255,255) ;
doDraw(c,col);
}
counter++;
diff --git a/DanHorwitz.pde b/DanHorwitz.pde
old mode 100755
new mode 100644
index d084609..ca829ee
--- a/DanHorwitz.pde
+++ b/DanHorwitz.pde
@@ -1,571 +1,571 @@
-//----------------------------------------------------------------------------------------------------------------------------------
-public class Pong extends DPat {
- SinLFO x,y,z,dx,dy,dz;
- float cRad; DParam pSize;
- Pick pChoose;
- xyz v = new xyz(), vMir = new xyz();
-
- Pong(GLucose glucose) {
- super(glucose);
- cRad = mMax.x/10;
- addModulator(dx = new SinLFO(6000, 500, 30000 )).trigger();
- addModulator(dy = new SinLFO(3000, 500, 22472 )).trigger();
- addModulator(dz = new SinLFO(1000, 500, 18420 )).trigger();
- addModulator(x = new SinLFO(cRad, mMax.x - cRad, 0)).trigger(); x.modulateDurationBy(dx);
- addModulator(y = new SinLFO(cRad, mMax.y - cRad, 0)).trigger(); y.modulateDurationBy(dy);
- addModulator(z = new SinLFO(cRad, mMax.z - cRad, 0)).trigger(); z.modulateDurationBy(dz);
- pSize = addParam ("Size" , 0.4 );
- pChoose = addPick ("Animiation" , 0, 2, new String[] {"Pong", "Ball", "Cone"} );
- }
-
- void StartRun(double deltaMs) { cRad = mMax.x*pSize.Val()/6; }
- color CalcPoint(xyz p) {
- v.set(x.getValuef(), y.getValuef(), z.getValuef());
- v.z=0;p.z=0;// ignore z dimension
- switch(pChoose.Cur()) {
- case 0: vMir.set(mMax); vMir.subtract(p);
- return color(0,0,c1c(1 - min(v.distance(p), v.distance(vMir))*.5/cRad)); // balls
- case 1: return color(0,0,c1c(1 - v.distance(p)*.5/cRad)); // ball
- case 2: vMir.set(mMax.x/2,0,mMax.z/2);
- return color(0,0,c1c(1 - CalcCone(p,v,vMir) * max(.02,.45-pSize.Val()))); // spot
- }
- return color(0,0,0);
- }
-}
-//----------------------------------------------------------------------------------------------------------------------------------
-public class NDat {
- float xz, yz, zz, hue, sat, speed, angle, den;
- float xoff,yoff,zoff;
- float sinAngle, cosAngle;
- boolean isActive;
- NDat () { isActive=false; }
- boolean Active() { return isActive; }
- void set (float _hue, float _sat, float _xz, float _yz, float _zz, float _den, float _speed, float _angle) {
- isActive = true;
- hue=_hue; sat=_sat; xz=_xz; yz=_yz; zz =_zz; den=_den; speed=_speed; angle=_angle;
- xoff = random(100e3); yoff = random(100e3); zoff = random(100e3);
- }
-}
-
-public class Noise extends DPat
-{
- int CurAnim, iSymm;
- int XSym=1,YSym=2,RadSym=3;
- float zTime , zTheta=0, zSin, zCos, rtime, ttime, transAdd;
- DParam pSpeed , pDensity;
- Pick pChoose, pSymm;
- int _ND = 4;
- NDat N[] = new NDat[_ND];
-
- Noise(GLucose glucose) {
- super(glucose);
- pSpeed = addParam("Fast" , .55);
- pDensity = addParam("Dens" , .5);
- pSymm = addPick("Symmetry" , 0, 3, new String[] {"None", "X", "Y", "Radial"} );
- pChoose = addPick("Animation", 6, 7, new String[] {"Drip", "Cloud", "Rain", "Fire", "Machine", "Spark","VWave", "Wave"} );
- for (int i=0; i<_ND; i++) N[i] = new NDat();
- }
-
- void StartPattern() { zTime = random(500); zTheta=0; rtime = 0; ttime = 0; transAdd=0; }
- void StartRun(double deltaMs) {
- zTime += deltaMs*(pSpeed.Val()-.5)*.002 ;
- zTheta += deltaMs*(pSpin .Val()-.5)*.01 ;
- rtime += deltaMs;
- iSymm = pSymm.Cur();
- transAdd = 1*(1 - constrain(rtime - ttime,0,1000)/1000);
- zSin = sin(zTheta);
- zCos = cos(zTheta);
-
- if (pChoose.Cur() != CurAnim) {
- CurAnim = pChoose.Cur(); ttime = rtime;
- pSpin .reset(); zTheta = 0;
- pDensity .reset(); pSpeed .reset();
- for (int i=0; i<_ND; i++) { N[i].isActive = false; }
-
- switch(CurAnim) {
- // hue sat xz yz zz den mph angle
- case 0: N[0].set(0 ,0 ,75 ,75 ,150,45 ,3 ,0 ); pSharp.set(1 ); break; // drip
- case 1: N[0].set(0 ,0 ,100,100,200,45 ,3 ,180); pSharp.set(0 ); break; // clouds
- case 2: N[0].set(0 ,0 ,2 ,400,2 ,20 ,3 ,0 ); pSharp.set(.5); break; // rain
- case 3: N[0].set(40 ,1 ,100,100,200,10 ,1 ,180);
- N[1].set(0 ,1 ,100,100,200,10 ,5 ,180); pSharp.set(0 ); break; // fire 1
- case 4: N[0].set(0 ,1 ,40 ,40 ,40 ,15 ,2.5,180);
- N[1].set(20 ,1 ,40 ,40 ,40 ,15 ,4 ,0 );
- N[2].set(40 ,1 ,40 ,40 ,40 ,15 ,2 ,90 );
- N[3].set(60 ,1 ,40 ,40 ,40 ,15 ,3 ,-90); pSharp.set(.5); break; // machine
- case 5: N[0].set(0 ,1 ,400,100,2 ,15 ,3 ,90 );
- N[1].set(20 ,1 ,400,100,2 ,15 ,2.5,0 );
- N[2].set(40 ,1 ,100,100,2 ,15 ,2 ,180);
- N[3].set(60 ,1 ,100,100,2 ,15 ,1.5,270); pSharp.set(.5); break; // spark
- }
-
- DG.UpdateLights();
- }
-
- for (int i=0; i<_ND; i++) if (N[i].Active()) {
- N[i].sinAngle = sin(radians(N[i].angle));
- N[i].cosAngle = cos(radians(N[i].angle));
- }
- }
-
- color CalcPoint(xyz P) {
- color c = 0;
- P.RotateZ(mCtr, zSin, zCos);
-
- if (CurAnim == 6 || CurAnim == 7) {
- P.setNorm();
- return color(0,0, 100 * (
- constrain(1-50*(1-pDensity.Val())*abs(P.y-sin(zTime*10 + P.x*(300))*.5 - .5),0,1) +
- (CurAnim == 7 ? constrain(1-50*(1-pDensity.Val())*abs(P.x-sin(zTime*10 + P.y*(300))*.5 - .5),0,1) : 0))
- );
- }
-
- if (iSymm == XSym && P.x > mMax.x/2) P.x = mMax.x-P.x;
- if (iSymm == YSym && P.y > mMax.y/2) P.y = mMax.y-P.y;
-
- for (int i=0;i<_ND; i++) if (N[i].Active()) {
- NDat n = N[i];
- float zx = zTime * n.speed * n.sinAngle,
- zy = zTime * n.speed * n.cosAngle;
-
- float b = (iSymm==RadSym ? noise(zTime*n.speed+n.xoff-Dist(P,mCtr)/n.xz)
- : noise(P.x/n.xz+zx+n.xoff,P.y/n.yz+zy+n.yoff,P.z/n.zz+n.zoff))
- *1.8;
-
- b += n.den/100 -.4 + pDensity.Val() -1;
- b += transAdd;
- c = blendColor(c,color(n.hue,100*n.sat,c1c(b)),ADD);
- }
- return c;
- }
-}
-//----------------------------------------------------------------------------------------------------------------------------------
-public class Play extends DPat
-{
- public class rAngle {
- float prvA, dstA, c;
- float prvR, dstR, r;
- float _cos, _sin, x, y;
- float fixAngle (float a, float b) { return a<b ?
- (abs(a-b) > abs(a+2*PI-b) ? a : a+2*PI) :
- (abs(a-b) > abs(a-2*PI-b) ? a : a-2*PI) ; }
- float getX(float r) { return mCtr.x + _cos*r; }
- float getY(float r) { return mCtr.y + _sin*r; }
- void move() { c = interp(t,prvA,dstA);
- r = interp(t,prvR,dstR);
- _cos = cos(c); _sin = sin(c);
- x = getX(r); y = getY(r); }
- void set() { prvA = dstA; dstA = random(2*PI); prvA = fixAngle(prvA, dstA);
- prvR = dstR; dstR = random(mCtr.y); }
- }
-
- int nBeats = 0;
- DParam pAmp, pRadius, pBounce;
-
- float t,amp,rad,bnc;
- float zTheta=0;
- ArrayList<rWave> waves = new ArrayList<rWave>(10);
-
- rAngle a1 = new rAngle(), a2 = new rAngle(),
- a3 = new rAngle(), a4 = new rAngle();
- xyz cPrev = new xyz(), cRand = new xyz(),
- cMid = new xyz(), V = new xyz(),
- Theta = new xyz(), TSin = new xyz(),
- TCos = new xyz(), cMidNorm = new xyz(),
- Pn = new xyz();
- float LastBeat=3, LastMeasure=3;
- int CurRandTempo = 1, CurRandTPat = 1;
-
- Pick pTimePattern, pTempoMult, pShape;
- int RandCube;
-
- Play(GLucose glucose) {
- super(glucose);
- pRadius = addParam("Rad" , .1 );
- pBounce = addParam("Bnc" , .2 );
- pAmp = addParam("Amp" , .2 );
- pTempoMult = addPick ("TMult" , 0 , 5 , new String[] {"1x", "2x", "4x", "8x", "16x", "Rand" } );
- pTimePattern= addPick ("TPat" , 6 , 7 , new String[] {"Bounce", "Sin", "Roll", "Quant", "Accel", "Deccel", "Slide", "Rand"} );
- pShape = addPick ("Shape" , 3 , 15 , new String[] {"Line", "Tap", "V", "RandV",
- "Pyramid", "Wings", "W2", "Clock",
- "Triangle", "Quad", "Sphere", "Cone",
- "Noise", "Wave", "?", "?"} );
- }
-
- public class rWave {
- float v0, a0, x0, t,damp,a;
- boolean bDone=false;
- final float len=8;
- rWave(float _x0, float _a0, float _v0, float _damp) { x0=_x0*len; a0=_a0; v0=_v0; t=0; damp = _damp; }
- void move(double deltaMs) {
- t += deltaMs*.001;
- if (t>4) bDone=true;
- }
- float val(float _x) {
- _x*=len;
- float dist = t*v0 - abs(_x-x0);
- if (dist<0) { a=1; return 0; }
- a = a0*exp(-dist*damp) * exp(-abs(_x-x0)/(.2*len)); // * max(0,1-t/dur)
- return -a*sin(dist);
- }
- }
-
- void StartPattern() { zTheta=0; }
- void StartRun(double deltaMs) {
- t = lx.tempo.rampf();
- amp = pAmp.Val();
- rad = pRadius.getValuef();
- bnc = pBounce.getValuef();
- zTheta += deltaMs*(pSpin .Val()-.5)*.01;
-
- Theta .set(pRotX.Val()*PI*2, pRotY.Val()*PI*2, pRotZ.Val()*PI*2 + zTheta);
- TSin .set(sin(Theta.x), sin(Theta.y), sin(Theta.z));
- TCos .set(cos(Theta.x), cos(Theta.y), cos(Theta.z));
-
- if (t<LastMeasure) {
- if (random(3) < 1) { CurRandTempo = int(random(4)); if (CurRandTempo == 3) CurRandTempo = int(random(4)); }
- if (random(3) < 1) { CurRandTPat = pShape.Cur() > 6 ? 2+int(random(5)) : int(random(7)); }
- } LastMeasure = t;
-
- int nTempo = pTempoMult .Cur(); if (nTempo == 5) nTempo = CurRandTempo;
- int nTPat = pTimePattern.Cur(); if (nTPat == 7) nTPat = CurRandTPat ;
-
- switch (nTempo) {
- case 0: t = t; break;
- case 1: t = (t*2. )%1.; break;
- case 2: t = (t*4. )%1.; break;
- case 3: t = (t*8. )%1.; break;
- case 4: t = (t*16.)%1.; break;
- }
-
- int i=0; while (i< waves.size()) {
- rWave w = waves.get(i);
- w.move(deltaMs); if (w.bDone) waves.remove(i); else i++;
- }
-
- if ((t<LastBeat && !pKey.b) || DG.KeyPressed>-1) {
- waves.add(new rWave(
- pKey.b ? map(DG.KeyPressed,0,7,0,1) : random(1), // location
- bnc*10, // bounciness
- 7, // velocity
- 2*(1-amp))); // dampiness
- DG.KeyPressed=-1;
- if (waves.size() > 5) waves.remove(0);
- }
-
- if (t<LastBeat) {
- cPrev.set(cRand); cRand.setRand();
- a1.set(); a2.set(); a3.set(); a4.set();
- } LastBeat = t;
-
- switch (nTPat) {
- case 0: t = sin(PI*t); break; // bounce
- case 1: t = norm(sin(2*PI*(t+PI/2)),-1,1); break; // sin
- case 2: t = t; break; // roll
- case 3: t = constrain(int(t*8)/7.,0,1); break; // quant
- case 4: t = t*t*t; break; // accel
- case 5: t = sin(PI*t*.5); break; // deccel
- case 6: t = .5*(1-cos(PI*t)); break; // slide
- }
-
- cMid.set (cPrev); cMid.interpolate (t,cRand);
- cMidNorm.set (cMid); cMidNorm.setNorm();
- a1.move(); a2.move(); a3.move(); a4.move();
- }
-
- color CalcPoint(xyz Px) {
- if (Theta.x != 0) Px.RotateX(mCtr, TSin.x, TCos.x);
- if (Theta.y != 0) Px.RotateY(mCtr, TSin.y, TCos.y);
- if (Theta.z != 0) Px.RotateZ(mCtr, TSin.z, TCos.z);
-
- Pn.set(Px); Pn.setNorm();
-
- float mp = min(Pn.x, Pn.z);
- float yt = map(t,0,1,.5-bnc/2,.5+bnc/2);
- float r,d;
-
- switch (pShape.Cur()) {
- case 0: V.set(Pn.x, yt , Pn.z); break; // bouncing line
- case 1: V.set(Pn.x, map(cos(PI*t * Pn.x),-1,1,0,1) , Pn.z); break; // top tap
- case 2: V.set(Pn.x, bnc*map(Pn.x<.5?Pn.x:1-Pn.x,0,.5 ,0,t-.5)+.5, Pn.z); break; // V shape
- case 3: V.set(Pn.x, Pn.x < cMidNorm.x ? map(Pn.x,0,cMidNorm.x, .5,yt) :
- map(Pn.x,cMidNorm.x,1, yt,.5), Pn.z); break; // Random V shape
-
- case 4: V.set(Pn.x, .5*(Pn.x < cMidNorm.x ? map(Pn.x,0,cMidNorm.x, .5,yt) :
- map(Pn.x,cMidNorm.x,1, yt,.5)) +
- .5*(Pn.z < cMidNorm.z ? map(Pn.z,0,cMidNorm.z, .5,yt) :
- map(Pn.z,cMidNorm.z,1, yt,.5)), Pn.z); break; // Random Pyramid shape
-
- case 5: V.set(Pn.x, bnc*map((Pn.x-.5)*(Pn.x-.5),0,.25,0,t-.5)+.5, Pn.z); break; // wings
- case 6: V.set(Pn.x, bnc*map((mp -.5)*(mp -.5),0,.25,0,t-.5)+.5, Pn.z); break; // wings
-
- case 7: d = min(
- distToSeg(Px.x, Px.y, a1.getX(70),a1.getY(70), mCtr.x, mCtr.y),
- distToSeg(Px.x, Px.y, a2.getX(40),a2.getY(40), mCtr.x, mCtr.y));
- d = constrain(30*(rad*40-d),0,100);
- return color(0,max(0,150-d), d); // clock
-
- case 8: r = amp*200 * map(bnc,0,1,1,sin(PI*t));
- d = min(
- distToSeg(Px.x, Px.y, a1.getX(r),a1.getY(r), a2.getX(r),a2.getY(r)),
- distToSeg(Px.x, Px.y, a2.getX(r),a2.getY(r), a3.getX(r),a3.getY(r)),
- distToSeg(Px.x, Px.y, a3.getX(r),a3.getY(r), a1.getX(r),a1.getY(r)) // triangle
- );
- d = constrain(30*(rad*40-d),0,100);
- return color(0,max(0,150-d), d); // clock
-
- case 9: r = amp*200 * map(bnc,0,1,1,sin(PI*t));
- d = min(
- distToSeg(Px.x, Px.y, a1.getX(r),a1.getY(r), a2.getX(r),a2.getY(r)),
- distToSeg(Px.x, Px.y, a2.getX(r),a2.getY(r), a3.getX(r),a3.getY(r)),
- distToSeg(Px.x, Px.y, a3.getX(r),a3.getY(r), a4.getX(r),a4.getY(r)),
- distToSeg(Px.x, Px.y, a4.getX(r),a4.getY(r), a1.getX(r),a1.getY(r)) // quad
- );
- d = constrain(30*(rad*40-d),0,100);
- return color(0,max(0,150-d), d); // clock
-
- case 10:
- r = map(bnc,0,1,a1.r,amp*200*sin(PI*t));
- return color(0,0,c1c(.9+2*rad - dist(Px.x,Px.y,a1.getX(r),a1.getY(r))*.03) ); // sphere
-
- case 11:
- Px.z=mCtr.z; cMid.z=mCtr.z;
- return color(0,0,c1c(1 - CalcCone(Px,cMid,mCtr) * 0.02 > .5?1:0)); // cone
-
- case 12: return color(100 + noise(Pn.x,Pn.y,Pn.z + (NoiseMove+50000)/1000.)*200,
- 85,c1c(Pn.y < noise(Pn.x + NoiseMove/2000.,Pn.z)*(1+amp)-amp/2.-.1 ? 1 : 0)); // noise
-
- case 13: float y=0; for (rWave w : waves) y += .5*w.val(Pn.x);
- V.set(Pn.x, .7+y, Pn.z);
- break;
-
- default: return color(0,0,0);
- }
-
- return color(0,
- 150-c1c(1 - V.distance(Pn)/rad),
- c1c(1 - V.distance(Pn)/rad));
- }
-}
-//----------------------------------------------------------------------------------------------------------------------------------
-// 0 - TLB, L (b), BLB, B (l) // Fwd , Down, Back, Up
-// 4 - TLF, F (l), BLF, L (f) // Fwd , Down, Back, Up
-// 8 - TRF, R (f), BRF, F (r) // Back, Down, Fwd , Up
-// 12- TRB, B (r), BRB, R (b) // Back, Down, Fwd , Up
-// 1->7, 15->9
-
-class dBolt {
- dStrip v, h;
- int vpos, hpos;
- dBolt(dStrip _v, dStrip _h, int _vpos, int _hpos) {
- v=_v; h=_h; vpos=_vpos; hpos=_hpos;
- if (v.b0 == null) { v.b0=this; h.b0=this; }
- else { v.b1=this; h.b1=this; }
- }
-}
-
-class dVertex {
- dStrip s1 , s2 ;
- int dir1, dir2 ;
- dVertex(dStrip s, int d) {
- int _a = (s.iS%4==1)? (d==1? 5: 3) :
- (s.iS%4==3)? (d==1? 9:11) :
- (d==1) ? (s.Top()?4:12) : (s.Top()?12:4);
- dir1 = d * (s.isVert() ? -1 : 1);
- dir2 = d;
- s1 = DL_.DS[s.iCube() + ((s.iS+_a) % 16)];
- s2 = DL_.DS[d == 1 ? (s.idx == s.iFace()+3 ? s.idx-3 : s.idx+1):
- (s.idx == s.iFace() ? s.idx+3 : s.idx-1)];
- swapout(1 , 6);
- swapout(15,-6);
- }
- void swapout(int a, int b) {
- if (s1.iS == a) { s1 = DL_.DS[s1.idx + b]; dir1 = -dir1; }
- if (s2.iS == a) { s2 = DL_.DS[s2.idx + b]; dir2 = -dir2; }
- }
-
-}
-
-class dStrip { // THIS WAS SUCH A PAIN!
- int row, col, ci, idx, iS, axis; // 1-y, 2-left, 3-right
- Strip s;
- boolean bTop; // direction: top ccw, bottom cw.
-
- boolean Top (){ return axis!=1 && bTop ; }
- boolean Bottom(){ return axis!=1 && !bTop; }
- boolean isVert(){ return axis==1; }
- boolean isHorz(){ return axis!=1; }
- int iCube (){ return 16*floor(idx/16); }
- int iFace (){ return iCube() + 4*floor(iS/4); }
-
- void init(Strip _s, int _i, int _row, int _col) {
- idx = _i; row = _row; col = _col; s = _s;
- iS = idx%16; bTop = (iS%4==0);
- ci = s.points.get(0).index;
- DL_.DQ[col][row] = iCube();
- switch (iS) {
- case 4: case 6 : case 12: case 14: axis=2; break;
- case 0: case 2 : case 8 : case 10: axis=3; break;
- default: axis=1; break;
- }
- }
-
- void addBolts() {
- v0 = new dVertex(this, 1);
- v1 = new dVertex(this,-1);
-
-
- if (iS == 7 && col != 0 && row != 0) // left bottom
- new dBolt(this, DL_.GetStrip(row-1,col-1,(col % 2 == 1) ? 8 : 12),
- 4, (col % 2 == 1) ? 6 : 9);
-
- if (iS == 7 && col != 0 && row < MaxCubeHeight*2-2) // left top
- new dBolt(this, DL_.GetStrip(row+1,col-1,(col % 2 == 1) ? 10 : 14),
- 11, (col % 2 == 1) ? 9 : 6);
-
- if (iS == 9 && col < NumBackTowers-1 && row < MaxCubeHeight*2-2) // right top
- new dBolt(this, DL_.GetStrip(row+1,col+1,(col % 2 == 1) ? 6 : 2),
- 4, (col % 2 == 1) ? 6 : 9);
-
- if (iS == 9 && col < NumBackTowers-1 && row != 0) // right bottom
- new dBolt(this, DL_.GetStrip(row-1,col+1,(col % 2 == 1) ? 4 : 0),
- 11, (col % 2 == 1) ? 9 : 6);
- }
-
- dBolt b0, b1;
- dVertex v0, v1;
-}
-
-class dCursor {
- dStrip s, sNext;
- int nLast,pos,posNext,end; // 0 - 65535
- int dir; // 1 or -1
- color clr;
-
- dCursor(color _c) { clr=_c;}
-
- boolean isDone() { return pos==end; }
- void set(dStrip _s, int _dir) {
- s=_s; dir=_dir; pos = 0; end=65536; nLast=-1; sNext=null;
- }
-
- boolean MakeTurn(dBolt b) {
- int nEnd= (s.isVert() ? b.vpos : b.hpos) <<12;
- nEnd= (dir==1 ? nEnd : 65536-nEnd);
- if (nEnd < pos) return false;
- if (s.isVert()) { sNext = b.h; posNext = b.hpos<<12; end = nEnd; }
- else { sNext = b.v; posNext = b.vpos<<12; end = nEnd; }
- return true;
- }
-
- void PickNext() {
- if (sNext != null) {
- if (end == 65536) exit();
- end = 65536;
- pos = posNext;
- dir = randDir();
- if (dir<0) pos = end-pos;
- s = sNext; sNext = null;
- nLast = -1;
- return;// could switch again!!
- } else {
- dVertex v = (dir == 1 ? s.v0 : s.v1);
- int r = floor(random(2));
- set(r==0 ? v.s1 : v.s2,r==0 ? v.dir1 : v.dir2);
- }
-
- // plan to turn the corner
- if (random(6)<1 && s.b0 != null && MakeTurn(s.b0)) return;
- if (random(6)<1 && s.b1 != null && MakeTurn(s.b1)) return;
- }
-}
-
-int randDir() { return round(random(1))*2-1; }
-
-class dLattice {
- int iTowerStrips=-1;
- dStrip[] DS = new dStrip[glucose.model.strips.size()];
- int[][] DQ = new int[NumBackTowers][MaxCubeHeight*2];
-
- int nStrips() { return iTowerStrips; }
- dStrip GetStrip (int row, int col, int off) { return DS[DQ[col][row]+off]; }
- dLattice() {
- DL_=this;
- int col = 0, row = -2, i=-1;
- for (Strip strip : glucose.model.strips ) { i++;
- if (i % 16 == 0) row+=2;
- if (row >= MaxCubeHeight*2-1) { col++; row = (col%2==1)?1:0; }
- if (col >= NumBackTowers) continue;
- iTowerStrips++ ;
- dStrip s = DS[iTowerStrips] = new dStrip();
- s.init(strip, iTowerStrips, row, col);
- }
-
- for (int j=0; j<iTowerStrips; j++) DS[j].addBolts();
- }
- dStrip rand() { return DS[floor(random(iTowerStrips))]; }
- void setRand(dCursor c) { c.set(rand(),randDir()); }
-}
-
-dLattice DL_;
-//----------------------------------------------------------------------------------------------------------------------------------
-class Worms extends SCPattern {
-
- int draw(dCursor c, int nAmount) {
- int nFrom = max(c.nLast+1,c.pos >> 12);
- int nTo = min(15,(c.pos+nAmount) >> 12); c.nLast=nTo;
- int nMv = min(nAmount, c.end-c.pos);
- c.pos += nMv;
- for (int i = nFrom; i <= nTo; i++) {
- int n = c.s.ci + (c.dir>0 ? i : 15-i);
- colors[n] = c.clr;
- }
- return nAmount - nMv;
- }
-
- float StripsPerSec = 6;
- float TrailTime = 1500;
- int Cursors = 40;
- dCursor cur[] = new dCursor[Cursors];
-
- Worms(GLucose glucose) {
- super(glucose);
- if (DL_ == null) DL_ = new dLattice();
- for (int i=0; i<Cursors; i++) { cur[i] = new dCursor(color(random(360),50+random(50),50+random(50))); DL_.setRand(cur[i]); }
- }
-
- void run(double deltaMs) {
- //Test Joints
- if (false) {
- for (int j=0; j<DL_.nStrips(); j++) {
- dStrip s =DL_.DS[j]; dBolt d = s.b0;
- if (d != null) {for (int i=0;i<16;i++) {
- if (s == d.v && i <= d.vpos) colors[d.v.ci+i] = color(0,0,30);
- if (s == d.h && i <= d.hpos) colors[d.h.ci+i] = color(0,0,30);
- }}
-
- d = s.b1;
- if (d != null) {for (int i=0;i<16;i++) {
- if (s == d.v && i >= d.vpos) colors[d.v.ci+i] = color(0,0,30);
- if (s == d.h && i >= d.hpos) colors[d.h.ci+i] = color(0,0,30);
- }}
- }
- } else {
- for (int i=0; i<Cursors; i++) {
- int nLeft = floor((float)deltaMs*.001*StripsPerSec * 65536);
- while(nLeft > 0) {
- nLeft = draw(cur[i], nLeft);
- if (cur[i].isDone()) cur[i].PickNext();
- }
- }
-
- for (int i=0,s=model.points.size(); i<s; i++) {
- float b = brightness(colors[i]);
- color c = colors[i];
- if (b>0) colors[i] = color(hue(c), saturation(c),
- (float)(b-100*deltaMs/TrailTime));
- }
- }
- }
-}
-//----------------------------------------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------------------------------------------------
+public class Pong extends DPat {
+ SinLFO x,y,z,dx,dy,dz;
+ float cRad; DParam pSize;
+ Pick pChoose;
+ xyz v = new xyz(), vMir = new xyz();
+
+ Pong(GLucose glucose) {
+ super(glucose);
+ cRad = mMax.x/10;
+ addModulator(dx = new SinLFO(6000, 500, 30000 )).trigger();
+ addModulator(dy = new SinLFO(3000, 500, 22472 )).trigger();
+ addModulator(dz = new SinLFO(1000, 500, 18420 )).trigger();
+ addModulator(x = new SinLFO(cRad, mMax.x - cRad, 0)).trigger(); x.modulateDurationBy(dx);
+ addModulator(y = new SinLFO(cRad, mMax.y - cRad, 0)).trigger(); y.modulateDurationBy(dy);
+ addModulator(z = new SinLFO(cRad, mMax.z - cRad, 0)).trigger(); z.modulateDurationBy(dz);
+ pSize = addParam ("Size" , 0.4 );
+ pChoose = addPick ("Animiation" , 0, 2, new String[] {"Pong", "Ball", "Cone"} );
+ }
+
+ void StartRun(double deltaMs) { cRad = mMax.x*pSize.Val()/6; }
+ color CalcPoint(xyz p) {
+ v.set(x.getValuef(), y.getValuef(), z.getValuef());
+ v.z=0;p.z=0;// ignore z dimension
+ switch(pChoose.Cur()) {
+ case 0: vMir.set(mMax); vMir.subtract(p);
+ return lx.hsb(0,0,c1c(1 - min(v.distance(p), v.distance(vMir))*.5/cRad)); // balls
+ case 1: return lx.hsb(0,0,c1c(1 - v.distance(p)*.5/cRad)); // ball
+ case 2: vMir.set(mMax.x/2,0,mMax.z/2);
+ return lx.hsb(0,0,c1c(1 - CalcCone(p,v,vMir) * max(.02,.45-pSize.Val()))); // spot
+ }
+ return lx.hsb(0,0,0);
+ }
+}
+//----------------------------------------------------------------------------------------------------------------------------------
+public class NDat {
+ float xz, yz, zz, hue, sat, speed, angle, den;
+ float xoff,yoff,zoff;
+ float sinAngle, cosAngle;
+ boolean isActive;
+ NDat () { isActive=false; }
+ boolean Active() { return isActive; }
+ void set (float _hue, float _sat, float _xz, float _yz, float _zz, float _den, float _speed, float _angle) {
+ isActive = true;
+ hue=_hue; sat=_sat; xz=_xz; yz=_yz; zz =_zz; den=_den; speed=_speed; angle=_angle;
+ xoff = random(100e3); yoff = random(100e3); zoff = random(100e3);
+ }
+}
+
+public class Noise extends DPat
+{
+ int CurAnim, iSymm;
+ int XSym=1,YSym=2,RadSym=3;
+ float zTime , zTheta=0, zSin, zCos, rtime, ttime, transAdd;
+ DParam pSpeed , pDensity;
+ Pick pChoose, pSymm;
+ int _ND = 4;
+ NDat N[] = new NDat[_ND];
+
+ Noise(GLucose glucose) {
+ super(glucose);
+ pSpeed = addParam("Fast" , .55);
+ pDensity = addParam("Dens" , .5);
+ pSymm = addPick("Symmetry" , 0, 3, new String[] {"None", "X", "Y", "Radial"} );
+ pChoose = addPick("Animation", 6, 7, new String[] {"Drip", "Cloud", "Rain", "Fire", "Machine", "Spark","VWave", "Wave"} );
+ for (int i=0; i<_ND; i++) N[i] = new NDat();
+ }
+
+ void StartPattern() { zTime = random(500); zTheta=0; rtime = 0; ttime = 0; transAdd=0; }
+ void StartRun(double deltaMs) {
+ zTime += deltaMs*(pSpeed.Val()-.5)*.002 ;
+ zTheta += deltaMs*(pSpin .Val()-.5)*.01 ;
+ rtime += deltaMs;
+ iSymm = pSymm.Cur();
+ transAdd = 1*(1 - constrain(rtime - ttime,0,1000)/1000);
+ zSin = sin(zTheta);
+ zCos = cos(zTheta);
+
+ if (pChoose.Cur() != CurAnim) {
+ CurAnim = pChoose.Cur(); ttime = rtime;
+ pSpin .reset(); zTheta = 0;
+ pDensity .reset(); pSpeed .reset();
+ for (int i=0; i<_ND; i++) { N[i].isActive = false; }
+
+ switch(CurAnim) {
+ // hue sat xz yz zz den mph angle
+ case 0: N[0].set(0 ,0 ,75 ,75 ,150,45 ,3 ,0 ); pSharp.set(1 ); break; // drip
+ case 1: N[0].set(0 ,0 ,100,100,200,45 ,3 ,180); pSharp.set(0 ); break; // clouds
+ case 2: N[0].set(0 ,0 ,2 ,400,2 ,20 ,3 ,0 ); pSharp.set(.5); break; // rain
+ case 3: N[0].set(40 ,1 ,100,100,200,10 ,1 ,180);
+ N[1].set(0 ,1 ,100,100,200,10 ,5 ,180); pSharp.set(0 ); break; // fire 1
+ case 4: N[0].set(0 ,1 ,40 ,40 ,40 ,15 ,2.5,180);
+ N[1].set(20 ,1 ,40 ,40 ,40 ,15 ,4 ,0 );
+ N[2].set(40 ,1 ,40 ,40 ,40 ,15 ,2 ,90 );
+ N[3].set(60 ,1 ,40 ,40 ,40 ,15 ,3 ,-90); pSharp.set(.5); break; // machine
+ case 5: N[0].set(0 ,1 ,400,100,2 ,15 ,3 ,90 );
+ N[1].set(20 ,1 ,400,100,2 ,15 ,2.5,0 );
+ N[2].set(40 ,1 ,100,100,2 ,15 ,2 ,180);
+ N[3].set(60 ,1 ,100,100,2 ,15 ,1.5,270); pSharp.set(.5); break; // spark
+ }
+
+ DG.UpdateLights();
+ }
+
+ for (int i=0; i<_ND; i++) if (N[i].Active()) {
+ N[i].sinAngle = sin(radians(N[i].angle));
+ N[i].cosAngle = cos(radians(N[i].angle));
+ }
+ }
+
+ color CalcPoint(xyz P) {
+ color c = 0;
+ P.RotateZ(mCtr, zSin, zCos);
+
+ if (CurAnim == 6 || CurAnim == 7) {
+ P.setNorm();
+ return lx.hsb(0,0, 100 * (
+ constrain(1-50*(1-pDensity.Val())*abs(P.y-sin(zTime*10 + P.x*(300))*.5 - .5),0,1) +
+ (CurAnim == 7 ? constrain(1-50*(1-pDensity.Val())*abs(P.x-sin(zTime*10 + P.y*(300))*.5 - .5),0,1) : 0))
+ );
+ }
+
+ if (iSymm == XSym && P.x > mMax.x/2) P.x = mMax.x-P.x;
+ if (iSymm == YSym && P.y > mMax.y/2) P.y = mMax.y-P.y;
+
+ for (int i=0;i<_ND; i++) if (N[i].Active()) {
+ NDat n = N[i];
+ float zx = zTime * n.speed * n.sinAngle,
+ zy = zTime * n.speed * n.cosAngle;
+
+ float b = (iSymm==RadSym ? noise(zTime*n.speed+n.xoff-Dist(P,mCtr)/n.xz)
+ : noise(P.x/n.xz+zx+n.xoff,P.y/n.yz+zy+n.yoff,P.z/n.zz+n.zoff))
+ *1.8;
+
+ b += n.den/100 -.4 + pDensity.Val() -1;
+ b += transAdd;
+ c = blendColor(c,lx.hsb(n.hue,100*n.sat,c1c(b)),ADD);
+ }
+ return c;
+ }
+}
+//----------------------------------------------------------------------------------------------------------------------------------
+public class Play extends DPat
+{
+ public class rAngle {
+ float prvA, dstA, c;
+ float prvR, dstR, r;
+ float _cos, _sin, x, y;
+ float fixAngle (float a, float b) { return a<b ?
+ (abs(a-b) > abs(a+2*PI-b) ? a : a+2*PI) :
+ (abs(a-b) > abs(a-2*PI-b) ? a : a-2*PI) ; }
+ float getX(float r) { return mCtr.x + _cos*r; }
+ float getY(float r) { return mCtr.y + _sin*r; }
+ void move() { c = interp(t,prvA,dstA);
+ r = interp(t,prvR,dstR);
+ _cos = cos(c); _sin = sin(c);
+ x = getX(r); y = getY(r); }
+ void set() { prvA = dstA; dstA = random(2*PI); prvA = fixAngle(prvA, dstA);
+ prvR = dstR; dstR = random(mCtr.y); }
+ }
+
+ int nBeats = 0;
+ DParam pAmp, pRadius, pBounce;
+
+ float t,amp,rad,bnc;
+ float zTheta=0;
+ ArrayList<rWave> waves = new ArrayList<rWave>(10);
+
+ rAngle a1 = new rAngle(), a2 = new rAngle(),
+ a3 = new rAngle(), a4 = new rAngle();
+ xyz cPrev = new xyz(), cRand = new xyz(),
+ cMid = new xyz(), V = new xyz(),
+ Theta = new xyz(), TSin = new xyz(),
+ TCos = new xyz(), cMidNorm = new xyz(),
+ Pn = new xyz();
+ float LastBeat=3, LastMeasure=3;
+ int CurRandTempo = 1, CurRandTPat = 1;
+
+ Pick pTimePattern, pTempoMult, pShape;
+ int RandCube;
+
+ Play(GLucose glucose) {
+ super(glucose);
+ pRadius = addParam("Rad" , .1 );
+ pBounce = addParam("Bnc" , .2 );
+ pAmp = addParam("Amp" , .2 );
+ pTempoMult = addPick ("TMult" , 0 , 5 , new String[] {"1x", "2x", "4x", "8x", "16x", "Rand" } );
+ pTimePattern= addPick ("TPat" , 6 , 7 , new String[] {"Bounce", "Sin", "Roll", "Quant", "Accel", "Deccel", "Slide", "Rand"} );
+ pShape = addPick ("Shape" , 3 , 15 , new String[] {"Line", "Tap", "V", "RandV",
+ "Pyramid", "Wings", "W2", "Clock",
+ "Triangle", "Quad", "Sphere", "Cone",
+ "Noise", "Wave", "?", "?"} );
+ }
+
+ public class rWave {
+ float v0, a0, x0, t,damp,a;
+ boolean bDone=false;
+ final float len=8;
+ rWave(float _x0, float _a0, float _v0, float _damp) { x0=_x0*len; a0=_a0; v0=_v0; t=0; damp = _damp; }
+ void move(double deltaMs) {
+ t += deltaMs*.001;
+ if (t>4) bDone=true;
+ }
+ float val(float _x) {
+ _x*=len;
+ float dist = t*v0 - abs(_x-x0);
+ if (dist<0) { a=1; return 0; }
+ a = a0*exp(-dist*damp) * exp(-abs(_x-x0)/(.2*len)); // * max(0,1-t/dur)
+ return -a*sin(dist);
+ }
+ }
+
+ void StartPattern() { zTheta=0; }
+ void StartRun(double deltaMs) {
+ t = lx.tempo.rampf();
+ amp = pAmp.Val();
+ rad = pRadius.getValuef();
+ bnc = pBounce.getValuef();
+ zTheta += deltaMs*(pSpin .Val()-.5)*.01;
+
+ Theta .set(pRotX.Val()*PI*2, pRotY.Val()*PI*2, pRotZ.Val()*PI*2 + zTheta);
+ TSin .set(sin(Theta.x), sin(Theta.y), sin(Theta.z));
+ TCos .set(cos(Theta.x), cos(Theta.y), cos(Theta.z));
+
+ if (t<LastMeasure) {
+ if (random(3) < 1) { CurRandTempo = int(random(4)); if (CurRandTempo == 3) CurRandTempo = int(random(4)); }
+ if (random(3) < 1) { CurRandTPat = pShape.Cur() > 6 ? 2+int(random(5)) : int(random(7)); }
+ } LastMeasure = t;
+
+ int nTempo = pTempoMult .Cur(); if (nTempo == 5) nTempo = CurRandTempo;
+ int nTPat = pTimePattern.Cur(); if (nTPat == 7) nTPat = CurRandTPat ;
+
+ switch (nTempo) {
+ case 0: t = t; break;
+ case 1: t = (t*2. )%1.; break;
+ case 2: t = (t*4. )%1.; break;
+ case 3: t = (t*8. )%1.; break;
+ case 4: t = (t*16.)%1.; break;
+ }
+
+ int i=0; while (i< waves.size()) {
+ rWave w = waves.get(i);
+ w.move(deltaMs); if (w.bDone) waves.remove(i); else i++;
+ }
+
+ if ((t<LastBeat && !pKey.b) || DG.KeyPressed>-1) {
+ waves.add(new rWave(
+ pKey.b ? map(DG.KeyPressed,0,7,0,1) : random(1), // location
+ bnc*10, // bounciness
+ 7, // velocity
+ 2*(1-amp))); // dampiness
+ DG.KeyPressed=-1;
+ if (waves.size() > 5) waves.remove(0);
+ }
+
+ if (t<LastBeat) {
+ cPrev.set(cRand); cRand.setRand();
+ a1.set(); a2.set(); a3.set(); a4.set();
+ } LastBeat = t;
+
+ switch (nTPat) {
+ case 0: t = sin(PI*t); break; // bounce
+ case 1: t = norm(sin(2*PI*(t+PI/2)),-1,1); break; // sin
+ case 2: t = t; break; // roll
+ case 3: t = constrain(int(t*8)/7.,0,1); break; // quant
+ case 4: t = t*t*t; break; // accel
+ case 5: t = sin(PI*t*.5); break; // deccel
+ case 6: t = .5*(1-cos(PI*t)); break; // slide
+ }
+
+ cMid.set (cPrev); cMid.interpolate (t,cRand);
+ cMidNorm.set (cMid); cMidNorm.setNorm();
+ a1.move(); a2.move(); a3.move(); a4.move();
+ }
+
+ color CalcPoint(xyz Px) {
+ if (Theta.x != 0) Px.RotateX(mCtr, TSin.x, TCos.x);
+ if (Theta.y != 0) Px.RotateY(mCtr, TSin.y, TCos.y);
+ if (Theta.z != 0) Px.RotateZ(mCtr, TSin.z, TCos.z);
+
+ Pn.set(Px); Pn.setNorm();
+
+ float mp = min(Pn.x, Pn.z);
+ float yt = map(t,0,1,.5-bnc/2,.5+bnc/2);
+ float r,d;
+
+ switch (pShape.Cur()) {
+ case 0: V.set(Pn.x, yt , Pn.z); break; // bouncing line
+ case 1: V.set(Pn.x, map(cos(PI*t * Pn.x),-1,1,0,1) , Pn.z); break; // top tap
+ case 2: V.set(Pn.x, bnc*map(Pn.x<.5?Pn.x:1-Pn.x,0,.5 ,0,t-.5)+.5, Pn.z); break; // V shape
+ case 3: V.set(Pn.x, Pn.x < cMidNorm.x ? map(Pn.x,0,cMidNorm.x, .5,yt) :
+ map(Pn.x,cMidNorm.x,1, yt,.5), Pn.z); break; // Random V shape
+
+ case 4: V.set(Pn.x, .5*(Pn.x < cMidNorm.x ? map(Pn.x,0,cMidNorm.x, .5,yt) :
+ map(Pn.x,cMidNorm.x,1, yt,.5)) +
+ .5*(Pn.z < cMidNorm.z ? map(Pn.z,0,cMidNorm.z, .5,yt) :
+ map(Pn.z,cMidNorm.z,1, yt,.5)), Pn.z); break; // Random Pyramid shape
+
+ case 5: V.set(Pn.x, bnc*map((Pn.x-.5)*(Pn.x-.5),0,.25,0,t-.5)+.5, Pn.z); break; // wings
+ case 6: V.set(Pn.x, bnc*map((mp -.5)*(mp -.5),0,.25,0,t-.5)+.5, Pn.z); break; // wings
+
+ case 7: d = min(
+ distToSeg(Px.x, Px.y, a1.getX(70),a1.getY(70), mCtr.x, mCtr.y),
+ distToSeg(Px.x, Px.y, a2.getX(40),a2.getY(40), mCtr.x, mCtr.y));
+ d = constrain(30*(rad*40-d),0,100);
+ return lx.hsb(0,max(0,150-d), d); // clock
+
+ case 8: r = amp*200 * map(bnc,0,1,1,sin(PI*t));
+ d = min(
+ distToSeg(Px.x, Px.y, a1.getX(r),a1.getY(r), a2.getX(r),a2.getY(r)),
+ distToSeg(Px.x, Px.y, a2.getX(r),a2.getY(r), a3.getX(r),a3.getY(r)),
+ distToSeg(Px.x, Px.y, a3.getX(r),a3.getY(r), a1.getX(r),a1.getY(r)) // triangle
+ );
+ d = constrain(30*(rad*40-d),0,100);
+ return lx.hsb(0,max(0,150-d), d); // clock
+
+ case 9: r = amp*200 * map(bnc,0,1,1,sin(PI*t));
+ d = min(
+ distToSeg(Px.x, Px.y, a1.getX(r),a1.getY(r), a2.getX(r),a2.getY(r)),
+ distToSeg(Px.x, Px.y, a2.getX(r),a2.getY(r), a3.getX(r),a3.getY(r)),
+ distToSeg(Px.x, Px.y, a3.getX(r),a3.getY(r), a4.getX(r),a4.getY(r)),
+ distToSeg(Px.x, Px.y, a4.getX(r),a4.getY(r), a1.getX(r),a1.getY(r)) // quad
+ );
+ d = constrain(30*(rad*40-d),0,100);
+ return lx.hsb(0,max(0,150-d), d); // clock
+
+ case 10:
+ r = map(bnc,0,1,a1.r,amp*200*sin(PI*t));
+ return lx.hsb(0,0,c1c(.9+2*rad - dist(Px.x,Px.y,a1.getX(r),a1.getY(r))*.03) ); // sphere
+
+ case 11:
+ Px.z=mCtr.z; cMid.z=mCtr.z;
+ return lx.hsb(0,0,c1c(1 - CalcCone(Px,cMid,mCtr) * 0.02 > .5?1:0)); // cone
+
+ case 12: return lx.hsb(100 + noise(Pn.x,Pn.y,Pn.z + (NoiseMove+50000)/1000.)*200,
+ 85,c1c(Pn.y < noise(Pn.x + NoiseMove/2000.,Pn.z)*(1+amp)-amp/2.-.1 ? 1 : 0)); // noise
+
+ case 13: float y=0; for (rWave w : waves) y += .5*w.val(Pn.x);
+ V.set(Pn.x, .7+y, Pn.z);
+ break;
+
+ default: return lx.hsb(0,0,0);
+ }
+
+ return lx.hsb(0,
+ 150-c1c(1 - V.distance(Pn)/rad),
+ c1c(1 - V.distance(Pn)/rad));
+ }
+}
+//----------------------------------------------------------------------------------------------------------------------------------
+// 0 - TLB, L (b), BLB, B (l) // Fwd , Down, Back, Up
+// 4 - TLF, F (l), BLF, L (f) // Fwd , Down, Back, Up
+// 8 - TRF, R (f), BRF, F (r) // Back, Down, Fwd , Up
+// 12- TRB, B (r), BRB, R (b) // Back, Down, Fwd , Up
+// 1->7, 15->9
+
+class dBolt {
+ dStrip v, h;
+ int vpos, hpos;
+ dBolt(dStrip _v, dStrip _h, int _vpos, int _hpos) {
+ v=_v; h=_h; vpos=_vpos; hpos=_hpos;
+ if (v.b0 == null) { v.b0=this; h.b0=this; }
+ else { v.b1=this; h.b1=this; }
+ }
+}
+
+class dVertex {
+ dStrip s1 , s2 ;
+ int dir1, dir2 ;
+ dVertex(dStrip s, int d) {
+ int _a = (s.iS%4==1)? (d==1? 5: 3) :
+ (s.iS%4==3)? (d==1? 9:11) :
+ (d==1) ? (s.Top()?4:12) : (s.Top()?12:4);
+ dir1 = d * (s.isVert() ? -1 : 1);
+ dir2 = d;
+ s1 = DL_.DS[s.iCube() + ((s.iS+_a) % 16)];
+ s2 = DL_.DS[d == 1 ? (s.idx == s.iFace()+3 ? s.idx-3 : s.idx+1):
+ (s.idx == s.iFace() ? s.idx+3 : s.idx-1)];
+ swapout(1 , 6);
+ swapout(15,-6);
+ }
+ void swapout(int a, int b) {
+ if (s1.iS == a) { s1 = DL_.DS[s1.idx + b]; dir1 = -dir1; }
+ if (s2.iS == a) { s2 = DL_.DS[s2.idx + b]; dir2 = -dir2; }
+ }
+
+}
+
+class dStrip { // THIS WAS SUCH A PAIN!
+ int row, col, ci, idx, iS, axis; // 1-y, 2-left, 3-right
+ Strip s;
+ boolean bTop; // direction: top ccw, bottom cw.
+
+ boolean Top (){ return axis!=1 && bTop ; }
+ boolean Bottom(){ return axis!=1 && !bTop; }
+ boolean isVert(){ return axis==1; }
+ boolean isHorz(){ return axis!=1; }
+ int iCube (){ return 16*floor(idx/16); }
+ int iFace (){ return iCube() + 4*floor(iS/4); }
+
+ void init(Strip _s, int _i, int _row, int _col) {
+ idx = _i; row = _row; col = _col; s = _s;
+ iS = idx%16; bTop = (iS%4==0);
+ ci = s.points.get(0).index;
+ DL_.DQ[col][row] = iCube();
+ switch (iS) {
+ case 4: case 6 : case 12: case 14: axis=2; break;
+ case 0: case 2 : case 8 : case 10: axis=3; break;
+ default: axis=1; break;
+ }
+ }
+
+ void addBolts() {
+ v0 = new dVertex(this, 1);
+ v1 = new dVertex(this,-1);
+
+
+ if (iS == 7 && col != 0 && row != 0) // left bottom
+ new dBolt(this, DL_.GetStrip(row-1,col-1,(col % 2 == 1) ? 8 : 12),
+ 4, (col % 2 == 1) ? 6 : 9);
+
+ if (iS == 7 && col != 0 && row < MaxCubeHeight*2-2) // left top
+ new dBolt(this, DL_.GetStrip(row+1,col-1,(col % 2 == 1) ? 10 : 14),
+ 11, (col % 2 == 1) ? 9 : 6);
+
+ if (iS == 9 && col < NumBackTowers-1 && row < MaxCubeHeight*2-2) // right top
+ new dBolt(this, DL_.GetStrip(row+1,col+1,(col % 2 == 1) ? 6 : 2),
+ 4, (col % 2 == 1) ? 6 : 9);
+
+ if (iS == 9 && col < NumBackTowers-1 && row != 0) // right bottom
+ new dBolt(this, DL_.GetStrip(row-1,col+1,(col % 2 == 1) ? 4 : 0),
+ 11, (col % 2 == 1) ? 9 : 6);
+ }
+
+ dBolt b0, b1;
+ dVertex v0, v1;
+}
+
+class dCursor {
+ dStrip s, sNext;
+ int nLast,pos,posNext,end; // 0 - 65535
+ int dir; // 1 or -1
+ color clr;
+
+ dCursor(color _c) { clr=_c;}
+
+ boolean isDone() { return pos==end; }
+ void set(dStrip _s, int _dir) {
+ s=_s; dir=_dir; pos = 0; end=65536; nLast=-1; sNext=null;
+ }
+
+ boolean MakeTurn(dBolt b) {
+ int nEnd= (s.isVert() ? b.vpos : b.hpos) <<12;
+ nEnd= (dir==1 ? nEnd : 65536-nEnd);
+ if (nEnd < pos) return false;
+ if (s.isVert()) { sNext = b.h; posNext = b.hpos<<12; end = nEnd; }
+ else { sNext = b.v; posNext = b.vpos<<12; end = nEnd; }
+ return true;
+ }
+
+ void PickNext() {
+ if (sNext != null) {
+ if (end == 65536) exit();
+ end = 65536;
+ pos = posNext;
+ dir = randDir();
+ if (dir<0) pos = end-pos;
+ s = sNext; sNext = null;
+ nLast = -1;
+ return;// could switch again!!
+ } else {
+ dVertex v = (dir == 1 ? s.v0 : s.v1);
+ int r = floor(random(2));
+ set(r==0 ? v.s1 : v.s2,r==0 ? v.dir1 : v.dir2);
+ }
+
+ // plan to turn the corner
+ if (random(6)<1 && s.b0 != null && MakeTurn(s.b0)) return;
+ if (random(6)<1 && s.b1 != null && MakeTurn(s.b1)) return;
+ }
+}
+
+int randDir() { return round(random(1))*2-1; }
+
+class dLattice {
+ int iTowerStrips=-1;
+ dStrip[] DS = new dStrip[glucose.model.strips.size()];
+ int[][] DQ = new int[NumBackTowers][MaxCubeHeight*2];
+
+ int nStrips() { return iTowerStrips; }
+ dStrip GetStrip (int row, int col, int off) { return DS[DQ[col][row]+off]; }
+ dLattice() {
+ DL_=this;
+ int col = 0, row = -2, i=-1;
+ for (Strip strip : glucose.model.strips ) { i++;
+ if (i % 16 == 0) row+=2;
+ if (row >= MaxCubeHeight*2-1) { col++; row = (col%2==1)?1:0; }
+ if (col >= NumBackTowers) continue;
+ iTowerStrips++ ;
+ dStrip s = DS[iTowerStrips] = new dStrip();
+ s.init(strip, iTowerStrips, row, col);
+ }
+
+ for (int j=0; j<iTowerStrips; j++) DS[j].addBolts();
+ }
+ dStrip rand() { return DS[floor(random(iTowerStrips))]; }
+ void setRand(dCursor c) { c.set(rand(),randDir()); }
+}
+
+dLattice DL_;
+//----------------------------------------------------------------------------------------------------------------------------------
+class Worms extends SCPattern {
+
+ int draw(dCursor c, int nAmount) {
+ int nFrom = max(c.nLast+1,c.pos >> 12);
+ int nTo = min(15,(c.pos+nAmount) >> 12); c.nLast=nTo;
+ int nMv = min(nAmount, c.end-c.pos);
+ c.pos += nMv;
+ for (int i = nFrom; i <= nTo; i++) {
+ int n = c.s.ci + (c.dir>0 ? i : 15-i);
+ colors[n] = c.clr;
+ }
+ return nAmount - nMv;
+ }
+
+ float StripsPerSec = 6;
+ float TrailTime = 1500;
+ int Cursors = 40;
+ dCursor cur[] = new dCursor[Cursors];
+
+ Worms(GLucose glucose) {
+ super(glucose);
+ if (DL_ == null) DL_ = new dLattice();
+ for (int i=0; i<Cursors; i++) { cur[i] = new dCursor(lx.hsb(random(360),50+random(50),50+random(50))); DL_.setRand(cur[i]); }
+ }
+
+ void run(double deltaMs) {
+ //Test Joints
+ if (false) {
+ for (int j=0; j<DL_.nStrips(); j++) {
+ dStrip s =DL_.DS[j]; dBolt d = s.b0;
+ if (d != null) {for (int i=0;i<16;i++) {
+ if (s == d.v && i <= d.vpos) colors[d.v.ci+i] = lx.hsb(0,0,30);
+ if (s == d.h && i <= d.hpos) colors[d.h.ci+i] = lx.hsb(0,0,30);
+ }}
+
+ d = s.b1;
+ if (d != null) {for (int i=0;i<16;i++) {
+ if (s == d.v && i >= d.vpos) colors[d.v.ci+i] = lx.hsb(0,0,30);
+ if (s == d.h && i >= d.hpos) colors[d.h.ci+i] = lx.hsb(0,0,30);
+ }}
+ }
+ } else {
+ for (int i=0; i<Cursors; i++) {
+ int nLeft = floor((float)deltaMs*.001*StripsPerSec * 65536);
+ while(nLeft > 0) {
+ nLeft = draw(cur[i], nLeft);
+ if (cur[i].isDone()) cur[i].PickNext();
+ }
+ }
+
+ for (int i=0,s=model.points.size(); i<s; i++) {
+ color c = colors[i];
+ float b = lx.b(c);
+ if (b>0) colors[i] = lx.hsb(lx.h(c), lx.s(c),
+ max(0, (float)(b-100*deltaMs/TrailTime)));
+ }
+ }
+ }
+}
+//----------------------------------------------------------------------------------------------------------------------------------
diff --git a/DanKaminsky.pde b/DanKaminsky.pde
index 3dd9d14..5364669 100644
--- a/DanKaminsky.pde
+++ b/DanKaminsky.pde
@@ -84,7 +84,7 @@ class ObjectMuckerEffect extends SCEffect {
for(int i=0; i<s.points.size(); i++){
int index = s.points.get(i).index;
color c = colors[index];
- colors[index] = color((i*22.5), saturation(c), brightness(c));
+ colors[index] = lx.hsb((i*22.5), saturation(c), brightness(c));
}
}*/
}
diff --git a/DanUtil.pde b/DanUtil.pde
index 7eca742..395ba44 100644
--- a/DanUtil.pde
+++ b/DanUtil.pde
@@ -225,7 +225,7 @@ public class DPat extends SCPattern
void StartPattern() { }
void StartRun(double deltaMs) { }
- color CalcPoint(xyz p) { return color(0,0,0); }
+ color CalcPoint(xyz p) { return lx.hsb(0,0,0); }
boolean IsActive() { return this == DG.CurPat; }
boolean IsFocused() { return this == midiEngine.getFocusedDeck().getActivePattern(); }
void onInactive() { UpdateState(); }
@@ -330,21 +330,21 @@ public class DPat extends SCPattern
if (pRsym.b) { tP.set(mMax.x-P.x,mMax.y-P.y,mMax.z-P.z); cNew = blendColor(cNew, CalcPoint(tP), ADD); }
if (pXdup.b) { tP.set((P.x+mMax.x*.5)%mMax.x,P.y,P.z); cNew = blendColor(cNew, CalcPoint(tP), ADD); }
- float s = saturation(cNew) + 100*(fSaturate*2-1);
- float b = brightness(cNew)/100.;
+ float s = lx.s(cNew) + 100*(fSaturate*2-1);
+ float b = lx.b(cNew)/100.;
if (pSharp.Val()>0) b = b < .5 ? pow(b,fSharp) : 1-pow(1-b,fSharp);
- if (DG._Trails()>0 && fQuant == 0) b = max(b, (float) (brightness(cOld)/100. - (1-DG._Trails()) * deltaMs/200.));
- if (DG.bSustain == true) b = max(b, (float) (brightness(cOld)/100.));
+ if (DG._Trails()>0 && fQuant == 0) b = max(b, (float) (lx.b(cOld)/100. - (1-DG._Trails()) * deltaMs/200.));
+ if (DG.bSustain == true) b = max(b, (float) (lx.b(cOld)/100.));
if (pInvert.b) { b = 1-b; s = 1-s; }
- colors[p.index] = color(
- (hue(cNew) + zSpinHue) % 360,
+ colors[p.index] = lx.hsb(
+ (lx.h(cNew) + zSpinHue) % 360,
s,
100 * b * DG._Level()
);
-// colors[p.index] = color(0,0, p.x >= modmin.x && p.y >= modmin.y && p.z >= modmin.z &&
+// colors[p.index] = lx.hsb(0,0, p.x >= modmin.x && p.y >= modmin.y && p.z >= modmin.z &&
// p.x <= modmin.x+mMax.x && p.y <= modmin.y+mMax.y && p.z <= modmin.z+mMax.z ? 100 : 0);
}
}
diff --git a/GranimPattern.pde b/GranimPattern.pde
index abe2237..450c17e 100644
--- a/GranimPattern.pde
+++ b/GranimPattern.pde
@@ -27,7 +27,7 @@ class Granim extends Graphic
{
while(width()< g.position+1)
{
- graphicBuffer.add(color(0,0,0));
+ graphicBuffer.add(lx.hsb(0,0,0));
}
drawAll();
displayList.put(name , g);
@@ -55,7 +55,7 @@ class Granim extends Graphic
{
while(width()< g.position + g.width())
{
- graphicBuffer.add(color(0,0,0));
+ graphicBuffer.add(lx.hsb(0,0,0));
}
if(g.changed)
{
@@ -141,7 +141,7 @@ class RedsGraphic extends Graphic
{
for(int i = 0; i < len ;i++)
{
- graphicBuffer.add(color(0,255,255));
+ graphicBuffer.add(lx.hsb(0,255,255));
}
}
};
@@ -229,7 +229,7 @@ class ColorDotsGraphic extends Graphic
super();
for (int colorVal : colorSequence)
{
- graphicBuffer.add(color(colorVal, 255, 255));
+ graphicBuffer.add(lx.hsb(colorVal, 255, 255));
}
changed = true;
}
diff --git a/JR.pde b/JR.pde
index cd494fa..6692baa 100644
--- a/JR.pde
+++ b/JR.pde
@@ -1,4 +1,4 @@
-color BLACK = color(0, 0, 0);
+color BLACK = #000000;
class Gimbal extends SCPattern {
@@ -121,7 +121,7 @@ class Gimbal extends SCPattern {
+ pow(nearest_circle_z - c.z * ringExtendParam.getValuef(), 2));
float xy_distance = sqrt(c.x*c.x + c.y*c.y);
- return color(this.hue, 100, (1 - distance_to_circle / girth * fadeFromCoreParam.getValuef()) * 100);
+ return lx.hsb(this.hue, 100, (1 - distance_to_circle / girth * fadeFromCoreParam.getValuef()) * 100);
}
}
@@ -166,18 +166,18 @@ class Zebra extends SCPattern {
int stripe_count = 12;
float stripe_width = model.xMax / (float)stripe_count;
if (Math.floor((c.x) / stripe_width) % 2 == 0) {
- return color(hue, 100, 100);
+ return lx.hsb(hue, 100, 100);
} else {
- return color((hue + 90) % 360, 100, 100);
+ return lx.hsb((hue + 90) % 360, 100, 100);
}
/* OCTANTS
if ((isPositiveBit(c.x) + isPositiveBit(c.y) + isPositiveBit(c.z)) % 2 == 0) {
- return color(lx.getBaseHuef(), 100, 100);
+ return lx.hsb(lx.getBaseHuef(), 100, 100);
} else {
- return color(0, 0, 0);
+ return lx.hsb(0, 0, 0);
}
*/
}
@@ -271,7 +271,7 @@ color specialBlend(color c1, color c2, color c3) {
float relative_b2 = b2 / (b1 + b2 + b3);
float relative_b3 = b3 / (b1 + b2 + b3);
- return color(
+ return lx.hsb(
(h1 * relative_b1 + h2 * relative_b1 + h3 * relative_b3) % 360,
s1 * relative_b1 + s2 * relative_b2 + s3 * relative_b3,
max(max(b1, b2), b3)
diff --git a/JackStahl.pde b/JackStahl.pde
index a840882..081ea40 100644
--- a/JackStahl.pde
+++ b/JackStahl.pde
@@ -64,7 +64,7 @@ class Swim extends SCPattern {
float v1 = sin_x > y_in_range ? (100 + 100*(y_in_range - sin_x)) : 0;
float hue_color = (lx.getBaseHuef() + hueScale.getValuef() * (abs(p.x-model.xMax/2.)*.3 + abs(p.y-model.yMax/2)*.9 + abs(p.z - model.zMax/2.))) % 360;
- colors[p.index] = color(hue_color, 70, v1);
+ colors[p.index] = lx.hsb(hue_color, 70, v1);
}
}
}
@@ -172,7 +172,7 @@ class Balance extends SCPattern {
float v1 = max(0, 100 * (1 - 4*abs(sin_x - y_in_range)));
float hue_color = (lx.getBaseHuef() + hueScale.getValuef() * (abs(p.x-model.xMax/2.) + abs(p.y-model.yMax/2)*.2 + abs(p.z - model.zMax/2.)*.5)) % 360;
- color c = color(hue_color, 80, v1);
+ color c = lx.hsb(hue_color, 80, v1);
// Now draw the spheres
for (Sphere s : spheres) {
@@ -197,7 +197,7 @@ class Balance extends SCPattern {
float sphere_color = (lx.getBaseHuef() - (1 - hueScale.getValuef()) * d/r * 45) % 360;
- c = blendColor(c, color((sphere_color + 270) % 360, 60, min(1, value) * 100), ADD);
+ c = blendColor(c, lx.hsb((sphere_color + 270) % 360, 60, min(1, value) * 100), ADD);
}
colors[p.index] = c;
}
diff --git a/MarkSlee.pde b/MarkSlee.pde
index 0eb12ac..b90a822 100644
--- a/MarkSlee.pde
+++ b/MarkSlee.pde
@@ -106,7 +106,7 @@ class Pulley extends SCPattern {
private boolean isRising = false;
private BasicParameter sz = new BasicParameter("SIZE", 0.5);
- private BasicParameter beatAmount = new BasicParameter("BEAT", 0.1);
+ private BasicParameter beatAmount = new BasicParameter("BEAT", 0);
Pulley(GLucose glucose) {
super(glucose);
@@ -125,7 +125,7 @@ class Pulley extends SCPattern {
int i = 0;
for (Accelerator g : gravity) {
if (isRising) {
- g.setSpeed(random(40, 50), 0).start();
+ g.setSpeed(random(20, 33), 0).start();
} else {
g.setVelocity(0).setAcceleration(-420);
delays[i].setDuration(random(0, 500)).trigger();
@@ -138,27 +138,31 @@ class Pulley extends SCPattern {
if (reset.click()) {
trigger();
}
- int j = 0;
- for (Click d : delays) {
- if (d.click()) {
- gravity[j].start();
- d.stop();
- }
- ++j;
- }
-
- for (Accelerator g : gravity) {
- if (isRising) {
- if (g.getValuef() > model.yMax) {
- g.stop();
- } else if (g.getValuef() > model.yMax*.55) {
- if (g.getVelocityf() > 10) {
- g.setAcceleration(-16);
- } else {
- g.setAcceleration(0);
- }
+ if (isRising) {
+ // Fucking A, had to comment this all out because of that bizarre
+ // Processing bug where some simple loop takes an absurd amount of
+ // time, must be some pre-processor bug
+// for (Accelerator g : gravity) {
+// if (g.getValuef() > model.yMax) {
+// g.stop();
+// } else if (g.getValuef() > model.yMax*.55) {
+// if (g.getVelocityf() > 10) {
+// g.setAcceleration(-16);
+// } else {
+// g.setAcceleration(0);
+// }
+// }
+// }
+ } else {
+ int j = 0;
+ for (Click d : delays) {
+ if (d.click()) {
+ gravity[j].start();
+ d.stop();
}
- } else {
+ ++j;
+ }
+ for (Accelerator g : gravity) {
if (g.getValuef() < 0) {
g.setValue(-g.getValuef());
g.setVelocity(-g.getVelocityf() * random(0.74, 0.84));
@@ -172,11 +176,11 @@ class Pulley extends SCPattern {
}
float falloff = 100. / (3 + sz.getValuef() * 36 + fPos * beatAmount.getValuef()*48);
for (Point p : model.points) {
- int g = (int) constrain((p.x - model.xMin) * NUM_DIVISIONS / (model.xMax - model.xMin), 0, NUM_DIVISIONS-1);
+ int gi = (int) constrain((p.x - model.xMin) * NUM_DIVISIONS / (model.xMax - model.xMin), 0, NUM_DIVISIONS-1);
colors[p.index] = lx.hsb(
(lx.getBaseHuef() + abs(p.x - model.cx)*.8 + p.y*.4) % 360,
constrain(130 - p.y*.8, 0, 100),
- max(0, 100 - abs(p.y - gravity[g].getValuef())*falloff)
+ max(0, 100 - abs(p.y - gravity[gi].getValuef())*falloff)
);
}
}
diff --git a/SamMorrow.pde b/SamMorrow.pde
index 0b70698..350615d 100644
--- a/SamMorrow.pde
+++ b/SamMorrow.pde
@@ -18,7 +18,7 @@ class JazzRainbow extends SamPattern {
float a = hv%250;
if (i%2 == 0) {
for (int b = 0; b < 70; b++) {
- colors[(i+b)%colors.length] = color(a+i%250, 100, b*a%100);
+ colors[(i+b)%colors.length] = lx.hsb(a+i%250, 100, b*a%100);
}
}
}
diff --git a/ShaheenGandhi.pde b/ShaheenGandhi.pde
index a9428aa..d718e36 100644
--- a/ShaheenGandhi.pde
+++ b/ShaheenGandhi.pde
@@ -130,7 +130,7 @@ class HelixPattern extends SCPattern {
// For performance reasons, cut out points that are outside of
// the tube where the toroidal coil lives.
if (abs(myDist(p, axisPoint) - radius) > girth*.5f) {
- return color(0,0,0);
+ return lx.hsb(0,0,0);
}
// Find the appropriate point for the current rotation
@@ -146,7 +146,7 @@ class HelixPattern extends SCPattern {
// Soften edges by fading brightness.
float b = constrain(100*(1 - ((d-.5*girth)/(girth*.5))), 0, 100);
- return color((lx.getBaseHuef() + (360*(phase / TWO_PI)))%360, 80, b);
+ return lx.hsb((lx.getBaseHuef() + (360*(phase / TWO_PI)))%360, 80, b);
}
}
@@ -232,7 +232,7 @@ class HelixPattern extends SCPattern {
float t = axis.getTValue(pt) + spokePhase;
int spokeIndex = (int)floor((t - tMin + spokePeriod/2) / spokePeriod);
if (spokeIndex < 0 || spokeIndex >= basePairs.length) {
- return color(0,0,0);
+ return lx.hsb(0,0,0);
}
BasePairInfo basePair = basePairs[spokeIndex];
Line spokeLine = basePair.line;
@@ -240,7 +240,7 @@ class HelixPattern extends SCPattern {
float d = PVector.dist(pt, pointOnSpoke);
float b = (PVector.dist(pointOnSpoke, spokeLine.getPoint()) < spokeRadius) ? constrain(100*(1 - ((d-.5*spokeGirth)/(spokeGirth*.5))), 0, 100) : 0.f;
float phase = spokeLine.getTValue(pointOnSpoke) < 0 ? basePair.colorPhase1 : basePair.colorPhase2;
- return color((lx.getBaseHuef() + (360*(phase / TWO_PI)))%360, 80.f, b);
+ return lx.hsb((lx.getBaseHuef() + (360*(phase / TWO_PI)))%360, 80.f, b);
}
void run(double deltaMs) {
@@ -259,15 +259,15 @@ class HelixPattern extends SCPattern {
color spokeColor = calculateSpokeColor(pt);
if (!h1on) {
- h1c = color(0,0,0);
+ h1c = lx.hsb(0,0,0);
}
if (!h2on) {
- h2c = color(0,0,0);
+ h2c = lx.hsb(0,0,0);
}
if (!spokesOn) {
- spokeColor = color(0,0,0);
+ spokeColor = lx.hsb(0,0,0);
}
// The helices are positioned to not overlap. If that changes,
diff --git a/TimBavaro.pde b/TimBavaro.pde
index bbbaac3..a10e89e 100644
--- a/TimBavaro.pde
+++ b/TimBavaro.pde
@@ -56,13 +56,13 @@ class TimSpheres extends SCPattern {
for (Point p : model.points) {
float value = 0;
- color c = color(0, 0, 0);
+ color c = lx.hsb(0, 0, 0);
for (Sphere s : spheres) {
float d = sqrt(pow(p.x - s.x, 2) + pow(p.y - s.y, 2) + pow(p.z - s.z, 2));
float r = (s.radius); // * (sinLfoValue + 0.5));
value = max(0, 1 - max(0, d - r) / 10);
- c = blendColor(c, color(((s.hue + lfoValue) % 1) * 360, 100, min(1, value) * 100), ADD);
+ c = blendColor(c, lx.hsb(((s.hue + lfoValue) % 1) * 360, 100, min(1, value) * 100), ADD);
}
colors[p.index] = c;
@@ -249,8 +249,8 @@ class TimRaindrops extends SCPattern {
for (Point p : model.points) {
color c =
blendColor(
- color(210, 20, (float)Math.max(0, 1 - Math.pow((model.yMax - p.y) / 10, 2)) * 50),
- color(220, 60, (float)Math.max(0, 1 - Math.pow((p.y - model.yMin) / 10, 2)) * 100),
+ lx.hsb(210, 20, (float)Math.max(0, 1 - Math.pow((model.yMax - p.y) / 10, 2)) * 50),
+ lx.hsb(220, 60, (float)Math.max(0, 1 - Math.pow((p.y - model.yMin) / 10, 2)) * 100),
ADD);
for (Raindrop raindrop : raindrops) {
if (p.x >= (raindrop.p.x - raindrop.radius) && p.x <= (raindrop.p.x + raindrop.radius) &&
@@ -258,7 +258,7 @@ class TimRaindrops extends SCPattern {
float d = raindrop.p.distanceTo(p) / raindrop.radius;
// float value = (float)Math.max(0, 1 - Math.pow(Math.min(0, d - raindrop.radius) / 5, 2));
if (d < 1) {
- c = blendColor(c, color(raindrop.hue, 80, (float)Math.pow(1 - d, 0.01) * 100), ADD);
+ c = blendColor(c, lx.hsb(raindrop.hue, 80, (float)Math.pow(1 - d, 0.01) * 100), ADD);
}
}
}
@@ -343,7 +343,7 @@ class TimCubes extends SCPattern {
for (CubeFlash flash : flashes) {
float hue = (hueParameter.getValuef() + (hueVarianceParameter.getValuef() * flash.hue)) % 1.0;
- color c = color(hue * 360, saturationParameter.getValuef() * 100, (flash.value) * 100);
+ color c = lx.hsb(hue * 360, saturationParameter.getValuef() * 100, (flash.value) * 100);
for (Point p : flash.c.points) {
colors[p.index] = c;
}
@@ -473,10 +473,10 @@ class TimPlanes extends SCPattern {
final color planeColor;
if (d <= thickness) {
- planeColor = color(plane.hue, saturation, 100);
+ planeColor = lx.hsb(plane.hue, saturation, 100);
} else if (d <= thickness * 2) {
float value = 1 - ((d - thickness) / thickness);
- planeColor = color(plane.hue, saturation, value * 100);
+ planeColor = lx.hsb(plane.hue, saturation, value * 100);
} else {
planeColor = 0;
}
@@ -640,16 +640,16 @@ class TimPinwheels extends SCPattern {
}
if (value == 1) {
values[i] = 1;
-// colors[p.index] = color(120, 0, 100);
+// colors[p.index] = lx.hsb(120, 0, 100);
} else {
values[i] = max(0, values[i] - fadeAmount);
//color c = colors[p.index];
- //colors[p.index] = color(max(0, hue(c) - 10), min(100, saturation(c) + 10), brightness(c) - 5 );
+ //colors[p.index] = lx.hsb(max(0, lx.h(c) - 10), min(100, lx.s(c) + 10), lx.b(c) - 5 );
}
if (random(1.0) >= derez) {
float v = values[i];
- colors[p.index] = color((360 + hue + pow(v, 2) * hueSpread) % 360, 30 + pow(1 - v, 0.25) * 60, v * 100);
+ colors[p.index] = lx.hsb((360 + hue + pow(v, 2) * hueSpread) % 360, 30 + pow(1 - v, 0.25) * 60, v * 100);
}
}
}
@@ -819,12 +819,12 @@ class TimTrace extends SCPattern {
public void run(double deltaMs) {
for (Point p : model.points) {
color c = colors[p.index];
- colors[p.index] = color(hue(c), saturation(c), brightness(c) - 3);
+ colors[p.index] = lx.hsb(lx.h(c), lx.s(c), lx.b(c) - 3);
}
for (MovingPoint mp : movingPoints) {
mp.step();
- colors[mp.currentPoint.index] = blendColor(colors[mp.currentPoint.index], color(mp.hue, 10, 100), ADD);
+ colors[mp.currentPoint.index] = blendColor(colors[mp.currentPoint.index], lx.hsb(mp.hue, 10, 100), ADD);
}
}
}
diff --git a/TobySegaran.pde b/TobySegaran.pde
index 0523129..82ad4d2 100644
--- a/TobySegaran.pde
+++ b/TobySegaran.pde
@@ -30,7 +30,7 @@ class GlitchPlasma extends SCPattern {
+ sin(dist(p.x, p.y + pos / 7, 192.0, 64.0) / 7.0)
+ sin(dist(p.x, p.z + pos, 192.0, 100.0) / 8.0);
float bv = 100;
- colors[p.index] = color((hv+2)*50, satu, bv);
+ colors[p.index] = lx.hsb((hv+2)*50, satu, bv);
}
if (random(1.0)<glitch/20) {
pos=pos-int(random(10,30));
@@ -63,9 +63,9 @@ class FireEffect extends SCPattern {
}
}
private color flameColor(float level) {
- if (level<=0) return color(0,0,0);
+ if (level<=0) return lx.hsb(0,0,0);
float br=min(100,sqrt(level)*15);
- return color(level/1.7,100,br);
+ return lx.hsb(level/1.7,100,br);
}
public void run(double deltaMs) {
for (int x=10;x<xm-10;x++) {
@@ -122,7 +122,7 @@ class StripBounce extends SCPattern {
float br = max(0,100-avgdist*4);
for (Point p : strip.points) {
if (on && br>bright[p.index]) {
- colors[p.index] = color(hv,sat[i].getValuef(),br);
+ colors[p.index] = lx.hsb(hv,sat[i].getValuef(),br);
bright[p.index] = br;
}
}
@@ -187,7 +187,7 @@ class SoundRain extends SCPattern {
for (Point p : s.points) {
int seq = int(p.y*avgSize/model.yMax+pos.getValuef()+sin(p.x+p.z)*2)%avgSize;
seq=min(abs(seq-(avgSize/2)),avgSize-1);
- colors[p.index] = color(200,max(0,100-abs(p.x-col1.getValuef())/2),lightVals[seq]);
+ colors[p.index] = lx.hsb(200,max(0,100-abs(p.x-col1.getValuef())/2),lightVals[seq]);
}
}
}
@@ -229,7 +229,7 @@ class FaceSync extends SCPattern {
float a2=max(0,100-abs(p.x-col2.getValuef()));
float sat = max(a1,a2);
float h = (359*a1+200*a2) / (a1+a2);
- colors[p.index] = color(h,sat,100-abs(dx*5)-abs(dz*5));
+ colors[p.index] = lx.hsb(h,sat,100-abs(dx*5)-abs(dz*5));
}
}
}
@@ -292,7 +292,7 @@ class SoundSpikes extends SCPattern {
if (seq>avgSize) seq=avgSize-seq;
seq=constrain(seq,0,avgSize-1);
float br=max(0, lightVals[seq]-p.y);
- colors[p.index] = color((dis*avgSize*65)/model.xMax,90,br);
+ colors[p.index] = lx.hsb((dis*avgSize*65)/model.xMax,90,br);
}
}
}
diff --git a/_Internals.pde b/_Internals.pde
index d616264..e568c4e 100644
--- a/_Internals.pde
+++ b/_Internals.pde
@@ -52,7 +52,6 @@ LXPattern[] patterns;
MappingTool mappingTool;
PandaDriver[] pandaBoards;
MidiEngine midiEngine;
-color[] threadColors;
// Display configuration mode
boolean mappingMode = false;
@@ -61,6 +60,7 @@ DebugUI debugUI;
boolean uiOn = true;
LXPattern restoreToPattern = null;
PImage logo;
+float[] hsb = new float[3];
// Handles to UI objects
UIContext[] overlays;
@@ -121,7 +121,6 @@ void setup() {
glucose = new GLucose(this, buildModel());
lx = glucose.lx;
lx.enableKeyboardTempo();
- threadColors = new color[lx.total];
logTime("Built GLucose engine");
// Set the patterns
@@ -267,12 +266,9 @@ void draw() {
// Gamma correction here. Apply a cubic to the brightness
// for better representation of dynamic range
for (int i = 0; i < sendColors.length; ++i) {
- float b = brightness(sendColors[i]) / 100.f;
- sendColors[i] = color(
- hue(sendColors[i]),
- saturation(sendColors[i]),
- (b*b*b) * 100.
- );
+ lx.RGBtoHSB(sendColors[i], hsb);
+ float b = hsb[2];
+ sendColors[i] = lx.hsb(360.*hsb[0], 100.*hsb[1], 100.*(b*b*b));
}
// TODO(mcslee): move into GLucose engine
diff --git a/_UIFramework.pde b/_UIFramework.pde
index ec590fe..f4a0a40 100644
--- a/_UIFramework.pde
+++ b/_UIFramework.pde
@@ -718,7 +718,7 @@ public class UIScrollList extends UIObject {
}
if (hasScroll) {
pg.noStroke();
- pg.fill(color(0, 0, 100, 15));
+ pg.fill(0x26ffffff);
pg.rect(w-12, 0, 12, h);
pg.fill(#333333);
pg.rect(w-12, scrollYStart, 12, scrollYHeight);
diff --git a/code/HeronLX.jar b/code/HeronLX.jar
index 336c147944128b00d9986e734b6c29e9bf4d878f..6069116fa5100282693f58bbf58e7c6134982384 100755
GIT binary patch
delta 7615
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
delta 7479
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
Mkc?=9A5fP62c_kpTmS$7
--
2.43.0