Commit: 8a4022645f8fe7bc79e837e3487cc4029982e03a - MIDITrailMod (git)

MIDITrail をピカピカにする。鍵盤方向自動切替・多ポート・歌詞対応等

Commit MetaInfo

• Revision: 8a4022645f8fe7bc79e837e3487cc4029982e03a (tree)
• Time: 2018-04-12 09:46:52
• Author: yoshy <yoshy@user...>
• Commiter: yoshy

Log Message

Merge branch 'develop' into master/yossiepon

Change Summary

• modified: MIDITrail/MIDITrail.rc
• modified: MIDITrail/MIDITrailApp.cpp
• modified: MIDITrail/MIDITrailApp.h
• modified: MIDITrail/MIDITrailVersion.h
• modified: MIDITrail/MTGridBox.h
• modified: MIDITrail/MTGridBoxMod.cpp
• modified: MIDITrail/MTGridBoxMod.h
• modified: MIDITrail/MTNoteBoxMod.cpp
• modified: MIDITrail/MTNoteDesignMod.cpp
• modified: MIDITrail/MTNoteDesignMod.h
• modified: MIDITrail/MTNoteRippleMod.cpp
• modified: MIDITrail/MTPianoKeyboard.cpp
• modified: MIDITrail/MTPianoKeyboard.h
• modified: MIDITrail/MTPianoKeyboardCtrlMod.cpp
• modified: MIDITrail/MTPianoKeyboardCtrlMod.h
• modified: MIDITrail/MTPianoKeyboardDesign.cpp
• modified: MIDITrail/MTPianoKeyboardDesign.h
• modified: MIDITrail/MTPianoKeyboardDesignMod.cpp
• modified: MIDITrail/MTPianoKeyboardDesignMod.h
• modified: MIDITrail/MTPianoKeyboardMod.cpp
• modified: MIDITrail/MTPianoKeyboardMod.h
• modified: MIDITrail/MTScene.h
• modified: MIDITrail/MTScenePianoRoll2DMod.cpp
• modified: MIDITrail/MTScenePianoRoll3DMod.cpp
• modified: MIDITrail/MTTimeIndicator.cpp
• modified: MIDITrail/MTTimeIndicator.h
• modified: MIDITrail/resource.h
• modified: MIDITrail/template/conf/PianoRoll2D.ini
• modified: MIDITrail/template/conf/PianoRoll3D.ini
• modified: readme_mod_yossiepon.txt

Incremental Difference

--- a/MIDITrail/MIDITrail.rc
+++ b/MIDITrail/MIDITrail.rc
@@ -79,6 +79,10 @@ BEGIN
         MENUITEM "Stars",                       IDM_ENABLE_STARS
         MENUITEM "Counter",                     IDM_ENABLE_COUNTER
         MENUITEM "Background Image",            IDM_ENABLE_BACKGROUNDIMAGE
+// >>> add 20180404 yossiepon begin
+        MENUITEM "Time Indicator",              IDM_ENABLE_TIMEINDICATOR
+        MENUITEM "Grid Box",                    IDM_ENABLE_GRIDBOX
+// <<< add 20180404 yossiepon end
         MENUITEM SEPARATOR
         MENUITEM "Auto save viewpoint",         32838
         MENUITEM SEPARATOR
@@ -309,9 +313,9 @@ END
 
 STRINGTABLE 
 BEGIN
-// >>> modify 20180404 yossiepon begin
-    IDS_APP_TITLE           "MIDITrail 1.2.3 mod. yossiepon_20180404"
-// <<< modify 20180404 yossiepon end
+// >>> modify 20180412 yossiepon begin
+    IDS_APP_TITLE           "MIDITrail 1.2.3 mod. yossiepon_20180412"
+// <<< modify 20180412 yossiepon end
     IDC_MIDITRAIL           "MIDITRAIL"
 END
 

--- a/MIDITrail/MIDITrailApp.cpp
+++ b/MIDITrail/MIDITrailApp.cpp
@@ -76,6 +76,10 @@ MIDITrailApp::MIDITrailApp(void)
 	m_isEnableCounter = true;
 	m_isEnableFileName = false;
 	m_isEnableBackgroundImage = true;
+// >>> add 20180404 yossiepon begin
+	m_isEnableTimeIndicator = true;
+	m_isEnableGridBox = true;
+// <<< add 20180404 yossiepon end
 
 	//シーン種別
 	m_SceneType = Title;
