Commit: 107c2733a3de5b3bedbf5350a98a9ab4cdea7710 - MIDITrailMod (git)

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

Commit MetaInfo

• Revision: 107c2733a3de5b3bedbf5350a98a9ab4cdea7710 (tree)
• Zeit: 2019-08-28 07:06:19
• Autor: yoshy <yoshy@user...>
• Commiter: yoshy

Log Message

[FIX] キーボード鍵のポリゴン描画順を修正、上面を最後に変更

Ändern Zusammenfassung

• modified: MIDITrail/MTPianoKeyboard.cpp
• modified: MIDITrail/MTPianoKeyboard.h
• modified: MIDITrail/MTPianoKeyboardMod.cpp
• modified: MIDITrail/MTPianoKeyboardMod.h
• modified: MIDITrail/MTScenePianoRoll2DMod.cpp
• modified: Resources/conf/PianoRoll2D.ini
• modified: Resources/conf/PianoRoll3D.ini

Diff

--- a/MIDITrail/MTPianoKeyboard.cpp
+++ b/MIDITrail/MTPianoKeyboard.cpp
@@ -23,14 +23,18 @@ using namespace YNBaseLib;
 //******************************************************************************
 //各キーの頂点数
 #define MTPIANOKEYBOARD_KEY_WHITE_1_VERTEX_NUM  (38)
-#define MTPIANOKEYBOARD_KEY_WHITE_2_VERTEX_NUM  (44)
+// >>> add 20180412 yossiepon begin
+#define MTPIANOKEYBOARD_KEY_WHITE_2_VERTEX_NUM  (44 + 4)
+// <<< add 20180412 yossiepon end
 #define MTPIANOKEYBOARD_KEY_WHITE_3_VERTEX_NUM  (38)
 #define MTPIANOKEYBOARD_KEY_BLACK_VERTEX_NUM    (30)
 #define MTPIANOKEYBOARD_KEY_VERTEX_NUM_MAX      MTPIANOKEYBOARD_KEY_WHITE_2_VERTEX_NUM
 
 //各キーのインデックス数
 #define MTPIANOKEYBOARD_KEY_WHITE_1_INDEX_NUM   (60)
-#define MTPIANOKEYBOARD_KEY_WHITE_2_INDEX_NUM   (66)
+// >>> add 20180412 yossiepon begin
+#define MTPIANOKEYBOARD_KEY_WHITE_2_INDEX_NUM   (66 + 6)
+// <<< add 20180412 yossiepon end
 #define MTPIANOKEYBOARD_KEY_WHITE_3_INDEX_NUM   (60)
 #define MTPIANOKEYBOARD_KEY_BLACK_INDEX_NUM     (48)
 #define MTPIANOKEYBOARD_KEY_INDEX_NUM_MAX       MTPIANOKEYBOARD_KEY_WHITE_2_INDEX_NUM

--- a/MIDITrail/MTPianoKeyboard.h
+++ b/MIDITrail/MTPianoKeyboard.h
@@ -87,7 +87,9 @@ public:
 	//共有用テクスチャ取得
 	LPDIRECT3DTEXTURE9 GetTexture();
 
