Merge pull request #709 from Abhijay007/Abhijay007-enhancement/oop

(Chore) : Fixed merge conficts Envelope uses ES6 class

Author: davepagurek

src/app.js

@@ -129,6 +129,12 @@ p5.Distortion = Distortion;
 import Gain from './gain';
 p5.Gain = Gain;
 
+import Envelope from './envelope';
+p5.Envelope = Envelope;
+
+import Env from './deprecations/Env';
+p5.Env = Env;
+
 import AudioVoice from './audioVoice';
 p5.AudioVoice = AudioVoice;
 

src/deprecations/Env.js

@@ -0,0 +1,13 @@
+import Envelope from '../envelope';
+
+class Env extends Envelope {
+  constructor(t1, l1, t2, l2, t3, l3) {
+    console.warn(
+      'WARNING: p5.Env is now deprecated and may be removed in future versions. ' +
+        'Please use the new p5.Envelope instead.'
+    );
+    super(t1, l1, t2, l2, t3, l3);
+  }
+}
+
+export default Env;