From: Alexander Green Date: Wed, 16 Oct 2013 14:05:30 +0000 (-0700) Subject: cubecurl X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=b30f14fdacdcccafe123e00f20a4d6df46e6995c;p=SugarCubes.git cubecurl --- diff --git a/AlexGreen.pde b/AlexGreen.pde index f63fb49..fdd88f0 100755 --- a/AlexGreen.pde +++ b/AlexGreen.pde @@ -96,7 +96,7 @@ final Sphery[] spherys; SineSphere(GLucose glucose) { super(glucose); - //Sshape = addPick("Shape", 0, 1); + //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), @@ -172,7 +172,9 @@ final Sphery[] spherys; } class CubeCurl extends SCPattern{ -float CH, CW; +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); @@ -183,25 +185,32 @@ addModulator(curl).trigger(); addModulator(bg).trigger(); this.CH = Cube.EDGE_HEIGHT; this.CW = Cube.EDGE_WIDTH; -final float diag = sqrt(CH*CH + CW*CW + CW*CW); -ArrayList centerlist = new ArrayList(); + this.diag = sqrt(CH*CH + 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(centerofcube(i)); - } + +} } //there is definitely a better way of doing this! PVector centerofcube(int i) { Cube c = model.cubes.get(i); -PVector cubeorigin = new PVector(c.x, c.y, c.z); -PVector cubecenter = new PVector(c.x+ CW/2, c.y + CH/2, c.z + CW/2); 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( cubeangle.x + cubeangle.y + cubeangle.z); -PVector cubecenterf = new PVector(cubecenter.x + tan(c.rx)*CW/2, cubecenter.y + tan(c.ry)*CH/2, cubecenter.z + tan(c.rz)*CW/2); - -return cubecenterf; +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 ); +return cubecenter; } @@ -222,7 +231,7 @@ for (Point p : c.points ){ else if (i%3 == 1) { for (Point p: c.points){ - colors[p.index]=color(0,0,0); + colors[p.index]=color(0,0,0); float dif = (p.y - c.y); // colors[p.index] = // color(bg.getValuef(), @@ -231,14 +240,17 @@ else if (i%3 == 1) { } } else if (i%3 == 2){ + // centerlist[i].sub(cubeorigin(i); for (Point 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(centerlist[i].x, 0, 360), constrain(centerlist[i].y, 0, 100), ); - } + } -} + } } } diff --git a/SugarCubes.pde b/SugarCubes.pde index a89368c..c4d5aa7 100644 --- a/SugarCubes.pde +++ b/SugarCubes.pde @@ -26,7 +26,7 @@ LXPattern[] patterns(GLucose glucose) { return new LXPattern[] { - new CubeCurl(glucose), + // Slee new Swarm(glucose), new ViolinWave(glucose), @@ -51,6 +51,7 @@ LXPattern[] patterns(GLucose glucose) { // Alex G new SineSphere(glucose), + new CubeCurl(glucose), // Shaheen new HelixPattern(glucose).setEligible(false), diff --git a/_Mappings.pde b/_Mappings.pde index b702319..94d50bb 100644 --- a/_Mappings.pde +++ b/_Mappings.pde @@ -56,7 +56,7 @@ public Model buildModel() { // Single cubes can be constructed directly here if you need them Cube[] singleCubes = new Cube[] { // new Cube(15, int( Cube.EDGE_HEIGHT), 39, 0, 10, 0, WRL), // Back left channel behind speaker - // new Cube(x, y, z, rx, ry, rz, wiring), + //new Cube(0, 0, 0, 0, 45, rz, wiring), }; // The bass box!