X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=AlexGreen.pde;h=e8b55cec34a6794de908f1fbacae0a0f4b8d7a7d;hb=b8bb27489db7dc687bf150576e9d9439f1fa17a6;hp=fdd88f0d20ccec2a2a597ce6dbf5accd0cd38124;hpb=b30f14fdacdcccafe123e00f20a4d6df46e6995c;p=SugarCubes.git diff --git a/AlexGreen.pde b/AlexGreen.pde old mode 100755 new mode 100644 index fdd88f0..e8b55ce --- a/AlexGreen.pde +++ b/AlexGreen.pde @@ -1,7 +1,9 @@ -class SineSphere extends DPat { +class SineSphere extends SCPattern { + private SinLFO yrot = new SinLFO(0, TWO_PI, 2000); + public final LXProjection sinespin; float modelrad = sqrt((model.xMax)*(model.xMax) + (model.yMax)*(model.yMax) + (model.zMax)*(model.zMax)); - //PVector modelcenter = new PVector(model.xMax, model.yMax, 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 @@ -16,8 +18,6 @@ class SineSphere extends DPat { public BasicParameter huespread; public BasicParameter bouncerate; public BasicParameter bounceamp; - - public Sphery(float f1xcenter, float f1ycenter, float f1zcenter, float vibration_min, float vibration_max, float vperiod) { @@ -31,14 +31,14 @@ class SineSphere extends DPat { addParameter(bouncerate = new BasicParameter("Rate", .5)); //ybounce.modulateDurationBy(bouncerate); addParameter(widthparameter = new BasicParameter("Width", .1)); addParameter(huespread = new BasicParameter("Hue", .2)); - + addModulator( vx = new SinLFO(-4000, 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(); //ybounce.modulateDurationBy //addModulator(bounceamp); //ybounce.setMagnitude(bouncerate); addModulator( vibration = new SinLFO(vibration_min , vibration_max, 240000./lx.tempo.bpm())).trigger(); //vibration.modulateDurationBy(vx); - + } public Sphery(float f1xcenter, float f1ycenter, float f1zcenter, float f2xcenter, float f2ycenter, float f2zcenter, float vibration_min, float vibration_max, float vperiod) @@ -72,22 +72,25 @@ 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 - 1.2*vibration.getValuef() ) ) ) ; } - - void run(int deltaMS) { }; +void run(double deltaMs) { + float vv = vibration.getValuef(); + float ybv = ybounce.getValuef(); + + } } @@ -96,6 +99,8 @@ final Sphery[] spherys; SineSphere(GLucose glucose) { super(glucose); + sinespin = new LXProjection(model); + addModulator(yrot).trigger(); //Sshape = addPick("Shape", , 1); spherys = new Sphery[] { new Sphery(model.xMax/4, model.yMax/2, model.zMax/2, modelrad/16, modelrad/8, 3000), @@ -125,14 +130,32 @@ final Sphery[] spherys; // } // } - void StartRun(int deltaMs) { + 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); - - + //spherys[3].run(deltaMs);] + sinespin.reset() + + // Translate so the center of the car is the origin, offset by yPos + .center() + + // Rotate around the origin (now the center of the car) about an X-vector + .rotate(yrot.getValuef(), 0, 1, 0); + + + + 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); + + colors[p.index] = lx.hsb(lx.h(c), lx.s(c), lx.b(c)); + + } + } @@ -142,15 +165,11 @@ final Sphery[] spherys; // spheremode++; // } - color CalcPoint(xyz Px) - { - // if (spheremode == 0 ) + // color CalcPoint(PVector Px) + // { + // // if (spheremode == 0 ) //{ - color c = 0; - c = blendColor(c, spherys[1].spheryvalue(Px.x, Px.y, Px.z, .75*model.xMax, model.yMax/2, model.zMax/2), ADD); - c = blendColor(c, spherys[0].spheryvalue(Px.x, Px.y, Px.z, model.xMax/4, model.yMax/4, model.zMax/2), ADD); - c = blendColor(c, spherys[2].spheryvalue(Px.x, Px.y, Px.z, model.xMax/2, model.yMax/2, model.zMax/2),ADD); - return c; + //} // else if (spheremode == 1) // { @@ -159,15 +178,15 @@ 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) ); // } - } + // } } @@ -185,7 +204,7 @@ addModulator(curl).trigger(); addModulator(bg).trigger(); this.CH = Cube.EDGE_HEIGHT; this.CW = Cube.EDGE_WIDTH; - this.diag = sqrt(CH*CH + CW*CW + CW*CW); + this.diag = sqrt(CW*CW + CW*CW); ArrayList centerlistrelative = new ArrayList(); @@ -200,16 +219,18 @@ 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" + cubeangle.x + "raw y" + cubeangle.y + "raw z" + cubeangle.z); -cubeangle.normalize(); -println( "norm"+ cubeangle.x + "norm" + cubeangle.y +"norm" + cubeangle.z); -PVector cubecenter = PVector.add(cubeorigin.get(i), PVector.mult(cubeangle, diag)); - -//PVector cubecenter = new PVector(c.x+ CW/2, c.y + CH/2, c.z + CW/2); -//println("cubecenter raw" + " : " + cubecenter.x + " " + cubecenter.y + " " + cubecenter.z ); -//PVector cubecenterf = new PVector(cubecenter.x + cos(c.ry)*CW/2, cubecenter.y , cubecenter.z - tan(c.ry) * CW/2); -//println("cubecenter angled" + " : " + cubecenterf.x + " " + cubecenterf.y + " " + cubecenterf.z ); +//println("raw x" + cubeangle.x + "raw y" + cubeangle.y + "raw z" + cubeangle.z); +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, 0, cos(c.rz)*CW/2 + sin(c.rz)*CW/2); + // nCos*(y-o.y) - nSin*(z-o.z) + o.y +cubecenter = PVector.add(cubecenter, centerrot); +println( " cubecenter.x " + cubecenter.x + " cubecenter.y " + cubecenter.y + " cubecenter.z " + cubecenter.z + " "); + + return cubecenter; } @@ -219,38 +240,38 @@ for (int i =0; i < model.cubes.size(); i++) { Cube c = model.cubes.get(i); float cfloor = c.y; -if (i%3 == 0){ +// if (i%3 == 0){ -for (Point 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); - } - } +// 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) { +// else if (i%3 == 1) { - for (Point 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){ +// 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 (Point p: c.points) { + for (LXPoint p: c.points) { PVector pv = new PVector(p.x, p.y, p.z); - colors[p.index] =color( constrain(5*pv.dist(centerlist.get(i)), 0, 360) , 50, 100 ); + 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), ); } - } + //} } } @@ -269,9 +290,9 @@ HueTestHSB(GLucose glucose) { } void run(double deltaMs){ - for (Point p : model.points) { + for (LXPoint 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(); @@ -281,4 +302,4 @@ HueTestHSB(GLucose glucose) { } } - } \ No newline at end of file + }