Changeset 14830

Timestamp:

06/29/08 14:11:52 (5 years ago)

Author:

tekisuke

Message:

lang/actionscript/flmml/: フィルタコマンド実装。

MChannel.as　　　　フィルタ実装。
MEvent.as 終了イベントを追加。
MLPFilter.as MFilterに名前変更。
MML.as　　　　　　　　　フィルタと終了イベントを追加。
MOscillator.as　　高速化。
MSequencer.as 終了処理を追加。
MStatus.as 終了処理を追加。
MTrack.as 終了処理を追加。
MFilter.as LPFとHPFを２種類ずつ追加。

Location:

lang/actionscript/flmml/trunk/src

Files:

• com/txt_nifty/sketch/flmml/MChannel.as (modified) (8 diffs)
• com/txt_nifty/sketch/flmml/MEvent.as (modified) (1 diff)
• com/txt_nifty/sketch/flmml/MFilter.as (added)
• com/txt_nifty/sketch/flmml/MLPFilter.as (deleted)
• com/txt_nifty/sketch/flmml/MML.as (modified) (2 diffs)
• com/txt_nifty/sketch/flmml/MOscillator.as (modified) (1 diff)
• com/txt_nifty/sketch/flmml/MSequencer.as (modified) (3 diffs)
• com/txt_nifty/sketch/flmml/MStatus.as (modified) (1 diff)
• com/txt_nifty/sketch/flmml/MTrack.as (modified) (2 diffs)
• flmml.swf (modified) (previous)

lang/actionscript/flmml/trunk/src/com/txt_nifty/sketch/flmml/MChannel.as

@@ -12 +12 @@
         private var m_osc2Connect:int;
         private var m_osc2Sign:Number;
-        private var m_lpfilter:MLPFilter;
-        private var m_lpfConnect:int;
+        private var m_filter:MFilter;
+        private var m_filterConnect:int;
         private var m_formant:MFormant;
         private var m_velocity:Number;    // velocity (max:1.0)
@@ -42 +42 @@
             m_oscillator2.setForm(MOscillator.SINE);
             m_osc2Connect = 0;
-            m_lpfilter = new MLPFilter();
-            m_lpfConnect = 0;
+            m_filter = new MFilter();
+            m_filterConnect = 0;
             m_formant = new MFormant();
             m_velocity = 100.0 / 127.0;
@@ -88 +88 @@
             m_oscillator1.resetPhase();
             m_oscillator2.resetPhase();
+            m_filter.reset();
             m_velocity = velocity / 127.0;
             m_onCounter = 0;
@@ -94 +95 @@
             m_envelope1.releaseEnvelope();
             m_envelope2.releaseEnvelope();
+        }
+        public function close():void {
+            noteOff();
+            m_filter.setSwitch(0);
         }
         public function setNoiseFreq(frequency:Number):void {
@@ -140 +145 @@
         }
         public function setLpfSwtAmt(swt:int, amt:int):void {
-            //if (swt == 1) m_lpfConnect = 1; else m_lpfConnect = 0;
+            if (-3 < swt && swt < 3 && swt != m_filterConnect) {
+                m_filterConnect = swt;
+                m_filter.setSwitch(swt);
+            }
             m_lpfAmt = ((amt < -127) ? -127 : (amt < 127) ? amt : 127) * PITCH_RESOLUTION;
         }
@@ -147 +155 @@
             if (frq > 127) frq = 127;
             m_lpfFrq = frq * PITCH_RESOLUTION;
-            m_lpfRes = res * (4.0 / 127.0);
+            m_lpfRes = res * (1.0 / 127.0);
             if (m_lpfRes < 0.0) m_lpfRes = 0.0;
