repositories
/
SugarCubes.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
251dcf2
)
sinesphere
author
Alexander Green
<alexandergreen22@gmail.com>
Fri, 22 Nov 2013 22:09:00 +0000
(14:09 -0800)
committer
Alexander Green
<alexandergreen22@gmail.com>
Fri, 22 Nov 2013 22:09:00 +0000
(14:09 -0800)
AlexGreen.pde
patch
|
blob
|
blame
|
history
diff --git
a/AlexGreen.pde
b/AlexGreen.pde
index 99a71df8815353bb45c9ee795c25e7d720d45dee..e44ff70077c54c1c1682fdd5ffd022719da1a819 100644
(file)
--- a/
AlexGreen.pde
+++ b/
AlexGreen.pde
@@
-61,7
+61,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(ybounce= new SinLFO(model.yMax/3, 2*model.yMax/3, 240000)).trigger(); //bounce.modulateDurationBy
//addModulator(bounceamp); //ybounce.setMagnitude(bouncerate);
- addModulator( vibration = new SinLFO( modelrad/1
0 - vibration_magnitude , modelrad/10
+ vibration_magnitude, vperiod)).trigger(); //vibration.setPeriod(240000/lx.tempo.bpm());
+ addModulator( vibration = new SinLFO( modelrad/1
5 - vibration_magnitude , modelrad/15
+ vibration_magnitude, vperiod)).trigger(); //vibration.setPeriod(240000/lx.tempo.bpm());
}
}
@@
-100,7
+100,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
void setVibrationPeriod(double period){
// to-do: make this conditional upon time signature
@@
-129,6
+129,13
@@
float distfromcirclecenter(float px, float py, float pz, float f1x, float f1y, f
//if (q.x > f1xcenter ) {return 140 ;}
//else {return 250;}
}
//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);
color spheryvalue (PVector p) {
circlecenter.set(this.f1xcenter, this.f1ycenter, this.f1zcenter);