Changeset 15293 for lang/actionscript

Timestamp:

07/06/08 22:12:37 (5 years ago)

Author:

tekisuke

Message:

lang/actionscript/flmml/: 音量モードを変更するxコマンド実装。

Location:

lang/actionscript/flmml/trunk/src

Files:

• com/txt_nifty/sketch/flmml/MChannel.as (modified) (6 diffs)
• com/txt_nifty/sketch/flmml/MEnvelope.as (modified) (4 diffs)
• com/txt_nifty/sketch/flmml/MEvent.as (modified) (2 diffs)
• com/txt_nifty/sketch/flmml/MFilter.as (modified) (4 diffs)
• com/txt_nifty/sketch/flmml/MML.as (modified) (1 diff)
• com/txt_nifty/sketch/flmml/MSequencer.as (modified) (1 diff)
• 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

@@ -25 +25 @@
         private var m_lpfFrq:Number;
         private var m_lpfRes:Number;
+        private var m_volMode:int;
         public    static var PITCH_RESOLUTION:int = 100;
         protected static var s_init:int = 0;
         protected static var s_frequencyMap:Array = new Array(128 * PITCH_RESOLUTION);
         protected static var s_frequencyLen:int;
+        protected static var s_volumeMap:Array = new Array(128);
+        protected static var s_volumeLen:int;
         protected static var s_samples:Array;
 
@@ -54 +57 @@
             m_lpfFrq   = 0;
             m_lpfRes   = 0;
+            m_volMode  = 0;
         }
         public static function boot(numSamples:int):void {
@@ -61 +65 @@
                 for(i = 0; i < s_frequencyLen; i++) {
                     s_frequencyMap[i] = 440.0 * Math.pow(2.0, (i-69*PITCH_RESOLUTION)/(12*PITCH_RESOLUTION));
+                }
+                s_volumeLen = s_volumeMap.length;
+                s_volumeMap[0] = 0.0;
+                for(i = 1; i < s_volumeLen; i++) {
+                    s_volumeMap[i] = Math.pow(10.0, (i-127.0)*(48.0/(127.0*20.0))); // min:-48db
+                    //trace(i+","+s_volumeMap[i]);
                 }
                 s_init = 1;
@@ -87 +97 @@
             m_oscillator2.resetPhase();
             m_filter.reset();
-            m_velocity = velocity / 127.0;
+            m_velocity = (m_volMode) ? s_volumeMap[velocity] : velocity / 127.0;
             m_onCounter = 0;
         }
@@ -157 +167 @@
             if (m_lpfRes > 1.0) m_lpfRes = 1.0;
         }
-        protected function getNextSample():Number {
-            return m_oscillator1.getNextSample() * m_envelope1.getNextAmplitude() * m_velocity;
+        public function setVolMode(m:int):void {
+            m_volMode = m;
+        }
+        protected function getNextSampleLinear():Number {
+            return m_oscillator1.getNextSample() * m_envelope1.getNextAmplitudeLinear() * m_velocity;
+        }
+        protected function getNextSampleNonLinear():Number {
+            return m_oscillator1.getNextSample() * m_envelope1.getNextAmplitudeNonLinear() * m_velocity;
         }
         protected function getNextCutoff():Number {
-            var cut:Number = m_lpfFrq + m_lpfAmt * m_envelope2.getNextAmplitude();
+            var cut:Number = m_lpfFrq + m_lpfAmt * m_envelope2.getNextAmplitudeLinear();
             cut = getFrequency(cut) * m_oscillator1.getFrequency() * (2.0 * Math.PI / (Audio.RATE44100 * 440.0));
             if (cut < (1.0/127.0)) cut = 0.0;
@@ -178 +194 @@
                 // no LFO
                 m_oscillator1.getSamples(s_samples, start, end);
-                m_envelope1.ampSamples(s_samples, start, end, m_velocity);
+                if (m_volMode == 0) m_envelope1.ampSamplesLinear(s_samples, start, end, m_velocity);
+                else m_envelope1.ampSamplesNonLinear(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;
+                // with LFO, linear
+                if (m_volMode == 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] = getNextSampleLinear();
+                        m_onCounter++;
                     }
-                    m_oscillator1.setFrequency(getFrequency(freqNo));
-                    s_samples[i] = getNextSample();
-                    m_onCounter++;
+                }
+                // with LFO, non linear
+                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] = getNextSampleNonLinear();
+                        m_onCounter++;
+                    }
                 }
             }

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

@@ -20 +20 @@
                 private var m_timeInSamples:int;
                 private var m_startAmplitude:Number;
+        protected static var s_init:int = 0;
+        protected static var s_volumeMap:Array = new Array(256);
+        protected static var s_volumeLen:int;
 
                 public function MEnvelope(attack:Number, decay:Number, sustain:Number, release:Number) {
@@ -31 +34 @@
                         m_releaseStep = 0;
                 }
+
+        public static function boot():void {
+            if (!s_init) {
+                s_volumeLen = s_volumeMap.length;
+                s_volumeMap[0] = 0.0;
+                for(var i:int = 1; i < s_volumeLen; i++) {
+                    s_volumeMap[i] = Math.pow(10.0, (i-255.0)*(48.0/(255.0*20.0))); // min:-48db
+                }
+                s_init = 1;
+            }
+        }
 
                 public function setAD(attack:Number, decay:Number):void {
@@ -55 +69 @@
                 }
                 
