Commit: 20576ea56ba8bb740850f57a37aa4c1dc5ba0c11 - MIDITrailMod (git)

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

Commit MetaInfo

• Révision: 20576ea56ba8bb740850f57a37aa4c1dc5ba0c11 (tree)
• l'heure: 2016-10-30 12:39:33
• Auteur: yoshy <yoshy@user...>
• Commiter: yoshy

Message de Log

[UPDATE] 2D/3D ビューの鍵盤を動くようにした
[UPDATE] 時間をミリ秒表示に修正
[FIX] ウィンドウ背景のブラシを黒固定に変更（背景が時々真っ白になるので）

Change Summary

• modified: MIDITrail/MIDITrail.rc
• modified: MIDITrail/MIDITrailApp.cpp
• modified: MIDITrail/MTDashboard.cpp
• modified: MIDITrail/MTDashboard.h
• modified: MIDITrail/MTPianoKeyboard.cpp
• modified: MIDITrail/MTPianoKeyboard.h
• modified: MIDITrail/MTPianoKeyboardCtrl.cpp
• modified: MIDITrail/MTPianoKeyboardCtrlLive.cpp
• modified: MIDITrail/MTPianoKeyboardDesign.cpp
• modified: MIDITrail/MTPianoKeyboardDesign.h
• modified: MIDITrail/MTScenePianoRoll3D.cpp
• modified: MIDITrail/MTScenePianoRoll3D.h
• modified: MIDITrail/MTScenePianoRollRain.cpp
• modified: SMIDILib/SMSequencer.cpp

Modification

--- a/MIDITrail/MIDITrail.rc
+++ b/MIDITrail/MIDITrail.rc
@@ -120,7 +120,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     ICON            IDI_MIDITRAIL,IDC_STATIC,74,12,20,20
     CTEXT           "MIDITrail",IDC_STATIC,16,42,138,8,SS_NOPREFIX
-    CTEXT           "Version 1.2.0",IDC_STATIC,16,63,138,8
+    CTEXT           "Version 1.2.0 mod. yossiepon_20120318",IDC_STATIC,16,63,138,8
     CTEXT           "Copyright (C) 2010-2012 WADA Masashi",IDC_STATIC,1,84,168,8
     DEFPUSHBUTTON   "OK",IDOK,58,108,53,14,WS_GROUP
 END
@@ -294,7 +294,7 @@ END
 
 STRINGTABLE 
 BEGIN
-    IDS_APP_TITLE           "MIDITrail"
+    IDS_APP_TITLE           "MIDITrail 1.2.0 mod. yossiepon_20120318"
     IDC_MIDITRAIL           "MIDITRAIL"
 END
 

--- a/MIDITrail/MIDITrailApp.cpp
+++ b/MIDITrail/MIDITrailApp.cpp
@@ -284,7 +284,7 @@ int MIDITrailApp::_RegisterClass(
 	wcex.hIcon			= LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MIDITRAIL));
 															//アイコンリソースハンドル
 	wcex.hCursor		= LoadCursor(NULL, IDC_ARROW);		//カーソルリソースハンドル
-	wcex.hbrBackground	= (HBRUSH)(COLOR_WINDOW+1);			//背景用ブラシハンドル
+	wcex.hbrBackground	= (HBRUSH)GetStockObject(BLACK_BRUSH); //(COLOR_WINDOW+1);			//背景用ブラシハンドル
 	wcex.lpszMenuName	= MAKEINTRESOURCE(IDC_MIDITRAIL);	//メニューリソース名称
 	wcex.lpszClassName	= m_WndClassName;					//ウィンドウクラス名称
 	wcex.hIconSm		= LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL));
@@ -1866,7 +1866,7 @@ int MIDITrailApp::_ChangeMenuStyle()
 		{	MF_GRAYED,	MF_GRAYED,	MF_GRAYED,	MF_GRAYED,	MF_GRAYED,	MF_ENABLED	},	//IDM_STOP_MONITORING
 		{	MF_ENABLED,	MF_ENABLED,	MF_GRAYED,	MF_GRAYED,	MF_ENABLED,	MF_GRAYED	},	//IDM_VIEW_3DPIAMF_GRAYEDROLL
 		{	MF_ENABLED,	MF_ENABLED,	MF_GRAYED,	MF_GRAYED,	MF_ENABLED,	MF_GRAYED	},	//IDM_VIEW_2DPIAMF_GRAYEDROLL
