Changeset 33297 for lang/actionscript

Timestamp:

05/15/09 01:09:36 (3 years ago)

Author:

tekisuke

Message:

OffGaoさんのコードをコミット。ファミコンDPCMが使えるようになりました。

Location:

lang/actionscript/flmml/trunk/src

Files:

• com/txt_nifty/sketch/flmml/MChannel.as (modified) (2 diffs)
• com/txt_nifty/sketch/flmml/MML.as (modified) (2 diffs)
• com/txt_nifty/sketch/flmml/MOscFcDpcm.as (added)
• com/txt_nifty/sketch/flmml/MOscillator.as (modified) (2 diffs)
• flmml.swf (modified) (previous)

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

@@ -139 +139 @@
             var modGbSNoise:MOscGbSNoise = (MOscGbSNoise)(m_oscSet1.getMod(MOscillator.GB_S_NOISE));
             modGbSNoise.setNoiseFreq(noteNo);
+                        //2009.05.10 OffGao ADD 2L addDPCM
+            var modFcDpcm:MOscFcDpcm = (MOscFcDpcm)(m_oscSet1.getMod(MOscillator.FC_DPCM));
+            modFcDpcm.setDpcmFreq(noteNo);
+                        
         }
         public function noteOff():void {
@@ -155 +159 @@
             m_oscMod1 = m_oscSet1.setForm(form);
             if (form == MOscillator.GB_WAVE) (MOscGbWave)(m_oscSet1.getMod(MOscillator.GB_WAVE)).setWaveNo(subform);
+                        //2009.05.10 OffGao ADD 1L addDPCM
+            if (form == MOscillator.FC_DPCM) (MOscFcDpcm)(m_oscSet1.getMod(MOscillator.FC_DPCM)).setWaveNo(subform);
         }
         public function setEnvelope1AD(attack:int, decay:int):void {

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

@@ -581 +581 @@
                 m_relativeDir = false;
             }
-            // WAVE (ex. "#WAV10 0,0123456789abcdeffedcba9876543210")
+            // GB WAVE (ex. "#WAV10 0,0123456789abcdeffedcba9876543210")
             {
                 exp = /^#WAV10\s.*$/gm;
@@ -601 +601 @@
                     }
                 }
-            }
+                        //2009.05.10 OffGao ADD START addDPCM
+            // DPCM WAVE (ex. "#WAV9 0,0123456789abcdeffedcba9876543210")
+                exp = /^#WAV9\s.*$/gm;
+                matched = m_string.match(exp);
+                if (matched) {
+                    for(i = 0; i < matched.length; i++) {
+                        m_string = m_string.replace(exp, "");
+                        //trace(matched[i]);
+                        wav = matched[i].split(" ");
+                        wavs = "";
+                        for(j = 1; j < wav.length; j++) wavs += wav[j];
+                        arg = wavs.split(",");
+                        waveNo = parseInt(arg[0]);
+                        if (waveNo < 0) waveNo = 0;
+                        if (waveNo >= MOscFcDpcm.MAX_WAVE) waveNo = MOscFcDpcm.MAX_WAVE-1;
+                        var intVol:int = parseInt(arg[1]);
+                        if (intVol < 0) intVol = 0;
+                        if (intVol > 127)intVol = 127;
+                        var loopFg:int = parseInt(arg[2]);
+                        if (loopFg < 0) loopFg = 0;
+                        if (loopFg > 1) loopFg = 1;
+                        /*
+                        var length:int = -1;
+                        if (arg.length >= 5){
+                            length = parseInt(arg[4]);
+                            if (length < 1) length = 1;
+                            if (length > 0xff) length = 0xff;
+                        }
+                        MOscFcDpcm.setWave(waveNo,intVol,loopFg,arg[3],length);
+                        */
+                        MOscFcDpcm.setWave(waveNo,intVol,loopFg,arg[3]);
+                    }
+                }
+            }
+                        //2009.05.10 OffGao ADD END addDPCM
             // macro
             begin();

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

@@ -34 +34 @@
             m_osc[FC_NOISE]   = new MOscFcNoise();
             m_osc[FC_S_NOISE] = null;
-            m_osc[FC_DPCM]    = new MOscMod();
+                        //2009.05.10 OffGao MOD 1L addDPCM
+            //m_osc[FC_DPCM]    = new MOscMod();
+            m_osc[FC_DPCM]    = new MOscFcDpcm();
             m_osc[GB_WAVE]    = new MOscGbWave();
             m_osc[GB_NOISE]   = new MOscGbLNoise();
@@ -52 +54 @@
             MOscFcTri.boot();
             MOscFcNoise.boot();
+                        //2009.05.10 OffGao ADD 1L addDPCM
+            MOscFcDpcm.boot();
             MOscGbWave.boot();
             MOscGbLNoise.boot();