From 93f9483b88cf4b897da137b789b0c7cca73a0d07 Mon Sep 17 00:00:00 2001 From: kumatan Date: Sun, 8 Dec 2024 17:25:50 +0900 Subject: [PATCH] =?UTF-8?q?TAG754=202024/12/8=202nd=20=20=20Core:PartCount?= =?UTF-8?q?er:.gwi:PP=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=80=82=20=20=20Core:OPN=E7=B3=BB(OPNA2=E9=99=A4?= =?UTF-8?q?=E3=81=8F):yXX=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89Ch3Ex?= =?UTF-8?q?=E5=90=91=E3=81=91=E4=BF=AE=E6=AD=A3=E3=80=82=20=20=20=20=20?= =?UTF-8?q?=E5=8F=82=E7=85=A7=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF?= =?UTF-8?q?=E3=81=8CEX=E3=83=91=E3=83=BC=E3=83=88=E5=90=8C=E5=A3=AB?= =?UTF-8?q?=E3=81=A7=E5=85=B1=E6=9C=89=E3=81=95=E3=82=8C=E3=81=BE=E3=81=9B?= =?UTF-8?q?=E3=82=93=E3=80=82=20=20=20=20=20=E9=9F=B3=E8=89=B2=E9=83=A8?= =?UTF-8?q?=E5=88=86=E9=81=A9=E5=BF=9C=E6=A9=9F=E8=83=BD=E3=81=AE=E8=80=83?= =?UTF-8?q?=E6=85=AE=E3=81=AF=E3=81=97=E3=81=BE=E3=81=9B=E3=82=93=E3=80=82?= =?UTF-8?q?(=E3=81=93=E3=82=8C=E3=81=AFCh3Ex=E4=BB=A5=E5=A4=96=E3=81=A7?= =?UTF-8?q?=E3=82=82=E5=90=8C=E3=81=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mml2vgm/CHANGE.txt | 6 +++ mml2vgm/Corex64/chips/clsOPN.cs | 37 +++++++++++++++++++ .../mml2vgmIDEx64/MMLParameter/Instrument.cs | 2 +- mml2vgm/mml2vgmIDEx64/form/FrmPartCounter.cs | 2 +- mml2vgm_MMLCommandMemo.txt | 4 +- 5 files changed, 47 insertions(+), 4 deletions(-) diff --git a/mml2vgm/CHANGE.txt b/mml2vgm/CHANGE.txt index 295277e..3260924 100644 --- a/mml2vgm/CHANGE.txt +++ b/mml2vgm/CHANGE.txt @@ -1,4 +1,10 @@ 更新履歴 +TAG754 2024/12/8 2nd + Core:PartCounter:.gwi:PPコマンド修正。 + Core:OPN系(OPNA2除く):yXXコマンドCh3Ex向け修正。 + 参照パラメータがEXパート同士で共有されません。 + 音色部分適応機能の考慮はしません。(これはCh3Ex以外でも同じ) + TAG753 2024/12/8 Core:PartCounter:.gwi:PPコマンド追加。パートの表示順を指定できます。 diff --git a/mml2vgm/Corex64/chips/clsOPN.cs b/mml2vgm/Corex64/chips/clsOPN.cs index 6fc4e3b..9b85a6b 100644 --- a/mml2vgm/Corex64/chips/clsOPN.cs +++ b/mml2vgm/Corex64/chips/clsOPN.cs @@ -1190,7 +1190,44 @@ public void OutFmSetInstrument(partPage page, MML mml, int n, int vol, char type break; } + + //迴ｾ蝨ｨ縺ｮ髻ｳ濶ｲ縺ｮ繝代Λ繝｡繝ｼ繧ｿ繧定ｨ俶ｶ縺吶ｋ(y繧ｳ繝槭Φ繝峨〒蜿らｧ縺輔ｌ繧) page.currentInstrument = CopyInstrument(parent.instFM[n]); + if (!(page.chip is YM2609)) + { + if (isDef && (page.ch == 2 || page.ch == m + 3 || page.ch == m + 4 || page.ch == m + 5)) + { + page.chip.lstPartWork[2].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + page.chip.lstPartWork[m + 3].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + page.chip.lstPartWork[m + 4].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + page.chip.lstPartWork[m + 5].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + } + } + else + { + if (page.chip.lstPartWork[2].cpg.Ch3SpecialMode && page.ch >= 12 && page.ch < 15) + { + if (isDef) + { + page.chip.lstPartWork[2].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + page.chip.lstPartWork[12].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + page.chip.lstPartWork[13].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + page.chip.lstPartWork[14].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + } + } + if (page.chip.lstPartWork[8].cpg.Ch3SpecialMode && page.ch >= 15 && page.ch < 18) + { + if (isDef) + { + page.chip.lstPartWork[8].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + page.chip.lstPartWork[15].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + page.chip.lstPartWork[16].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + page.chip.lstPartWork[17].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + } + } + } + + if (!(page.chip is YM2612X2)) { diff --git a/mml2vgm/mml2vgmIDEx64/MMLParameter/Instrument.cs b/mml2vgm/mml2vgmIDEx64/MMLParameter/Instrument.cs index 773f1ae..22a75ee 100644 --- a/mml2vgm/mml2vgmIDEx64/MMLParameter/Instrument.cs +++ b/mml2vgm/mml2vgmIDEx64/MMLParameter/Instrument.cs @@ -83,7 +83,7 @@ public Instrument(int n, SoundManager.Chip chip, Setting setting,MIDIKbd midiKbd volMode[i] = 0; beforeTie[i] = false; partColor[i] = 1; - partPriority[i] = 100; + partPriority[i] = i; } TraceInfoOld = new outDatum[n]; this.chip = chip; diff --git a/mml2vgm/mml2vgmIDEx64/form/FrmPartCounter.cs b/mml2vgm/mml2vgmIDEx64/form/FrmPartCounter.cs index 7f87b78..c745cad 100644 --- a/mml2vgm/mml2vgmIDEx64/form/FrmPartCounter.cs +++ b/mml2vgm/mml2vgmIDEx64/form/FrmPartCounter.cs @@ -67,7 +67,7 @@ public FrmPartCounter(Setting setting) { InitializeComponent(); this.setting = setting; - comparer=new PartRowComparer(SortOrder.Descending); + comparer=new PartRowComparer(SortOrder.Ascending); dgvPartCounter.BackgroundColor = Color.FromArgb(setting.ColorScheme.PartCounter_BackColor); dgvPartCounter.DefaultCellStyle.BackColor = Color.FromArgb(setting.ColorScheme.PartCounter_BackColor); diff --git a/mml2vgm_MMLCommandMemo.txt b/mml2vgm_MMLCommandMemo.txt index 234a93e..6fda149 100644 --- a/mml2vgm_MMLCommandMemo.txt +++ b/mml2vgm_MMLCommandMemo.txt @@ -1072,8 +1072,8 @@ ___ -oooooooooooooooooooooooooooooooooooooooooooooooooooooo 螻謇 PCn ooooooooooooooooooooooooooooooooooooooooooooooooooooooo 繝代ｼ繝医き繝ｩ繝ｼ(0 - 63 def:1)IDE縺ｮ繝代ｼ繝郁牡繧呈欠螳壹☆繧九 0:鮟 1:髱 2:襍､ 3:邏ｫ 4:邱 5:豌ｴ 6:鮟 7:逋ｽ 8:muap鬚ｨ蜻ｳ濶ｲ 9-15:譛螟ｧ髻ｳ驥乗凾縲∬ｵ､縺ｫ縺ｪ繧九 16莉･髯63縺ｾ縺ｧ縺ｯ郢ｰ繧願ｿ斐＠ -PPn ooooooooooooooooooooooooooooooooooooooooooooooooooooooo 繝代ｼ繝郁｡ｨ遉ｺ蜆ｪ蜈亥ｺｦ(0 - 65535 def:100) - partcounter逕ｻ髱｢縺ｧ縺ｮ陦ｨ遉ｺ鬆繧貞､画峩縺吶ｋ縲ょ､縺悟､ｧ縺阪＞縺ｻ縺ｩ荳翫↓陦ｨ遉ｺ縺輔ｌ縺ｾ縺(驥阪＞縺ｧ縺) +PPn ooooooooooooooooooooooooooooooooooooooooooooooooooooooo 繝代ｼ繝郁｡ｨ遉ｺ蜆ｪ蜈亥ｺｦ(0 - 65535 def:陦檎分蜿ｷ(0蟋九∪繧)) + partcounter逕ｻ髱｢縺ｧ縺ｮ陦ｨ遉ｺ鬆繧貞､画峩縺吶ｋ縲ょ､縺悟ｰ上＆縺縺ｻ縺ｩ荳翫↓陦ｨ遉ｺ縺輔ｌ縺ｾ縺(蜃ｦ逅驥阪＞縺ｧ縺) c -oooooooooooooooooooooooooooooooooooooooooooooooooooooo 髻ｳ隨ｦ繝 d -oooooooooooooooooooooooooooooooooooooooooooooooooooooo 髻ｳ隨ｦ繝ｬ