Merge pull request #288 from JunShern/rename-envelope

JunShern · web-flow · commit 09f822d147f2 · 2018-06-11T14:38:31.000+01:00
Rename envelope
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -76,7 +76,7 @@ module.exports = function(grunt) {
             'pulse': 'src/pulse',
             'noise': 'src/noise',
             'audioin': 'src/audioin',
-            'env': 'src/env',
+            'envelope': 'src/envelope',
             'delay': 'src/delay',
             'effect': 'src/effect',
             'panner3d' : 'src/panner3d',
diff --git a/examples/DelayNoiseEnvelope/sketch.js b/examples/DelayNoiseEnvelope/sketch.js
@@ -1,5 +1,5 @@
 /**
- *  Example: p5.Delay w/ p5.Noise, p5.Env & p5.Amplitude
+ *  Example: p5.Delay w/ p5.Noise, p5.Envelope & p5.Amplitude
  *  
  *  Click the mouse to hear the p5.Delay process a Noise Envelope.
  *  
@@ -13,7 +13,7 @@ function setup() {
   createCanvas(710, 400);
   noise = new p5.Noise('white'); // other types include 'brown' and 'pink'
 
-  // Turn down because we'll control .amp with a p5.Env
+  // Turn down because we'll control .amp with a p5.Envelope
   noise.amp(0);
 
   noise.start();
@@ -22,8 +22,8 @@ function setup() {
   delay = new p5.Delay();
   delay.process(noise, .12, .7, 2300); // tell delay to process noise
 
-  // the Env ADSR: attackTime, decayTime, sustainLevel, releaseTime
-  env = new p5.Env();
+  // the Envelope ADSR: attackTime, decayTime, sustainLevel, releaseTime
+  env = new p5.Envelope();
   env.setADSR(0.01, 0.2, 0.2, 0.1)
   env.setRange(1, 0);
 
diff --git a/examples/_polyphonic_synth/sketch.js b/examples/_polyphonic_synth/sketch.js
@@ -63,7 +63,7 @@ function PeriodicWave(params){
     this.osc.disconnect();
     this.osc.start();
 
-    this.env = new p5.Env(0.021,0.025,0.025,0.025,0.95,0.33,0.25);
+    this.env = new p5.Envelope(0.021,0.025,0.025,0.025,0.95,0.33,0.25);
     this.env.disconnect();
 
     this.filter = new p5.LowPass();
diff --git a/examples/bells_envelope_test/sketch.js b/examples/bells_envelope_test/sketch.js
@@ -56,7 +56,7 @@ function setup()
     {
       // make arrays of sine waves for each note, additive synthesis, and assign independent envelopes, amplitudes, and slight detunings for each harmonic
       osc[i][j] = new p5.SinOsc();
-      envelope[i][j] = new p5.Env();
+      envelope[i][j] = new p5.Envelope();
       if (random(0, 1) > percentWashed)
       {
         myMaxAttack = maxAttack;
diff --git a/examples/distortion/sketch.js b/examples/distortion/sketch.js
@@ -13,7 +13,7 @@ function setup() {
   fft = new p5.FFT(0, 256);
 
 
-  env = new p5.Env();
+  env = new p5.Envelope();
   env.setADSR(0.01, 0.2, 0.1, 0.3);
   env.setRange(1.0, 0.0);
 
diff --git a/examples/envAmpFreq/sketch.js b/examples/envAmpFreq/sketch.js
@@ -7,11 +7,11 @@ var osc; // this oscillator will modulate the amplitude of the carrier
 var freqEnv; // env for frequency
 
 function setup() {
-  env = new p5.Env();
+  env = new p5.Envelope();
   env.setADSR(0.01, 0.2, 0.2, 0.3);
   env.setRange(0, 1);
 
-  freqEnv = new p5.Env();
+  freqEnv = new p5.Envelope();
   freqEnv.setADSR(0.01, 0.2, 0.2, 0.3);
   freqEnv.setRange(300, 5000);
 
diff --git a/examples/envExp/sketch.js b/examples/envExp/sketch.js
@@ -34,7 +34,7 @@ function setup() {
   audioContext = getAudioContext();
 
   // Instantiate the envelope with time / value pairs
-  envelope = new p5.Env(0.1, 0.5, 0.01, 0.0, 0.0, 0.0, 0.0, 0.0);
+  envelope = new p5.Envelope(0.1, 0.5, 0.01, 0.0, 0.0, 0.0, 0.0, 0.0);
   osc.amp(0.);
   osc.start();
   myPhraseAttack = new p5.Phrase('testerAttack', makeSoundAttack, atPattern);
diff --git a/examples/envelope/sketch.js b/examples/envelope/sketch.js
@@ -45,7 +45,7 @@ function setup(){
   triOsc.amp(0);
   triOsc.start();
 
-  env = new p5.Env();
+  env = new p5.Envelope();
   env.setADSR(attackTime, decayTime, susPercent, releaseTime);
   env.setRange(attackLevel, releaseLevel);
 
diff --git a/examples/envelopeMultipleSources/sketch.js b/examples/envelopeMultipleSources/sketch.js
@@ -53,7 +53,7 @@ function setup(){
   noise.setType('brown');
   noise.start();
 
-  env = new p5.Env(attackTime, attackLevel, decayTime, decayLevel, sustainTime, sustainLevel, releaseTime);
+  env = new p5.Envelope(attackTime, attackLevel, decayTime, decayLevel, sustainTime, sustainLevel, releaseTime);
 
   // noise.amp(env);
   // triOsc.amp(env);
diff --git a/examples/envelopeOnOff/sketch.js b/examples/envelopeOnOff/sketch.js
@@ -1,5 +1,5 @@
 /**
- *  Example: Create an Envelope (p5.Env) to control oscillator amplitude.
+ *  Example: Create an Envelope (p5.Envelope) to control oscillator amplitude.
  *  Trigger the Attack portion of the envelope when the mouse is clicked.
  *  Trigger the Release when the mouse is released.
  */
@@ -35,7 +35,7 @@ function setup(){
   osc.freq(220);
   osc.start();
 
-  env = new p5.Env();
+  env = new p5.Envelope();
   env.setADSR(attackTime, decayTime, susPercent, releaseTime);
   env.setRange(attackLevel, releaseLevel);
 
diff --git a/examples/envelopeRamp/sketch.js b/examples/envelopeRamp/sketch.js
@@ -10,7 +10,7 @@ var numWaveforms = 50;
 function setup() {
   createCanvas(710, 200);
   osc = new p5.SinOsc();
-  envelope = new p5.Env(); 
+  envelope = new p5.Envelope(); 
   envelope.setADSR(.005,0.02);
   osc.amp(0.);
   osc.start();
diff --git a/examples/envelope_designer/sketch.js b/examples/envelope_designer/sketch.js
@@ -20,7 +20,7 @@ function setup() {
   var cnv = createCanvas(500, 500);
   cnv.mousePressed(playEnv);
 
-  env = new p5.Env();  
+  env = new p5.Envelope();  
   osc = new p5.Oscillator('triangle');
   osc.amp(env);
   osc.start();
diff --git a/examples/envelope_exponential_play/sketch.js b/examples/envelope_exponential_play/sketch.js
@@ -11,7 +11,7 @@ var numWaveforms = 50;
 function setup() {
   createCanvas(710, 200);
   osc = new p5.SinOsc();
-  envelope = new p5.Env(0.1, 1.0, 0.1, .5, .1, .5, .1, 0.0); // 
+  envelope = new p5.Envelope(0.1, 1.0, 0.1, .5, .1, .5, .1, 0.0); // 
   envelope.setExp(true);
   //envelope.setADSR(0.1, 1.0, 1.0, 0.2, 5.0, 0.0); //AT, AL, DT, SL, RT, RL
   osc.amp(0.);
diff --git a/examples/envelope_exponential_trig_rel/sketch.js b/examples/envelope_exponential_trig_rel/sketch.js
@@ -11,7 +11,7 @@ var numWaveforms = 50;
 function setup() {
   createCanvas(710, 200);
   osc = new p5.SinOsc();
-  envelope = new p5.Env(); 
+  envelope = new p5.Envelope(); 
   envelope.setExp(true);
   envelope.setADSR(0.1, 1.0, .1, 0.2, .01, 0.0); //AT, AL, DT, SL, RT, RL
   osc.amp(0.);
diff --git a/examples/learningProcessingExamples/07_envelope/sketch.js b/examples/learningProcessingExamples/07_envelope/sketch.js
@@ -27,7 +27,7 @@ function setup() {
   osc = new p5.SinOsc();
 
   // Instantiate the envelope with time / value pairs
-  envelope = new p5.Env(0.01, 0.5, 1, 0.5);
+  envelope = new p5.Envelope(0.01, 0.5, 1, 0.5);
 
   osc.start();
 }
diff --git a/examples/looper_simple/sketch.js b/examples/looper_simple/sketch.js
@@ -15,7 +15,7 @@ var prevTime = 0;
 
 function setup() {
   // prepare the osc and env used by playNote()
-  env = new p5.Env(0.01, 0.8, 0.2, 0);
+  env = new p5.Envelope(0.01, 0.8, 0.2, 0);
   osc = new p5.TriOsc(); // connects to master output by default
   osc.start(0);
   osc.connect();
@@ -25,7 +25,7 @@ function setup() {
   noise = new p5.Noise();
   // noise.amp(0.0);
   noise.start();
-  noiseEnv = new p5.Env(0.01, 0.5, 0.1, 0);
+  noiseEnv = new p5.Envelope(0.01, 0.5, 0.1, 0);
   noiseEnv.setInput(noise);
   // create a part with 8 spaces, where each space represents 1/16th note (default)
   part = new p5.Part(8, 1/16);
diff --git a/examples/oscillator_FMSynth/sketch.js b/examples/oscillator_FMSynth/sketch.js
@@ -17,7 +17,7 @@ function setup() {
   carrier.freq(carrierFreq);
   carrier.start();
 
-  env = new p5.Env(0.05, 1, 0.5, 0);
+  env = new p5.Envelope(0.05, 1, 0.5, 0);
   carrier.amp(env);
 
   modulator = new p5.Oscillator();
diff --git a/src/app.js b/src/app.js
@@ -12,7 +12,7 @@ define(function (require) {
   require('fft');
   require('signal');
   require('oscillator');
-  require('env');
+  require('envelope');
   require('pulse');
   require('noise');
   require('audioin');
diff --git a/src/delay.js b/src/delay.js
@@ -46,7 +46,7 @@ define(function (require) {
    *
    *    // play the noise with an envelope,
    *    // a series of fades ( time / value pairs )
-   *    env = new p5.Env(.01, 0.2, .2, .1);
+   *    env = new p5.Envelope(.01, 0.2, .2, .1);
    *  }
    *
    *  // mouseClick triggers envelope
diff --git a/src/envelope.js b/src/envelope.js
diff --git a/src/helpers.js b/src/helpers.js
diff --git a/src/master.js b/src/master.js
diff --git a/src/monosynth.js b/src/monosynth.js
diff --git a/src/soundfile.js b/src/soundfile.js
diff --git a/todo.md b/todo.md

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ function setup()`
`56`	`56`	`{`
`57`	`57`	`// make arrays of sine waves for each note, additive synthesis, and assign independent envelopes, amplitudes, and slight detunings for each harmonic`
`58`	`58`	`osc[i][j] = new p5.SinOsc();`
`59`		`- envelope[i][j] = new p5.Env();`
	`59`	`+ envelope[i][j] = new p5.Envelope();`
`60`	`60`	`if (random(0, 1) > percentWashed)`
`61`	`61`	`{`
`62`	`62`	`myMaxAttack = maxAttack;`