-private:
+// >>> modify access level to protected 20180412 yossiepon begin
+protected:
+// <<< modify 20180412 yossiepon end
 
 	//頂点バッファ構造体
 	struct MTPIANOKEYBOARD_VERTEX {
@@ -127,10 +129,6 @@ protected:
 	//キーボードデザイン
 	MTPianoKeyboardDesign m_KeyboardDesign;
 
-// >>> modify access level 20161224 yossiepon begin
-private:
-// <<< modify 20161224 yossiepon end
-
 	//バッファ情報
 	MTBufInfo m_BufInfo[SM_MAX_NOTE_NUM];
 
@@ -141,30 +139,37 @@ private:
 	void _CreateBufInfo();
 	int _CreateVertexOfKeyboard(LPDIRECT3DDEVICE9 pD3DDevice);
 	int _CreateVertexOfKey(unsigned char noteNo);
-	int _CreateVertexOfKeyWhite1(
+// >>> modify function decl to virtual 20180412 yossiepon begin
+	virtual int _CreateVertexOfKeyWhite1(
 				unsigned char noteNo,
 				MTPIANOKEYBOARD_VERTEX* pVertex,
 				unsigned long* pIndex,
 				D3DXCOLOR* pColor = NULL
 			);
-	int _CreateVertexOfKeyWhite2(
+	virtual int _CreateVertexOfKeyWhite2(
 				unsigned char noteNo,
 				MTPIANOKEYBOARD_VERTEX* pVertex,
 				unsigned long* pIndex,
 				D3DXCOLOR* pColor = NULL
 			);
-	int _CreateVertexOfKeyWhite3(
+	virtual int _CreateVertexOfKeyWhite3(
 				unsigned char noteNo,
 				MTPIANOKEYBOARD_VERTEX* pVertex,
 				unsigned long* pIndex,
 				D3DXCOLOR* pColor = NULL
 			);
-	int _CreateVertexOfKeyBlack(
+	virtual int _CreateVertexOfKeyBlack(
 				unsigned char noteNo,
 				MTPIANOKEYBOARD_VERTEX* pVertex,
 				unsigned long* pIndex,
 				D3DXCOLOR* pColor = NULL
 			);
+// <<< modify function decl to virtual 20180412 yossiepon end
+
+// >>> modify access level 20180412 yossiepon begin
+private:
+// <<< modify 20180412 yossiepon end
+
 	int _LoadTexture(LPDIRECT3DDEVICE9 pD3DDevice, const TCHAR* pSceneName);
 	void _MakeMaterial(D3DMATERIAL9* pMaterial);
 

--- a/MIDITrail/MTPianoKeyboardMod.cpp
+++ b/MIDITrail/MTPianoKeyboardMod.cpp
@@ -174,3 +174,635 @@ EXIT:;
 	return result;
 }
 
+//******************************************************************************
+// キーボード頂点生成：白鍵A
+//******************************************************************************
+int MTPianoKeyboardMod::_CreateVertexOfKeyWhite1(
+		unsigned char noteNo,
+		MTPIANOKEYBOARD_VERTEX* pVertex,
+		unsigned long* pIndex,
+		D3DXCOLOR* pColor
+	)
+{
+	//基底クラスの頂点生成処理を呼び出す
+	int result = MTPianoKeyboard::_CreateVertexOfKeyWhite1(
+			noteNo,
+			pVertex,
+			pIndex,
+			pColor
+		);
+
+	// 描画順の修正
+	int idx = 0;
+
+	//----------------------------------------------------------------
+	//下の面
+	//----------------------------------------------------------------
+	//  37 6+--+5 36
+	//      |  |
+	//      |  |
+	//      |  |4 35
+	//  34 3+--+--+2 33
+	//      |     |     +z
+	//      |     |      |
+	//      |     |      |
+	//  31 0+-----+1 32  +---> +x
+	//         |
+	//        posX
+
+	//下面インデックス
+	unsigned long indexDW[] = { 31, 32, 33, 31, 33, 34, 34, 35, 36, 34, 36, 37 };
+	for (int i = 0; i < 12; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + indexDW[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 0-1
+	//----------------------------------------------------------------
+	// 0      1
+	// 7+----+8
+	//  |    |
+	// 9+----+10
+
+	//インデックス
+	unsigned long index01[] = { 7, 8, 9, 8, 10, 9 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index01[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 1-2
+	//----------------------------------------------------------------
+	// 2 12+--+14
+	//     |  |
+	//     |  |
+	// 1 11+--+13
+
+	//インデックス
+	unsigned long index12[] = { 11, 12, 13, 12, 14, 13 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index12[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 2-4
+	//----------------------------------------------------------------
+	//   18+--+17
+	//     |  |
+	// 4 16+--+15 2
+
+	//インデックス
+	unsigned long index24[] = { 15, 16, 17, 16, 18, 17 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index24[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 4-5
+	//----------------------------------------------------------------
+	// 5 20+--+22
+	//     |  |
+	//     |  |
+	// 4 19+--+21
+
+	//インデックス
+	unsigned long index45[] = { 19, 20, 21, 20, 22, 21 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index45[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 5-6
+	//----------------------------------------------------------------
+	//   26+--+25
+	//     |  |
+	// 6 24+--+23 5
+
+	//インデックス
+	unsigned long index56[] = { 23, 24, 25, 24, 26, 25 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index56[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 6-0
+	//----------------------------------------------------------------
+	// 29+--+27 6
+	//   |  |
+	//   |  |
+	// 30+--+28 0
+
+	//インデックス
+	unsigned long index60[] = { 27, 28, 29, 28, 30, 29 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index60[i];
+	}
+
+	//----------------------------------------------------------------
+	//上の面
+	//----------------------------------------------------------------
+	// 6+--+5
+	//  |  |
+	//  |  |
+	//  |  |4
+	// 3+--+--+2
+	//  |     |   +z
+	//  |     |    |
+	//  |     |    |
+	// 0+-----+1   +---> +x
+	//     |
+	//    posX
+
+	//インデックス
+	unsigned long indexUP[] = { 0, 2, 1, 0, 3, 2, 3, 5, 4, 3, 6, 5 };
+	for (int i = 0; i < 12; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + indexUP[i];
+	}
+
+	return result;
+}
+
+//******************************************************************************
+// キーボード頂点生成：白鍵B
+//******************************************************************************
+int MTPianoKeyboardMod::_CreateVertexOfKeyWhite2(
+		unsigned char noteNo,
+		MTPIANOKEYBOARD_VERTEX* pVertex,
+		unsigned long* pIndex,
+		D3DXCOLOR* pColor
+	)
+{
+	//基底クラスの頂点生成処理を呼び出す
+	int result = MTPianoKeyboard::_CreateVertexOfKeyWhite2(
+			noteNo,
+			pVertex,
+			pIndex,
+			pColor
+		);
+
+	D3DXCOLOR keyColor;
+	D3DXVECTOR2 tsc;
+
+	//白鍵カラー
+	if (pColor == NULL) {
+		keyColor = m_KeyboardDesign.GetWhiteKeyColor();
+	}
+	else {
+		keyColor = *pColor;
+	}
+
+	// 描画順の修正
+	int idx = 0;
+
+	//----------------------------------------------------------------
+	//下の面
+	//----------------------------------------------------------------
+	//   42 6+-+5 41
+	//       | |
+	//       | |
+	//   43 7| |4 40
+	// 39 3+-+-+-+2 38
+	//     |     |     +z
+	//     |     |      |
+	//     |     |      |
+	// 36 0+-----+1 37  +---> +x
+	//        |
+	//       posX
+
+	//インデックス
+	unsigned long indexDW[] = { 36, 37, 38, 36, 38, 39, 43, 40, 41, 43, 41, 42 };
+	for (int i = 0; i < 12; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + indexDW[i];
+	}
+	//----------------------------------------------------------------
+	//側面 0-1
+	//----------------------------------------------------------------
+	//  0      1
+	//  8+----+9
+	//   |    |
+	// 10+----+11
+
+	//インデックス
+	unsigned long index01[] = { 8, 9, 10, 9, 11, 10 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index01[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 1-2
+	//----------------------------------------------------------------
+	// 2 13+--+15
+	//     |  |
+	//     |  |
+	// 1 12+--+14
+
+	//インデックス
+	unsigned long index12[] = { 12, 13, 14, 13, 15, 14 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index12[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 2-4
+	//----------------------------------------------------------------
+	//   19+--+18
+	//     |  |
+	// 4 17+--+16 2
+
+	//基底クラスでは2-3で生成しているが、透過すると4-7間が仕切りとして
+	//見えてしまうため、2-4、7-3に分割する
+
+	//頂点
+	pVertex[17].p = pVertex[4].p;
+	pVertex[19].p = D3DXVECTOR3(pVertex[4].p.x, 0.0f, pVertex[4].p.z);  // 4'
+
+	//インデックス
+	unsigned long index24[] = { 16, 17, 18, 17, 19, 18 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index24[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 4-5
+	//----------------------------------------------------------------
+	// 5 21+--+23
+	//     |  |
+	//     |  |
+	// 4 20+--+22
+
+	//インデックス
+	unsigned long index45[] = { 20, 21, 22, 21, 23, 22 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index45[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 5-6
+	//----------------------------------------------------------------
+	//   27+--+26
+	//     |  |
+	// 6 25+--+24 5
+
+	//インデックス
+	unsigned long index56[] = { 24, 25, 26, 25, 27, 26 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index56[i];
+	}
+
+
+	//----------------------------------------------------------------
+	//側面 6-7
+	//----------------------------------------------------------------
+	// 30+--+28 6
+	//   |  |
+	//   |  |
+	// 31+--+29 7
+
+	//インデックス
+	unsigned long index67[] = { 28, 29, 30, 29, 31, 30 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index67[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 7-3
+	//----------------------------------------------------------------
+	//   47+--+46
+	//     |  |
+	// 3 45+--+44 7
+
+	//頂点
+	pVertex[44].p = pVertex[7].p;
+	pVertex[45].p = pVertex[3].p;
+	pVertex[46].p = D3DXVECTOR3(pVertex[7].p.x, 0.0f, pVertex[7].p.z);  // 7'
+	pVertex[47].p = D3DXVECTOR3(pVertex[3].p.x, 0.0f, pVertex[3].p.z);  // 3'
+
+	//法線／色
+	for (int i = 44; i < 48; i++) {
+		pVertex[i].n = D3DXVECTOR3(0.0f, 0.0f, 1.0f);
+		pVertex[i].c = keyColor;
+	}
+
+	//インデックス
+	unsigned long index73[] = { 44, 45, 46, 45, 47, 46 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index73[i];
+	}
+
+	//単一色のテクスチャ座標
+	m_KeyboardDesign.GetWhiteKeyTexturePosSingleColor(noteNo, &tsc);
+	for (int i = 44; i < 48; i++) {
+		pVertex[i].t = tsc;
+	}
+
+	//----------------------------------------------------------------
+	//側面 3-0
+	//----------------------------------------------------------------
+	// 34+--+32 3
+	//   |  |
+	//   |  |
+	// 35+--+33 0
+
+	//インデックス
+	unsigned long index30[] = { 32, 33, 34, 33, 35, 34 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index30[i];
+	}
+
+	//----------------------------------------------------------------
+	//上の面
+	//----------------------------------------------------------------
+	//   6+-+5
+	//    | |
+	//    | |
+	//   7| |4
+	// 3+-+-+-+2
+	//  |     |   +z
+	//  |     |    |
+	//  |     |    |
+	// 0+-----+1   +---> +x
+	//     |
+	//    posX
+
+	//インデックス
+	unsigned long indexUP[] = { 0, 2, 1, 0, 3, 2, 7, 5, 4, 7, 6, 5 };
+	for (int i = 0; i < 12; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + indexUP[i];
+	}
+
+	return result;
+}
+
+//******************************************************************************
+// キーボード頂点生成：白鍵C
+//******************************************************************************
+int MTPianoKeyboardMod::_CreateVertexOfKeyWhite3(
+		unsigned char noteNo,
+		MTPIANOKEYBOARD_VERTEX* pVertex,
+		unsigned long* pIndex,
+		D3DXCOLOR* pColor
+	)
+{
+	//基底クラスの頂点生成処理を呼び出す
+	int result = MTPianoKeyboard::_CreateVertexOfKeyWhite3(
+			noteNo,
+			pVertex,
+			pIndex,
+			pColor
+		);
+
+	// 描画順の修正
+	int idx = 0;
+
+	//----------------------------------------------------------------
+	//下の面
+	//----------------------------------------------------------------
+	//    36 5+--+4 35
+	//        |  |
+	//        |  |
+	//    37 6|  |
+	// 34 3+--+--+2 33
+	//     |     |     +z
+	//     |     |      |
+	//     |     |      |
+	// 31 0+-----+1 32  +---> +x
+	//        |
+	//       posX
+
+	//インデックス
+	unsigned long indexDW[] = { 31, 32, 33, 31, 33, 34, 33, 35, 37, 37, 35, 36 };
+	for (int i = 0; i < 12; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + indexDW[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 0-1
+	//----------------------------------------------------------------
+	// 0      1
+	// 7+----+8
+	//  |    |
+	// 9+----+10
+
+	//インデックス
+	unsigned long index01[] = { 7, 8, 9, 8, 10, 9 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index01[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 1-4
+	//----------------------------------------------------------------
+	// 4 12+--+14
+	//     |  |
+	//     |  |
+	// 1 11+--+13
+
+	//インデックス
+	unsigned long index14[] = { 11, 12, 13, 12, 14, 13 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index14[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 4-5
+	//----------------------------------------------------------------
+	//   18+--+17
+	//     |  |
+	// 5 16+--+15 4
+
+	//インデックス
+	unsigned long index45[] = { 15, 16, 17, 16, 18, 17 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index45[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 5-6
+	//----------------------------------------------------------------
+	// 21+--+19 5
+	//   |  |
+	//   |  |
+	// 22+--+20 6
+
+	//インデックス
+	unsigned long index56[] = { 19, 20, 21, 20, 22, 21 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index56[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 6-3
+	//----------------------------------------------------------------
+	//   26+--+25
+	//     |  |
+	// 3 24+--+23 6
+
+	//インデックス
+	unsigned long index63[] = { 23, 24, 25, 24, 26, 25 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index63[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 3-0
+	//----------------------------------------------------------------
+	// 29+--+27 3
+	//   |  |
+	//   |  |
+	// 30+--+28 0
+
+	//インデックス
+	unsigned long index30[] = { 27, 28, 29, 28, 30, 29 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index30[i];
+	}
+
+	//----------------------------------------------------------------
+	//上の面
+	//----------------------------------------------------------------
+	//    5+--+4
+	//     |  |
+	//     |  |
+	//    6|  |
+	// 3+--+--+2
+	//  |     |   +z
+	//  |     |    |
+	//  |     |    |
+	// 0+-----+1   +---> +x
+	//     |
+	//    posX
+
+	//インデックス
+	unsigned long indexUP[] = { 0, 2, 1, 0, 3, 2, 2, 6, 4, 6, 5, 4 };
+	for (int i = 0; i < 12; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + indexUP[i];
+	}
+
+	return result;
+}
+
+//******************************************************************************
+// キーボード頂点生成：黒鍵
+//******************************************************************************
+int MTPianoKeyboardMod::_CreateVertexOfKeyBlack(
+		unsigned char noteNo,
+		MTPIANOKEYBOARD_VERTEX* pVertex,
+		unsigned long* pIndex,
+		D3DXCOLOR* pColor
+	)
+{
+	//基底クラスの頂点生成処理を呼び出す
+	int result = MTPianoKeyboard::_CreateVertexOfKeyBlack(
+			noteNo,
+			pVertex,
+			pIndex,
+			pColor
+		);
+
+	// 描画順の修正
+	int idx = 0;
+
+	//----------------------------------------------------------------
+	//下の面
+	//----------------------------------------------------------------
+	//   29 6+-+5 28
+	//       | |
+	//       | |
+	//       | |
+	//   26 0+-+1 27
+	//        |      +z
+	//        |       |
+	//        |       |
+	//      --+--     +---> +x
+	//        |
+	//       posX
+
+	//インデックス
+	unsigned long indexDW[] = { 26, 27, 28, 26, 28, 29 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + indexDW[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 0-1
+	//----------------------------------------------------------------
+	//  0      1
+	//  8+----+9
+	//   |    |
+	// 10+----+11
+
+	//インデックス
+	unsigned long index01[] = { 8, 9, 10, 9, 11, 10 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index01[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 1-2-5
+	//----------------------------------------------------------------
+	// 5 14+--+16
+	//     |  |
+	//     |  |
+	// 2 13+  |
+	//      \ |
+	// 1 12 +-+15
+
+	//インデックス
+	unsigned long index125[] = { 12, 13, 15, 13, 16, 15, 13, 14, 16 };
+	for (int i = 0; i < 9; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index125[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 5-6
+	//----------------------------------------------------------------
+	//   20+--+19
+	//     |  |
+	// 6 18+--+17 5
+
+	//インデックス
+	unsigned long index56[] = { 17, 18, 19, 18, 20, 19 };
+	for (int i = 0; i < 6; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index56[i];
+	}
+
+	//----------------------------------------------------------------
+	//側面 6-3-0
+	//----------------------------------------------------------------
+	// 24+--+21 6
+	//   |  |
+	//   |  |
+	//   |  +22 3
+	//   | /
+	// 25+-+23  0
+
+	//インデックス
+	unsigned long index630[] = { 21, 22, 24, 22, 25, 24, 22, 23, 25 };
+	for (int i = 0; i < 9; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + index630[i];
+	}
+
+	//----------------------------------------------------------------
+	//上の面
+	//----------------------------------------------------------------
+	//   6+-+5
+	//    | |
+	//    | |
+	// 7 3+-+2 4
+	//   0+-+1
+	//     |   +z
+	//     |    |
+	//     |    |
+	//   --+--  +---> +x
+	//     |
+	//    posX
+
+	//インデックス
+	unsigned long indexUP[] = { 0, 2, 1, 0, 3, 2, 4, 7, 5, 7, 6, 5 };
+	for (int i = 0; i < 12; i++) {
+		pIndex[idx++] = m_BufInfo[noteNo].vertexPos + indexUP[i];
+	}
+
+	return result;
+}
+

--- a/MIDITrail/MTPianoKeyboardMod.h
+++ b/MIDITrail/MTPianoKeyboardMod.h
@@ -52,6 +52,33 @@ public:
 
 private:
 
+	virtual int _CreateVertexOfKeyWhite1(
+				unsigned char noteNo,
+				MTPIANOKEYBOARD_VERTEX* pVertex,
+				unsigned long* pIndex,
+				D3DXCOLOR* pColor = NULL
+			);
+	virtual int _CreateVertexOfKeyWhite2(
+				unsigned char noteNo,
+				MTPIANOKEYBOARD_VERTEX* pVertex,
+				unsigned long* pIndex,
+				D3DXCOLOR* pColor = NULL
+			);
+	virtual int _CreateVertexOfKeyWhite3(
+				unsigned char noteNo,
+				MTPIANOKEYBOARD_VERTEX* pVertex,
+				unsigned long* pIndex,
+				D3DXCOLOR* pColor = NULL
+			);
+	virtual int _CreateVertexOfKeyBlack(
+				unsigned char noteNo,
+				MTPIANOKEYBOARD_VERTEX* pVertex,
+				unsigned long* pIndex,
+				D3DXCOLOR* pColor = NULL
+			);
+
+private:
+
 	//キーボードデザイン
 	MTPianoKeyboardDesignMod m_KeyboardDesignMod;
 

--- a/MIDITrail/MTScenePianoRoll2DMod.cpp
+++ b/MIDITrail/MTScenePianoRoll2DMod.cpp
@@ -46,11 +46,6 @@ int MTScenePianoRoll2DMod::Create(
 {
 	int result = 0;
 
-	//ピアノロール2Dはライトなし
-	//  ノートボックスの幅をゼロにするので表と裏が同一平面状で重なる
-	//  ライトを有効にすると表と裏の色が異なりZファイティングを誘発する
-	m_IsEnableLight = FALSE;
-
 	result = MTScenePianoRoll3DMod::Create(hWnd, pD3DDevice, pSeqData);
 	if (result != 0) goto EXIT;
 

--- a/Resources/conf/PianoRoll2D.ini
+++ b/Resources/conf/PianoRoll2D.ini
@@ -108,8 +108,8 @@ KeyUpDuration=40
 KeyboardStepY=0.34
 KeyboardStepZ=1.5
 KeyboardMaxDispNum=16
-WhiteKeyColor=FFFFFFDD
-BlackKeyColor=FFFFFFDD
+WhiteKeyColor=FFFFFFAA
+BlackKeyColor=FFFFFFAA
 ActiveKeyColorType=STANDARD
 ;ActiveKeyColor=FF0000FF
 Ch-01-ActiveKeyColor=E61A1AEE

--- a/Resources/conf/PianoRoll3D.ini
+++ b/Resources/conf/PianoRoll3D.ini
@@ -109,8 +109,8 @@ KeyUpDuration=40
 KeyboardStepY=0.34
 KeyboardStepZ=1.5
 KeyboardMaxDispNum=16
-WhiteKeyColor=FFFFFFDD
-BlackKeyColor=FFFFFFDD
+WhiteKeyColor=FFFFFFAA
+BlackKeyColor=FFFFFFAA
 ActiveKeyColorType=STANDARD
 ;ActiveKeyColor=FF0000FF
 Ch-01-ActiveKeyColor=E61A1AEE