From: greena1re Date: Thu, 27 Feb 2014 10:40:29 +0000 (-0800) Subject: Merge branch 'master' into newmaster X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=commitdiff_plain;h=dab0c644cfeb7e21f73d0189e6085c33bc46299a;hp=4a6fef0116ebcb73dc3b2bffd87225bab8bd693d Merge branch 'master' into newmaster --- diff --git a/AlexGreen.pde b/AlexGreen.pde index 54af5c0..61754b1 100644 --- a/AlexGreen.pde +++ b/AlexGreen.pde @@ -11,15 +11,15 @@ class SineSphere extends APat { public BasicParameter widthparameter= new BasicParameter("Width", 20, 1, 60); public BasicParameter vibration_magnitude = new BasicParameter("Vmag", 20, 2, modelrad/2); public BasicParameter scale = new BasicParameter("Scale", 1, .1, 5); - private int pitch = 0; - private int channel = 0; - private int velocity = 0; - private int cur = 0; - public final LXProjection sinespin; + private int pitch = 0; + private int channel = 0; + private int velocity = 0; + private int cur = 0; + public final LXProjection sinespin; public final LXProjection sinespin2; public final LXProjection sinespin3; - Pick Galaxy, STime; + Pick Galaxy, STime; public BasicParameter rotationx = new BasicParameter("rotx", 0, 0, 1 ); public BasicParameter rotationy = new BasicParameter("roty", 1, 0, 1); @@ -29,8 +29,8 @@ class SineSphere extends APat { class Sphery { float f1xcenter, f1ycenter, f1zcenter, f2xcenter , f2ycenter, f2zcenter; //second three are for an ellipse with two foci - private SinLFO vibration; - private SinLFO surfacewave; + private SinLFO vibration; + private SinLFO surfacewave; private SinLFO xbounce; public SinLFO ybounce; @@ -43,22 +43,22 @@ class SineSphere extends APat { public BasicParameter vibrationrate; public final PVector circlecenter; - public Sphery(float f1xcenter, float f1ycenter, float f1zcenter, float radius, float vibration_magnitude , float vperiod) + public Sphery(float f1xcenter, float f1ycenter, float f1zcenter, float radius, float vibration_magnitude , float vperiod) { this.f1xcenter = f1xcenter; this.f1ycenter = f1ycenter; this.f1zcenter = f1zcenter; - this.radius = radius; + this.radius = radius; this.circlecenter= new PVector(f1xcenter,f1ycenter,f1zcenter); this.vibration_magnitude = vibration_magnitude; this.vperiod = vperiod; //addParameter(bounceamp = new BasicParameter("Amp", .5)); - //addParameter(bouncerate = new BasicParameter("Rate", .5)); //ybounce.modulateDurationBy(bouncerate); + //addParameter(bouncerate = new BasicParameter("Rate", .5)); //ybounce.modulateDurationBy(bouncerate); //addParameter(vibrationrate = new BasicParameter("vibration", 1000, 10000)); //addParameter(widthparameter = new BasicParameter("Width", .2)); - //addModulator(xbounce = new SinLFO(model.xMax/3, 2*model.yMax/3, 2000)).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)).trigger(); //bounce.modulateDurationBy //addModulator(bounceamp); //ybounce.setMagnitude(bouncerate); @@ -67,44 +67,44 @@ class SineSphere extends APat { } - // public Sphery(float f1xcenter, float f1ycenter, float f1zcenter, float vibration_magnitude, float vperiod) + // public Sphery(float f1xcenter, float f1ycenter, float f1zcenter, float vibration_magnitude, float vperiod) // { - // this.f1xcenter = f1xcenter; - // this.f1ycenter = f1ycenter; - // this.f1zcenter = f1zcenter; - // this.vibration_magnitude = vibration_magnitude; + // this.f1xcenter = f1xcenter; + // this.f1ycenter = f1ycenter; + // this.f1zcenter = f1zcenter; + // this.vibration_magnitude = vibration_magnitude; // this.vperiod = vperiod; - // addModulator(ybounce= new SinLFO(model.yMax/3, 2*model.yMax/3, 240000)).trigger(); //bounce.modulateDurationBy - // addModulator( vibration = new SinLFO( modelrad/10 - vibration_magnitude , modelrad/10 + vibration_magnitude, vperiod)).trigger(); //vibration.setPeriod(240000/lx.tempo.bpm()); + // addModulator(ybounce= new SinLFO(model.yMax/3, 2*model.yMax/3, 240000)).trigger(); //bounce.modulateDurationBy + // addModulator( vibration = new SinLFO( modelrad/10 - vibration_magnitude , modelrad/10 + vibration_magnitude, vperiod)).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) +// 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)); +// { +// 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)); // } -public int c1c (float a) { return round(100*constrain(a,0,1)); } +public int c1c (float a) { return round(100*constrain(a,0,1)); } void setVibrationPeriod(double period){ -// to-do: make this conditional upon time signature +// to-do: make this conditional upon time signature this.vibration.setPeriod(period); } @@ -116,33 +116,33 @@ this.vibration.setRange(-mag,mag); } -float distfromcirclecenter(float px, float py, float pz, float f1x, float f1y, float f1z) +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) ); - float qphi = acos( (q.z-f1zcenter)/(PVector.dist(q,circlecenter)) ); + float qtheta = atan2( (q.x-f1xcenter) , (q.z - f1zcenter) ); + float qphi = acos( (q.z-f1zcenter)/(PVector.dist(q,circlecenter)) ); return map(qtheta, -PI/2, PI/2, 200-huespread.getValuef(), 240+huespread.getValuef()); //if (q.x > f1xcenter ) {return 140 ;} - //else {return 250;} + //else {return 250;} } // float noisesat(PVector q) { - // return noise() + // return noise() // } color spheryvalue (PVector p) { - circlecenter.set(this.f1xcenter, this.f1ycenter, this.f1zcenter); + circlecenter.set(this.f1xcenter, this.f1ycenter, this.f1zcenter); -//switch(sShpape.cur() ) {} +//switch(sShpape.cur() ) {} float b = max(0, 100 - widthparameter.getValuef()*abs(p.dist(circlecenter) - vibration.getValuef()) ); @@ -156,49 +156,49 @@ float distfromcirclecenter(float px, float py, float pz, float f1x, float f1y, f // constrain(100*noise(quadrant(p)), 0, 100), 100, 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) , +//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() ) ) ) ; + abs( (dist(px, py, pz, f1xc, ybounce.getValuef(), f1zc) + + (dist(px, py , pz, f2xc, ybounce.getValuef(), f2zc) ) )/2 + - 1.2*vibration.getValuef() ) ) ) ; } -} +} boolean noteOn(Note note) { int row = note.getPitch(), col = note.getChannel(); - // if (row == 57) {KeyPressed = col; return true; } + // if (row == 57) {KeyPressed = col; return true; } return super.noteOn(note); } -// public boolean noteOn(Note note) { -// pitch= note.getPitch(); +// public boolean noteOn(Note note) { +// pitch= note.getPitch(); // velocity=note.getVelocity(); // 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); +// pitch = row; channel = col; +// cur = NumApcCols*(pitch-53)+col; +// //setState(row, col, 0 ? 1 : 0); // return true; // } //public grid final Sphery[] spherys; - SineSphere(LX lx) + SineSphere(LX lx) { super(lx); - println("modelrad " + modelrad); + println("modelrad " + modelrad); sinespin = new LXProjection(model); sinespin2 = new LXProjection(model); sinespin3= new LXProjection(model); @@ -214,7 +214,7 @@ final Sphery[] spherys; addParameter(vibration_magnitude); addParameter(scale); addModulator(yrot).trigger(); - addModulator(yrot2).trigger(); + addModulator(yrot2).trigger(); addModulator(yrot3).trigger(); //Galaxy = addPick("Galaxy", 1, 3, new String[] {"home", "vertical","single","aquarium"}); STime =addPick("Time", 1, 4, new String[]{"half", "triplet", "beat", "2x", "3x" }); @@ -222,36 +222,47 @@ final Sphery[] spherys; spherys = new Sphery[] { new Sphery(model.xMax/4, model.yMax/2, model.zMax/2, modelrad/12, modelrad/25, 3000), new Sphery(.75*model.xMax, model.yMax/2, model.zMax/2, modelrad/14, modelrad/28, 2000), - new Sphery(model.cx, model.cy, model.cz, modelrad/5, modelrad/15, 2300), + new Sphery(model.cx, model.cy, model.cz, modelrad/5, modelrad/15, 2300), new Sphery(.7*model.xMax, .65*model.yMax, .5*model.zMax, modelrad/11, modelrad/25, 3500), new Sphery(.75*model.xMax, .8*model.yMax, .7*model.zMax, modelrad/12, modelrad/30, 2000) - - }; + + + + + // 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(.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), + + }; } // 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); -// } -// } -// } +// 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); +// } +// } +// } public void run( double deltaMs) { - float t = lx.tempo.rampf(); + float t = lx.tempo.rampf(); float bpm = lx.tempo.bpmf(); float scalevalue = scale.getValuef(); int spherytime= STime.Cur(); @@ -259,26 +270,28 @@ final Sphery[] spherys; switch (spherytime) { - case 0: t = map(.5*t ,0,.5, 0,1); bpm = .5*bpm; break; + case 0: t = map(.5*t ,0,.5, 0,1); bpm = .5*bpm; break; - case 1: t = t; bpm = bpm; break; + case 1: t = t; bpm = bpm; break; - case 2: t = map(2*t,0,2,0,1); bpm = 2*bpm; break; + case 2: 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.vibration.setBasis(t); s.setVibrationPeriod(vibrationrate.getValuef()); - // s.setVibrationMagnitude(vibration_magnitude.getValuef()); + // s.setVibrationMagnitude(vibration_magnitude.getValuef()); } sinespin.reset() - // Translate so the center of the car is the origin, offset + // Translate so the center of the car is the origin, offset .center() .scale(scalevalue, scalevalue, scalevalue) // Rotate around the origin (now the center of the car) about an y-vector @@ -311,21 +324,21 @@ final Sphery[] spherys; .translate(model.cx,model.cy,model.cz); for (LXVector p: sinespin2) - { color c = 0; + { 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),ADD); colors[p.index] = blendIfColor(colors[p.index], c , ADD); - } + } sinespin3.reset() .center() .scale(scalevalue,scalevalue,scalevalue) .rotate(yrot3.getValuef(),-1 + rotationx.getValuef(), rotationy.getValuef(), rotationz.getValuef()) .translate(model.cx, model.cy, model.cz); for (LXVector p: sinespin3) - { color c = 0; + { 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); @@ -350,92 +363,92 @@ final Sphery[] spherys; } - // 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; + // 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) + // // else if(spheremode ==2) // { color c = 0; - // return lx.hsb(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) ); // } - // } + // } } /*This just takes all of Dan Horwitz's code that I want to inherit and leaves the rest behind. -A work in progress. */ + A work in progress. */ public class APat extends SCPattern { - ArrayList picks = new ArrayList (); - ArrayList bools = new ArrayList (); - - PVector mMax, mCtr, mHalf; - - MidiOutput APCOut; - int nMaxRow = 53; - float LastJog = -1; - float[] xWaveNz, yWaveNz; - int nPoint , nPoints; - PVector xyzJog = new PVector(), modmin; - - float NoiseMove = random(10000); - BasicParameter pSpark, pWave, pRotX, pRotY, pRotZ, pSpin, pTransX, pTransY; - DBool pXsym, pYsym, pRsym, pXdup, pXtrip, pJog, pGrey; - - float lxh () { return lx.getBaseHuef(); } - int c1c (float a) { return round(100*constrain(a,0,1)); } - float interpWv(float i, float[] vals) { return interp(i-floor(i), vals[floor(i)], vals[ceil(i)]); } - void setNorm (PVector vec) { vec.set(vec.x/mMax.x, vec.y/mMax.y, vec.z/mMax.z); } - void setRand (PVector vec) { vec.set(random(mMax.x), random(mMax.y), random(mMax.z)); } - void setVec (PVector vec, LXPoint p) { vec.set(p.x, p.y, p.z); } - void interpolate(float i, PVector a, PVector b) { a.set(interp(i,a.x,b.x), interp(i,a.y,b.y), interp(i,a.z,b.z)); } - void StartRun(double deltaMs) { } - float val (BasicParameter p) { return p.getValuef(); } - color CalcPoint(PVector p) { return lx.hsb(0,0,0); } - color blend3(color c1, color c2, color c3) { return blendColor(c1,blendColor(c2,c3,ADD),ADD); } - - void rotateZ (PVector p, PVector o, float nSin, float nCos) { p.set( nCos*(p.x-o.x) - nSin*(p.y-o.y) + o.x , nSin*(p.x-o.x) + nCos*(p.y-o.y) + o.y,p.z); } - void rotateX (PVector p, PVector o, float nSin, float nCos) { p.set(p.x,nCos*(p.y-o.y) - nSin*(p.z-o.z) + o.y , nSin*(p.y-o.y) + nCos*(p.z-o.z) + o.z ); } - void rotateY (PVector p, PVector o, float nSin, float nCos) { p.set( nSin*(p.z-o.z) + nCos*(p.x-o.x) + o.x,p.y, nCos*(p.z-o.z) - nSin*(p.x-o.x) + o.z ); } - - BasicParameter addParam(String label, double value) { BasicParameter p = new BasicParameter(label, value); addParameter(p); return p; } - - PVector vT1 = new PVector(), vT2 = new PVector(); - float calcCone (PVector v1, PVector v2, PVector c) { vT1.set(v1); vT2.set(v2); vT1.sub(c); vT2.sub(c); + ArrayList picks = new ArrayList (); + ArrayList bools = new ArrayList (); + + PVector mMax, mCtr, mHalf; + + MidiOutput APCOut; + int nMaxRow = 53; + float LastJog = -1; + float[] xWaveNz, yWaveNz; + int nPoint , nPoints; + PVector xyzJog = new PVector(), modmin; + + float NoiseMove = random(10000); + BasicParameter pSpark, pWave, pRotX, pRotY, pRotZ, pSpin, pTransX, pTransY; + DBool pXsym, pYsym, pRsym, pXdup, pXtrip, pJog, pGrey; + + float lxh () { return lx.getBaseHuef(); } + int c1c (float a) { return round(100*constrain(a,0,1)); } + float interpWv(float i, float[] vals) { return interp(i-floor(i), vals[floor(i)], vals[ceil(i)]); } + void setNorm (PVector vec) { vec.set(vec.x/mMax.x, vec.y/mMax.y, vec.z/mMax.z); } + void setRand (PVector vec) { vec.set(random(mMax.x), random(mMax.y), random(mMax.z)); } + void setVec (PVector vec, LXPoint p) { vec.set(p.x, p.y, p.z); } + void interpolate(float i, PVector a, PVector b) { a.set(interp(i,a.x,b.x), interp(i,a.y,b.y), interp(i,a.z,b.z)); } + //void StartRun(double deltaMs) { } + float val (BasicParameter p) { return p.getValuef(); } + //color CalcPoint(PVector p) { return lx.hsb(0,0,0); } + color blend3(color c1, color c2, color c3) { return blendColor(c1,blendColor(c2,c3,ADD),ADD); } + + void rotateZ (PVector p, PVector o, float nSin, float nCos) { p.set( nCos*(p.x-o.x) - nSin*(p.y-o.y) + o.x , nSin*(p.x-o.x) + nCos*(p.y-o.y) + o.y,p.z); } + void rotateX (PVector p, PVector o, float nSin, float nCos) { p.set(p.x,nCos*(p.y-o.y) - nSin*(p.z-o.z) + o.y , nSin*(p.y-o.y) + nCos*(p.z-o.z) + o.z ); } + void rotateY (PVector p, PVector o, float nSin, float nCos) { p.set( nSin*(p.z-o.z) + nCos*(p.x-o.x) + o.x,p.y, nCos*(p.z-o.z) - nSin*(p.x-o.x) + o.z ); } + + BasicParameter addParam(String label, double value) { BasicParameter p = new BasicParameter(label, value); addParameter(p); return p; } + + PVector vT1 = new PVector(), vT2 = new PVector(); + float calcCone (PVector v1, PVector v2, PVector c) { vT1.set(v1); vT2.set(v2); vT1.sub(c); vT2.sub(c); return degrees(PVector.angleBetween(vT1,vT2)); } - Pick addPick(String name, int def, int _max, String[] desc) { - Pick P = new Pick(name, def, _max+1, nMaxRow, desc); - nMaxRow = P.EndRow + 1; + Pick addPick(String name, int def, int _max, String[] desc) { + Pick P = new Pick(name, def, _max+1, nMaxRow, desc); + nMaxRow = P.EndRow + 1; picks.add(P); return P; } - boolean noteOff(Note note) { + boolean noteOff(Note note) { int row = note.getPitch(), col = note.getChannel(); for (int i=0; i 0) { - for (int i=0; i 0) {P.y += sprk*randctr(50); P.x += sprk*randctr(50); P.z += sprk*randctr(50); } - if (wvAmp > 0) P.y += interpWv(p.x-modmin.x, yWaveNz); - if (wvAmp > 0) P.x += interpWv(p.y-modmin.y, xWaveNz); - if (pJog.b) P.add(xyzJog); - - - color cNew, cOld = colors[p.index]; - { tP.set(P); cNew = CalcPoint(tP); } - if (pXsym.b) { tP.set(mMax.x-P.x,P.y,P.z); cNew = blendColor(cNew, CalcPoint(tP), ADD); } - if (pYsym.b) { tP.set(P.x,mMax.y-P.y,P.z); cNew = blendColor(cNew, CalcPoint(tP), ADD); } - 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); } - if (pGrey.b) { cNew = lx.hsb(0, 0, lx.b(cNew)); } - colors[p.index] = cNew; - } + } } @@ -544,7 +517,7 @@ 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 curl = new SinLFO(0, Cube.EDGE_HEIGHT, 5000 ); private SinLFO bg = new SinLFO(180, 220, 3000); @@ -563,11 +536,11 @@ for (int i = 0; i < model.cubes.size(); 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) { +PVector centerofcube(int i) { Cube c = model.cubes.get(i); PVector cubecenter = new PVector(c.cx, c.cy, c.cz); @@ -576,36 +549,36 @@ return cubecenter; void run(double deltaMs){ -for (int i =0; i < model.cubes.size(); i++) { +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); -// } -// } +// // 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 ); -// } -// } +// 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), ); + 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), ); } @@ -616,122 +589,6 @@ float cfloor = c.y; } } } - JGraphAdapterDemo graph1; - - -// class SpinningCube extends SCPattern{ -// LXProjection spin1, spin2, spin3; -// SawLFO - -//} - - - - - -class PixelGraph implements EdgeFactory { - -dPixel p0; dPixel p1; dVertex v0; - -public dVertex createEdge(dPixel p0, dPixel p1) { - - return v0; - -} - - -} - - class GraphTest extends SCPattern { - JGraphAdapterDemo graph1; - -GraphTest( LX lx) {super(lx); JGraphAdapterDemo graph1 = new JGraphAdapterDemo();} - - void run(double deltaMs){ - } -} - -class SpinningCube extends SCPattern{ - - LXProjection spin1, spin2, spin3; - SawLFO spinx, spiny, spinz; - SinLFO spinx1, spiny1, spinz1, cubesize; - BasicParameter xoff = new BasicParameter("xoff", 10, 0, 100); - BasicParameter toff = new BasicParameter("toff", 10,0,1000); - BasicParameter huev = new BasicParameter("hue", 200, 0, 360); - BasicParameter density = new BasicParameter("density", 0, 0, 1); - BasicParameter Vsize = new BasicParameter("size", model.xMax/3,0, model.xMax); - VirtualCube V1, V2, V3; - PVector P = new PVector(); - float noisetime=0.; - class VirtualCube { - float x,y,z,d; - PVector center; - - VirtualCube(float x, float y, float z, float d) { - this.x=x; - this.y= y; - this.z=z; - this.d=d; - this.center=new PVector(x,y,z); - } - - color getcolor(LXVector q) { - if ( q.x > this.x + d/2 || q.x < this.x - d/2 || q.y > this.y + d/2 || q.y < this.y - d/2 || q.z > this.z + d/2 || q.z < this.z - d/2 ) - {return 0;} - else { - return lx.hsb(huev.getValuef()*noise(xoff.getValuef()*.001*noisetime ) , constrain(100*noise(xoff.getValuef()*.001*q.x*noisetime), 0, 100), max(100*(noise(xoff.getValuef()*.001*q.x*noisetime)-density.getValuef()), 0) ); - } - } - void setcenter(float x, float y, float z) {this.x=x; this.y = y; this.z=z; } - void setsize(float din){ this.d=din ; } - - } - -SpinningCube(LX lx) { - super(lx); - addParameter(xoff); - addParameter(toff); - addParameter(Vsize); - addParameter(huev); - addParameter(density); - //addModulator() - V1 = new VirtualCube(model.cx, model.cy, model.cz, model.xMax/2); - spinx= new SawLFO(0, TWO_PI, 8000); - spin1 = new LXProjection(model); - -} - - -void run(double deltaMs) { - - noisetime+= deltaMs*.0001*toff.getValuef(); - -spin1.reset() -.center() -//.scale () -.rotate(spinx.getValuef(),0, 1, 0) -.translate(model.cx, model.cy, model.cz); - -for (LXVector p: spin1) { - P.set(p.x, p.y, p.z); - - colors[p.index] = V1.getcolor(p); - -} - -V1.setsize(Vsize.getValuef()); - - -}; - - -} - - - - - class HueTestHSB extends SCPattern{ BasicParameter HueT = new BasicParameter("Hue", .5); @@ -754,7 +611,7 @@ HueTestHSB(LX lx) { int now= millis(); if (now % 1000 <= 20) { - println("Hue: " + 360*HueT.getValuef() + "Sat: " + 100*SatT.getValuef() + "Bright: " + 100*BriT.getValuef()); + println("Hue: " + 360*HueT.getValuef() + "Sat: " + 100*SatT.getValuef() + "Bright: " + 100*BriT.getValuef()); } } diff --git a/DanUtil.pde b/DanUtil.pde index d2cb568..44478be 100644 --- a/DanUtil.pde +++ b/DanUtil.pde @@ -250,7 +250,7 @@ class dVertex { dVertex(Strip _s, LXPoint _p) { s = _s; ci = _p.index; } LXPoint getPoint(int i) { return s.points.get(dir>0 ? i : 15-i); } - void setOpp( dVertex _opp) { opp = _opp; dir = (ci < opp.ci ? 1 : -1); } + void setOpp(dVertex _opp) { opp = _opp; dir = (ci < opp.ci ? 1 : -1); } } //---------------------------------------------------------------------------------------------------------------------------------- class dPixel { dVertex v; int pos; dPixel(dVertex _v, int _pos) { v=_v; pos=_pos; } } diff --git a/SugarCubes.pde b/SugarCubes.pde index 227a75c..0afeefe 100644 --- a/SugarCubes.pde +++ b/SugarCubes.pde @@ -26,16 +26,6 @@ LXPattern[] patterns(LX lx) { return new LXPattern[] { - - new SineSphere(glucose), - //new CubeCurl(glucose), - // DanH - new Noise(glucose), - new Play (glucose), - new Pong (glucose), - new Worms(glucose), - - new SineSphere(lx), //new CubeCurl(lx), @@ -45,32 +35,6 @@ LXPattern[] patterns(LX lx) { new MidiMusic(lx), new Pulley(lx), - - 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 TimRaindrops(glucose), - new TimCubes(glucose), - new MultipleCubes(glucose), - - new Traktor(glucose).setEligible(false), - new BassPod(glucose).setEligible(false), - new CubeEQ(glucose).setEligible(false), - new PianoKeyPattern(glucose).setEligible(false), - - new StripBounce(glucose), - - // AntonK - //new AKPong(glucose), - new Swim(glucose), - new Balance(glucose), - - new ViolinWave(lx), new BouncyBalls(lx), new SpaceTime(lx), @@ -96,22 +60,11 @@ LXPattern[] patterns(LX lx) { new Pong (lx), new Worms(lx), - - // JR new Gimbal(lx), // Alex G - - // Tim - new TimMetronome(glucose), - new TimPlanes(glucose), - new TimPinwheels(glucose), - - // new TimTrace(glucose), - new TimSpheres(glucose), - // Tim new TimMetronome(lx), new TimPlanes(lx), @@ -135,16 +88,6 @@ LXPattern[] patterns(LX lx) { new VSTowers(lx), // Toby - - new GlitchPlasma(glucose), - new FireEffect(glucose).setEligible(false), - - new SoundRain(glucose).setEligible(false), - new SoundSpikes(glucose).setEligible(false), - new FaceSync(glucose), - - // Jack - new GlitchPlasma(lx), new FireEffect(lx).setEligible(false), new StripBounce(lx), @@ -154,7 +97,9 @@ LXPattern[] patterns(LX lx) { // Jack new Swim(lx), - new Balance(lx), // Ben + new Balance(lx), + + // Ben // new Sandbox(lx), new TowerParams(lx), new DriveableCrossSections(lx), diff --git a/_Mappings.pde b/_Mappings.pde index 7335b86..8798fb5 100644 --- a/_Mappings.pde +++ b/_Mappings.pde @@ -13,230 +13,9 @@ * when physical changes or tuning is being done to the structure. */ -<<<<<<< HEAD -final int MaxCubeHeight = 6; -final int NumBackTowers = 16; - -public Model buildModel() { - - // Shorthand helpers for specifying wiring more quickly - final Cube.Wiring WFL = Cube.Wiring.FRONT_LEFT; - final Cube.Wiring WFR = Cube.Wiring.FRONT_RIGHT; - final Cube.Wiring WRL = Cube.Wiring.REAR_LEFT; - final Cube.Wiring WRR = Cube.Wiring.REAR_RIGHT; - - // Utility value if you need the height of a cube shorthand - final float CH = Cube.EDGE_HEIGHT; - final float CW = Cube.EDGE_WIDTH ; - - // Positions for the bass box - final float BBY = BassBox.EDGE_HEIGHT + BoothFloor.PLEXI_WIDTH; - final float BBX = 56; - final float BBZ = 2; - - // The model is represented as an array of towers. The cubes in the tower - // are represenented relatively. Each tower has an x, y, z reference position, - // which is typically the base cube's bottom left corner. - // - // Following that is an array of floats. A 2-d array contains an x-offset - // and a z-offset from the previous reference position. Typically the first cube - // will just be {0, 0}. Each successive cube uses the position of the previous - // cube as its reference. - // - // A 3-d array contains an x-offset, a z-offset, and a rotation about the - // y-axis. - // - // The cubes automatically increment their y-position by Cube.EDGE_HEIGHT. - - // To-Do: (Mark Slee, Alex Green, or Ben Morrow): The Cube # is determined by the order in this list. - // "raw object index" is serialized by running through towermapping and then individual cube mapping below. - // We can do better than this. The raw object index should be obvious from the code-- looking through the - // rendered simulation and counting through cubes in mapping mode is grossly inefficient. - - TowerMapping[] towerCubes = new TowerMapping[] {}; - - // 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,225,0, WRR), - }; - - // The bass box! - // BassBox bassBox = BassBox.unlitBassBox(BBX, 0, BBZ); // frame exists, no lights - BassBox bassBox = BassBox.noBassBox(); // no bass box at all - // BassBox bassBox = new BassBox(BBX, 0, BBZ); // bass box with lights - - // The speakers! - List speakers = Arrays.asList(new Speaker[] { - // Each speaker parameter is x, y, z, rotation, the left speaker comes first - // new Speaker(TRAILER_WIDTH - Speaker.EDGE_WIDTH + 8, 6, 3, -15) - }); - - - //////////////////////////////////////////////////////////////////////// - // dan's proposed lattice - ArrayList scubes = new ArrayList(); - //if (NumBackTowers != 25) exit(); - for (int i=0; i dcubes = new ArrayList(); - // for (int i=1; i<6; i++) { - // if (i>1) dcubes.add(new Cube(-6+CW*4/3*i , 0, 0, 0, 0, 0, WRR)); - // dcubes.add(new Cube(-6+CW*4/3*i+CW*2/3., CH*.5, 0, 0, 0, 0, WRR)); - // } - -float current_x_position = 0; -// scubes.add(new StaggeredTower(//tower 1 -// current_x_position, // x -// 15 , // y -// 0 , // z -// 45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) ); -// current_x_position += 25.25; -// scubes.add(new StaggeredTower(// tower 2 -// current_x_position, // x -// 0 , // y -// -10.5 , // z -// 45, 6, new Cube.Wiring[] { WFR, WFL, WRR, WRR, WFL, WRR}) ); -// current_x_position += 25.25; -// scubes.add(new StaggeredTower(//tower 3 -// current_x_position, // x -// 15 , // y -// 0, // z -// 45, 6, new Cube.Wiring[] { WRR, WFL, WRR, WRR, WFL, WRR}) ); -// current_x_position += 25.25; -// scubes.add(new StaggeredTower(//tower 4 -// current_x_position, // x -// 0, // y -// -10.5 , // z -// 45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) ); -// current_x_position += 28; -// scubes.add(new StaggeredTower(//tower 5 -// current_x_position, // x -// 15 , // y -// -4.5 , // z -// 45, 6, new Cube.Wiring[] { WRR, WFL, WRR, WFL, WRR, WFL}) ); -// current_x_position += 28; -// scubes.add(new StaggeredTower(//tower 6 -// current_x_position, // x -// 0 , // y -// -10.5, // z -// 45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) ); -// current_x_position += 25.25; -// scubes.add(new StaggeredTower(// tower 7 -// current_x_position, // x -// 15 , // y -// 0, // z -// 45, 6, new Cube.Wiring[] { WRR, WFL, WRR, WFL, WRR, WFL}) ); -// current_x_position += 25.25; -// scubes.add(new StaggeredTower(//tower 8 -// current_x_position, // x -// 0 , // y -// -10.5 , // z -// 45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) ); -// current_x_position += 25.25; -// scubes.add(new StaggeredTower(//tower 9 -// current_x_position, // x -// 15 , // y -// 0, // z -// 45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) ); -// current_x_position += 25.25; - -// //TOWERS ON DANCE FLOOR -// scubes.add(new StaggeredTower(//tower 10 -// 83.75+39+43-124.5, // x -// 0, // y -// -47.5-43, // z -// 45, 4, new Cube.Wiring[]{ WRR, WFL, WFL, WRR}) ); -// scubes.add(new StaggeredTower(//tower 11 -// 83.75, // x -// 0, // y -// -47.5, // z -// 45, 4, new Cube.Wiring[]{ WFL, WRR, WRR, WFL}) ); -// scubes.add(new StaggeredTower(//tower 12 -// 83.75+39, // x -// 0, // y -// -47.5, // z -// 45, 4, new Cube.Wiring[]{ WRR, WFL, WFL, WRR}) ); -// scubes.add(new StaggeredTower(//tower 13 -// 83.75+39+43, // x -// 0, // y -// -47.5-43, // z -// 45, 4, new Cube.Wiring[]{ WFL, WRR, WFL, WRR}) ); - -// scubes.add(new StaggeredTower(// Single cube on top of tower 4 -// 42, // x -// 112 , // y -// 72, // z -// -10, 1, new Cube.Wiring[]{ WRL}) ); - - - - - - - - ////////////////////////////////////////////////////////////////////// - // BENEATH HERE SHOULD NOT REQUIRE ANY MODIFICATION!!!! // - ////////////////////////////////////////////////////////////////////// - - // These guts just convert the shorthand mappings into usable objects - ArrayList towerList = new ArrayList(); - ArrayList tower; - Cube[] cubes = new Cube[200]; - int cubeIndex = 1; - float px, pz, ny; - for (TowerMapping tm : towerCubes) { - px = tm.x; - ny = tm.y; - pz = tm.z; - tower = new ArrayList(); - for (CubeMapping cm : tm.cubeMappings) { - tower.add(cubes[cubeIndex++] = new Cube(px = px + cm.dx, ny, pz = pz + cm.dz, 0, cm.ry, 0, cm.wiring)); - ny += Cube.EDGE_HEIGHT; - } - towerList.add(new Tower(tower)); - } - - - for (Cube cube : singleCubes) { - cubes[cubeIndex++] = cube; - } - for (Cube cube : dcubes) { - cubes[cubeIndex++] = cube; - } - for (StaggeredTower st : scubes) { - tower = new ArrayList(); - for (int i=0; i < st.n; i++) { - Cube.Wiring w = (i < st.wiring.length) ? st.wiring[i] : WRR; - tower.add(cubes[cubeIndex++] = new Cube(st.x, st.y + CH* 4/3.*i, st.z, 0, st.r, 0, w)); - } - towerList.add(new Tower(tower)); - } - - return new Model(towerList, cubes, bassBox, speakers); -} -======= static final float SPACING = 27; static final float RISER = 13.5; static final float FLOOR = 0; ->>>>>>> 21dffb1b77608cacc57382f3eb6eac3ed16054c3 /** * Definitions of tower positions. This is all that should need diff --git a/_Model.pde b/_Model.pde index ac225e3..3376246 100644 --- a/_Model.pde +++ b/_Model.pde @@ -362,4 +362,4 @@ public static class Strip extends LXModel { } } } - +