From: Alexander Green Date: Mon, 9 Dec 2013 08:51:23 +0000 (-0500) Subject: Merge branch 'master' of https://github.com/sugarcubes/SugarCubes X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=commitdiff_plain;h=fdb2c3cbacdba5d9527712ef7f75decea919ab32;hp=4c54ee2ce807d08dc9b6df505edc0f2e5adeec45 Merge branch 'master' of https://github.com/sugarcubes/SugarCubes --- diff --git a/AlexGreen.pde b/AlexGreen.pde index e44ff70..3e164d8 100644 --- a/AlexGreen.pde +++ b/AlexGreen.pde @@ -1,4 +1,4 @@ -class SineSphere extends SCPattern { +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); @@ -7,7 +7,7 @@ class SineSphere extends SCPattern { 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, 360); + public BasicParameter huespread = new BasicParameter("Hue", 0, 180); 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); @@ -19,7 +19,7 @@ class SineSphere extends SCPattern { public final LXProjection sinespin2; public final LXProjection sinespin3; - Pick Sshape; + Pick Galaxy, STime; public BasicParameter rotationx = new BasicParameter("rotx", 0, 0, 1 ); public BasicParameter rotationy = new BasicParameter("roty", 1, 0, 1); @@ -35,20 +35,21 @@ class SineSphere extends SCPattern { private SinLFO xbounce; public SinLFO ybounce; private SinLFO zbounce; - float vibration_magnitude, vperiod; //vibration_min; vibration_max; + 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_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.circlecenter= new PVector(f1xcenter,f1ycenter,f1zcenter); this.vibration_magnitude = vibration_magnitude; @@ -61,7 +62,7 @@ class SineSphere extends SCPattern { addModulator(ybounce= new SinLFO(model.yMax/3, 2*model.yMax/3, 240000)).trigger(); //bounce.modulateDurationBy //addModulator(bounceamp); //ybounce.setMagnitude(bouncerate); - addModulator( vibration = new SinLFO( modelrad/15 - vibration_magnitude , modelrad/15 + vibration_magnitude, vperiod)).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()); } @@ -123,9 +124,10 @@ 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, 180-huespread.getValuef(), 220+huespread.getValuef()); + return map(qtheta, -PI/2, PI/2, 200-huespread.getValuef(), 240+huespread.getValuef()); //if (q.x > f1xcenter ) {return 140 ;} //else {return 250;} } @@ -166,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; @@ -219,17 +216,16 @@ final Sphery[] spherys; 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/8, 3000), - new Sphery(.75*model.xMax, model.yMax/2, model.zMax/2, modelrad/10, 2000), - new Sphery(model.xMax/2, model.yMax/2, model.zMax/2, modelrad/5, 2300), - new Sphery(.7*model.xMax, .65*model.yMax, .5*model.zMax, modelrad/7, 3500), - new Sphery(.75*model.xMax, .8*model.yMax, .7*model.zMax, modelrad/10, 2000), - new Sphery(model.xMax/2, model.yMax/2, model.zMax/2, modelrad/4, 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) + @@ -269,18 +265,19 @@ final Sphery[] spherys; 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) @@ -352,6 +349,10 @@ final Sphery[] spherys; + + + + } color blendIfColor(color c1, color c2, int mode) { @@ -377,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