From: Mark Slee Date: Wed, 26 Feb 2014 08:36:29 +0000 (-0800) Subject: The death of GLucose! Hear ye, hear ye. X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=0c7bfdb51209c7b8ab72ff352fbd945187521098;p=SugarCubes.git The death of GLucose! Hear ye, hear ye. --- diff --git a/AlexGreen.pde.orig b/AlexGreen.pde.orig deleted file mode 100644 index 9d657e9..0000000 --- a/AlexGreen.pde.orig +++ /dev/null @@ -1,446 +0,0 @@ -class SineSphere extends SCPattern { -<<<<<<< HEAD - private SawLFO yrot = new SawLFO(0, TWO_PI, 3000); - private SawLFO yrot2 = new SawLFO(0, -TWO_PI, 8000); - public BasicParameter huespread = new BasicParameter("Hue", 0, 180); - public BasicParameter widthparameter= new BasicParameter("Width", .2); - private int pitch = 0; - private int channel = 0; - private int velocity = 0; - public final Projection sinespin; - public final Projection sinespin2; - - //to-do: how to sync all hues across sphery's via one basicparameter - //public BasicParameter huespread = new BasicParameter("HueSpread", 180, 360); - public BasicParameter rotationx = new BasicParameter("rotx", 0, 0, 1 ); - public BasicParameter rotationy = new BasicParameter("roty", 1, 0, 1); - public BasicParameter rotationz = new BasicParameter("rotz", 0, 0, 1); - -======= - private SinLFO yrot = new SinLFO(0, TWO_PI, 2000); - public final LXProjection sinespin; ->>>>>>> b8bb27489db7dc687bf150576e9d9439f1fa17a6 - float modelrad = sqrt((model.xMax)*(model.xMax) + (model.yMax)*(model.yMax) + (model.zMax)*(model.zMax)); - Pick Sshape; - public final PVector P = new PVector(); - - class Sphery { - float f1xcenter, f1ycenter, f1zcenter, f2xcenter , f2ycenter, f2zcenter; //second three are for an ellipse with two foci - private SinLFO vibration; - private SinLFO surface; - private SinLFO vx; - private SinLFO xbounce; - public SinLFO ybounce; - private SinLFO zbounce; - float vibration_min, vibration_max, vperiod; - - //public BasicParameter huespread; - public BasicParameter bouncerate; - public BasicParameter bounceamp; - public BasicParameter vibrationrate; - public final PVector circlecenter = new PVector(); - - public Sphery(float f1xcenter, float f1ycenter, float f1zcenter, float vibration_min, float vibration_max, float vperiod) - { - this.f1xcenter = f1xcenter; - this.f1ycenter = f1ycenter; - this.f1zcenter = f1zcenter; - this.vibration_min = vibration_min; - this.vibration_max = vibration_max; - this.vperiod = vperiod; - //addParameter(bounceamp = new BasicParameter("Amp", .5)); - //addParameter(bouncerate = new BasicParameter("Rate", .5)); //ybounce.modulateDurationBy(bouncerate); - //addParameter(vibrationrate = new BasicParameter("vibration", 1000, 10000)); - //addParameter(widthparameter = new BasicParameter("Width", .2)); - - - addModulator( vx = new SinLFO(500, 10000, 100000)).trigger() ; - //addModulator(xbounce = new SinLFO(model.xMax/3, 2*model.yMax/3, 2000)).trigger(); - addModulator(ybounce= new SinLFO(model.yMax/3, 2*model.yMax/3, 240000./lx.tempo.bpm())).trigger(); //bounce.modulateDurationBy - - //addModulator(bounceamp); //ybounce.setMagnitude(bouncerate); - addModulator( vibration = new SinLFO(vibration_min , vibration_max, 10000)).trigger(); //vibration.setPeriod(240000/lx.tempo.bpm()); - - } - - //for an ellipse -// public Sphery(float f1xcenter, float f1ycenter, float f1zcenter, float f2xcenter, float f2ycenter, float f2zcenter, -// float vibration_min, float vibration_max, float vperiod) - -// { -// this.f1xcenter = f1xcenter; -// this.f1ycenter = f1ycenter; -// this.f1zcenter = f1zcenter; -// this.f2xcenter = f2xcenter; -// this.f2ycenter = f2ycenter; -// this.f2zcenter = f2zcenter; -// this.vibration_min = vibration_min; -// this.vibration_max = vibration_max; -// this.vperiod = vperiod; -// //addModulator(xbounce = new SinLFO(model.xMax/3, 2*model.yMax/3, 2000)).trigger(); -// addModulator(ybounce).trigger(); -// addModulator( vibration = new SinLFO(vibration_min , vibration_max, lx.tempo.rampf())).trigger(); //vibration.modulateDurationBy(vx); -// addParameter(widthparameter = new BasicParameter("Width", .1)); -// //addParameter(huespread = new BasicParameter("bonk", .2)); - -// } - - - -void setVibrationPeriod(double period){ -// to-do: make this conditional upon time signature - -vibration.setPeriod(period); - -} - - -float distfromcirclecenter(float px, float py, float pz, float f1x, float f1y, float f1z) -{ - return dist(px, py, pz, f1x, f1y, f1z); - } - //void updatespherey(deltaMs, ) - - float quadrant(PVector q) { - float qtheta = atan2( (q.x-f1xcenter) , (q.z - f1zcenter) ); - - - return map(qtheta, -PI/2, PI/2, 160-huespread.getValuef(), 240 +huespread.getValuef()); - //if (q.x > f1xcenter ) {return 140 ;} - //else {return 250;} - } - color spheryvalue (PVector p, float f1xcenter, float f1ycenter, float f1zcenter) { - circlecenter.set(f1xcenter, f1ycenter, f1zcenter); - - -//switch(sShpape.cur() ) {} - - float b = max(0, 100 - 100*widthparameter.getValuef()*abs(p.dist(circlecenter) - - vibration.getValuef() ) ); - - if (b <= 0) { - return 0; - } - - return lx.hsb( - constrain(quadrant(p), 0, 360), - 80, - b - ); - } - color ellipsevalue(float px, float py, float pz , float f1xc, float f1yc, float f1zc, float f2xc, float f2yc, float f2zc) - { -//switch(sShpape.cur() ) {} - 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 - - 1.2*vibration.getValuef() ) ) ) ; - } - -void run(double deltaMs) { - float vv = vibration.getValuef(); - float ybv = ybounce.getValuef(); - - } - -} - -// public boolean gridPressed(int row, int co){ -// midiengine.grid.setState(); - -// return true; - -// } - -public boolean noteOn(Note note) { -pitch= note.getPitch(); -velocity=note.getVelocity(); -channel=note.getChannel(); -return true; -} - -final Sphery[] spherys; - - SineSphere(GLucose glucose) - { - super(glucose); -<<<<<<< HEAD - sinespin = new Projection(model); - sinespin2 = new Projection(model); - addParameter(huespread); - addParameter(rotationx); - addParameter(rotationy); - addParameter(rotationz); -======= - sinespin = new LXProjection(model); ->>>>>>> b8bb27489db7dc687bf150576e9d9439f1fa17a6 - addModulator(yrot).trigger(); - addModulator(yrot2).trigger(); - - //addParameter(huespread); - //Sshape = addPick("Shape", , 1); - spherys = new Sphery[] { - new Sphery(model.xMax/4, model.yMax/2, model.zMax/2, modelrad/16, modelrad/8, 3000), - new Sphery(.75*model.xMax, model.yMax/2, model.zMax/2, modelrad/20, modelrad/10, 2000), - new Sphery(model.xMax/2, model.yMax/2, model.zMax/2, modelrad/4, modelrad/8, 2300), - - new Sphery(.3*model.xMax, .4*model.yMax, .6*model.zMax, modelrad/16, modelrad/8, 4000), - new Sphery(.75*model.xMax, model.yMax/2, model.zMax/2, modelrad/20, modelrad/10, 2000), - new Sphery(model.xMax/2, model.yMax/2, model.zMax/2, modelrad/4, modelrad/8, 2300), - - }; - } - -// public void onParameterChanged(LXParameter parameter) -// { - - -// for (Sphery s : spherys) { -// if (s == null) continue; -// double bampv = s.bounceamp.getValue(); -// double brv = s.bouncerate.getValue(); -// double tempobounce = lx.tempo.bpm(); -// if (parameter == s.bounceamp) -// { -// s.ybounce.setRange(bampv*model.yMax/3 , bampv*2*model.yMax/3, brv); -// } -// else if ( parameter == s.bouncerate ) -// { -// s.ybounce.setDuration(120000./tempobounce); -// } -// } -// } - -<<<<<<< HEAD - public void run( double deltaMs) { - double t = lx.tempo.ramp(); - double bpm = lx.tempo.bpm(); - spherys[0].run(deltaMs); - spherys[1].run(deltaMs); - spherys[2].run(deltaMs); - spherys[3].run(deltaMs); - - - switch (pitch) - { - case 53: t = .5*t; bpm = .5*bpm; break; -======= - void run( double deltaMs) { - float t = lx.tempo.rampf(); - float bpm = lx.tempo.bpmf(); - //spherys[1].run(deltaMs); - //spherys[2].run(deltaMs); - //spherys[3].run(deltaMs);] - sinespin.reset() - - // Translate so the center of the car is the origin, offset by yPos - .center() ->>>>>>> b8bb27489db7dc687bf150576e9d9439f1fa17a6 - - case 54: t = t; bpm = bpm; break; - - case 55: t = 2*t; bpm = 2*bpm; break; - - default: t= t; bpm = bpm; - -<<<<<<< HEAD -======= - for (LXPoint p : model.points){ - color c = 0; - c = blendColor(c, spherys[1].spheryvalue(p.x, p.y, p.z, .75*model.xMax, model.yMax/2, model.zMax/2), ADD); - c = blendColor(c, spherys[0].spheryvalue(p.x, p.y, p.z, model.xMax/4, model.yMax/4, model.zMax/2), ADD); - c = blendColor(c, spherys[2].spheryvalue(p.x, p.y, p.z, model.xMax/2, model.yMax/2, model.zMax/2),ADD); ->>>>>>> b8bb27489db7dc687bf150576e9d9439f1fa17a6 - - } - - for ( Sphery s: spherys){ - s.setVibrationPeriod(480000/bpm); - s.vibration.setBasis(t); - } - sinespin.reset(model) - - - // Translate so the center of the car is the origin, offset - .translateCenter(model, 0, 0, 0) - // .scale(1.3,1.3,1.3) - // Rotate around the origin (now the center of the car) about an y-vector - .rotate(yrot.getValuef(), rotationx.getValuef(), rotationy.getValuef() , rotationz.getValuef()) - .translate(model.cx, model.cy, model.cz); - - - - - - for (Coord p: sinespin) - // for (Point p: model.points) - { - P.set(p.x, p.y, p.z); - // PVector P = new PVector(p.x, p.y, p.z); - color c = #000000; - c = blendIfColor(c, spherys[1].spheryvalue(P, .75*model.xMax, model.yMax/2, model.zMax/2), ADD); - c = blendIfColor(c, spherys[0].spheryvalue(P, model.xMax/4, model.yMax/4, model.zMax/2), ADD); - c = blendIfColor(c, spherys[2].spheryvalue(P, model.xMax/2, model.yMax/2, model.zMax/2),ADD); - - - colors[p.index] = c; - - - } - sinespin2.reset(model). - translateCenter(model,0,0,0). - rotate(yrot2.getValuef(), 0, 1, 0). - translate(model.cx,model.cy,model.cz); - - for (Coord p: sinespin2) - { color c = 0; - // PVector P = new PVector(p.x, p.y, p.z); - P.set(p.x, p.y, p.z); - c = blendIfColor(c, spherys[3].spheryvalue(P, .3*model.xMax, .7*model.yMax, .6*model.zMax),ADD); - - colors[p.index] = blendIfColor(colors[p.index], c , ADD); - - } - - - - } - - color blendIfColor(color c1, color c2, int mode) { - if (c2 != 0) { - return blendColor(c1, c2, mode); - } - return c1; - } - - - // color c = 0; - // 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 lx.hsb(0,0,0); - // // else if(spheremode ==2) - // { color c = 0; - // return lx.hsb(CalcCone( (xyz by = new xyz(0,spherys[2].ybounce.getValuef(),0) ), Px, mid) ); - - // } - - - // } - - } - -class CubeCurl extends SCPattern{ -float CH, CW, diag; -ArrayList cubeorigin = new ArrayList(); -ArrayList centerlist = new ArrayList(); -private SinLFO curl = new SinLFO(0, Cube.EDGE_HEIGHT, 5000 ); - -private SinLFO bg = new SinLFO(180, 220, 3000); - -CubeCurl(GLucose glucose){ -super(glucose); -addModulator(curl).trigger(); -addModulator(bg).trigger(); - this.CH = Cube.EDGE_HEIGHT; - this.CW = Cube.EDGE_WIDTH; - this.diag = sqrt(CW*CW + CW*CW); - - -ArrayList centerlistrelative = new ArrayList(); -for (int i = 0; i < model.cubes.size(); i++){ - Cube a = model.cubes.get(i); - cubeorigin.add(new PVector(a.x, a.y, a.z)); - centerlist.add(new PVector(a.cx, a.cy, a.cz) ); - -} - -} -//there is definitely a better way of doing this! -PVector centerofcube(int i) { -Cube c = model.cubes.get(i); - -println(" cube #: " + i + " c.x " + c.x + " c.y " + c.y + " c.z " + c.z ); -// PVector cubeangle = new PVector(c.rx, c.ry, c.rz); -println("raw x angle: " + c.rx + "raw y angle: " + c.ry + "raw z angle: " + c.rz); -PVector cubecenter = new PVector(c.x + CW/2, c.y + CH/2, c.z + CW/2); -println("cubecenter unrotated: " + cubecenter.x + " " +cubecenter.y + " " +cubecenter.z ); -PVector centerrot = new PVector(cos(c.rx)*CW/2 - sin(c.rx)*CW/2, cubecenter.y, cos(c.rz)*CW/2 + sin(c.rz)*CW/2); - // nCos*(y-o.y) - nSin*(z-o.z) + o.y -cubecenter = PVector.add(new PVector(c.x, c.y, c.z), centerrot); -println( " cubecenter.x " + cubecenter.x + " cubecenter.y " + cubecenter.y + " cubecenter.z " + cubecenter.z + " "); - - -return cubecenter; -} - - -void run(double deltaMs){ -for (int i =0; i < model.cubes.size(); i++) { -Cube c = model.cubes.get(i); -float cfloor = c.y; - -// if (i%3 == 0){ - -// for (LXPoint p : c.points ){ -// // colors[p.index]=color(0,0,0); -// //float dif = (p.y - c.y); -// //colors[p.index] = color( bg.getValuef() , 80 , dif < curl.getValuef() ? 80 : 0, ADD); -// } -// } - -// else if (i%3 == 1) { - -// for (LXPoint p: c.points){ -// colors[p.index]=color(0,0,0); -// float dif = (p.y - c.y); -// // colors[p.index] = -// // color(bg.getValuef(), -// // map(curl.getValuef(), 0, Cube.EDGE_HEIGHT, 20, 100), -// // 100 - 10*abs(dif - curl.getValuef()), ADD ); -// } -// } -// else if (i%3 == 2){ - // centerlist[i].sub(cubeorigin(i); - for (LXPoint p: c.points) { - PVector pv = new PVector(p.x, p.y, p.z); - colors[p.index] =color( constrain(4* pv.dist(centerlist.get(i)), 0, 360) , 50, 100 ); - // colors[p.index] =color(constrain(centerlist[i].x, 0, 360), constrain(centerlist[i].y, 0, 100), ); - - - } - - - //} - - } - } - } - - class HueTestHSB extends SCPattern{ - BasicParameter HueT = new BasicParameter("Hue", .5); - BasicParameter SatT = new BasicParameter("Sat", .5); - BasicParameter BriT = new BasicParameter("Bright", .5); - -HueTestHSB(GLucose glucose) { - super(glucose); - addParameter(HueT); - addParameter(SatT); - addParameter(BriT); -} - void run(double deltaMs){ - - for (LXPoint p : model.points) { - color c = 0; - c = blendColor(c, lx.hsb(360*HueT.getValuef(), 100*SatT.getValuef(), 100*BriT.getValuef()), ADD); - colors[p.index]= c; - } - int now= millis(); - if (now % 1000 <= 20) - { - println("Hue: " + 360*HueT.getValuef() + "Sat: " + 100*SatT.getValuef() + "Bright: " + 100*BriT.getValuef()); - } - } - - } diff --git a/DanKaminsky.pde b/DanKaminsky.pde index 88fd543..c4ca005 100644 --- a/DanKaminsky.pde +++ b/DanKaminsky.pde @@ -11,7 +11,7 @@ class GenericController { if(p!=null) { p.setValue(val); } } if(type==2) { - p = glucose.getSelectedEffect().getParameters().get(num); + p = getSelectedEffect().getParameters().get(num); if(p!=null) { p.setValue(val); } } } diff --git a/MarkSlee.pde b/MarkSlee.pde index 1423994..a2d36fd 100644 --- a/MarkSlee.pde +++ b/MarkSlee.pde @@ -1380,7 +1380,7 @@ class QuantizeEffect extends LXEffect { QuantizeEffect(LX lx) { super(lx); - quantizedFrame = new color[glucose.lx.total]; + quantizedFrame = new color[lx.total]; lastQuant = 0; } diff --git a/SugarCubes.pde.orig b/SugarCubes.pde.orig deleted file mode 100644 index e989980..0000000 --- a/SugarCubes.pde.orig +++ /dev/null @@ -1,148 +0,0 @@ -/** - * +-+-+-+-+-+ +-+-+-+-+-+ - * / /| |\ \ - * / / + + \ \ - * +-+-+-+-+-+ | +-+-+-+-+ | +-+-+-+-+-+ - * | | + / \ + | | - * + THE + / / \ \ + CUBES + - * | |/ +-+-+-+-+-+-+-+ \| | - * +-+-+-+-+-+ | | +-+-+-+-+-+ - * + + - * | SUGAR | - * + + - * | | - * +-+-+-+-+-+-+-+ - * - * Welcome to the Sugar Cubes! This Processing sketch is a fun place to build - * animations, effects, and interactions for the platform. Most of the icky - * code guts are embedded in the GLucose library extension. If you're an - * artist, you shouldn't need to worry about any of that. - * - * Below, you will find definitions of the Patterns, Effects, and Interactions. - * If you're an artist, create a new tab in the Processing environment with - * your name. Implement your classes there, and add them to the list below. - */ - -LXPattern[] patterns(GLucose glucose) { - return new LXPattern[] { - -<<<<<<< HEAD - new SineSphere(glucose), - new CubeCurl(glucose), -======= ->>>>>>> b8bb27489db7dc687bf150576e9d9439f1fa17a6 - // Slee - new Cathedrals(glucose), - new MidiMusic(glucose), - new Pulley(glucose), - new Swarm(glucose), - new ViolinWave(glucose), - new BouncyBalls(glucose), - new SpaceTime(glucose), - new ShiftingPlane(glucose), - new AskewPlanes(glucose), - new Blinders(glucose), - new CrossSections(glucose), - new Psychedelia(glucose), - - new Traktor(glucose).setEligible(false), - new BassPod(glucose).setEligible(false), - new CubeEQ(glucose).setEligible(false), - new PianoKeyPattern(glucose).setEligible(false), - - // DanH - new Noise(glucose), - new Play (glucose), - new Pong (glucose), - new Worms(glucose), - - // Alex G - - - // Shaheen - new HelixPattern(glucose).setEligible(false), - - // Toby - new GlitchPlasma(glucose), - new FireEffect(glucose).setEligible(false), - new StripBounce(glucose), - new SoundRain(glucose).setEligible(false), - new SoundSpikes(glucose).setEligible(false), - new FaceSync(glucose), - - // Jack - new Swim(glucose), - new Balance(glucose), - - // Tim - new TimPlanes(glucose), - new TimPinwheels(glucose), - new TimRaindrops(glucose), - new TimCubes(glucose), - // new TimTrace(glucose), - new TimSpheres(glucose), - - // Ben - // new Sandbox(glucose), - new TowerParams(glucose), - new DriveableCrossSections(glucose), - new GranimTestPattern2(glucose), - - //JR - new Gimbal(glucose), - - // Sam - new JazzRainbow(glucose), - - // Arjun - new TelevisionStatic(glucose), - new AbstractPainting(glucose), - new Spirality(glucose), - - // Basic test patterns for reference, not art - new TestCubePattern(glucose), - new TestTowerPattern(glucose), - new TestProjectionPattern(glucose), - new TestStripPattern(glucose), - new TestBassMapping(glucose), - new TestFloorMapping(glucose), - new TestSpeakerMapping(glucose), - // new TestHuePattern(glucose), - // new TestXPattern(glucose), - // new TestYPattern(glucose), - // new TestZPattern(glucose), - - }; -} - -LXTransition[] transitions(GLucose glucose) { - return new LXTransition[] { - new DissolveTransition(lx), - new AddTransition(glucose), - new MultiplyTransition(glucose), - new OverlayTransition(glucose), - new DodgeTransition(glucose), - new SwipeTransition(glucose), - new FadeTransition(lx), -// new SubtractTransition(glucose), // similar to multiply - dh -// new BurnTransition(glucose), // similar to multiply - dh -// new ScreenTransition(glucose), // same as add -dh -// new SoftLightTransition(glucose), // same as overlay -dh - }; -} - -// Handles to globally triggerable effects -class Effects { - FlashEffect flash = new FlashEffect(lx); - BoomEffect boom = new BoomEffect(glucose); - BlurEffect blur = new BlurEffect(glucose); - QuantizeEffect quantize = new QuantizeEffect(glucose); - ColorFuckerEffect colorFucker = new ColorFuckerEffect(glucose); - - Effects() { - blur.enable(); - quantize.enable(); - colorFucker.enable(); - } -} - diff --git a/_Internals.pde b/_Internals.pde index 0ee146d..0362a7c 100644 --- a/_Internals.pde +++ b/_Internals.pde @@ -13,7 +13,6 @@ * for general animation work. */ -import glucose.*; import heronarts.lx.*; import heronarts.lx.effect.*; import heronarts.lx.model.*; @@ -49,13 +48,13 @@ int targetFramerate = 60; int startMillis, lastMillis; // Core engine variables -GLucose glucose; LX lx; Model model; LXPattern[] patterns; LXTransition[] transitions; -DiscreteParameter activeTransition; Effects effects; +LXEffect[] effectsArr; +DiscreteParameter selectedEffect; MappingTool mappingTool; GrizzlyOutput[] grizzlies; PresetManager presetManager; @@ -116,7 +115,11 @@ LXEffect[] _effectsArray(Effects effects) { } catch (IllegalAccessException iax) {} } return effectList.toArray(new LXEffect[]{}); -} +} + +LXEffect getSelectedEffect() { + return effectsArr[selectedEffect.getValuei()]; +} void logTime(String evt) { int now = millis(); @@ -134,11 +137,14 @@ void setup() { // hint(ENABLE_OPENGL_4X_SMOOTH); // no discernable improvement? logTime("Created viewport"); - // Create the GLucose engine to run the cubes - glucose = new GLucose(this, model = buildModel()); - lx = glucose.lx; + // Create the model + model = buildModel(); + logTime("Built Model"); + + // LX engine + lx = new LX(this, model); lx.enableKeyboardTempo(); - logTime("Built GLucose engine"); + logTime("Built LX engine"); // Set the patterns LXEngine engine = lx.engine; @@ -148,17 +154,12 @@ void setup() { // Transitions transitions = transitions(lx); - activeTransition = new DiscreteParameter("TRANSITION", transitions.length); - activeTransition.addListener(new LXParameterListener() { - public void onParameterChanged(LXParameter parameter) { - lx.engine.getDeck(RIGHT_DECK).setFaderTransition(transitions[activeTransition.getValuei()]); - } - }); - lx.engine.getDeck(RIGHT_DECK).setFaderTransition(transitions[activeTransition.getValuei()]); + lx.engine.getDeck(RIGHT_DECK).setFaderTransition(transitions[0]); logTime("Built transitions"); // Effects - glucose.lx.addEffects(_effectsArray(effects = new Effects())); + lx.addEffects(effectsArr = _effectsArray(effects = new Effects())); + selectedEffect = new DiscreteParameter("EFFECT", effectsArr.length); logTime("Built effects"); // Preset manager @@ -180,9 +181,10 @@ void setup() { x.printStackTrace(); } logTime("Built Grizzly Outputs"); - - // Mapping tools + + // Mapping tool mappingTool = new MappingTool(lx); + logTime("Built Mapping Tool"); // Build overlay UI UILayer[] layers = new UILayer[] { @@ -192,14 +194,14 @@ void setup() { .setRadius(290).addComponent(new UICubesLayer()), // Left controls - uiPatternA = new UIPatternDeck(lx.ui, lx.engine.getDeck(GLucose.LEFT_DECK), "PATTERN A", 4, 4, 140, 324), + uiPatternA = new UIPatternDeck(lx.ui, lx.engine.getDeck(LEFT_DECK), "PATTERN A", 4, 4, 140, 324), new UIBlendMode(4, 332, 140, 86), new UIEffects(4, 422, 140, 144), new UITempo(4, 570, 140, 50), uiSpeed = new UISpeed(4, 624, 140, 50), // Right controls - new UIPatternDeck(lx.ui, lx.engine.getDeck(GLucose.RIGHT_DECK), "PATTERN B", width-144, 4, 140, 324), + new UIPatternDeck(lx.ui, lx.engine.getDeck(RIGHT_DECK), "PATTERN B", width-144, 4, 140, 324), uiMidi = new UIMidi(midiEngine, width-144, 332, 140, 158), new UIOutput(grizzlies, width-144, 494, 140, 106), @@ -230,7 +232,7 @@ public SCPattern getPattern() { /** * Subclass of LXPattern specific to sugar cubes. These patterns - * get access to the glucose state and geometry, and have some + * get access to the state and geometry, and have some * little helpers for interacting with the model. */ public static abstract class SCPattern extends LXPattern { @@ -322,7 +324,7 @@ void draw() { background(40); // Send colors - color[] sendColors = glucose.getColors(); + color[] sendColors = lx.getColors(); long gammaStart = System.nanoTime(); // Gamma correction here. Apply a cubic to the brightness // for better representation of dynamic range @@ -347,12 +349,12 @@ void draw() { class UICubesLayer extends UICameraComponent { void onDraw(UI ui) { - color[] simulationColors = glucose.getColors(); + color[] simulationColors = lx.getColors(); String displayMode = uiCrossfader.getDisplayMode(); if (displayMode == "A") { - simulationColors = lx.engine.getDeck(GLucose.LEFT_DECK).getColors(); + simulationColors = lx.engine.getDeck(LEFT_DECK).getColors(); } else if (displayMode == "B") { - simulationColors = lx.engine.getDeck(GLucose.RIGHT_DECK).getColors(); + simulationColors = lx.engine.getDeck(RIGHT_DECK).getColors(); } long simulationStart = System.nanoTime(); diff --git a/_MIDI.pde b/_MIDI.pde index 18fa5a3..562aa86 100644 --- a/_MIDI.pde +++ b/_MIDI.pde @@ -445,7 +445,7 @@ public class APC40MidiInput extends GenericDeviceMidiInput { // Crossfader case 15: - lx.engine.getDeck(GLucose.RIGHT_DECK).getFader().setNormalized(value); + lx.engine.getDeck(RIGHT_DECK).getFader().setNormalized(value); return true; // Cue level @@ -478,7 +478,8 @@ public class APC40MidiInput extends GenericDeviceMidiInput { if (number >= 20 && number <= 23) { int effectIndex = number - 20; - List parameters = glucose.getSelectedEffect().getParameters(); + // TODO(mclsee): fix selected effect + List parameters = getSelectedEffect().getParameters(); if (effectIndex < parameters.size()) { setNormalized(parameters.get(effectIndex), value); return true; @@ -537,7 +538,7 @@ public class APC40MidiInput extends GenericDeviceMidiInput { case 91: // play if (shiftOn) { - midiEngine.setFocusedDeck(GLucose.LEFT_DECK); + midiEngine.setFocusedDeck(LEFT_DECK); } else { uiCrossfader.setDisplayMode("A"); } @@ -549,7 +550,7 @@ public class APC40MidiInput extends GenericDeviceMidiInput { case 93: // rec if (shiftOn) { - midiEngine.setFocusedDeck(GLucose.RIGHT_DECK); + midiEngine.setFocusedDeck(RIGHT_DECK); } else { uiCrossfader.setDisplayMode("B"); } @@ -557,7 +558,7 @@ public class APC40MidiInput extends GenericDeviceMidiInput { case 94: // up bank if (shiftOn) { - glucose.incrementSelectedEffectBy(-1); + selectedEffect.setValue(selectedEffect.getValuei() - 1); } else { getTargetDeck().goPrev(); } @@ -565,7 +566,7 @@ public class APC40MidiInput extends GenericDeviceMidiInput { case 95: // down bank if (shiftOn) { - glucose.incrementSelectedEffectBy(1); + selectedEffect.setValue(selectedEffect.getValuei() + 1); } else { getTargetDeck().goNext(); } @@ -588,7 +589,7 @@ public class APC40MidiInput extends GenericDeviceMidiInput { return true; case 62: // Detail View / red 5 - releaseEffect = glucose.getSelectedEffect(); + releaseEffect = getSelectedEffect(); if (releaseEffect.isMomentary()) { releaseEffect.enable(); } else { @@ -597,7 +598,7 @@ public class APC40MidiInput extends GenericDeviceMidiInput { return true; case 63: // rec quantize / red 6 - glucose.getSelectedEffect().disable(); + getSelectedEffect().disable(); return true; } @@ -689,11 +690,11 @@ class KorgNanoKontrolMidiInput extends GenericDeviceMidiInput { switch (number) { case 58: // Left track - midiEngine.setFocusedDeck(GLucose.LEFT_DECK); + midiEngine.setFocusedDeck(LEFT_DECK); return true; case 59: // Right track - midiEngine.setFocusedDeck(GLucose.RIGHT_DECK); + midiEngine.setFocusedDeck(RIGHT_DECK); return true; case 43: // Left chevron @@ -737,8 +738,8 @@ class APC40MidiOutput implements LXParameterListener, GridOutput { } }); } - glucose.addEffectListener(new GLucose.EffectListener() { - public void effectSelected(LXEffect effect) { + selectedEffect.addListener(new LXParameterListener() { + public void onParameterChanged(LXParameter parameter) { resetEffectParameters(); } }); @@ -842,7 +843,7 @@ class APC40MidiOutput implements LXParameterListener, GridOutput { } private void resetEffectParameters() { - LXEffect newEffect = glucose.getSelectedEffect(); + LXEffect newEffect = getSelectedEffect(); if (newEffect == focusedEffect) { return; } diff --git a/_UIImplementation.pde b/_UIImplementation.pde index 1257f6f..1e78bee 100644 --- a/_UIImplementation.pde +++ b/_UIImplementation.pde @@ -15,14 +15,13 @@ class UIBlendMode extends UIWindow { public UIBlendMode(float x, float y, float w, float h) { super(lx.ui, "BLEND MODE", x, y, w, h); List items = new ArrayList(); - int i = 0; for (LXTransition t : transitions) { - items.add(new TransitionScrollItem(t, i++)); + items.add(new TransitionScrollItem(t)); } final UIScrollList tList; (tList = new UIScrollList(1, UIWindow.TITLE_LABEL_HEIGHT, w-2, 60)).setItems(items).addToContainer(this); - lx.engine.getDeck(GLucose.RIGHT_DECK).addListener(new LXDeck.AbstractListener() { + lx.engine.getDeck(RIGHT_DECK).addListener(new LXDeck.AbstractListener() { public void faderTransitionDidChange(LXDeck deck, LXTransition transition) { tList.redraw(); } @@ -31,12 +30,10 @@ class UIBlendMode extends UIWindow { class TransitionScrollItem extends UIScrollList.AbstractItem { private final LXTransition transition; - private final int index; private final String label; - TransitionScrollItem(LXTransition transition, int index) { + TransitionScrollItem(LXTransition transition) { this.transition = transition; - this.index = index; this.label = className(transition, "Transition"); } @@ -45,7 +42,7 @@ class UIBlendMode extends UIWindow { } public boolean isSelected() { - return index == activeTransition.getValuei(); + return this.transition == lx.engine.getDeck(RIGHT_DECK).getFaderTransition(); } public boolean isPending() { @@ -53,7 +50,7 @@ class UIBlendMode extends UIWindow { } public void onMousePressed() { - activeTransition.setValue(this.index); + lx.engine.getDeck(RIGHT_DECK).setFaderTransition(this.transition); } } @@ -66,7 +63,7 @@ class UICrossfader extends UIWindow { public UICrossfader(float x, float y, float w, float h) { super(lx.ui, "CROSSFADER", x, y, w, h); - new UISlider(4, UIWindow.TITLE_LABEL_HEIGHT, w-9, 32).setParameter(lx.engine.getDeck(GLucose.RIGHT_DECK).getFader()).addToContainer(this); + new UISlider(4, UIWindow.TITLE_LABEL_HEIGHT, w-9, 32).setParameter(lx.engine.getDeck(RIGHT_DECK).getFader()).addToContainer(this); (displayMode = new UIToggleSet(4, UIWindow.TITLE_LABEL_HEIGHT + 36, w-9, 20)).setOptions(new String[] { "A", "COMP", "B" }).setValue("COMP").addToContainer(this); } @@ -86,8 +83,9 @@ class UIEffects extends UIWindow { int yp = UIWindow.TITLE_LABEL_HEIGHT; List items = new ArrayList(); - for (LXEffect fx : glucose.lx.getEffects()) { - items.add(new FXScrollItem(fx)); + int i = 0; + for (LXEffect fx : effectsArr) { + items.add(new FXScrollItem(fx, i++)); } final UIScrollList effectsList = new UIScrollList(1, yp, w-2, 60).setItems(items); effectsList.addToContainer(this); @@ -99,10 +97,10 @@ class UIEffects extends UIWindow { parameterKnobs[ki].addToContainer(this); } - GLucose.EffectListener fxListener = new GLucose.EffectListener() { - public void effectSelected(LXEffect effect) { + LXParameterListener fxListener = new LXParameterListener() { + public void onParameterChanged(LXParameter parameter) { int i = 0; - for (LXParameter p : effect.getParameters()) { + for (LXParameter p : getSelectedEffect().getParameters()) { if (i >= parameterKnobs.length) { break; } @@ -116,19 +114,21 @@ class UIEffects extends UIWindow { } }; - glucose.addEffectListener(fxListener); - fxListener.effectSelected(glucose.getSelectedEffect()); + selectedEffect.addListener(fxListener); + fxListener.onParameterChanged(null); } class FXScrollItem extends UIScrollList.AbstractItem { - private LXEffect effect; - private String label; + private final LXEffect effect; + private final int index; + private final String label; - FXScrollItem(LXEffect effect) { + FXScrollItem(LXEffect effect, int index) { this.effect = effect; - label = className(effect, "Effect"); + this.index = index; + this.label = className(effect, "Effect"); } public String getLabel() { @@ -136,7 +136,7 @@ class UIEffects extends UIWindow { } public boolean isSelected() { - return !effect.isEnabled() && (glucose.getSelectedEffect() == effect); + return !effect.isEnabled() && (effect == getSelectedEffect()); } public boolean isPending() { @@ -144,14 +144,14 @@ class UIEffects extends UIWindow { } public void onMousePressed() { - if (glucose.getSelectedEffect() == effect) { + if (effect == getSelectedEffect()) { if (effect.isMomentary()) { effect.enable(); } else { effect.toggle(); } } else { - glucose.setSelectedEffect(effect); + selectedEffect.setValue(index); } } @@ -471,7 +471,7 @@ class UIMidi extends UIWindow { } public LXDeck getFocusedDeck() { - return lx.engine.getDeck(deckMode.getValue() == "A" ? GLucose.LEFT_DECK : GLucose.RIGHT_DECK); + return lx.engine.getDeck(deckMode.getValue() == "A" ? LEFT_DECK : RIGHT_DECK); } } diff --git a/code/GLucose.jar b/code/GLucose.jar deleted file mode 100755 index e1b6aa6..0000000 Binary files a/code/GLucose.jar and /dev/null differ