-                public function getNextAmplitude():Number {
+                public function getNextAmplitudeLinear():Number {
                         if (!m_playing) return 0;
                         var val:Number;
@@ -82 +96 @@
                         return m_currentVal;
                 }
+                public function getNextAmplitudeNonLinear():Number {
+                        if (!m_playing) return 0;
+                        var val:Number;
+                        var offset:Number = (m_timeInSamples as Number) / Audio.RATE44100;
+                        
+                        if (!m_releasing) {
+                                if (offset < m_attack) {                                   // attack phase
+                                        val = m_startAmplitude + (1 - m_startAmplitude) * offset / m_attack;
+                                }
+                                else if (offset < (m_attack + m_decay)) {  //decay phase
+                                        val = 1.0 - ((offset - m_attack) / m_decay) * (1.0 - m_sustain);
+                                }
+                                else if (offset >= (m_attack + m_decay)) { //sustain phase
+                                        val = m_sustain;
+                                }
+                        }
+                        else {
+                                val = m_currentVal - m_releaseStep;                //release phase
+                        }
+                        
+                        if (val < 0) {
+                                m_playing = false;
+                        }
+                        m_currentVal = Math.max(0, val);
+                        ++m_timeInSamples;
+            var d:int = m_currentVal * 255.0;
+                        return s_volumeMap[d];
+                }
 
-        public function ampSamples(samples:Array, start:int, end:int, velocity:Number):void {
+        public function ampSamplesLinear(samples:Array, start:int, end:int, velocity:Number):void {
             var i:int;
             for(i = start; i < end; i++) {
-                samples[i] = Number(samples[i]) * getNextAmplitude() * velocity;
+                samples[i] = Number(samples[i]) * getNextAmplitudeLinear() * velocity;
+            }
+        }
+        public function ampSamplesNonLinear(samples:Array, start:int, end:int, velocity:Number):void {
+            var i:int;
+            for(i = start; i < end; i++) {
+                samples[i] = Number(samples[i]) * getNextAmplitudeNonLinear() * velocity;
             }
         }

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

@@ -39 +39 @@
         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 setVolMode(m:int):void                { set(MStatus.VOL_MODE, m, 0); }
         public function setDelta(delta:int):void              { m_delta = delta; }
         public function getStatus():int     { return m_status; }
@@ -66 +67 @@
         public function getLPFFrq():int     { return m_data0; }
         public function getLPFRes():int     { return m_data1; }
+        public function getVolMode():int    { return m_data0; }
     }
 }

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

@@ -46 +46 @@
             if (amt > 0.0001 || amt < -0.0001) {
                 for(i = start; i < end; i++) {
-                    cut = MChannel.getFrequency(frq + amt * envelope.getNextAmplitude()) * k;
+                    cut = MChannel.getFrequency(frq + amt * envelope.getNextAmplitudeLinear()) * k;
                     if (cut < (1.0/127.0))  cut = 0.0;
                     if (cut > (1.0-0.0001)) cut = 1.0-0.0001;
@@ -70 +70 @@
             var k:Number = key * (2.0 * Math.PI / (Audio.RATE44100 * 440.0));
             for(var i:int = start; i < end; i++) {
-                var cut:Number = MChannel.getFrequency(frq + amt * envelope.getNextAmplitude()) * k;
+                var cut:Number = MChannel.getFrequency(frq + amt * envelope.getNextAmplitudeLinear()) * k;
                 if (cut < (1.0/127.0)) cut = 0.0;
                 if (cut > 1.0) cut = 1.0;
@@ -98 +98 @@
             if (amt > 0.0001 || amt < -0.0001) {
                 for(i = start; i < end; i++) {
-                    cut = MChannel.getFrequency(frq + amt * envelope.getNextAmplitude()) * k;
+                    cut = MChannel.getFrequency(frq + amt * envelope.getNextAmplitudeLinear()) * k;
                     if (cut < (1.0/127.0))  cut = 0.0;
                     if (cut > (1.0-0.0001)) cut = 1.0-0.0001;
@@ -126 +126 @@
             var k:Number = key * (2.0 * Math.PI / (Audio.RATE44100 * 440.0));
             for(var i:int = start; i < end; i++) {
-                var cut:Number = MChannel.getFrequency(frq + amt * envelope.getNextAmplitude()) * k;
+                var cut:Number = MChannel.getFrequency(frq + amt * envelope.getNextAmplitudeLinear()) * k;
                 if (cut < (1.0/127.0)) cut = 0.0;
                 if (cut > 1.0) cut = 1.0;

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

@@ -242 +242 @@
             case '@':
                 atmark();
+                break;
+            case 'x':
+                m_tracks[m_trackNo].recVolMode(getUInt(1));
                 break;
             default:

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

@@ -24 +24 @@
             MChannel.boot(multiple * Audio.RATE44100);
             MOscillator.boot();
+            MEnvelope.boot();
             m_trackArr = new Array();
             m_volume = 100;

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

@@ -24 +24 @@
         public static const LPF_FRQRES:int   = 19;
         public static const CLOSE:int        = 20;
+        public static const VOL_MODE:int     = 21;
     }
 }

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

@@ -123 +123 @@
                                 m_ch.setLpfFrqRes(e.getLPFFrq(), e.getLPFRes());
                                 break;
+                            case MStatus.VOL_MODE:
+                                m_ch.setVolMode(e.getVolMode());
+                                break;
                             case MStatus.CLOSE:
                                 m_ch.close();
@@ -326 +329 @@
             e = new MEvent();
             e.setLPFFRQRES(frq, res);
+            m_events.push(e);
+        }
+
+        public function recVolMode(m:int): void {
+            var e:MEvent = new MEvent();
+            recDelta(e);
+            e.setVolMode(m);
             m_events.push(e);
         }