@@ -683,6 +687,18 @@ LRESULT MIDITrailApp::_WndProcImpl(
 					result = _OnMenuEnableEffect(MTScene::EffectBackgroundImage);
 					if (result != 0) goto EXIT;
 					break;
+// >>> add 20180404 yossiepon begin
+				case IDM_ENABLE_TIMEINDICATOR:
+					//表示効果：タイムインジケータ
+					result = _OnMenuEnableEffect(MTScene::EffectTimeIndicator);
+					if (result != 0) goto EXIT;
+					break;
+				case IDM_ENABLE_GRIDBOX:
+					//表示効果：グリッドボックス
+					result = _OnMenuEnableEffect(MTScene::EffectGridBox);
+					if (result != 0) goto EXIT;
+					break;
+// <<< add 20180404 yossiepon end
 				case IDM_WINDOWSIZE:
 					//ウィンドウサイズ設定
 					result = _OnMenuWindowSize();
@@ -1275,6 +1291,14 @@ int MIDITrailApp::_OnMenuEnableEffect(
 		case MTScene::EffectBackgroundImage:
 			m_isEnableBackgroundImage = m_isEnableBackgroundImage ? false : true;
 			break;
+// >>> add 20180404 yossiepon begin
+		case MTScene::EffectTimeIndicator:
+			m_isEnableTimeIndicator = !m_isEnableTimeIndicator;
+			break;
+		case MTScene::EffectGridBox:
+			m_isEnableGridBox = !m_isEnableGridBox;
+			break;
+// <<< add 20180404 yossiepon end
 		default:
 			break;
 	}
@@ -2138,7 +2162,10 @@ int MIDITrailApp::_ChangeMenuStyle()
 		IDM_ENABLE_PITCHBEND,
 		IDM_ENABLE_STARS,
 		IDM_ENABLE_COUNTER,
-		IDM_ENABLE_BACKGROUNDIMAGE,
+// >>> add 20180404 yossiepon begin
+		IDM_ENABLE_TIMEINDICATOR,
+		IDM_ENABLE_GRIDBOX,
+// <<< add 20180404 yossiepon end
 		IDM_WINDOWSIZE,
 		IDM_OPTION_MIDIOUT,
 		IDM_OPTION_MIDIIN,
@@ -2178,6 +2205,10 @@ int MIDITrailApp::_ChangeMenuStyle()
 		{	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_ENABLE_STARS
 		{	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_ENABLE_COUNTER
 		{	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_ENABLE_BACKGROUNDIMAGE
+// >>> add 20180404 yossiepon begin
+		{	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_ENABLE_TIMEINDICATOR
+		{	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_ENABLE_GRIDBOX
+// <<< add 20180404 yossiepon end
 		{	MF_ENABLED,	MF_ENABLED,	MF_GRAYED,	MF_GRAYED,	MF_ENABLED,	MF_GRAYED	},	//IDM_WINDOWSIZE
 		{	MF_ENABLED,	MF_ENABLED,	MF_GRAYED,	MF_GRAYED,	MF_ENABLED,	MF_GRAYED	},	//IDM_OPTION_MIDIOUT
 		{	MF_ENABLED,	MF_ENABLED,	MF_GRAYED,	MF_GRAYED,	MF_ENABLED,	MF_GRAYED	},	//IDM_OPTION_MIDIIN
@@ -2798,6 +2829,14 @@ int MIDITrailApp::_UpdateMenuCheckmark()
 	//背景画像表示
 	_CheckMenuItem(IDM_ENABLE_BACKGROUNDIMAGE, m_isEnableBackgroundImage);
 
+// >>> add 20180404 yossiepon begin
+	//タイムインジケータ表示
+	_CheckMenuItem(IDM_ENABLE_TIMEINDICATOR, m_isEnableTimeIndicator);
+
+	//グリッドボックス表示
+	_CheckMenuItem(IDM_ENABLE_GRIDBOX, m_isEnableGridBox);
+// <<< add 20180404 yossiepon end
+
 	//自動視点保存
 	_CheckMenuItem(IDM_AUTO_SAVE_VIEWPOINT, m_isAutoSaveViewpoint);
 
@@ -2840,6 +2879,10 @@ void MIDITrailApp::_UpdateEffect()
 		m_pScene->SetEffect(MTScene::EffectCounter, m_isEnableCounter);
 		m_pScene->SetEffect(MTScene::EffectFileName, m_isEnableFileName);
 		m_pScene->SetEffect(MTScene::EffectBackgroundImage, m_isEnableBackgroundImage);
+// >>> add 20180404 yossiepon begin
+		m_pScene->SetEffect(MTScene::EffectTimeIndicator, m_isEnableTimeIndicator);
+		m_pScene->SetEffect(MTScene::EffectGridBox, m_isEnableGridBox);
+// <<< add 20180404 yossiepon end
 	}
 	return;
 }

--- a/MIDITrail/MIDITrailApp.h
+++ b/MIDITrail/MIDITrailApp.h
@@ -43,9 +43,9 @@ using namespace SMIDILib;
 #define WM_FILEPATH_POSTED  (WM_USER + 100)
 
 //メニュースタイル制御
-// >>> modify 20161223 yossiepon begin
-#define MT_MENU_NUM        (32)
-// <<< modify 20161223 yossiepon end
+// >>> modify 20180404 yossiepon begin
+#define MT_MENU_NUM        (34)
+// <<< modify 20180404 yossiepon end
 #define MT_PLAYSTATUS_NUM  (6)
 
 //デバイスロスト警告メッセージ
@@ -181,6 +181,10 @@ private:
 	bool m_isEnableCounter;
 	bool m_isEnableFileName;
 	bool m_isEnableBackgroundImage;
+// >>> add 20180404 yossiepon begin
+	bool m_isEnableTimeIndicator;
+	bool m_isEnableGridBox;
+// <<< add 20180404 yossiepon end
 
 	//シーン種別
 	SceneType m_SceneType;

--- a/MIDITrail/MIDITrailVersion.h
+++ b/MIDITrail/MIDITrailVersion.h
@@ -16,8 +16,10 @@
 //******************************************************************************
 
 //バージョン文字列
-#define MIDITRAIL_VERSION_STRING_X86  _T("1.2.3 (x86), mod. yossiepon_20180404")
-#define MIDITRAIL_VERSION_STRING_X64  _T("1.2.3 (x64), mod. yossiepon_20180404")
+// >>> modify 20180412 yossiepon begin
+#define MIDITRAIL_VERSION_STRING_X86  _T("1.2.3 (x86), mod. yossiepon_20180412")
+#define MIDITRAIL_VERSION_STRING_X64  _T("1.2.3 (x64), mod. yossiepon_20180412")
+// <<< modify 20180412 yossiepon end
 
 //コピーライト
 #define MIDITRAIL_COPYRIGHT          _T("Copyright (C) 2010-2017 WADA Masashi");

--- a/MIDITrail/MTGridBox.h
+++ b/MIDITrail/MTGridBox.h
@@ -36,11 +36,13 @@ public:
 	//生成
 	int Create(LPDIRECT3DDEVICE9 pD3DDevice, const TCHAR* pSceneName, SMSeqData* pSeqData);
 
+// >>> modify function to virtual 20180404 yossiepon begin
 	//更新
-	int Transform(LPDIRECT3DDEVICE9 pD3DDevice, float rollAngle);
+	virtual int Transform(LPDIRECT3DDEVICE9 pD3DDevice, float rollAngle);
 
 	//描画
-	int Draw(LPDIRECT3DDEVICE9 pD3DDevice);
+	virtual int Draw(LPDIRECT3DDEVICE9 pD3DDevice);
+// <<< modify function to virtual 20180404 yossiepon end
 
 	//解放
 	void Release();

--- a/MIDITrail/MTGridBoxMod.cpp
+++ b/MIDITrail/MTGridBoxMod.cpp
@@ -20,6 +20,7 @@ using namespace YNBaseLib;
 //******************************************************************************
 MTGridBoxMod::MTGridBoxMod(void)
 {
+	m_isEnable = true;
 }
 
 //******************************************************************************
@@ -48,14 +49,6 @@ int MTGridBoxMod::Transform(
 	D3DXMatrixIdentity(&moveMatrix);
 	D3DXMatrixIdentity(&worldMatrix);
 
-	if(rollAngle < 0.0f) {
-		rollAngle += 360.0f;
-	}
-
-	if((rollAngle > 120.0f) && (rollAngle < 300.0f)) {
-		rollAngle -= 180.0f;
-	}
-
 	//回転行列
 	D3DXMatrixRotationX(&rotateMatrix, D3DXToRadian(rollAngle));
 
@@ -71,3 +64,31 @@ int MTGridBoxMod::Transform(
 
 	return result;
 }
+
+//******************************************************************************
+// 描画
+//******************************************************************************
+int MTGridBoxMod::Draw(
+		LPDIRECT3DDEVICE9 pD3DDevice
+	)
+{
+	int result = 0;
+
+	if (!m_isEnable) goto EXIT;
+
+	result = MTGridBox::Draw(pD3DDevice);
+	if (result != 0) goto EXIT;
+
+EXIT:;
+	return result;
+}
+
+//******************************************************************************
+// 表示設定
+//******************************************************************************
+void MTGridBoxMod::SetEnable(
+		bool isEnable
+	)
+{
+	m_isEnable = isEnable;
+}

--- a/MIDITrail/MTGridBoxMod.h
+++ b/MIDITrail/MTGridBoxMod.h
@@ -27,5 +27,15 @@ public:
 	//更新
 	virtual int Transform(LPDIRECT3DDEVICE9 pD3DDevice, float rollAngle);
 
+	//描画
+	virtual int Draw(LPDIRECT3DDEVICE9 pD3DDevice);
+
+	//表示設定
+	void SetEnable(bool isEnable);
+
+private:
+
+	//表示可否
+	bool m_isEnable;
 };
 

--- a/MIDITrail/MTNoteBoxMod.cpp
+++ b/MIDITrail/MTNoteBoxMod.cpp
@@ -365,15 +365,11 @@ int MTNoteBoxMod::_UpdateVertexOfActiveNotes(
 						);
 			if (result != 0) goto EXIT;
 
-			//発音中ノートがピッチベンドで移動する場合
 			//発音終了までオリジナルのノートを非表示にする
 			if (!(m_pNoteStatusMod[i].isHide)) {
-				if ((m_pNotePitchBend->GetValue(note.portNo, note.chNo) != 0)
-				 && (m_pNotePitchBend->GetSensitivity(note.portNo, note.chNo) != 0)) {
-					result = _HideNoteBox(m_pNoteStatusMod[i].index);
-					if (result != 0) goto EXIT;
-					m_pNoteStatusMod[i].isHide = true;
-				}
+				result = _HideNoteBox(m_pNoteStatusMod[i].index);
+				if (result != 0) goto EXIT;
+				m_pNoteStatusMod[i].isHide = true;
 			}
 
 			activeNoteNum++;

--- a/MIDITrail/MTNoteDesignMod.cpp
+++ b/MIDITrail/MTNoteDesignMod.cpp
@@ -67,6 +67,22 @@ unsigned long MTNoteDesignMod::GetRippleReleaseDuration()
 }
 
 //******************************************************************************
+// 描画元（リップル画像）ブレンド指定
+//******************************************************************************
+D3DBLEND MTNoteDesignMod::GetRippleSrcBlend()
+{
+	return m_RippleSrcBlend;
+}
+
+//******************************************************************************
+// 描画元（リップル画像）ブレンド指定
+//******************************************************************************
+D3DBLEND MTNoteDesignMod::GetRippleDestBlend()
+{
+	return m_RippleDestBlend;
+}
+
+//******************************************************************************
 // 波紋上書き回数
 //******************************************************************************
 unsigned long MTNoteDesignMod::GetRippleOverwriteTimes()
@@ -247,6 +263,14 @@ int MTNoteDesignMod::_LoadConfFile(
 	result = confFile.GetInt(_T("ReleaseDuration"), &m_RippleReleaseDuration, 250);
 	if (result != 0) goto EXIT;
 
+	//描画元（リップル画像）ブレンド指定 Default: D3DBLEND_SRCALPHA(5)
+	result = confFile.GetInt(_T("SrcBlend"), (int *)&m_RippleSrcBlend, 5);
+	if (result != 0) goto EXIT;
+
+	//描画先（背景画像）ブレンド指定 Default: D3DBLEND_ONE(2)
+	result = confFile.GetInt(_T("DestBlend"), (int *)&m_RippleDestBlend, 2);
+	if (result != 0) goto EXIT;
+
 	//波紋上書き回数
 	result = confFile.GetInt(_T("OverwriteTimes"), &m_RippleOverwriteTimes, 3);
 	if (result != 0) goto EXIT;

--- a/MIDITrail/MTNoteDesignMod.h
+++ b/MIDITrail/MTNoteDesignMod.h
@@ -30,6 +30,8 @@ public:
 	unsigned long GetRippleReleaseDuration();
 
 	//波紋描画情報取得
+	D3DBLEND GetRippleSrcBlend();
+	D3DBLEND GetRippleDestBlend();
 	unsigned long GetRippleOverwriteTimes();
 	float GetRippleSpacing();
 
@@ -72,14 +74,19 @@ protected:
 
 private:
 
-	//ディケイ時間
+	//波紋ディケイ時間
 	int m_RippleDecayDuration;
-	//リリース時間
+	//波紋リリース時間
 	int m_RippleReleaseDuration;
 
-	//上書き回数
+	//波紋描画元（リップル画像）ブレンド指定 
+	D3DBLEND m_RippleSrcBlend;
+	//波紋描画先（背景画像）ブレンド指定
+	D3DBLEND m_RippleDestBlend;
+
+	//波紋上書き回数
 	int m_RippleOverwriteTimes;
-	//描画間隔
+	//波紋描画間隔
 	float m_RippleSpacing;
 };
 

--- a/MIDITrail/MTNoteRippleMod.cpp
+++ b/MIDITrail/MTNoteRippleMod.cpp
@@ -391,9 +391,9 @@ int MTNoteRippleMod::Draw(
 	pD3DDevice->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
 	pD3DDevice->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
 
-	//レンダリングステート設定：加算合成
-	pD3DDevice->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_ONE);
-	pD3DDevice->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
+	//レンダリングステート設定：ブレンド指定値
+	pD3DDevice->SetRenderState(D3DRS_SRCBLEND, m_NoteDesignMod.GetRippleSrcBlend());
+	pD3DDevice->SetRenderState(D3DRS_DESTBLEND, m_NoteDesignMod.GetRippleDestBlend());
 
 	//プリミティブ描画
 	if (m_ActiveNoteNum > 0) {
@@ -403,8 +403,8 @@ int MTNoteRippleMod::Draw(
 	}
 
 	//レンダリングステート設定：通常のアルファ合成
-	pD3DDevice->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
 	pD3DDevice->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
+	pD3DDevice->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
 
 EXIT:;
 	return result;

--- a/MIDITrail/MTPianoKeyboard.cpp
+++ b/MIDITrail/MTPianoKeyboard.cpp
@@ -1599,20 +1599,20 @@ int MTPianoKeyboard::Transform(
 }
 
 // >>> add 20120729 yossiepon begin
+// >>> modify 20180411 yossiepon begin
 //******************************************************************************
 // 移動
 //******************************************************************************
 int MTPianoKeyboard::Transform(
 		LPDIRECT3DDEVICE9 pD3DDevice,
-		D3DXVECTOR3 moveVector1,
-		D3DXVECTOR3 moveVector2,
-		float scale,
-		float z,
+		D3DXVECTOR3 basePosVector,
+		D3DXVECTOR3 playbackPosVector,
 		float rollAngle
 	)
 {
 	return YN_SET_ERR("Program error.", 0, 0);
 }
+// <<< modify 20180411 yossiepon end
 // <<< add 20120729 yossiepon end
 
 //******************************************************************************

--- a/MIDITrail/MTPianoKeyboard.h
+++ b/MIDITrail/MTPianoKeyboard.h
@@ -47,7 +47,14 @@ public:
 	//更新
 	int Transform(LPDIRECT3DDEVICE9 pD3DDevice, D3DXVECTOR3 moveVector, float rollAngle);
 // >>> add 20120729 yossiepon begin
-	virtual int Transform(LPDIRECT3DDEVICE9 pD3DDevice, D3DXVECTOR3 moveVector1, D3DXVECTOR3 moveVector2, float scale, float z, float rollAngle);
+// >>> modify 20180411 yossiepon begin
+	virtual int Transform(
+			LPDIRECT3DDEVICE9 pD3DDevice,
+			D3DXVECTOR3 basePosVector,
+			D3DXVECTOR3 playbackPosVector,
+			float rollAngle
+		);
+// <<< modify 20180411 yossiepon end
 // <<< add 20120729 yossiepon end
 
 

--- a/MIDITrail/MTPianoKeyboardCtrlMod.cpp
+++ b/MIDITrail/MTPianoKeyboardCtrlMod.cpp
@@ -12,8 +12,6 @@
 #include "YNBaseLib.h"
 #include "MTPianoKeyboardCtrlMod.h"
 #include "MTPianoKeyboardMod.h"
-#include "MTNoteRippleMod.h"
-#include "MTNoteLyrics.h"
 
 using namespace YNBaseLib;
 
@@ -29,7 +27,7 @@ using namespace YNBaseLib;
 //******************************************************************************
 MTPianoKeyboardCtrlMod::MTPianoKeyboardCtrlMod(void)
 {
-	m_MaxPortIndex = 0;
+	m_MaxKeyboardIndex = 0;
 	ZeroMemory(m_KeyDownRateMod, sizeof(float) * SM_MAX_CH_NUM* SM_MAX_CH_NUM * SM_MAX_NOTE_NUM);
 }
 
@@ -54,7 +52,7 @@ int MTPianoKeyboardCtrlMod::Create(
 {
 	int result = 0;
 	unsigned long index = 0;
-	unsigned long portIndex = 0;
+	unsigned long keyboardIndex = 0;
 	unsigned char portNo = 0;
 	SMTrack track;
 
@@ -77,20 +75,32 @@ int MTPianoKeyboardCtrlMod::Create(
 	result = pSeqData->GetPortList(&m_PortList);
 	if (result != 0) goto EXIT;
 
-	//ポート番号に昇順のインデックスを振る
-	//ポート 0番 3番 5番 に出力する場合のインデックスはそれぞれ 0, 1, 2
 	for (index = 0; index < SM_MAX_PORT_NUM; index++) {
-		m_PortIndex[index] = -1;
+		m_KeyboardIndex[index] = -1;
 	}
-	for (index = 0; index < m_PortList.GetSize(); index++) {
-		m_PortList.GetPort(index, &portNo);
-		m_PortIndex[portNo] = portIndex;
-		portIndex++;
-		if(portIndex == m_KeyboardDesignMod.GetKeyboardMaxDispNum()){
-			break;
+
+	//シングルキーボードでない場合
+	if (!isSingleKeyboard) {
+		//ポート番号に昇順のキーボードインデックスを振る
+		//ポート 0番 3番 5番 に出力する場合のインデックスはそれぞれ 0, 1, 2
+		for (index = 0; index < m_PortList.GetSize(); index++) {
+			m_PortList.GetPort(index, &portNo);
+			m_KeyboardIndex[portNo] = keyboardIndex;
+			keyboardIndex++;
+			if(keyboardIndex == m_KeyboardDesignMod.GetKeyboardMaxDispNum()){
+				break;
+			}
 		}
+		m_MaxKeyboardIndex = (unsigned char)keyboardIndex;
+	}
+	//シングルキーボードの場合
+	else {
+		//キーボードデザインをシングルモードに設定
+		m_KeyboardDesignMod.SetKeyboardSingle();
+		//ポートとキーボードの対応を1:1に固定
+		m_KeyboardIndex[0] = 0;
+		m_MaxKeyboardIndex = 1;
 	}
-	m_MaxPortIndex = (unsigned char)portIndex;
 
 	//トラック取得
 	result = pSeqData->GetMergedTrack(&track);
@@ -112,7 +122,6 @@ int MTPianoKeyboardCtrlMod::Create(
 	m_pNotePitchBend = pNotePitchBend;
 
 	//シングルキーボードフラグ
-	//※フラグを受け取っても使用しない。ポート別シングルキーボードで常に動作する
 	m_isSingleKeyboard = isSingleKeyboard;
 
 EXIT:;
@@ -129,23 +138,23 @@ int MTPianoKeyboardCtrlMod::_CreateKeyboards(
 	)
 {
 	int result = 0;
-	unsigned char portIndex = 0;
+	unsigned char index = 0;
 	LPDIRECT3DTEXTURE9 pTexture = NULL;
 
-	for (portIndex = 0; portIndex < m_MaxPortIndex; portIndex++) {
+	for (index = 0; index < m_MaxKeyboardIndex; index++) {
 		try {
-			m_pPianoKeyboard[portIndex] = new MTPianoKeyboardMod;
+			m_pPianoKeyboard[index] = new MTPianoKeyboardMod;
 		}
 		catch (std::bad_alloc) {
 			result = YN_SET_ERR("Could not allocate memory.", 0, 0);
 			goto EXIT;
 		}
 
-		result = m_pPianoKeyboard[portIndex]->Create(pD3DDevice, pSceneName, pSeqData, pTexture);
+		result = m_pPianoKeyboard[index]->Create(pD3DDevice, pSceneName, pSeqData, pTexture);
 		if (result != 0) goto EXIT;
 
 		//先頭オブジェクトで作成したテクスチャを再利用する
-		pTexture = m_pPianoKeyboard[portIndex]->GetTexture();
+		pTexture = m_pPianoKeyboard[index]->GetTexture();
 	}
 
 EXIT:;
@@ -163,107 +172,52 @@ int MTPianoKeyboardCtrlMod::Transform(
 	int result = 0;
 	unsigned char portNo = 0;
 	unsigned char chNo = 0;
-	D3DXVECTOR3 vectorLU;
-	D3DXVECTOR3 vectorRU;
-	D3DXVECTOR3 vectorLD;
-	D3DXVECTOR3 vectorRD;
-	D3DXVECTOR3 moveVector1;
-	D3DXVECTOR3 moveVector2;
+	int index;
+	D3DXVECTOR3 basePosVector;
+	D3DXVECTOR3 playbackPosVector;
+
+	//アクティブポートフラグクリア
+	for (index = 0; index < SM_MAX_PORT_NUM; index++) {
+		m_isActivePort[index] = false;
+	}
 
 	//現在発音中ノートの頂点更新
 	result = _TransformActiveNotes(pD3DDevice);
 	if (result != 0) goto EXIT;
 
-	//再生面頂点座標取得
-	m_NoteDesignMod.GetPlaybackSectionVirtexPos(
-			0,
-			&vectorLU,
-			&vectorRU,
-			&vectorLD,
-			&vectorRD
-		);
-
-	float boardHeight = vectorLU.y - vectorLD.y;
-	float keyboardWidth = m_KeyboardDesignMod.GetPortOriginX(0) * -2.0f;
-
-	float rippleSpacing = m_NoteDesignMod.GetRippleSpacing();
-
 	//移動ベクトル：再生面に追従する
-	moveVector2 = m_NoteDesignMod.GetWorldMoveVector();
-	moveVector2.x += m_NoteDesignMod.GetPlayPosX(m_CurTickTime);
+	playbackPosVector = m_NoteDesignMod.GetWorldMoveVector();
+	playbackPosVector.x += m_NoteDesignMod.GetPlayPosX(m_CurTickTime);
 
 	unsigned char lastPortNo = 0;
 
-	m_PortList.GetPort(m_PortList.GetSize()-1, &lastPortNo);
+	if (!m_isSingleKeyboard) {
+		//シングルキーボードでない場合、最終ポート番号を取得
+		m_PortList.GetPort(m_PortList.GetSize()-1, &lastPortNo);
+	}
+	else {
+		//シングルキーボードの場合、最終ポート番号は0固定
+		lastPortNo = 0;
+	}
 
 	for(portNo = 0; portNo <= lastPortNo; portNo ++) {
 
-		int portIndex = m_PortIndex[portNo];
+		//ポート番号からキーボードインデックスを取得
+		//シングルキーボードの場合、インデックスは0固定
+		int keyboardIndex = !m_isSingleKeyboard ? m_KeyboardIndex[portNo] : 0;
 
-		if(portIndex == -1) {
+		if(keyboardIndex == -1) {
 			continue;
 		}
 
-		//ピッチベンドシフトの最大量を求める
-		float maxAbsPitchBendShift = 0.0f;
-		float curMaxPitchBendShift = 0.0f;
-
-		for (chNo = 0; chNo < SM_MAX_CH_NUM; chNo++) {
-
-			float pitchBendShift = _GetPichBendShiftPosX(portNo, chNo);
-			if(maxAbsPitchBendShift < fabs(pitchBendShift)) {
-
-				curMaxPitchBendShift = pitchBendShift;
-				maxAbsPitchBendShift = fabs(pitchBendShift);
-			}
-		}
-
 		//移動ベクトル：キーボード基準座標
-		moveVector1 = m_KeyboardDesignMod.GetKeyboardBasePos(portIndex, 0, keyboardWidth / boardHeight);
+		basePosVector = m_KeyboardDesignMod.GetKeyboardBasePos(keyboardIndex, rollAngle);
 
 		//移動ベクトル：ピッチベンドシフトを反映
-		moveVector1.x += curMaxPitchBendShift;
-
-		if(rollAngle < 0.0f) {
-			rollAngle += 360.0f;
-		}
-
-		float portWidth =  m_KeyboardDesignMod.GetChStep() * 16.0f;
-
-		if((rollAngle > 120.0f) && (rollAngle < 300.0f)) {
-
-			//鍵盤の1/2の幅だけ高音側に
-			moveVector1.x += m_KeyboardDesignMod.GetWhiteKeyStep() / 2.0f;
-
-			//ポート原点Y
-			moveVector1.y -= portWidth * (m_PortList.GetSize() - portIndex - 1) * (keyboardWidth / boardHeight);
-
-			//鍵盤の原点をCh15に
-			moveVector1.y -= m_KeyboardDesignMod.GetChStep()  * (keyboardWidth / boardHeight) * 15.0f;
-
-			//鍵盤の1/4の高さだけ下に
-			moveVector1.y -= m_KeyboardDesignMod.GetWhiteKeyHeight() / 4.0f;
-
-			//鍵盤の長さ＋リップルマージン＋歌詞マージンだけ手前に
-			moveVector1.z -= m_KeyboardDesignMod.GetWhiteKeyLen() + rippleSpacing * (MTNOTELYRICS_MAX_LYRICS_NUM + MTNOTERIPPLE_MAX_RIPPLE_NUM) * (keyboardWidth / boardHeight);
-
-		} else {
-
-			//鍵盤の1/2の幅だけ高音側に
-			moveVector1.x += m_KeyboardDesignMod.GetWhiteKeyStep() / 2.0f;
-
-			//ポート原点Y
-			moveVector1.y += portWidth * (m_PortList.GetSize() - portIndex - 1) * (keyboardWidth / boardHeight);
-
-			//鍵盤の1/4の高さだけ下に
-			moveVector1.y -= m_KeyboardDesignMod.GetWhiteKeyHeight() / 4.0f;
-
-			//リップルマージン＋歌詞マージンだけ奥に
-			moveVector1.z += 0.002f * (MTNOTELYRICS_MAX_LYRICS_NUM + MTNOTERIPPLE_MAX_RIPPLE_NUM) * (keyboardWidth / boardHeight);
-		}
+		basePosVector.x += GetMaxPitchBendShift(portNo);
 
 		//キーボード移動
-		result = m_pPianoKeyboard[portIndex]->Transform(pD3DDevice, moveVector1, moveVector2, boardHeight / keyboardWidth, vectorLU.z, rollAngle);
+		result = m_pPianoKeyboard[keyboardIndex]->Transform(pD3DDevice, basePosVector, playbackPosVector, rollAngle);
 		if (result != 0) goto EXIT;
 	}
 
@@ -312,8 +266,8 @@ int MTPianoKeyboardCtrlMod::_UpdateNoteStatus(
 	//ノートOFF後（キー復帰済み）
 	else {
 		//ノート情報を破棄
-		//複数チャンネルのキー状態をポート別に集約する
-		result = m_pPianoKeyboard[m_PortIndex[note.portNo]]->ResetKey(note.noteNo);
+		//発音中のキーをリセットする
+		result = m_pPianoKeyboard[_GetKeyboardIndexFromNote(note)]->ResetKey(note.noteNo);
 		if (result != 0) goto EXIT;
 
 		pNoteStatus->isActive = false;
@@ -322,6 +276,12 @@ int MTPianoKeyboardCtrlMod::_UpdateNoteStatus(
 		pNoteStatus->keyDownRate = 0.0f;
 	}
 
+	//状態更新後、発音中であれば
+	if (pNoteStatus->isActive) {
+		//アクティブポートフラグを立てる
+		m_isActivePort[note.portNo] = true;
+	}
+
 EXIT:;
 	return result;
 }
@@ -338,6 +298,7 @@ int MTPianoKeyboardCtrlMod::_UpdateVertexOfActiveNotes(
 	unsigned long elapsedTime = 0;
 	SMNote note;
 	D3DXCOLOR noteColor;
+	unsigned char notePortNo;
 
 	ZeroMemory(m_KeyDownRateMod, sizeof(float) * SM_MAX_CH_NUM* SM_MAX_CH_NUM * SM_MAX_NOTE_NUM);
 
@@ -358,21 +319,32 @@ int MTPianoKeyboardCtrlMod::_UpdateVertexOfActiveNotes(
 
 		//ノートの色
 		noteColor = m_NoteDesignMod.GetNoteBoxColor(note.portNo, note.chNo, note.noteNo);
-		
+
+		//シングルキーボードでない場合
+		if (!m_isSingleKeyboard) {
+			//ノートのポート番号を取得
+			notePortNo = note.portNo;
+		}
+		//シングルキーボードの場合
+		else {
+			//ノートのポート番号を0固定に
+			notePortNo = 0;
+		}
+
 		//発音対象キーを回転
 		//  すでに同一ノートに対して頂点を更新している場合
 		//  押下率が前回よりも上回る場合に限り頂点を更新する
-		if (m_KeyDownRateMod[note.portNo][note.chNo][note.noteNo] < m_pNoteStatus[i].keyDownRate) {
+		if (m_KeyDownRateMod[notePortNo][note.chNo][note.noteNo] < m_pNoteStatus[i].keyDownRate) {
 			//複数チャンネルのキー状態をポート別に集約する
-			result = m_pPianoKeyboard[m_PortIndex[note.portNo]]->PushKey(
-																	note.chNo,
-																	note.noteNo,
-																	m_pNoteStatus[i].keyDownRate,
-																	elapsedTime,
-																	&noteColor
-																);
+			result = m_pPianoKeyboard[_GetKeyboardIndexFromNote(note)]->PushKey(
+																		note.chNo,
+																		note.noteNo,
+																		m_pNoteStatus[i].keyDownRate,
+																		elapsedTime,
+																		&noteColor
+																	);
 			if (result != 0) goto EXIT;
-			m_KeyDownRateMod[note.portNo][note.chNo][note.noteNo] = m_pNoteStatus[i].keyDownRate;
+			m_KeyDownRateMod[notePortNo][note.chNo][note.noteNo] = m_pNoteStatus[i].keyDownRate;
 		}
 	}
 
@@ -388,19 +360,25 @@ int MTPianoKeyboardCtrlMod::Draw(
    )
 {
 	int result = 0;
-	unsigned char portIndex = 0;
+	unsigned char index = 0;
 	unsigned long count = 0;
 	unsigned long dispNum = 0;
 
 	if (!m_isEnable) goto EXIT;
 
+	//レンダリングステート設定：Zバッファへの書き込みオフ
+//	pD3DDevice->SetRenderState(D3DRS_ZWRITEENABLE, FALSE);
+
 	//キーボードの描画
-	for (portIndex = 0; portIndex < m_MaxPortIndex; portIndex++) {
+	for (index = 0; index < m_MaxKeyboardIndex; index++) {
 
-		result = m_pPianoKeyboard[portIndex]->Draw(pD3DDevice);
+		result = m_pPianoKeyboard[index]->Draw(pD3DDevice);
 		if (result != 0) goto EXIT;
 	}
 
+	//レンダリングステート設定：Zバッファへの書き込みオン
+//	pD3DDevice->SetRenderState(D3DRS_ZWRITEENABLE, TRUE);
+
 EXIT:;
 	return result;
 }
@@ -423,8 +401,8 @@ void MTPianoKeyboardCtrlMod::Reset()
 			result = m_NoteListRT.GetNote(m_pNoteStatus[i].index, &note);
 			//if (result != 0) goto EXIT;
 
-			//複数チャンネルのキー状態をポート別に集約する
-			result = m_pPianoKeyboard[m_PortIndex[note.portNo]]->ResetKey(note.noteNo);
+			//発音中のキーをリセットする
+			result = m_pPianoKeyboard[_GetKeyboardIndexFromNote(note)]->ResetKey(note.noteNo);
 			//if (result != 0) goto EXIT;
 		}
 		m_pNoteStatus[i].isActive = false;
@@ -435,3 +413,53 @@ void MTPianoKeyboardCtrlMod::Reset()
 
 	return;
 }
+
+int MTPianoKeyboardCtrlMod::_GetKeyboardIndexFromNote(const SMNote &note)
+{
+	//シングルキーボードでない場合
+	if (!m_isSingleKeyboard) {
+		//ノートのピアノ番号を取得
+		return m_KeyboardIndex[note.portNo];
+	}
+	//シングルキーボードの場合
+	else {
+		//ノートのピアノ番号を0固定に
+		return 0;
+	}
+}
+
+//******************************************************************************
+// ピッチベンドシフトの最大量を求める
+//******************************************************************************
+float MTPianoKeyboardCtrlMod::GetMaxPitchBendShift(unsigned char portNo) {
+
+	float max = 0.0f;
+	float cur = 0.0f;
+
+	//シングルキーボードでない場合、指定のポート番号から求める
+	//シングルキーボードの場合、シーケンスに含まれるポート番号すべてから求める
+	int portListSize = !m_isSingleKeyboard ? 1 : m_PortList.GetSize();
+
+	for (int i = 0; i < portListSize; i++) {
+
+		if (m_isSingleKeyboard) {
+			m_PortList.GetPort(i, &portNo);
+		}
+
+		if (!m_isActivePort[portNo]) {
+			continue;
+		}
+
+		for (unsigned char chNo = 0; chNo < SM_MAX_CH_NUM; chNo++) {
+
+			float pitchBendShift = _GetPichBendShiftPosX(portNo, chNo);
+			if(max < fabs(pitchBendShift)) {
+
+				cur = pitchBendShift;
+				max = fabs(pitchBendShift);
+			}
+		}
+	}
+
+	return cur;
+}
\ No newline at end of file

--- a/MIDITrail/MTPianoKeyboardCtrlMod.h
+++ b/MIDITrail/MTPianoKeyboardCtrlMod.h
@@ -58,8 +58,13 @@ private:
 
 	//ポートリスト
 	SMPortList m_PortList;
-	int m_PortIndex[SM_MAX_PORT_NUM];
-	unsigned char m_MaxPortIndex;
+
+	//アクティブポートフラグ
+	bool m_isActivePort[SM_MAX_PORT_NUM];
+
+	//キーボードインデックス
+	int m_KeyboardIndex[SM_MAX_PORT_NUM];
+	unsigned char m_MaxKeyboardIndex;
 
 	//キー押下率配列
 	float m_KeyDownRateMod[SM_MAX_CH_NUM][SM_MAX_CH_NUM][SM_MAX_NOTE_NUM];
@@ -73,6 +78,9 @@ private:
 			);
 	virtual int _UpdateVertexOfActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice);
 
+	int _GetKeyboardIndexFromNote(const SMNote &note);
+
+	float GetMaxPitchBendShift(unsigned char portNo);
 };
 
 

--- a/MIDITrail/MTPianoKeyboardDesign.cpp
+++ b/MIDITrail/MTPianoKeyboardDesign.cpp
@@ -916,6 +916,16 @@ unsigned long MTPianoKeyboardDesign::GetKeyboardMaxDispNum()
 	return (unsigned long)m_KeyboardMaxDispNum;
 }
 
+// >>> add 20180404 yossiepon begin
+//******************************************************************************
+// キーボード表示数設定
+//******************************************************************************
+void MTPianoKeyboardDesign::SetKeyboardSingle()
+{
+	m_KeyboardMaxDispNum = 1;
+}
+// <<< add 20180404 yossiepon end
+
 //******************************************************************************
 // キー表示範囲：開始
 //******************************************************************************

--- a/MIDITrail/MTPianoKeyboardDesign.h
+++ b/MIDITrail/MTPianoKeyboardDesign.h
@@ -67,10 +67,8 @@ public:
 
 	//ポート原点座標取得
 	float GetPortOriginX(unsigned char portNo);
-// >>> modify 20120728 yossiepon begin
-	virtual float GetPortOriginY(unsigned char portNo);
-	virtual float GetPortOriginZ(unsigned char portNo);
-// <<< modify 20120728 yossiepon end
+	float GetPortOriginY(unsigned char portNo);
+	float GetPortOriginZ(unsigned char portNo);
 
 	//キー種別取得
 	KeyType GetKeyType(unsigned char noteNo);
@@ -182,13 +180,15 @@ public:
 		);
 
 	//キーボード基準座標取得
-// >>> modify 20120728 yossiepon begin
-	virtual D3DXVECTOR3 GetKeyboardBasePos(unsigned char portNo, unsigned char chNo);
-// <<< modify 20120728 yossiepon end
+	D3DXVECTOR3 GetKeyboardBasePos(unsigned char portNo, unsigned char chNo);
 
 	//キーボード最大表示数取得
 	unsigned long GetKeyboardMaxDispNum();
 
+// >>> add 20180404 yossiepon begin
+	void SetKeyboardSingle();
+// <<< add 20180404 yossiepon end
+
 	//キー表示範囲取得
 	unsigned char GetKeyDispRangeStart();
 	unsigned char GetKeyDispRangeEnd();

--- a/MIDITrail/MTPianoKeyboardDesignMod.cpp
+++ b/MIDITrail/MTPianoKeyboardDesignMod.cpp
@@ -12,6 +12,8 @@
 #include "DXColorUtil.h"
 #include "MTConfFile.h"
 #include "MTPianoKeyboardDesignMod.h"
+#include "MTNoteRippleMod.h"
+#include "MTNoteLyrics.h"
 
 
 //******************************************************************************
@@ -75,24 +77,209 @@ void MTPianoKeyboardDesignMod::_Initialize()
 }
 
 //******************************************************************************
+// キーボード基準座標取得
+//******************************************************************************
+D3DXVECTOR3 MTPianoKeyboardDesignMod::GetKeyboardBasePos(
+		int keyboardIndex,
+		float angle
+	)
+{
+	float ox, oy, oz = 0.0f;
+
+	//ロール角度によって描画方法を切り替える
+	angle += angle < 0.0f ? 360.0f : 0.0f;
+	bool flip = !((angle > 120.0f) && (angle < 300.0f));
+
+	//ポート単位の原点座標
+	ox = GetPortOriginX();
+	oy = GetPortOriginY(keyboardIndex, flip);
+	oz = GetPortOriginZ(keyboardIndex, flip);
+
+	return D3DXVECTOR3(ox, oy, oz);
+}
+
+//******************************************************************************
+// ポート原点X座標取得
+//******************************************************************************
+float MTPianoKeyboardDesignMod::GetPortOriginX()
+{
+	// angle: 120°〜300°(rotateX: 90°, rotateZ: 90°)
+	//             +z
+	//              |
+	// -x<----------0---------->+x
+	//              | -RippleMargin
+	//         +----+----+
+	//         |    |    |  @:OriginX
+	//         |    |    |
+	//         |    |    |
+	//         |    |    |
+	//         @----+----+
+	//    Note #0   |  #127
+	//             -z
+
+	// angle: 0°〜120°or 300°〜360°(rotateX: -90°, rotateZ: 90°)
+	//             +z
+	//              |
+	//    Note #0   |  #127
+	//         +----+----+
+	//         |    |    |  @:OriginX
+	//         |    |    |
+	//         |    |    |
+	//         |    |    |
+	//         @----+----+
+	//              | +RippleMargin
+	// -x<----------0---------->+x
+	//              |
+	//             -z
+
+	float originX = -GetPlaybackSectionHeight() / 2.0f;
+
+	//鍵盤の1/2の幅だけ高音側に移動
+	originX += GetWhiteKeyStep() * GetKeyboardResizeRatio() / 2.0f;
+
+	return originX;
+}
+
+//******************************************************************************
 // ポート原点Y座標取得
 //******************************************************************************
 float MTPianoKeyboardDesignMod::GetPortOriginY(
-		unsigned char portNo
+		int keyboardIndex,
+		bool flip
 	)
 {
-	return 0;
+	// angle: 120°〜300°(rotateX: 90°, rotateZ: 90°)
+	//      +y                                    
+	//       |                                    
+	//       |                             Ch.15  
+	//       |                                    
+	//       |            +--------------+        
+	//       |      portC +--------------@ Ch.0   
+	//       |                             Ch.15  
+	//       |                                    
+	// +z<---0---------------------------------------------->-z
+	//       |            +--------------+        
+	//       |      portB +--------------@ Ch.0   
+	//       |                             Ch.15  
+	//       |                                    
+	//       |            +--------------+          @:OriginY(for portA,B,C)
+	//       |      portA +--------------@ Ch.0   
+	//       |                                    
+	//      -y                                    
+
+	// angle: 0°〜120°or 300°〜360°(rotateX: -90°, rotateZ: 90°)
+	//                                           +y
+	//                                     Ch.15  |
+	//                                            |
+	//                    +--------------+        |
+	//              portA +--------------@ Ch.0   |
+	//                                     Ch.15  |
+	//                                            |
+	// +z<----------------------------------------0-------------->-z
+	//                    +--------------+        |
+	//              portB +--------------@ Ch.0   |
+	//                                     Ch.15  |
+	//                                            |
+	//                    +--------------+        |
+	//              portC +--------------@ Ch.0   |
+	//                                            |
+	//                                            | @:OriginY(for portA,B,C)
+	//                                           -y
+
+	float portWidth = GetPortWidth();
+
+	// TODO シングルキーボードの判定方法を再検討
+	int keyboardDispNum = GetKeyboardMaxDispNum() > 1 ? m_PortList.GetSize() : 1;
+
+	float originY;
+
+	if (!flip) {
+		originY = -portWidth * (float)(keyboardDispNum - keyboardIndex * 2) / 2.0f;
+
+		//チャネル間隔の62.5%の高さだけ下に
+		originY -= GetChStep() * 0.625f;
+	}
+	else {
+		originY = portWidth * (float)(keyboardDispNum - (keyboardIndex + 1) * 2) / 2.0f;
+
+		//チャネル間隔の37.5%の高さだけ上に
+		originY += GetChStep() * 0.375f;
+	}
+
+	return originY;
 }
 
 //******************************************************************************
 // ポート原点Z座標取得
 //******************************************************************************
 float MTPianoKeyboardDesignMod::GetPortOriginZ(
-		unsigned char portNo
+		int keyboardIndex,
+		bool flip
 	)
 {
+	// angle: 120°〜300°(rotateX: 90°, rotateZ: 90°)
+	//             +z
+	//              |
+	// -x<----------0---------->+x
+	//              | -RippleMargin
+	//         +----+----+
+	//         |    |    |  @:OriginZ
+	//         |    |    |
+	//         |    |    |
+	//         |    |    |
+	//         @----+----+
+	//    Note #0   |  #127
+	//             -z
+
+	// angle: 0°〜120°or 300°〜360°(rotateX: -90°, rotateZ: 90°)
+	//             +z
+	//              |
+	//    Note #0   |  #127
+	//         +----+----+
+	//         |    |    |  @:OriginZ
+	//         |    |    |
+	//         |    |    |
+	//         |    |    |
+	//         @----+----+
+	//              | +RippleMargin
+	// -x<----------0---------->+x
+	//              |
+	//             -z
+
+	float originZ;
+
+	if (!flip) {
+		originZ = -(GetWhiteKeyLen() * GetKeyboardResizeRatio() + GetRippleMargin());
+	}
+	else {
+		originZ = GetRippleMargin();
+	}
 
-	return 0;
+	return originZ;
+}
+
+//******************************************************************************
+// ノートボックス高さ取得
+//******************************************************************************
+float MTPianoKeyboardDesignMod::GetNoteBoxHeight()
+{
+	return m_NoteBoxHeight;
+}
+
+//******************************************************************************
+// ノートボックス幅取得
+//******************************************************************************
+float MTPianoKeyboardDesignMod::GetNoteBoxWidth()
+{
+	return m_NoteBoxWidth;
+}
+
+//******************************************************************************
+// ノート間隔取得
+//******************************************************************************
+float MTPianoKeyboardDesignMod::GetNoteStep()
+{
+	return m_NoteStep;
 }
 
 //******************************************************************************
@@ -104,6 +291,95 @@ float MTPianoKeyboardDesignMod::GetChStep()
 }
 
 //******************************************************************************
+// キーボード高さ取得
+//******************************************************************************
+float MTPianoKeyboardDesignMod::GetKeyboardHeight()
+{
+	return GetBlackKeyHeight();
+}
+
+//******************************************************************************
+// キーボード幅取得
+//******************************************************************************
+float MTPianoKeyboardDesignMod::GetKeyboardWidth()
+{
+	return GetWhiteKeyStep() * (float)(SM_MAX_NOTE_NUM - 53);
+}
+
+//******************************************************************************
+// グリッド高さ取得
+//******************************************************************************
+float MTPianoKeyboardDesignMod::GetGridHeight()
+{
+	return GetNoteStep() * 127.0f;
+}
+
+//******************************************************************************
+// グリッド幅取得
+//******************************************************************************
+float MTPianoKeyboardDesignMod::GetGridWidth()
+{
+	return GetChStep() * 15.0f;
+}
+
+//******************************************************************************
+// ポート高さ取得
+//******************************************************************************
+float MTPianoKeyboardDesignMod::GetPortHeight()
+{
+	return GetGridHeight();
+}
+
+//******************************************************************************
+// ポート幅取得
+//******************************************************************************
+float MTPianoKeyboardDesignMod::GetPortWidth()
+{
+	return GetChStep() * 16.0f;
+}
+
+//******************************************************************************
+// 再生面高さ取得
+//******************************************************************************
+float MTPianoKeyboardDesignMod::GetPlaybackSectionHeight()
+{
+	return GetGridHeight() + GetNoteBoxHeight();
+}
+
+//******************************************************************************
+// 再生面幅取得
+//******************************************************************************
+float MTPianoKeyboardDesignMod::GetPlaybackSectionWidth()
+{
+	return GetGridWidth() + GetNoteBoxWidth();
+}
+
+//******************************************************************************
+// 波紋描画間隔取得
+//******************************************************************************
+float MTPianoKeyboardDesignMod::GetRippleSpacing()
+{
+	return m_RippleSpacing;
+}
+
+//******************************************************************************
+// 波紋描画マージン取得
+//******************************************************************************
+float MTPianoKeyboardDesignMod::GetRippleMargin()
+{
+	return GetRippleSpacing() * (MTNOTELYRICS_MAX_LYRICS_NUM + MTNOTERIPPLE_MAX_RIPPLE_NUM);
+}
+
+//******************************************************************************
+// キーボードリサイズ比取得
+//******************************************************************************
+float MTPianoKeyboardDesignMod::GetKeyboardResizeRatio()
+{
+	//キーボード基準の相対座標に適用するリサイズ比
+	return GetPlaybackSectionHeight() / GetKeyboardWidth();
+}
+
+//******************************************************************************
 // 発音中キーカラー取得
 //******************************************************************************
 D3DXCOLOR MTPianoKeyboardDesignMod::GetActiveKeyColor(
@@ -168,25 +444,6 @@ D3DXCOLOR MTPianoKeyboardDesignMod::GetActiveKeyColor(
 }
 
 //******************************************************************************
-// キーボード基準座標取得
-//******************************************************************************
-D3DXVECTOR3 MTPianoKeyboardDesignMod::GetKeyboardBasePos(
-		unsigned char portNo,
-		unsigned char chNo,
-		float scale
-	)
-{
-	float ox, oy, oz = 0.0f;
-
-	//ポート単位の原点座標
-	ox = GetPortOriginX(portNo);
-	oy = GetPortOriginY(portNo);
-	oz = GetPortOriginZ(portNo);
-
-	return D3DXVECTOR3(ox, oy, oz);
-}
-
-//******************************************************************************
 // 設定ファイル読み込み
 //******************************************************************************
 int MTPianoKeyboardDesignMod::_LoadConfFile(
@@ -212,6 +469,13 @@ int MTPianoKeyboardDesignMod::_LoadConfFile(
 	//----------------------------------
 	result = confFile.SetCurSection(_T("Scale"));
 	if (result != 0) goto EXIT;
+
+	result = confFile.GetFloat(_T("NoteBoxHeight"), &m_NoteBoxHeight, 0.1f);
+	if (result != 0) goto EXIT;
+	result = confFile.GetFloat(_T("NoteBoxWidth"), &m_NoteBoxWidth, 0.1f);
+	if (result != 0) goto EXIT;
+	result = confFile.GetFloat(_T("NoteStep"), &m_NoteStep, 0.1f);
+	if (result != 0) goto EXIT;
 	result = confFile.GetFloat(_T("ChStep"), &m_ChStep, 0.5f);
 	if (result != 0) goto EXIT;
 
@@ -230,6 +494,16 @@ int MTPianoKeyboardDesignMod::_LoadConfFile(
 		m_ActiveKeyColorList[i] = DXColorUtil::MakeColorFromHexRGBA(hexColor);
 	}
 
+	//----------------------------------
+	//波紋情報
+	//----------------------------------
+	result = confFile.SetCurSection(_T("Ripple"));
+	if (result != 0) goto EXIT;
+
+	//波紋描画間隔
+	result = confFile.GetFloat(_T("Spacing"), &m_RippleSpacing, 0.002f);
+	if (result != 0) goto EXIT;
+
 EXIT:;
 	return result;
 }

--- a/MIDITrail/MTPianoKeyboardDesignMod.h
+++ b/MIDITrail/MTPianoKeyboardDesignMod.h
@@ -27,13 +27,52 @@ public:
 	//初期化
 	virtual int Initialize(const TCHAR* pSceneName, SMSeqData* pSeqData);
 
+	//キーボード基準座標取得
+	D3DXVECTOR3 GetKeyboardBasePos(
+			int keyboardIndex,
+			float angle
+		);
+
 	//ポート原点座標取得
-	virtual float GetPortOriginY(unsigned char portNo);
-	virtual float GetPortOriginZ(unsigned char portNo);
+	float GetPortOriginX();
+	float GetPortOriginY(int keyboardIndex, bool flip);
+	float GetPortOriginZ(int keyboardIndex, bool flip);
+
+	//ノートボックス高さ・幅取得
+	float GetNoteBoxHeight();
+	float GetNoteBoxWidth();
+
+	//ノート間隔取得
+	float GetNoteStep();
 
 	//チャンネル間隔取得
 	float GetChStep();
 
+	//キーボード高さ・幅取得
+	float GetKeyboardHeight();
+	float GetKeyboardWidth();
+
+	//グリッド高さ・幅取得
+	float GetGridHeight();
+	float GetGridWidth();
+
+	//ポート高さ・幅取得
+	float GetPortHeight();
+	float GetPortWidth();
+
+	//再生面高さ・幅取得
+	float GetPlaybackSectionHeight();
+	float GetPlaybackSectionWidth();
+
+	//波紋描画間隔取得
+	float GetRippleSpacing();
+
+	//波紋描画マージン取得
+	float GetRippleMargin();
+
+	//キーボードリサイズ比取得
+	float GetKeyboardResizeRatio();
+
 	//発音中キーカラー取得
 	D3DXCOLOR GetActiveKeyColor(
 			unsigned char chNo,
@@ -42,9 +81,6 @@ public:
 			D3DXCOLOR* pNoteColor = NULL
 		);
 
-	//キーボード基準座標取得
-	virtual D3DXVECTOR3 GetKeyboardBasePos(unsigned char portNo, unsigned char chNo, float scale);
-
 protected:
 
 	virtual void _Initialize();
@@ -52,9 +88,18 @@ protected:
 
 private:
 
+	//ノートボックス高さ
+	float m_NoteBoxHeight;
+	//ノートボックス幅
+	float m_NoteBoxWidth;
+	//ノート間隔
+	float m_NoteStep;
 	//チャンネル間隔
 	float m_ChStep;
 
+	//波紋描画間隔
+	float m_RippleSpacing;
+
 	//発音中キー色情報
 	D3DXCOLOR m_ActiveKeyColorList[16];
 

--- a/MIDITrail/MTPianoKeyboardMod.cpp
+++ b/MIDITrail/MTPianoKeyboardMod.cpp
@@ -77,10 +77,8 @@ EXIT:;
 //******************************************************************************
 int MTPianoKeyboardMod::Transform(
 		LPDIRECT3DDEVICE9 pD3DDevice,
-		D3DXVECTOR3 moveVector1,
-		D3DXVECTOR3 moveVector2,
-		float scale,
-		float z,
+		D3DXVECTOR3 basePosVector,
+		D3DXVECTOR3 playbackPosVector,
 		float rollAngle
 	)
 {
@@ -89,21 +87,17 @@ int MTPianoKeyboardMod::Transform(
 	D3DXMATRIX rotateMatrix1;
 	D3DXMATRIX rotateMatrix2;
 	D3DXMATRIX rotateMatrix3;
-	D3DXMATRIX moveMatrix1;
-	D3DXMATRIX moveMatrix2;
-	D3DXMATRIX moveMatrix3;
-	D3DXMATRIX worldMatrix1;
-	D3DXMATRIX worldMatrix2;
+	D3DXMATRIX basePosMatrix;
+	D3DXMATRIX playbackPosMatrix;
+	D3DXMATRIX worldMatrix;
 
 	//行列初期化
 	D3DXMatrixIdentity(&scaleMatrix);
 	D3DXMatrixIdentity(&rotateMatrix1);
 	D3DXMatrixIdentity(&rotateMatrix2);
-	D3DXMatrixIdentity(&rotateMatrix3);
-	D3DXMatrixIdentity(&moveMatrix1);
-	D3DXMatrixIdentity(&moveMatrix2);
-	D3DXMatrixIdentity(&worldMatrix1);
-	D3DXMatrixIdentity(&worldMatrix2);
+	D3DXMatrixIdentity(&basePosMatrix);
+	D3DXMatrixIdentity(&playbackPosMatrix);
+	D3DXMatrixIdentity(&worldMatrix);
 
 	//回転行列
 
@@ -112,33 +106,33 @@ int MTPianoKeyboardMod::Transform(
 	}
 
 	if((rollAngle > 120.0f) && (rollAngle < 300.0f)) {
-		D3DXMatrixRotationX(&rotateMatrix1, D3DXToRadian(90.0f));
-		D3DXMatrixRotationZ(&rotateMatrix2, D3DXToRadian(90.0f));
+		D3DXMatrixRotationX(&rotateMatrix1, D3DX_PI / 2.0f);
+		D3DXMatrixRotationZ(&rotateMatrix2, D3DX_PI / 2.0f);
 	} else {
-		D3DXMatrixRotationX(&rotateMatrix1, D3DXToRadian(-90.0f));
-		D3DXMatrixRotationZ(&rotateMatrix2, D3DXToRadian(90.0f));
+		D3DXMatrixRotationX(&rotateMatrix1, -D3DX_PI / 2.0f);
+		D3DXMatrixRotationZ(&rotateMatrix2, D3DX_PI / 2.0f);
 	}
 
 	D3DXMatrixRotationX(&rotateMatrix3, D3DXToRadian(rollAngle));
 
 	//移動行列
-	D3DXMatrixTranslation(&moveMatrix1, moveVector1.x, moveVector1.y, moveVector1.z);
-	D3DXMatrixTranslation(&moveMatrix2, moveVector2.x, moveVector2.y, moveVector2.z);
-	D3DXMatrixTranslation(&moveMatrix3, 0.0f, 0.0f, z / scale);
+	D3DXMatrixTranslation(&basePosMatrix, basePosVector.x, basePosVector.y, basePosVector.z);
+	D3DXMatrixTranslation(&playbackPosMatrix, playbackPosVector.x, playbackPosVector.y, playbackPosVector.z);
 
 	//スケール行列
+	float scale = m_KeyboardDesignMod.GetKeyboardResizeRatio();
 	D3DXMatrixScaling(&scaleMatrix, scale, scale, scale);
 
-	//行列の合成：ピッチベンド移動１→鍵盤向き補正回転１・２→グリッド面まで移動３→ホイール回転３→スケール→再生面追従移動２
-	D3DXMatrixMultiply(&worldMatrix1, &moveMatrix1, &rotateMatrix1);
-	D3DXMatrixMultiply(&worldMatrix2, &worldMatrix1, &rotateMatrix2);
-	D3DXMatrixMultiply(&worldMatrix1, &worldMatrix2, &moveMatrix3);
-	D3DXMatrixMultiply(&worldMatrix2, &worldMatrix1, &rotateMatrix3);
-	D3DXMatrixMultiply(&worldMatrix1, &worldMatrix2, &scaleMatrix);
-	D3DXMatrixMultiply(&worldMatrix2, &worldMatrix1, &moveMatrix2);
+	//行列の合成：スケール→原点移動→回転１・２（鍵盤向き補正）→回転３（ホイール角度）→再生位置追従移動
+	D3DXMatrixMultiply(&worldMatrix, &worldMatrix, &scaleMatrix);
+	D3DXMatrixMultiply(&worldMatrix, &worldMatrix, &basePosMatrix);
+	D3DXMatrixMultiply(&worldMatrix, &worldMatrix, &rotateMatrix1);
+	D3DXMatrixMultiply(&worldMatrix, &worldMatrix, &rotateMatrix2);
+	D3DXMatrixMultiply(&worldMatrix, &worldMatrix, &rotateMatrix3);
+	D3DXMatrixMultiply(&worldMatrix, &worldMatrix, &playbackPosMatrix);
 
 	//変換行列設定
-	m_PrimitiveKeyboard.Transform(worldMatrix2);
+	m_PrimitiveKeyboard.Transform(worldMatrix);
 
 //EXIT:;
 	return result;

--- a/MIDITrail/MTPianoKeyboardMod.h
+++ b/MIDITrail/MTPianoKeyboardMod.h
@@ -34,7 +34,12 @@ public:
 		);
 
 	//更新
-	virtual int Transform(LPDIRECT3DDEVICE9 pD3DDevice, D3DXVECTOR3 moveVector1, D3DXVECTOR3 moveVector2, float scale, float z, float rollAngle);
+	int Transform(
+			LPDIRECT3DDEVICE9 pD3DDevice,
+			D3DXVECTOR3 basePosVector,
+			D3DXVECTOR3 playbackPosVector,
+			float rollAngle
+		);
 
 	//キー状態変更
 	virtual int PushKey(

--- a/MIDITrail/MTScene.h
+++ b/MIDITrail/MTScene.h
@@ -34,7 +34,11 @@ public:
 		EffectStars,
 		EffectCounter,
 		EffectBackgroundImage,
-		EffectFileName
+		EffectFileName,
+// >>> add 20180404 yossiepon begin
+		EffectTimeIndicator,
+		EffectGridBox,
+// <<< add 20180404 yossiepon end
 	};
 
 	typedef std::map<std::string, float>  MTViewParamMap;

--- a/MIDITrail/MTScenePianoRoll2DMod.cpp
+++ b/MIDITrail/MTScenePianoRoll2DMod.cpp
@@ -17,6 +17,7 @@
 //******************************************************************************
 MTScenePianoRoll2DMod::MTScenePianoRoll2DMod(void)
 {
+	m_IsSingleKeyboard = true;
 }
 
 //******************************************************************************

--- a/MIDITrail/MTScenePianoRoll3DMod.cpp
+++ b/MIDITrail/MTScenePianoRoll3DMod.cpp
@@ -388,6 +388,14 @@ void MTScenePianoRoll3DMod::SetEffect(
 		case EffectBackgroundImage:
 			m_BackgroundImage.SetEnable(isEnable);
 			break;
+// >>> add 20180404 yossiepon begin
+		case EffectTimeIndicator:
+			m_TimeIndicator.SetEnable(isEnable);
+			break;
+		case EffectGridBox:
+			m_GridBoxMod.SetEnable(isEnable);
+			break;
+// <<< add 20180404 yossiepon end
 		default:
 			break;
 	}

--- a/MIDITrail/MTTimeIndicator.cpp
+++ b/MIDITrail/MTTimeIndicator.cpp
@@ -23,6 +23,9 @@ MTTimeIndicator::MTTimeIndicator(void)
 	m_CurPos = 0.0f;
 	m_CurTickTime = 0;
 	m_isEnableLine = false;
+// >>> add 20180404 yossiepon begin
+	m_isEnable = true;
+// <<< add 20180404 yossiepon end
 }
 
 //******************************************************************************
@@ -203,6 +206,12 @@ int MTTimeIndicator::Draw(
 {
 	int result = 0;
 
+// >>> add 20180404 yossiepon begin
+
+	if (!m_isEnable) goto EXIT;
+
+// <<< add 20180404 yossiepon end
+
 // >>> add 20120728 yossiepon begin
 
 	//テクスチャステージ設定
@@ -377,3 +386,12 @@ D3DXVECTOR3 MTTimeIndicator::GetMoveVector()
 	return D3DXVECTOR3(m_CurPos, 0.0f, 0.0f);
 }
 
+//******************************************************************************
+// 表示設定
+//******************************************************************************
+void MTTimeIndicator::SetEnable(
+		bool isEnable
+	)
+{
+	m_isEnable = isEnable;
+}

--- a/MIDITrail/MTTimeIndicator.h
+++ b/MIDITrail/MTTimeIndicator.h
@@ -57,6 +57,11 @@ public:
 	//移動ベクトル取得
 	D3DXVECTOR3 GetMoveVector();
 
+// >>> add 20180404 yossiepon begin
+	//表示設定
+	void SetEnable(bool isEnable);
+// <<< add 20180404 yossiepon end
+
 private:
 
 	DXPrimitive m_Primitive;
@@ -65,6 +70,11 @@ private:
 	MTNoteDesign m_NoteDesign;
 	bool m_isEnableLine;
 
+// >>> add 20180404 yossiepon begin
+	//表示可否
+	bool m_isEnable;
+// <<< add 20180404 yossiepon end
+
 	unsigned long m_CurTickTime;
 
 	//頂点バッファ構造体

--- a/MIDITrail/resource.h
+++ b/MIDITrail/resource.h
@@ -68,7 +68,13 @@
 #define IDM_ADD_FILE                    32837
 // <<< add 20120728 yossiepon end
 #define IDM_AUTO_SAVE_VIEWPOINT         32838
+// >>> add 20180404 yossiepon begin
+#define IDM_ENABLE_GRIDBOX              32839
+// <<< add 20180404 yossiepon end
 #define IDM_VIEW_PIANOROLLRAIN2D        32840
+// >>> add 20180404 yossiepon begin
+#define IDM_ENABLE_TIMEINDICATOR        32841
+// <<< add 20180404 yossiepon end
 #define IDM_ENABLE_BACKGROUNDIMAGE      32842
 #define IDC_STATIC                      -1
 

--- a/MIDITrail/template/conf/PianoRoll2D.ini
+++ b/MIDITrail/template/conf/PianoRoll2D.ini
@@ -64,7 +64,11 @@ SizeRatio=1.4
 ;Duration=1600
 DecayDuration=100
 ReleaseDuration=250
+;-- D3dBlendType : ZERO=1, ONE=2, SRCALPHA=5, INVSRCALPHA=6, DESTALPHA=7, INVDESTALPHA=8
+SrcBlend=5
+DestBlend=2
 OverwriteTimes=3
+;-- e.g.) BlackBG : Src/Dest/Overwrite = 5/2/3, PictureBG : Src/Dest/Overwrite = 5/2/1
 Spacing=0.002
 
 [Stars]

--- a/MIDITrail/template/conf/PianoRoll3D.ini
+++ b/MIDITrail/template/conf/PianoRoll3D.ini
@@ -64,7 +64,11 @@ SizeRatio=1.4
 ;Duration=1600
 DecayDuration=100
 ReleaseDuration=250
+;-- D3dBlendType : ZERO=1, ONE=2, SRCALPHA=5, INVSRCALPHA=6, DESTALPHA=7, INVDESTALPHA=8
+SrcBlend=5
+DestBlend=2
 OverwriteTimes=3
+;-- e.g.) BlackBG : Src/Dest/Overwrite = 5/2/3, PictureBG : Src/Dest/Overwrite = 5/2/1
 Spacing=0.002
 
 [Stars]

--- a/readme_mod_yossiepon.txt
+++ b/readme_mod_yossiepon.txt
@@ -1,24 +1,36 @@
 ピカピカMIDITrail 鍵盤方向自動切替・多ポート・歌詞対応等
 
-MIDITrail 1.2.3 mod. yossiepon_20180404
+MIDITrail 1.2.3 mod. yossiepon_20180412
 mail: [e-mail]
 
-改造点 20180404：
-・1.2.3をマージ
+改造点 20180412：
+・[UPDATE] 1.2.3をマージ
+・[ADD] リップルと背景画像のブレンド方法を指定できる設定を追加
+　→INIファイル中のRippleセクション SrcBlendおよびDestBlend
+・[FIX] 多ポートのシーケンスでPianoRoll2Dのキーボードが1つに集約されない不具合を修正
+・[FIX] PianoRoll3Dで多ポート時のキーボード基準位置がずれている不具合を修正
 
 改造点 20170528：
-・シーケンス中のテキスト取得時にRTRIMをかけるように修正
-・タイトルがない場合にファイル名を表示するように修正
+・[FIX] タイトル（シーケンス名）が空の場合、ファイル名を代替表示するよう修正
+・[FIX] シーケンス中のテキスト取得時にRTRIMをかけるように修正
+
+改造点 20161226：
+・[FIX] original 1.2.1 からの取り込みを保留していた機能を反映
+　#30547 機能追加：音階色指定
+　#32427 機能追加：押下状態のキーにノートの色を反映する
+・[UPDATE] PianoRoll2D/3DMod : ActiveKeyColorType=NOTE に対応
+・[ADD] 波紋上書き回数および波紋間の描画間隔を指定できる設定を追加
+　→INIファイル中のRippleセクション OverwriteTimesおよびSpacing
 
 改造点 20161223：
-・1.2.2をベースに再マージ
+・[UPDATE] 1.2.2をベースに再マージ
 
 改造点 20140920：
-・1.2.1bをベースに再マージ（とりあえず動く程度）
-・x64版のバイナリを追加
+・[UPDATE] 1.2.1bをベースに再マージ（とりあえず動く程度）
+・[ADD] x64版のバイナリを追加
 
 改造点 20121229：
-・PianoRoll3D: 逆方向にライトを追加しました
+・[ADD] PianoRoll3D: 逆方向にライトを追加しました
 
 改造点 20120728-30：
 ・改造箇所をなるべく別ソースに出すように作り直した