-		{	MF_ENABLED,	MF_ENABLED,	MF_GRAYED,	MF_GRAYED,	MF_ENABLED,	MF_GRAYED	},	//IDM_VIEW_PIAMF_GRAYEDROLLRAIN
+		{	MF_GRAYED,	MF_GRAYED,	MF_GRAYED,	MF_GRAYED,	MF_GRAYED,	MF_GRAYED	},	//IDM_VIEW_PIAMF_GRAYEDROLLRAIN
 		{	MF_GRAYED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_RESET_VIEWPOINT
 		{	MF_GRAYED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_SAVE_VIEWPOINT
 		{	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_ENABLE_PIAMF_GRAYEDKEYBOAR

--- a/MIDITrail/MTDashboard.cpp
+++ b/MIDITrail/MTDashboard.cpp
@@ -111,7 +111,7 @@ int MTDashboard::Create(
 	m_Counter.SetColor(m_CaptionColor);
 
 	//全体演奏時間
-	SetTotalPlayTimeSec(pSeqData->GetTotalPlayTime()/1000);
+	SetTotalPlayTimeSec(pSeqData->GetTotalPlayTime());
 
 	//テンポ(BPM)
 	SetTempoBPM(pSeqData->GetTempoBPM());
@@ -365,11 +365,13 @@ int MTDashboard::_GetCounterStr(
 	eresult = _stprintf_s(
 				pStr,
 				bufSize,
-				_T("TIME:%02d:%02d/%02d:%02d BPM:%03d BEAT:%d/%d BAR:%03d/%03d NOTES:%05d/%05d"),
-				m_PlayTimeSec / 60,
-				m_PlayTimeSec % 60,
-				m_TotalPlayTimeSec / 60,
-				m_TotalPlayTimeSec % 60,
+				_T("TIME:%02d:%02d.%03d/%02d:%02d.%03d BPM:%03d BEAT:%d/%d BAR:%03d/%03d NOTES:%05d/%05d"),
+				m_PlayTimeSec / 60000,
+				(m_PlayTimeSec % 60000) / 1000,
+				m_PlayTimeSec % 1000,
+				m_TotalPlayTimeSec / 60000,
+				(m_TotalPlayTimeSec % 60000) / 1000,
+				m_TotalPlayTimeSec % 1000,
 				m_TempoBPM,
 				m_BeatNumerator,
 				m_BeatDenominator,

--- a/MIDITrail/MTDashboard.h
+++ b/MIDITrail/MTDashboard.h
@@ -30,13 +30,13 @@ using namespace SMIDILib;
 #define MTDASHBOARD_FONTSIZE  (40)
 
 //カウンタキャプション文字列
-#define MTDASHBOARD_COUNTER_CHARS  _T("ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:/% ")
+#define MTDASHBOARD_COUNTER_CHARS  _T("ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:./% ")
 
 //カウンタキャプションサイズ
 //   12345678901234567890123456789012345678901234567890123456789012345678901234  (74)
 //  "TIME:00:00/00:00 BPM:000 BEAT:4/4 BAR:000/000 NOTES:00000/00000 SPEED:000%"
 //  余裕をみて80にしておく
-#define MTDASHBOARD_COUNTER_SIZE  (80)
+#define MTDASHBOARD_COUNTER_SIZE  (92)
 
 //枠サイズ（ピクセル）
 #define MTDASHBOARD_FRAMESIZE  (5.0f)

--- a/MIDITrail/MTPianoKeyboard.cpp
+++ b/MIDITrail/MTPianoKeyboard.cpp
@@ -1540,32 +1540,58 @@ void MTPianoKeyboard::_MakeMaterial(
 //******************************************************************************
 int MTPianoKeyboard::Transform(
 		LPDIRECT3DDEVICE9 pD3DDevice,
-		D3DXVECTOR3 moveVector,
+		D3DXVECTOR3 moveVector1,
+		D3DXVECTOR3 moveVector2,
+		float scale,
+		float z,
 		float rollAngle
 	)
 {
 	int result = 0;
-	D3DXMATRIX rotateMatrix;
-	D3DXMATRIX moveMatrix;
-	D3DXMATRIX worldMatrix;
+	D3DXMATRIX scaleMatrix;
+	D3DXMATRIX rotateMatrix1;
+	D3DXMATRIX rotateMatrix2;
+	D3DXMATRIX rotateMatrix3;
+	D3DXMATRIX moveMatrix1;
+	D3DXMATRIX moveMatrix2;
+	D3DXMATRIX moveMatrix3;
+	D3DXMATRIX worldMatrix1;
+	D3DXMATRIX worldMatrix2;
 
 	//行列初期化
-	D3DXMatrixIdentity(&rotateMatrix);
-	D3DXMatrixIdentity(&moveMatrix);
-	D3DXMatrixIdentity(&worldMatrix);
+	D3DXMatrixIdentity(&scaleMatrix);
+	D3DXMatrixIdentity(&rotateMatrix1);
+	D3DXMatrixIdentity(&rotateMatrix2);
+	D3DXMatrixIdentity(&rotateMatrix3);
+	D3DXMatrixIdentity(&moveMatrix1);
+	D3DXMatrixIdentity(&moveMatrix2);
+	D3DXMatrixIdentity(&worldMatrix1);
+	D3DXMatrixIdentity(&worldMatrix2);
 
 	//回転行列
-	D3DXMatrixRotationY(&rotateMatrix, D3DXToRadian(rollAngle));
+	D3DXMatrixRotationX(&rotateMatrix1, D3DXToRadian(-90.0f));
+	D3DXMatrixRotationZ(&rotateMatrix2, D3DXToRadian(90.0f));
+	D3DXMatrixRotationX(&rotateMatrix3, D3DXToRadian(rollAngle));
 
 	//移動行列
-	D3DXMatrixTranslation(&moveMatrix, moveVector.x, moveVector.y, moveVector.z);
+	D3DXMatrixTranslation(&moveMatrix1, moveVector1.x, moveVector1.y, moveVector1.z);
+	D3DXMatrixTranslation(&moveMatrix2, moveVector2.x, moveVector2.y, moveVector2.z);
+	D3DXMatrixTranslation(&moveMatrix3, 0.0f, 0.0f, z / scale);
 
-	//行列の合成：移動→回転
+	//スケール行列
+	D3DXMatrixScaling(&scaleMatrix, scale, scale, scale);
+
+	//行列の合成：ピッチベンド移動１→鍵盤向き補正回転１・２→ホイール回転３→スケール→再生面追従移動２
 	//ピッチベンドによるシフトを先に適用してから回転する
-	D3DXMatrixMultiply(&worldMatrix, &moveMatrix, &rotateMatrix);
+	D3DXMatrixMultiply(&worldMatrix1, &moveMatrix1, &rotateMatrix1);
+	D3DXMatrixMultiply(&worldMatrix2, &worldMatrix1, &rotateMatrix2);
+	D3DXMatrixMultiply(&worldMatrix1, &worldMatrix2, &moveMatrix3);
+	D3DXMatrixMultiply(&worldMatrix2, &worldMatrix1, &rotateMatrix3);
+	D3DXMatrixMultiply(&worldMatrix1, &worldMatrix2, &scaleMatrix);
+	D3DXMatrixMultiply(&worldMatrix2, &worldMatrix1, &moveMatrix2);
 
 	//変換行列設定
-	m_PrimitiveKeyboard.Transform(worldMatrix);
+	m_PrimitiveKeyboard.Transform(worldMatrix2);
 
 //EXIT:;
 	return result;
@@ -1596,6 +1622,7 @@ EXIT:;
 // キーの押し込み
 //******************************************************************************
 int MTPianoKeyboard::PushKey(
+		unsigned char chNo,
 		unsigned char noteNo,
 		float keyDownRate,
 		unsigned long elapsedTime
@@ -1618,7 +1645,7 @@ int MTPianoKeyboard::PushKey(
 	}
 	else {
 		//キーが押下状態の場合は色を変更して回転させる
-		color = m_KeyboardDesign.GetActiveKeyColor(noteNo, elapsedTime);
+		color = m_KeyboardDesign.GetActiveKeyColor(chNo, noteNo, elapsedTime);
 		_RotateKey(noteNo, angle, &color);
 	}
 

--- a/MIDITrail/MTPianoKeyboard.h
+++ b/MIDITrail/MTPianoKeyboard.h
@@ -43,7 +43,7 @@ public:
 		);
 
 	//更新
-	int Transform(LPDIRECT3DDEVICE9 pD3DDevice, D3DXVECTOR3 moveVector, float rollAngle);
+	int Transform(LPDIRECT3DDEVICE9 pD3DDevice, D3DXVECTOR3 moveVector1, D3DXVECTOR3 moveVector2, float scale, float z, float rollAngle);
 
 	//描画
 	int Draw(LPDIRECT3DDEVICE9 pD3DDevice);
@@ -53,7 +53,7 @@ public:
 
 	//キー状態変更
 	int ResetKey(unsigned char noteNo);
-	int PushKey(unsigned char noteNo, float keyDownRate, unsigned long elapsedTime);
+	int PushKey(unsigned char chNo, unsigned char noteNo, float keyDownRate, unsigned long elapsedTime);
 
 	//共有用テクスチャ取得
 	LPDIRECT3DTEXTURE9 GetTexture();

--- a/MIDITrail/MTPianoKeyboardCtrl.cpp
+++ b/MIDITrail/MTPianoKeyboardCtrl.cpp
@@ -173,26 +173,44 @@ int MTPianoKeyboardCtrl::Transform(
 	int result = 0;
 	unsigned char portNo = 0;
 	unsigned char chNo = 0;
-	D3DXVECTOR3 moveVector;
+	D3DXVECTOR3 vectorLU;
+	D3DXVECTOR3 vectorRU;
+	D3DXVECTOR3 vectorLD;
+	D3DXVECTOR3 vectorRD;
+	D3DXVECTOR3 moveVector1;
+	D3DXVECTOR3 moveVector2;
 
 	//現在発音中ノートの頂点更新
 	result = _TransformActiveNotes(pD3DDevice);
 	if (result != 0) goto EXIT;
 
+	//再生面頂点座標取得
+	m_NoteDesign.GetPlaybackSectionVirtexPos(
+			0,
+			&vectorLU,
+			&vectorRU,
+			&vectorLD,
+			&vectorRD
+		);
+
+	float boardHeight = vectorLU.y - vectorLD.y;
+	float keyboardWidth = m_KeyboardDesign.GetPortOriginX(0) * -2.0f;
+
 	//各キーボードの移動
 	for (chNo = 0; chNo < SM_MAX_CH_NUM; chNo++) {
 
 		//移動ベクトル：キーボード基準座標
-		moveVector = m_KeyboardDesign.GetKeyboardBasePos(portNo, chNo);
+		moveVector1 = m_KeyboardDesign.GetKeyboardBasePos(portNo, chNo);
 
 		//移動ベクトル：ピッチベンドシフトを反映
-		moveVector.x += _GetPichBendShiftPosX(portNo, chNo);
+		moveVector1.x += _GetPichBendShiftPosX(portNo, chNo);
 
 		//移動ベクトル：再生面に追従する
-		moveVector.y += m_NoteDesign.GetPlayPosX(m_CurTickTime);
+		moveVector2 = m_NoteDesign.GetWorldMoveVector();
+		moveVector2.x += m_NoteDesign.GetPlayPosX(m_CurTickTime);
 
 		//キーボード移動
-		result = m_pPianoKeyboard[chNo]->Transform(pD3DDevice, moveVector, rollAngle);
+		result = m_pPianoKeyboard[chNo]->Transform(pD3DDevice, moveVector1, moveVector2, boardHeight / keyboardWidth, vectorLU.z, rollAngle);
 		if (result != 0) goto EXIT;
 	}
 
@@ -368,7 +386,7 @@ int MTPianoKeyboardCtrl::_UpdateNoteStatus(
 		//ノート情報を破棄
 		//TODO: 複数ポート対応
 		if (note.portNo == 0) {
-			result = m_pPianoKeyboard[note.chNo]->ResetKey(note.noteNo);
+			result = m_pPianoKeyboard[0]->ResetKey(note.noteNo);
 			if (result != 0) goto EXIT;
 		}
 		pNoteStatus->isActive = false;
@@ -414,7 +432,8 @@ int MTPianoKeyboardCtrl::_UpdateVertexOfActiveNotes(
 			//  TODO: 複数ポート対応
 			if ((note.portNo == 0)
 			 && (m_KeyDownRate[note.chNo][note.noteNo] < m_pNoteStatus[i].keyDownRate)) {
-				result = m_pPianoKeyboard[note.chNo]->PushKey(
+				result = m_pPianoKeyboard[0]->PushKey(
+														note.chNo,
 														note.noteNo,
 														m_pNoteStatus[i].keyDownRate,
 														elapsedTime
@@ -444,7 +463,7 @@ int MTPianoKeyboardCtrl::Draw(
 	if (!m_isEnable) goto EXIT;
 
 	//キーボード最大表示数
-	dispNum = SM_MAX_CH_NUM;
+	dispNum = 1; //SM_MAX_CH_NUM;
 	if (m_KeyboardDesign.GetKeyboardMaxDispNum() < dispNum) {
 		dispNum = m_KeyboardDesign.GetKeyboardMaxDispNum();
 	}
@@ -544,7 +563,7 @@ void MTPianoKeyboardCtrl::Reset()
 
 			//TODO: 複数ポート対応
 			if (note.portNo == 0) {
-				result = m_pPianoKeyboard[note.chNo]->ResetKey(note.noteNo);
+				result = m_pPianoKeyboard[0]->ResetKey(note.noteNo);
 				//if (result != 0) goto EXIT;
 			}
 		}

--- a/MIDITrail/MTPianoKeyboardCtrlLive.cpp
+++ b/MIDITrail/MTPianoKeyboardCtrlLive.cpp
@@ -141,26 +141,44 @@ int MTPianoKeyboardCtrlLive::Transform(
 	int result = 0;
 	unsigned char portNo = 0;
 	unsigned char chNo = 0;
-	D3DXVECTOR3 moveVector;
+	D3DXVECTOR3 vectorLU;
+	D3DXVECTOR3 vectorRU;
+	D3DXVECTOR3 vectorLD;
+	D3DXVECTOR3 vectorRD;
+	D3DXVECTOR3 moveVector1;
+	D3DXVECTOR3 moveVector2;
 	
 	//現在発音中ノートの頂点更新
 	result = _TransformActiveNotes(pD3DDevice);
 	if (result != 0) goto EXIT;
 	
+	//再生面頂点座標取得
+	m_NoteDesign.GetPlaybackSectionVirtexPos(
+			0,
+			&vectorLU,
+			&vectorRU,
+			&vectorLD,
+			&vectorRD
+		);
+
+	float boardHeight = vectorLU.y - vectorLD.y;
+	float keyboardWidth = m_KeyboardDesign.GetPortOriginX(0) * -2.0f;
+
 	//各キーボードの移動
 	for (chNo = 0; chNo < SM_MAX_CH_NUM; chNo++) {
 		
 		//移動ベクトル：キーボード基準座標
-		moveVector = m_KeyboardDesign.GetKeyboardBasePos(portNo, chNo);
+		moveVector1 = m_KeyboardDesign.GetKeyboardBasePos(portNo, chNo);
 		
 		//移動ベクトル：ピッチベンドシフトを反映
-		moveVector.x += _GetPichBendShiftPosX(portNo, chNo);
+		moveVector1.x += _GetPichBendShiftPosX(portNo, chNo);
 		
 		//移動ベクトル：再生面に追従する
-		//moveVector.y += m_NoteDesign.GetPlayPosX(m_CurTickTime);
+		moveVector2 = m_NoteDesign.GetWorldMoveVector();
+		//moveVector2.x += m_NoteDesign.GetPlayPosX(m_CurTickTime);
 		
 		//キーボード移動
-		result = m_pPianoKeyboard[chNo]->Transform(pD3DDevice, moveVector, rollAngle);
+		result = m_pPianoKeyboard[chNo]->Transform(pD3DDevice, moveVector1, moveVector2, boardHeight / keyboardWidth, vectorLU.z, rollAngle);
 		if (result != 0) goto EXIT;
 	}
 	
@@ -218,12 +236,12 @@ int MTPianoKeyboardCtrlLive::_UpdateStatusOfActiveNotes(
 					m_NoteStatus[chNo][noteNo].startTime = 0;
 					m_NoteStatus[chNo][noteNo].endTime = 0;
 					m_NoteStatus[chNo][noteNo].keyDownRate = 0.0f;
-					result = m_pPianoKeyboard[chNo]->ResetKey((unsigned char)noteNo);
+					result = m_pPianoKeyboard[0]->ResetKey((unsigned char)noteNo);
 					if (result != 0) goto EXIT;
 				}
 				//キー押下率を更新
 				else {
-					m_NoteStatus[chNo][noteNo].keyDownRate
+					m_NoteStatus[0][noteNo].keyDownRate
 						= 1.0f - ((float)(curTime - m_NoteStatus[chNo][noteNo].endTime) / (float)keyUpDuration);
 				}
 			}
@@ -257,7 +275,8 @@ int MTPianoKeyboardCtrlLive::_UpdateVertexOfActiveNotes(
 				elapsedTime = curTime - m_NoteStatus[chNo][noteNo].startTime;
 			
 				//発音対象キーを回転
-				result = m_pPianoKeyboard[chNo]->PushKey(
+				result = m_pPianoKeyboard[0]->PushKey(
+									(unsigned char)chNo,
 									(unsigned char)noteNo,
 									m_NoteStatus[chNo][noteNo].keyDownRate,
 									elapsedTime
@@ -286,7 +305,7 @@ int MTPianoKeyboardCtrlLive::Draw(
 	if (!m_isEnable) goto EXIT;
 	
 	//キーボード最大表示数
-	dispNum = SM_MAX_CH_NUM;
+	dispNum = 1; //SM_MAX_CH_NUM;
 	if (m_KeyboardDesign.GetKeyboardMaxDispNum() < dispNum) {
 		dispNum = m_KeyboardDesign.GetKeyboardMaxDispNum();
 	}

--- a/MIDITrail/MTPianoKeyboardDesign.cpp
+++ b/MIDITrail/MTPianoKeyboardDesign.cpp
@@ -326,7 +326,7 @@ float MTPianoKeyboardDesign::GetPortOriginY(
 	totalHeight = portHeight * ((float)chNum / (float)SM_MAX_CH_NUM);
 	originY = (portHeight * portIndex) - (totalHeight / 2.0f);
 
-	return originY;
+	return 0; //originY;
 }
 
 //******************************************************************************
@@ -378,7 +378,7 @@ float MTPianoKeyboardDesign::GetPortOriginZ(
 	totalLen = portLen * ((float)chNum / (float)SM_MAX_CH_NUM);
 	originZ = (portLen * portIndex) - (totalLen / 2.0f);
 
-	return originZ;
+	return 0; //originZ;
 }
 
 //******************************************************************************
@@ -583,6 +583,7 @@ D3DXCOLOR MTPianoKeyboardDesign::GetBlackKeyColor()
 // 発音中キーカラー取得
 //******************************************************************************
 D3DXCOLOR MTPianoKeyboardDesign::GetActiveKeyColor(
+		unsigned char chNo,
 		unsigned char noteNo,
 		unsigned long elapsedTime
 	)
@@ -608,7 +609,7 @@ D3DXCOLOR MTPianoKeyboardDesign::GetActiveKeyColor(
 	//      |   on :   off
 	//          <-->duration
 
-	color    = m_ActiveKeyColor;
+	color    = m_NoteColor[chNo];
 	duration = (unsigned long)m_ActiveKeyColorDuration;
 	rate     = m_ActiveKeyColorTailRate;
 
@@ -845,9 +846,9 @@ D3DXVECTOR3 MTPianoKeyboardDesign::GetKeyboardBasePos(
 	oz = GetPortOriginZ(portNo);
 
 	//チャンネルを考慮した配置座標
-	moveVector.x = ox + 0.0f;
+	moveVector.x = ox + GetWhiteKeyStep() / 2.0f;
 	moveVector.y = oy + ((float)chNo * m_KeyboardStepY);
-	moveVector.z = oz + ((float)chNo * m_KeyboardStepZ);
+	moveVector.z = oz; // + ((float)chNo * m_KeyboardStepZ);
 
 	return moveVector;
 }
@@ -868,7 +869,9 @@ int MTPianoKeyboardDesign::_LoadConfFile(
 	)
 {
 	int result = 0;
+	TCHAR key[16] = {_T('\0')};
 	TCHAR hexColor[16] = {_T('\0')};
+	unsigned long i = 0;
 	MTConfFile confFile;
 
 	result = confFile.Initialize(pSceneName);
@@ -915,6 +918,18 @@ int MTPianoKeyboardDesign::_LoadConfFile(
 		m_KeyboardMaxDispNum = 0;
 	}
 
+	//----------------------------------
+	//色情報
+	//----------------------------------
+	//ノート色情報を取得
+	for (i = 0; i < 16; i++) {
+		_stprintf_s(key, 16, _T("Ch-%02d-NoteRGBA"), i+1);
+		result = confFile.GetStr(key, hexColor, 16, _T("FFFFFFFF"));
+		if (result != 0) goto EXIT;
+
+		m_NoteColor[i] = DXColorUtil::MakeColorFromHexRGBA(hexColor);
+	}
+
 EXIT:;
 	return result;
 }

--- a/MIDITrail/MTPianoKeyboardDesign.h
+++ b/MIDITrail/MTPianoKeyboardDesign.h
@@ -120,7 +120,7 @@ public:
 	D3DXCOLOR GetBlackKeyColor();
 
 	//発音中キーカラー取得
-	D3DXCOLOR GetActiveKeyColor(unsigned char noteNo, unsigned long elapsedTime);
+	D3DXCOLOR GetActiveKeyColor(unsigned char chNo, unsigned char noteNo, unsigned long elapsedTime);
 
 	//白鍵テクスチャ座標取得
 	void GetWhiteKeyTexturePosTop(
@@ -221,6 +221,7 @@ private:
 	D3DXCOLOR m_BlackKeyColor;
 
 	//発音中キー色情報
+	D3DXCOLOR m_NoteColor[16];
 	D3DXCOLOR m_ActiveKeyColor;
 	int m_ActiveKeyColorDuration;
 	float m_ActiveKeyColorTailRate;

--- a/MIDITrail/MTScenePianoRoll3D.cpp
+++ b/MIDITrail/MTScenePianoRoll3D.cpp
@@ -104,6 +104,10 @@ int MTScenePianoRoll3D::Create(
 	result = m_NotePitchBend.Initialize();
 	if (result != 0) goto EXIT;
 
+	//ピアノキーボード制御
+	result = m_PianoKeyboardCtrl.Create(pD3DDevice, GetName(), pSeqData, &m_NotePitchBend);
+	if (result != 0) goto EXIT;
+
 	//ノートボックス生成
 	result = m_NoteBox.Create(pD3DDevice, GetName(), pSeqData, &m_NotePitchBend);
 	if (result != 0) goto EXIT;
@@ -119,6 +123,7 @@ int MTScenePianoRoll3D::Create(
 	//ピクチャボード生成
 	result = m_PictBoard.Create(pD3DDevice, GetName(), pSeqData);
 	if (result != 0) goto EXIT;
+	m_PictBoard.SetEnable(false);
 
 	//ダッシュボード生成
 	result = m_Dashboard.Create(pD3DDevice, GetName(), pSeqData, hWnd);
@@ -182,6 +187,10 @@ int MTScenePianoRoll3D::Transform(
 	//回転角度取得
 	rollAngle = m_FirstPersonCam.GetManualRollAngle();
 
+	//ピアノキーボード更新
+	result = m_PianoKeyboardCtrl.Transform(pD3DDevice, rollAngle);
+	if (result != 0) goto EXIT;
+
 	//ノートボックス更新
 	result = m_NoteBox.Transform(pD3DDevice, rollAngle);
 	if (result != 0) goto EXIT;
@@ -244,6 +253,10 @@ int MTScenePianoRoll3D::Draw(
 	result = m_PictBoard.Draw(pD3DDevice);
 	if (result != 0) goto EXIT;
 
+	//ピアノキーボード描画
+	result = m_PianoKeyboardCtrl.Draw(pD3DDevice);
+	if (result != 0) goto EXIT;
+
 	//星描画
 	result = m_Stars.Draw(pD3DDevice);
 	if (result != 0) goto EXIT;
@@ -269,6 +282,7 @@ EXIT:;
 //******************************************************************************
 void MTScenePianoRoll3D::Release()
 {
+	m_PianoKeyboardCtrl.Release();
 	m_NoteBox.Release();
 	m_GridBox.Release();
 	m_PictBoard.Release();
@@ -369,7 +383,9 @@ int MTScenePianoRoll3D::OnRecvSequencerMsg(
 	}
 	//演奏チックタイム通知
 	else if (parser.GetMsg() == SMMsgParser::MsgPlayTime) {
-		m_Dashboard.SetPlayTimeSec(parser.GetPlayTimeSec());
+		m_Dashboard.SetPlayTimeSec(parser.GetPlayTimeMSec());
+		m_PianoKeyboardCtrl.SetPlayTimeMSec(parser.GetPlayTimeMSec());
+		m_PianoKeyboardCtrl.SetCurTickTime(parser.GetPlayTickTime());
 		m_FirstPersonCam.SetCurTickTime(parser.GetPlayTickTime());
 		m_TimeIndicator.SetCurTickTime(parser.GetPlayTickTime());
 		m_NoteRipple.SetCurTickTime(parser.GetPlayTickTime());
@@ -406,6 +422,8 @@ int MTScenePianoRoll3D::OnRecvSequencerMsg(
 		if (parser.GetSkipStartDirection() == SMMsgParser::SkipBack) {
 			m_NotePitchBend.Reset();
 		}
+		m_PianoKeyboardCtrl.Reset();
+		m_PianoKeyboardCtrl.SetSkipStatus(true);
 		m_NoteBox.Reset();
 		m_NoteBox.SetSkipStatus(true);
 		m_NoteRipple.Reset();
@@ -415,6 +433,7 @@ int MTScenePianoRoll3D::OnRecvSequencerMsg(
 	//スキップ終了通知
 	else if (parser.GetMsg() == SMMsgParser::MsgSkipEnd) {
 		m_Dashboard.SetNotesCount(parser.GetSkipEndNotesCount());
+		m_PianoKeyboardCtrl.SetSkipStatus(false);
 		m_NoteBox.SetSkipStatus(false);
 		m_NoteRipple.SetSkipStatus(false);
 		m_IsSkipping = false;
@@ -446,6 +465,7 @@ void MTScenePianoRoll3D::_Reset()
 {
 	m_Dashboard.Reset();
 	m_FirstPersonCam.Reset();
+	m_PianoKeyboardCtrl.Reset();
 	m_TimeIndicator.Reset();
 	m_PictBoard.Reset();
 	m_NoteBox.Reset();
@@ -627,7 +647,8 @@ void MTScenePianoRoll3D::SetEffect(
 {
 	switch (type) {
 		case EffectPianoKeyboard:
-			m_PictBoard.SetEnable(isEnable);
+			m_PianoKeyboardCtrl.SetEnable(isEnable);
+			//m_PictBoard.SetEnable(isEnable);
 			break;
 		case EffectRipple:
 			m_NoteRipple.SetEnable(isEnable);

--- a/MIDITrail/MTScenePianoRoll3D.h
+++ b/MIDITrail/MTScenePianoRoll3D.h
@@ -23,6 +23,7 @@
 #include "MTPictBoard.h"
 #include "MTDashboard.h"
 #include "MTStars.h"
+#include "MTPianoKeyboardCtrl.h"
 #include "MTTimeIndicator.h"
 #include "SMIDILib.h"
 
@@ -118,6 +119,8 @@ private:
 	MTStars m_Stars;
 	MTTimeIndicator m_TimeIndicator;
 
+	MTPianoKeyboardCtrl m_PianoKeyboardCtrl;
+
 	//マウス視線移動モード
 	bool m_IsMouseCamMode;
 

--- a/MIDITrail/MTScenePianoRollRain.cpp
+++ b/MIDITrail/MTScenePianoRollRain.cpp
@@ -326,7 +326,7 @@ int MTScenePianoRollRain::OnRecvSequencerMsg(
 	}
 	//演奏チックタイム通知
 	else if (parser.GetMsg() == SMMsgParser::MsgPlayTime) {
-		m_Dashboard.SetPlayTimeSec(parser.GetPlayTimeSec());
+		m_Dashboard.SetPlayTimeSec(parser.GetPlayTimeMSec());
 		m_PianoKeyboardCtrl.SetPlayTimeMSec(parser.GetPlayTimeMSec());
 		m_NoteRain.SetCurTickTime(parser.GetPlayTickTime());
 		m_CurTickTime = parser.GetPlayTickTime();

--- a/SMIDILib/SMSequencer.cpp
+++ b/SMIDILib/SMSequencer.cpp
@@ -578,7 +578,7 @@ int SMSequencer::_UpdatePlayPosition()
 		m_MsgTrans.PostPlayTime((unsigned long)(m_CurPlayTime/1000000), m_TotalTickTimeTemp);
 		//通知間隔は60FPS表示を考慮して0.01秒(10msec = 10000000nanosec)とする
 		//TODO: 外部から間隔を指定できるようにする
-		ntcSpan = 10 * 1000000;;
+		ntcSpan = (unsigned long long)((double)10 * 1000000 * m_PlaySpeedRatio);
 		m_NextNtcTime = m_CurPlayTime - (m_CurPlayTime % ntcSpan) + ntcSpan;
 	}