-            if (m_lpfRes > 4.0) m_lpfRes = 4.0;
+            if (m_lpfRes > 1.0) m_lpfRes = 1.0;
         }
         public function getNextSample():Number {
@@ -156 +164 @@
         public function getNextCutoff():Number {
             var cut:Number = m_lpfFrq + m_lpfAmt * m_envelope2.getNextAmplitude();
-            cut = getFrequency(cut) * m_oscillator1.getFrequency() * (6.0 / (Audio.RATE44100 * 440.0));
+            cut = getFrequency(cut) * m_oscillator1.getFrequency() * (2.0 * Math.PI / (Audio.RATE44100 * 440.0));
             if (cut < (1.0/127.0)) cut = 0.0;
-            if (cut > 1.0) cut = 1.0;
             return cut;
          }
@@ -169 +176 @@
             var i:int;
             if (end >= max) end = max;
+            var key:Number = m_oscillator1.getFrequency();
             if (m_osc2Connect == 0) {
-                if (m_lpfConnect == 0) {
-                    // no LFO, no LPF
-                    m_oscillator1.getSamples(s_samples, start, end);
-                    m_envelope1.ampSamples(s_samples, start, end, m_velocity);
+                // no LFO
+                m_oscillator1.getSamples(s_samples, start, end);
+                m_envelope1.ampSamples(s_samples, start, end, m_velocity);
+            }
+            else {
+                // with LFO
+                for(i = start; i < end; i++) {
+                    freqNo = m_freqNo;
+                    if (m_onCounter >= m_lfoDelay && (m_lfoEnd == 0 || m_onCounter < m_lfoEnd)) {
+                        freqNo += m_oscillator2.getNextSample() * m_osc2Sign * m_lfoDepth;
+                    }
+                    m_oscillator1.setFrequency(getFrequency(freqNo));
+                    s_samples[i] = getNextSample();
+                    m_onCounter++;
                 }
-                else {
-                    // no LFO, with LPF
-                    m_oscillator1.getSamples(s_samples, start, end);
-                    m_envelope1.ampSamples(s_samples, start, end, m_velocity);
-                    for(i = start; i < end; i++) {
-                        s_samples[i] = m_lpfilter.getNextSample(s_samples[i], getNextCutoff(), m_lpfRes);
-                    }
-                }
-            }
-            else {
-                // with LFO, no LPF
-                if (m_lpfConnect == 0) {
-                    for(i = start; i < end; i++) {
-                        freqNo = m_freqNo;
-                        if (m_onCounter >= m_lfoDelay && (m_lfoEnd == 0 || m_onCounter < m_lfoEnd)) {
-                            freqNo += m_oscillator2.getNextSample() * m_osc2Sign * m_lfoDepth;
-                        }
-                        m_oscillator1.setFrequency(getFrequency(freqNo));
-                        s_samples[i] = getNextSample();
-                        m_onCounter++;
-                    }
-                }
-                // with LFO, with LPF
-                else {
-                    for(i = start; i < end; i++) {
-                        freqNo = m_freqNo;
-                        if (m_onCounter >= m_lfoDelay && (m_lfoEnd == 0 || m_onCounter < m_lfoEnd)) {
-                            freqNo += m_oscillator2.getNextSample() * m_osc2Sign * m_lfoDepth;
-                        }
-                        m_oscillator1.setFrequency(getFrequency(freqNo));
-                        s_samples[i] = getNextSample();
-                        s_samples[i] = m_lpfilter.getNextSample(s_samples[i], getNextCutoff(), m_lpfRes);
-                        m_onCounter++;
-                    }
-                }
             }
             m_formant.run(s_samples, start, end);
+            m_filter.run(s_samples, start, end, m_envelope2, m_lpfFrq, m_lpfAmt, m_lpfRes, key);
             for(i = start; i < end; i++) {
                 amplitude = s_samples[i];

lang/actionscript/flmml/trunk/src/com/txt_nifty/sketch/flmml/MEvent.as

@@ -38 +38 @@
         public function setLPFSWTAMT(swt:int, amt:int):void   { set(MStatus.LPF_SWTAMT, swt, amt); }
         public function setLPFFRQRES(frq:int, res:int):void   { set(MStatus.LPF_FRQRES, frq, res); }
+        public function setClose():void                       { set(MStatus.CLOSE, 0, 0); }
         public function setDelta(delta:int):void              { m_delta = delta; }
         public function getStatus():int     { return m_status; }

lang/actionscript/flmml/trunk/src/com/txt_nifty/sketch/flmml/MML.as

@@ -166 +166 @@
                 }
                 break;
-            case 'f': // low pass Filter
+            case 'f': // Filter
                 {
                     var swt:int = 0, amt:int = 0, frq:int = 0, res:int = 0;
                     next();
-                    swt = getUInt(swt);
+                    swt = getSInt(swt);
                     if (getChar() == ',') {
                         next();
@@ -592 +592 @@
             for(var i:int = MTrack.TEMPO_TRACK; i < m_tracks.length; i++) {
                 m_tracks[i].recRest(384);
+                m_tracks[i].recClose();
+                m_tracks[i].recRest(96);
                 m_tracks[i].recEOT();
                 m_sequencer.connect(m_tracks[i]);

lang/actionscript/flmml/trunk/src/com/txt_nifty/sketch/flmml/MOscillator.as

@@ -90 +90 @@
         public function getSamples(samples:Array, start:int, end:int):void {
             var i:int;
+            var dp:Number = 1.0 / Audio.RATE44100;
             switch(m_form) {
             case SINE:
+                dp *= m_frequency;
                 for(i = start; i < end; i++) {
-                    samples[i] = Number(s_sinTable[int(m_phase * s_sinLen)]);
-                    m_phase += (m_frequency * (1.0 / Audio.RATE44100));
+                    samples[i] = s_sinTable[int(m_phase * s_sinLen)] as Number;
+                    m_phase += dp;
                     if (m_phase > 1.0) m_phase -= 1.0;
                 }
                 break;
             case SAW:
+                dp *= m_frequency;
                 for(i = start; i < end; i++) {
                     samples[i] = m_phase / 0.5 - 1.0;
-                    m_phase += (m_frequency * (1.0 / Audio.RATE44100));
+                    m_phase += dp;
                     if (m_phase > 1.0) m_phase -= 1.0;
                 }
                 break;
             case TRIANGLE:
+                dp *= m_frequency;
                 for(i = start; i < end; i++) {
                     samples[i] = (m_phase < 0.5) ? (1.0 - 4.0 * m_phase) : (1.0 - 4.0 * (1.0 - m_phase));
-                    m_phase += (m_frequency * (1.0 / Audio.RATE44100));
+                    m_phase += dp;
                     if (m_phase > 1.0) m_phase -= 1.0;
                 }
                 break;
             case PULSE:
+                dp *= m_frequency;
                 for(i = start; i < end; i++) {
                     samples[i] = (m_phase < m_pwm) ? 1.0 : -1.0;
-                    m_phase += (m_frequency * (1.0 / Audio.RATE44100));
+                    m_phase += dp;
                     if (m_phase > 1.0) m_phase -= 1.0;
                 }
                 break;
             case NOISE:
+                dp *= m_noiseFreq;
                 for(i = start; i < end; i++) {
-                    samples[i] = Number(s_rndTable[int(m_phase * s_rndLen)]);
-                    m_phase += m_noiseFreq * (1.0 / Audio.RATE44100);
+                    samples[i] = s_rndTable[int(m_phase * s_rndLen)] as Number;
+                    m_phase += dp;
                     if (m_phase > 1.0) m_phase -= 1.0;
                 }

lang/actionscript/flmml/trunk/src/com/txt_nifty/sketch/flmml/MSequencer.as

@@ -10 +10 @@
         protected static const STATUS_BUFFERING:int = 2;
         protected static const STATUS_PLAY:int      = 3;
+        protected static const STATUS_LAST1:int     = 4;
+        protected static const STATUS_LAST2:int     = 5;
         protected var m_audioBuffer:AudioBuffer;
         protected var m_trackArr:Array;
@@ -100 +102 @@
         private function onAudioBufferComplete(buffer:AudioBuffer):void {
             if (m_status < STATUS_BUFFERING) return;
+            if (m_status == STATUS_LAST2) {
+                stop();
+                dispatchEvent(new MMLEvent(MMLEvent.COMPLETE));
+                return;
+            }
+            if (m_status == STATUS_LAST1) m_status++;
             //var starttime:Date = new Date();
             var samples:Array = buffer.getSamples();
@@ -135 +143 @@
 
             // end of sequence
-            var n:int = 0;
-            for (i = 0; i < m_trackArr.length; i++) {
-                if (m_trackArr[i].isEnd()) n++;
-            }
-            if (n >= m_trackArr.length) {
-                stop();
-                dispatchEvent(new MMLEvent(MMLEvent.COMPLETE));
-                m_status = STATUS_STOP;
+            if (m_status == STATUS_PLAY) {
+                var n:int = 0;
+                for (i = 0; i < m_trackArr.length; i++) {
+                    if (m_trackArr[i].isEnd()) n++;
+                }
+                if (n >= m_trackArr.length) {
+                    m_status = STATUS_LAST1;
+                }
             }
 

lang/actionscript/flmml/trunk/src/com/txt_nifty/sketch/flmml/MStatus.as

@@ -23 +23 @@
         public static const LPF_SWTAMT:int   = 18;
         public static const LPF_FRQRES:int   = 19;
+        public static const CLOSE:int        = 20;
     }
 }

lang/actionscript/flmml/trunk/src/com/txt_nifty/sketch/flmml/MTrack.as

@@ -123 +123 @@
                                 m_ch.setLpfFrqRes(e.getLPFFrq(), e.getLPFRes());
                                 break;
+                            case MStatus.CLOSE:
+                                m_ch.close();
+                                break;
                             case MStatus.EOT:
-                                m_ch.noteOff();
                                 m_isEnd = 1;
                                 break;
@@ -322 +324 @@
             e = new MEvent();
             e.setLPFFRQRES(frq, res);
+            m_events.push(e);
+        }
+
+        public function recClose():void {
+            var e:MEvent = new MEvent();
+            e.setClose();
             m_events.push(e);
         }