p5.sound env tweaks

Author: therewasaguy

lib/addons/p5.sound.js

@@ -1943,7 +1943,7 @@ signal = function () {
    */
   p5.Signal.prototype.setValueAtTime = function (value, time) {
     value *= this._syncRatio;
-    var t = time || 0;
+    var t = time || ac.currentTime;
     this.scalar.gain.setValueAtTime(value, t);
   };
   p5.Signal.prototype.setCurrentValueNow = function () {
@@ -1954,16 +1954,16 @@ signal = function () {
     return currentVal;
   };
   p5.Signal.prototype.cancelScheduledValues = function (time) {
-    var t = time || 0;
+    var t = time || ac.currentTime;
     this.scalar.gain.cancelScheduledValues(t);
   };
   p5.Signal.prototype.linearRampToValueAtTime = function (value, endTime) {
-    var t = endTime || 0;
+    var t = endTime || ac.currentTime;
     value *= this._syncRatio;
     this.scalar.gain.linearRampToValueAtTime(value, t);
   };
   p5.Signal.prototype.exponentialRampToValueAtTime = function (value, endTime) {
-    var t = endTime || 0;
+    var t = endTime || ac.currentTime;
     value *= this._syncRatio;
     this.scalar.gain.exponentialRampToValueAtTime(value, t);
   };
@@ -1975,8 +1975,7 @@ signal = function () {
    *  @param  {[Number]} secondsFromNow Length of fade, in seconds from now
    */
   p5.Signal.prototype.fade = function (value, secondsFromNow) {
-    var s = secondsFromNow || 0;
-    var t = ac.currentTime + s + 0.01;
+    var t = secondsFromNow || ac.currentTime;
     value *= this._syncRatio;
     this.scalar.gain.linearRampToValueAtTime(value, t);
   };
@@ -2707,8 +2706,7 @@ env = function () {
     }
     var currentVal = this.control.getValue();
     this.control.cancelScheduledValues(t);
-    // this.control.fade(currentVal, now + tFromNow);
-    this.control.fade(0, t);
+    this.control.fade(currentVal, now + tFromNow);
     if (unit) {
       if (this.connection !== unit) {
         this.connect(unit);
@@ -2756,22 +2754,24 @@ env = function () {
   p5.Env.prototype.triggerAttack = function (unit, secondsFromNow) {
     var now = p5sound.audiocontext.currentTime;
     var tFromNow = secondsFromNow || 0;
-    var t = now + tFromNow;
+    var tMinus = now + tFromNow;
+    var t = tMinus + 0.03;
     this.lastAttack = t;
     if (typeof this.timeoutID === 'number') {
       window.clearTimeout(this.timeoutID);
     }
     var currentVal = this.control.getValue();
-    this.control.cancelScheduledValues(t);
-    this.control.fade(currentVal);
+    console.log(currentVal);
+    this.control.cancelScheduledValues(tMinus);
+    this.control.fade(currentVal, t);
     if (unit) {
       if (this.connection !== unit) {
         this.connect(unit);
       }
     }
     // if unit is an oscillator, set its amp to 0 and start it
     if (this.connection && this.connection instanceof p5.Oscillator) {
-      if (this.connection.started) {
+      if (!this.connection.started) {
         this.connection.stop();
       }
     }
@@ -2797,42 +2797,49 @@ env = function () {
    *  @param  {Number} secondsFromNow time to trigger the release
    */
   p5.Env.prototype.triggerRelease = function (unit, secondsFromNow) {
-    var now = p5sound.audiocontext.currentTime + 0.001;
+    var now = p5sound.audiocontext.currentTime;
     var tFromNow = secondsFromNow || 0;
-    var t = now + tFromNow;
-    // + envTime;
+    var tMinus = now + tFromNow;
+    var t = tMinus + 0.03;
     var relTime;
     if (unit) {
       if (this.connection !== unit) {
         this.connect(unit);
       }
     }
     var currentVal = this.control.getValue();
-    this.control.cancelScheduledValues(t);
-    this.control.fade(currentVal);
+    this.control.cancelScheduledValues(tMinus);
+    this.control.fade(currentVal, t);
     // release based on how much time has passed since this.lastAttack
-    if (now - this.lastAttack > this.aTime + this.dTime + this.sTime + this.rTime) {
-      this.control.linearRampToValueAtTime(this.sLevel, t + this.sTime);
-      this.control.linearRampToValueAtTime(this.rLevel, t + this.sTime + this.rTime);
-      relTime = t + this.rTime;
-    } else if (now - this.lastAttack > this.aTime + this.dTime) {
-      this.control.linearRampToValueAtTime(this.dLevel, t + this.dTime);
-      this.control.linearRampToValueAtTime(this.sLevel, t + this.dTime + this.sTime);
-      this.control.linearRampToValueAtTime(this.rLevel, t + this.dTime + this.sTime + this.rTime);
+    if (now - this.lastAttack < this.aTime) {
+      var a = this.aTime - (now - this.lastAttack);
+      this.control.linearRampToValueAtTime(this.aLevel, t + a);
+      this.control.linearRampToValueAtTime(this.dLevel, t + this.aTime + this.dTime);
+      this.control.linearRampToValueAtTime(this.sLevel, t + this.aTime + this.dTime + this.sTime);
+      this.control.linearRampToValueAtTime(this.rLevel, t + this.aTime + this.dTime + this.sTime + this.rTime);
+      relTime = t + this.dTime + this.sTime + this.rTime;
+    } else if (now - this.lastAttack < this.aTime + this.dTime) {
+      var d = this.aTime + this.dTime - (now - this.lastAttack);
+      this.control.linearRampToValueAtTime(this.dLevel, t + d);
+      this.control.linearRampToValueAtTime(this.sLevel, t + d + this.sTime);
+      this.control.linearRampToValueAtTime(this.rLevel, t + d + this.sTime + this.rTime);
       relTime = t + this.sTime + this.rTime;
-    } else if (now - this.lastAttack > this.aTime) {
-      this.control.linearRampToValueAtTime(this.dLevel, t + this.dTime);
-      this.control.linearRampToValueAtTime(this.sLevel, t + this.dTime + this.sTime);
-      this.control.linearRampToValueAtTime(this.rLevel, t + this.dTime + this.sTime + this.rTime);
+    } else if (now - this.lastAttack < this.aTime + this.dTime + this.sTime) {
+      var s = this.aTime + this.dTime + this.sTime - (now - this.lastAttack);
+      this.control.linearRampToValueAtTime(this.sLevel, t + s);
+      this.control.linearRampToValueAtTime(this.rLevel, t + s + this.rTime);
+      relTime = t + this.rTime;
+    } else {
+      this.control.linearRampToValueAtTime(this.rLevel, t + this.rTime);
       relTime = t + this.dTime + this.sTime + this.rTime;
     }
-    if (this.connection.hasOwnProperty('oscillator')) {
+    if (this.connection && this.connection.hasOwnProperty('oscillator')) {
       var clearTime = relTime * 1000;
       this.timeoutID = window.setTimeout(clearThing, clearTime);
     }
     // if unit is an oscillator, and volume is 0, stop it to save memory
     function clearThing() {
-      if (this.connection.hasOwnProperty('oscillator') && unit.started) {
+      if (this.connection && this.connection.hasOwnProperty('oscillator') && unit.started) {
         this.connection.amp(0);
         this.connection.stop();
       }