X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=AlexGreen.pde;h=91ed1411a16bae8a9e1adec007bcb4d1c84c9520;hb=e88f9c30a0bf121453d67a4dfcc7e2a709fc9ea8;hp=e3897cfe8045ebfb8752cb0975995f62f362f02a;hpb=1c44211b1a15965afee7056a2f1d43a1306df61b;p=SugarCubes.git diff --git a/AlexGreen.pde b/AlexGreen.pde index e3897cf..91ed141 100644 --- a/AlexGreen.pde +++ b/AlexGreen.pde @@ -1,22 +1,28 @@ class SineSphere extends SCPattern { - private SawLFO yrot = new SawLFO(0, TWO_PI, 3000); - private SawLFO yrot2 = new SawLFO(0, -TWO_PI, 8000); + + private BasicParameter yrotspeed = new BasicParameter("yspeed", 3000, 1, 10000); + private BasicParameter yrot2speed = new BasicParameter("y2speed", 8000, 1, 15000); + private BasicParameter yrot3speed = new BasicParameter("y3speed", 1400, 1, 15000); + private BasicParameter vibrationrate = new BasicParameter("vib", 1000, 1, 10000); + private SawLFO yrot = new SawLFO(0, TWO_PI, yrotspeed); + private SawLFO yrot2 = new SawLFO(0, -TWO_PI, yrot2speed); + private SawLFO yrot3 = new SawLFO(0, -TWO_PI, yrot3speed); 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); + private int cur = 0; + public final LXProjection sinespin; + public final LXProjection sinespin2; + public final LXProjection sinespin3; + float modelrad = sqrt((model.xMax)*(model.xMax) + (model.yMax)*(model.yMax) + (model.zMax)*(model.zMax)); + Pick Sshape; + 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); - 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 { @@ -51,10 +57,10 @@ class SineSphere extends SCPattern { 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(ybounce= new SinLFO(model.yMax/3, 2*model.yMax/3, 240000)).trigger(); //bounce.modulateDurationBy //addModulator(bounceamp); //ybounce.setMagnitude(bouncerate); - addModulator( vibration = new SinLFO(vibration_min , vibration_max, 10000)).trigger(); //vibration.setPeriod(240000/lx.tempo.bpm()); + addModulator( vibration = new SinLFO(vibration_min , vibration_max, 30000)).trigger(); //vibration.setPeriod(240000/lx.tempo.bpm()); } @@ -85,8 +91,7 @@ class SineSphere extends SCPattern { void setVibrationPeriod(double period){ // to-do: make this conditional upon time signature -vibration.setPeriod(period); - +this.vibration.setPeriod(period); } @@ -104,8 +109,8 @@ float distfromcirclecenter(float px, float py, float pz, float f1x, float f1y, f //if (q.x > f1xcenter ) {return 140 ;} //else {return 250;} } - color spheryvalue (PVector p, float f1xcenter, float f1ycenter, float f1zcenter) { - circlecenter.set(f1xcenter, f1ycenter, f1zcenter); + color spheryvalue (PVector p) { + circlecenter.set(this.f1xcenter, this.f1ycenter, this.f1zcenter); //switch(sShpape.cur() ) {} @@ -155,19 +160,33 @@ channel=note.getChannel(); return true; } +public boolean gridPressed(int row, int col) { + pitch = row; channel = col; + cur = NumApcCols*(pitch-53)+col; +//setState(row, col, 0 ? 1 : 0); +return true; +} + +//public grid final Sphery[] spherys; SineSphere(GLucose glucose) { super(glucose); - sinespin = new Projection(model); - sinespin2 = new Projection(model); + sinespin = new LXProjection(model); + sinespin2 = new LXProjection(model); + sinespin3= new LXProjection(model); addParameter(huespread); + addParameter(vibrationrate); addParameter(rotationx); addParameter(rotationy); addParameter(rotationz); + addParameter(yrotspeed); + addParameter(yrot2speed); + addParameter(yrot3speed); addModulator(yrot).trigger(); addModulator(yrot2).trigger(); + addModulator(yrot3).trigger(); //addParameter(huespread); //Sshape = addPick("Shape", , 1); @@ -176,8 +195,8 @@ final Sphery[] spherys; 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(.7*model.xMax, .65*model.yMax, .5*model.zMax, modelrad/14, modelrad/7, 3500), + new Sphery(.75*model.xMax, .8*model.yMax, .7*model.zMax, modelrad/20, modelrad/10, 2000), new Sphery(model.xMax/2, model.yMax/2, model.zMax/2, modelrad/4, modelrad/8, 2300), }; @@ -204,37 +223,37 @@ final Sphery[] spherys; // } 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); + float t = lx.tempo.rampf(); + float bpm = lx.tempo.bpmf(); + + + // switch (cur) { - switch (pitch) - { - case 53: t = .5*t; bpm = .5*bpm; break; + // case 1: t = map(.5*t ,0,.5, 0,1); bpm = .5*bpm; break; - case 54: t = t; bpm = bpm; break; + // case 2: t = t; bpm = bpm; break; - case 55: t = 2*t; bpm = 2*bpm; break; + // case 3: t = map(2*t,0,2,0,1); bpm = 2*bpm; break; - default: t= t; bpm = bpm; + // default: t= t; bpm = bpm; + // } - - } - + //switch(sphery.colorscheme) + for ( Sphery s: spherys){ - s.setVibrationPeriod(480000/bpm); - s.vibration.setBasis(t); - } - sinespin.reset(model) + + //s.vibration.setBasis(t); + s.setVibrationPeriod(vibrationrate.getValuef()); + - - // Translate so the center of the car is the origin, offset - .translateCenter(model, 0, 0, 0) - // .scale(1.3,1.3,1.3) + } + + + sinespin.reset() + // Translate so the center of the car is the origin, offset + .center() + // .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); @@ -243,35 +262,48 @@ final Sphery[] spherys; - for (Coord p: sinespin) - // for (Point p: model.points) + for (LXVector 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); + c = blendIfColor(c, spherys[1].spheryvalue(P), ADD); + c = blendIfColor(c, spherys[0].spheryvalue(P), ADD); + c = blendIfColor(c, spherys[2].spheryvalue(P),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); + sinespin2.reset() + .center() + .rotate(yrot2.getValuef(), rotationx.getValuef(), rotationy.getValuef() , rotationz.getValuef()) + .translate(model.cx,model.cy,model.cz); - for (Coord p: sinespin2) + for (LXVector 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); + c = blendIfColor(c, spherys[3].spheryvalue(P),ADD); colors[p.index] = blendIfColor(colors[p.index], c , ADD); } + sinespin3.reset() + .center() + .rotate(yrot3.getValuef(),-1 + rotationx.getValuef(), rotationy.getValuef(), rotationz.getValuef()) + .translate(model.cx, model.cy, model.cz); + for (LXVector p: sinespin3) + { 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[4].spheryvalue(P),ADD); + + colors[p.index] = blendIfColor(colors[p.index], c , ADD); + + } @@ -330,17 +362,7 @@ for (int i = 0; i < model.cubes.size(); i++){ //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 + " "); - +PVector cubecenter = new PVector(c.cx, c.cy, c.cz); return cubecenter; } @@ -353,7 +375,7 @@ float cfloor = c.y; // if (i%3 == 0){ -// for (Point p : c.points ){ +// 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); @@ -362,7 +384,7 @@ float cfloor = c.y; // else if (i%3 == 1) { -// for (Point p: c.points){ +// for (LXPoint p: c.points){ // colors[p.index]=color(0,0,0); // float dif = (p.y - c.y); // // colors[p.index] = @@ -373,7 +395,7 @@ float cfloor = c.y; // } // else if (i%3 == 2){ // centerlist[i].sub(cubeorigin(i); - for (Point p: c.points) { + 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), ); @@ -401,7 +423,7 @@ HueTestHSB(GLucose glucose) { } void run(double deltaMs){ - for (Point p : model.points) { + 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;