repositories
/
SugarCubes.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dbf92ce
)
Added gain parameter to soundrain
author
Toby Segaran
<tobys@tobys-macbookpro2.local>
Thu, 15 Aug 2013 18:13:50 +0000
(11:13 -0700)
committer
Toby Segaran
<tobys@tobys-macbookpro2.local>
Thu, 15 Aug 2013 18:13:50 +0000
(11:13 -0700)
TobySegaran.pde
patch
|
blob
|
blame
|
history
diff --git
a/TobySegaran.pde
b/TobySegaran.pde
index 4334ff81219e0d8bb835b851a884c97abce5b27c..08e955481951e8333d5308889a3dbcc94507d449 100644
(file)
--- a/
TobySegaran.pde
+++ b/
TobySegaran.pde
@@
-137,16
+137,23
@@
class SoundRain extends SCPattern {
private LinearEnvelope[] bandVals = null;
private float[] lightVals = null;
private int avgSize;
private LinearEnvelope[] bandVals = null;
private float[] lightVals = null;
private int avgSize;
+ private float gain = 25;
SawLFO pos = new SawLFO(0, 9, 8000);
SinLFO col1 = new SinLFO(0, model.xMax, 5000);
SawLFO pos = new SawLFO(0, 9, 8000);
SinLFO col1 = new SinLFO(0, model.xMax, 5000);
-
+ BasicParameter gainParameter = new BasicParameter("GAIN", 0.5);
public SoundRain(GLucose glucose) {
super(glucose);
addModulator(pos).trigger();
addModulator(col1).trigger();
public SoundRain(GLucose glucose) {
super(glucose);
addModulator(pos).trigger();
addModulator(col1).trigger();
+ addParameter(gainParameter);
}
}
+ public void onParameterChanged(LXParameter parameter) {
+ if (parameter == gainParameter) {
+ gain = 50*parameter.getValuef();
+ }
+ }
protected void onActive() {
if (this.fft == null) {
this.fft = new FFT(lx.audioInput().bufferSize(), lx.audioInput().sampleRate());
protected void onActive() {
if (this.fft == null) {
this.fft = new FFT(lx.audioInput().bufferSize(), lx.audioInput().sampleRate());
@@
-166,7
+173,7
@@
class SoundRain extends SCPattern {
for (int i = 0; i < avgSize; ++i) {
float value = this.fft.getAvg(i);
this.bandVals[i].setEndVal(value,40).trigger();
for (int i = 0; i < avgSize; ++i) {
float value = this.fft.getAvg(i);
this.bandVals[i].setEndVal(value,40).trigger();
- float lv = min(value*
25
,100);
+ float lv = min(value*
gain
,100);
if (lv>lightVals[i]) {
lightVals[i]=min(lightVals[i]+10,lv,100);
} else {
if (lv>lightVals[i]) {
lightVals[i]=min(lightVals[i]+10,lv,100);
} else {