X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=blobdiff_plain;f=AlexGreen.pde;h=3e164d8bff34509891657cf09d585d69026c3f8a;hp=71d385ac46e78f4f59092b8f647c7c69bf249eef;hb=8f4e6c99775f2724edf3cec488860eb68b06491c;hpb=1a92d73ad74318a7f0bbd6581ebfc12721a48487 diff --git a/AlexGreen.pde b/AlexGreen.pde index 71d385a..3e164d8 100644 --- a/AlexGreen.pde +++ b/AlexGreen.pde @@ -1,14 +1,16 @@ -class SineSphere extends SCPattern { - - private BasicParameter yrotspeed = new BasicParameter("yspeed", 3000, 0, 10000); - private BasicParameter yrot2speed = new BasicParameter("y2speed", 8000, 0, 15000); - private BasicParameter yrot3speed = new BasicParameter("y3speed", 900, 0, 15000); - private BasicParameter vibrationrate = new BasicParameter("vib", 1000, 0, 10000); - private SawLFO yrot = new SawLFO(0, TWO_PI, yrotspeed.getValuef()); - private SawLFO yrot2 = new SawLFO(0, -TWO_PI, yrot2speed.getValuef()); - private SawLFO yrot3 = new SawLFO(0, -TWO_PI, yrot3speed.getValuef()); +class SineSphere extends APat { + float modelrad = sqrt((model.xMax)*(model.xMax) + (model.yMax)*(model.yMax) + (model.zMax)*(model.zMax)); + private BasicParameter yrotspeed = new BasicParameter("yspeed", 3000, 1, 10000); + private BasicParameter yrot2speed = new BasicParameter("y2speed", 4000, 1, 15000); + private BasicParameter yrot3speed = new BasicParameter("y3speed", 1400, 1, 15000); + private BasicParameter vibrationrate = new BasicParameter("vib", 3000, 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); + 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; @@ -16,8 +18,8 @@ class SineSphere extends SCPattern { 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; + + Pick Galaxy, STime; public BasicParameter rotationx = new BasicParameter("rotx", 0, 0, 1 ); public BasicParameter rotationy = new BasicParameter("roty", 1, 0, 1); @@ -28,42 +30,55 @@ class SineSphere extends SCPattern { 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 surfacewave; + private SinLFO xbounce; public SinLFO ybounce; private SinLFO zbounce; - float vibration_min, vibration_max, vperiod; + float vibration_magnitude, vperiod, radius, vibration_min, vibration_max; //public BasicParameter huespread; public BasicParameter bouncerate; public BasicParameter bounceamp; public BasicParameter vibrationrate; - public final PVector circlecenter = new PVector(); + public final PVector circlecenter; - public Sphery(float f1xcenter, float f1ycenter, float f1zcenter, float vibration_min, float vibration_max, 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.vibration_min = vibration_min; - this.vibration_max = vibration_max; + 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(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(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); - addModulator( vibration = new SinLFO(vibration_min , vibration_max, 30000)).trigger(); //vibration.setPeriod(240000/lx.tempo.bpm()); + addModulator( vibration = new SinLFO( this.radius - vibration_magnitude , this.radius + vibration_magnitude, vperiod)).trigger(); //vibration.setPeriod(240000/lx.tempo.bpm()); + } + // 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.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()); + + // } + //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) @@ -86,7 +101,7 @@ class SineSphere extends SCPattern { // } - +public int c1c (float a) { return round(100*constrain(a,0,1)); } void setVibrationPeriod(double period){ // to-do: make this conditional upon time signature @@ -94,6 +109,12 @@ void setVibrationPeriod(double period){ this.vibration.setPeriod(period); } +void setVibrationMagnitude(double mag){ +//to-do: make this optionally conditional upon decibel volume, frequency spectrum) +this.vibration.setRange(-mag,mag); + +} + float distfromcirclecenter(float px, float py, float pz, float f1x, float f1y, float f1z) { @@ -103,20 +124,28 @@ float distfromcirclecenter(float px, float py, float pz, float f1x, float f1y, f float quadrant(PVector q) { 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, 160-huespread.getValuef(), 240 +huespread.getValuef()); + return map(qtheta, -PI/2, PI/2, 200-huespread.getValuef(), 240+huespread.getValuef()); //if (q.x > f1xcenter ) {return 140 ;} //else {return 250;} } + + // float noisesat(PVector q) { + + + // return noise() + + // } color spheryvalue (PVector p) { circlecenter.set(this.f1xcenter, this.f1ycenter, this.f1zcenter); //switch(sShpape.cur() ) {} - float b = max(0, 100 - 100*widthparameter.getValuef()*abs(p.dist(circlecenter) - - vibration.getValuef() ) ); + float b = max(0, 100 - widthparameter.getValuef()*abs(p.dist(circlecenter) + - vibration.getValuef()) ); if (b <= 0) { return 0; @@ -124,8 +153,9 @@ float distfromcirclecenter(float px, float py, float pz, float f1x, float f1y, f return lx.hsb( constrain(quadrant(p), 0, 360), - 80, - b + // 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) @@ -138,34 +168,29 @@ float distfromcirclecenter(float px, float py, float pz, float f1x, float f1y, f - 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(); +boolean noteOn(Note note) { + int row = note.getPitch(), col = note.getChannel(); + // if (row == 57) {KeyPressed = col; return true; } + return super.noteOn(note); + } -// return true; +// public boolean noteOn(Note note) { +// pitch= note.getPitch(); +// velocity=note.getVelocity(); +// channel=note.getChannel(); +// return true; // } -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); -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; @@ -173,31 +198,45 @@ final Sphery[] spherys; SineSphere(GLucose glucose) { super(glucose); + println("modelrad " + modelrad); sinespin = new LXProjection(model); sinespin2 = new LXProjection(model); sinespin3= new LXProjection(model); addParameter(huespread); addParameter(vibrationrate); + addParameter(widthparameter); addParameter(rotationx); addParameter(rotationy); addParameter(rotationz); addParameter(yrotspeed); addParameter(yrot2speed); addParameter(yrot3speed); + addParameter(vibration_magnitude); + addParameter(scale); addModulator(yrot).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" }); - //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(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(.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(.8*model.xMax, .8*model.yMax, .7*model.zMax, modelrad/14, modelrad/7, 3500), - 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), }; } @@ -225,19 +264,20 @@ final Sphery[] spherys; public void run( double deltaMs) { float t = lx.tempo.rampf(); float bpm = lx.tempo.bpmf(); - - + float scalevalue = scale.getValuef(); + int spherytime= STime.Cur(); + - // switch (cur) { + switch (spherytime) { - // case 1: 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 2: t = t; bpm = bpm; break; + case 1: t = t; bpm = bpm; break; - // case 3: 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) @@ -245,7 +285,7 @@ final Sphery[] spherys; //s.vibration.setBasis(t); s.setVibrationPeriod(vibrationrate.getValuef()); - + // s.setVibrationMagnitude(vibration_magnitude.getValuef()); } @@ -253,7 +293,7 @@ final Sphery[] spherys; sinespin.reset() // Translate so the center of the car is the origin, offset .center() - // .scale(1.3,1.3,1.3) + .scale(scalevalue, scalevalue, scalevalue) // 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); @@ -279,6 +319,7 @@ final Sphery[] spherys; } sinespin2.reset() .center() + .scale(scalevalue,scalevalue,scalevalue) .rotate(yrot2.getValuef(), rotationx.getValuef(), rotationy.getValuef() , rotationz.getValuef()) .translate(model.cx,model.cy,model.cz); @@ -293,7 +334,8 @@ final Sphery[] spherys; } sinespin3.reset() .center() - .rotate(yrot3.getValuef(), -1 + rotationx.getValuef(), rotationy.getValuef(), rotationz.getValuef()) + .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; @@ -307,6 +349,10 @@ final Sphery[] spherys; + + + + } color blendIfColor(color c1, color c2, int mode) { @@ -332,6 +378,140 @@ final Sphery[] spherys; // } } +/*This just takes all of Dan Horwitz's code that I want to inherit and leaves the rest behind. + 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); + 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; + picks.add(P); + return P; + } + + boolean noteOff(Note note) { + int row = note.getPitch(), col = note.getChannel(); + for (int i=0; i= 0.55) { + return raw - 0.05; + } + return 0.5; + } + + void setAPCOutput(MidiOutput output) { + APCOut = output; + } + + void updateLights() { if (APCOut == null) return; + for (int i = 0; i < NumApcRows; ++i) + for (int j = 0; j < 8; ++j) APCOut.sendNoteOn(j, 53+i, 0); + for (int i=0; i 100) return; + + if (this == midiEngine.getFocusedDeck().getActivePattern()) { + String Text1="", Text2=""; + for (int i=0; i