TAG176 2022/05/21

Compiler 音色データをmmlから読みこんだ時、値の解釈が異なっていたのを修正
kuma4649 · May 20, 2022 · 44ebcb3 · 44ebcb3
1 parent 2475290
commit 44ebcb3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGE.txt b/CHANGE.txt
@@ -1,4 +1,8 @@
 �X�V����
+TAG176 2022/05/21
+  Compiler
+    ���F�f�[�^��mml����ǂ݂��񂾎��A�l�̉��߂��قȂ��Ă����̂��C��
+
 TAG175 2022/05/20 2nd
   Driver
     �O���v���O���������Ƀ{�����[�����[�h���𑗐M����悤��OPM���ł���悤�C��(�Y��Ă�)

diff --git a/mucomDotNETCompiler/smon.cs b/mucomDotNETCompiler/smon.cs
@@ -42,14 +42,14 @@ public void CONVERT()
             for (int row = 0; row < 4; row++)
             {
                 //MUL/DT
-                a = vbuf[row + 32] * 16 + vbuf[row + 28];
+                a = (vbuf[row + 32] & 0xf) * 16 + (vbuf[row + 28] & 0xf);
                 mucInfo.mmlVoiceDataWork.Set(row + 1, (byte)a);
 
                 //TL
                 mucInfo.mmlVoiceDataWork.Set(row + 5, (byte)vbuf[row + 20]);
 
                 //KS/AR
-                a = vbuf[row + 24] * 64 + vbuf[row];
+                a = (vbuf[row + 24] & 0x3) * 64 + (vbuf[row] & 0x1f);
                 mucInfo.mmlVoiceDataWork.Set(row + 9, (byte)a);
 
                 //DR
@@ -59,11 +59,11 @@ public void CONVERT()
                 mucInfo.mmlVoiceDataWork.Set(row + 17, (byte)vbuf[row + 8]);
 
                 //SL/RR
-                a = vbuf[row + 16] * 16 + vbuf[row + 12];
+                a = (vbuf[row + 16] & 0xf) * 16 + (vbuf[row + 12] & 0xf);
                 mucInfo.mmlVoiceDataWork.Set(row + 21, (byte)a);
             }
 
-            a = vbuf[36] * 8 + vbuf[37];
+            a = (vbuf[36] & 0x7) * 8 + (vbuf[37] & 0x7);
             mucInfo.mmlVoiceDataWork.Set(25, (byte)a);
 
             ////OPEX() 要らないと思う

diff --git a/mucomDotNETConsole/Properties/launchSettings.json b/mucomDotNETConsole/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Console": {
       "commandName": "Project",
-      "commandLineArgs": "-LOGLEVEL=TRACE \"D:\\bootcamp\\FM音源\\data\\自作\\test\\test.muc\""
+      "commandLineArgs": "-LOGLEVEL=TRACE \"C:\\Users\\kuma\\Desktop\\_test_psycomiku.muc\""
     }
   }
 }