Commit: a350541fc73729924bdb3b1cfa47c3e287fa2dd5 - MIDITrailMod (git)

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

Commit MetaInfo

• Revision: a350541fc73729924bdb3b1cfa47c3e287fa2dd5 (tree)
• Zeit: 2018-04-12 08:44:05
• Autor: yoshy <yoshy@user...>
• Commiter: yoshy

Log Message

[CLEAN] キーボードの基準座標の計算をデザインクラス側に移動

Ändern Zusammenfassung

• modified: MIDITrail/MTGridBoxMod.cpp
• modified: MIDITrail/MTPianoKeyboardCtrlMod.cpp
• modified: MIDITrail/MTPianoKeyboardDesign.h
• modified: MIDITrail/MTPianoKeyboardDesignMod.cpp
• modified: MIDITrail/MTPianoKeyboardDesignMod.h
• modified: MIDITrail/MTPianoKeyboardMod.cpp

Diff

--- a/MIDITrail/MTGridBoxMod.cpp
+++ b/MIDITrail/MTGridBoxMod.cpp
@@ -49,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));
 

--- a/MIDITrail/MTPianoKeyboardCtrlMod.cpp
+++ b/MIDITrail/MTPianoKeyboardCtrlMod.cpp
@@ -201,14 +201,12 @@ int MTPianoKeyboardCtrlMod::Transform(
 		);
 
 	float boardHeight = portWindowLU.y - portWindowLD.y;
-	float keyboardWidth = m_KeyboardDesignMod.GetPortOriginX(0) * -2.0f;
-	float portWidth =  m_KeyboardDesignMod.GetChStep() * 16.0f;
+	float keyboardWidth = m_KeyboardDesignMod.GetPortOriginX() * -2.0f;
 
 	float resizeSacle = boardHeight / keyboardWidth;
-	float antiResizeScale = keyboardWidth / boardHeight;
 
 	float rippleSpacing = m_NoteDesignMod.GetRippleSpacing();
-	float rippleMargin = rippleSpacing * (MTNOTELYRICS_MAX_LYRICS_NUM + MTNOTERIPPLE_MAX_RIPPLE_NUM) * antiResizeScale;
+	float rippleMargin = rippleSpacing * (MTNOTELYRICS_MAX_LYRICS_NUM + MTNOTERIPPLE_MAX_RIPPLE_NUM); // * antiResizeScale;
 
 	//移動ベクトル：再生面に追従する
 	playbackPosVector = m_NoteDesignMod.GetWorldMoveVector();
@@ -236,43 +234,11 @@ int MTPianoKeyboardCtrlMod::Transform(
 		}
 
 		//移動ベクトル：キーボード基準座標
-		transformVector = m_KeyboardDesignMod.GetKeyboardBasePos(keyboardIndex, 0, antiResizeScale);
+		transformVector = m_KeyboardDesignMod.GetKeyboardBasePos(keyboardIndex, rippleMargin, boardHeight, rollAngle);
 
 		//移動ベクトル：ピッチベンドシフトを反映
 		transformVector.x += GetMaxPitchBendShift(portNo);
 
-		if(rollAngle < 0.0f) {
-			rollAngle += 360.0f;
-		}
-
-		float portOriginY = portWidth * (m_PortList.GetSize() - keyboardIndex - 1) * antiResizeScale;
-
-		//鍵盤の1/2の幅だけ高音側に
-		transformVector.x += m_KeyboardDesignMod.GetWhiteKeyStep() / 2.0f;
-
-		//鍵盤の1/4の高さだけ下に
-		transformVector.y -= m_KeyboardDesignMod.GetWhiteKeyHeight() / 4.0f;
-
-		if((rollAngle > 120.0f) && (rollAngle < 300.0f)) {
-
-			//ポート原点Y
-			transformVector.y -= portOriginY;
-
-			//鍵盤の原点をCh15に
-			transformVector.y -= m_KeyboardDesignMod.GetChStep() * 15.0f * antiResizeScale;
-
-			//鍵盤の長さ＋リップルマージン＋歌詞マージンだけ手前に
-			transformVector.z -= m_KeyboardDesignMod.GetWhiteKeyLen() + rippleMargin;
-
-		} else {
-
-			//ポート原点Y
-			transformVector.y += portOriginY;
-
-			//リップルマージン＋歌詞マージンだけ奥に
-			transformVector.z += rippleMargin;
-		}
-
 		//キーボード移動
 		result = m_pPianoKeyboard[keyboardIndex]->Transform(pD3DDevice, transformVector, playbackPosVector, resizeSacle, portWindowLU.z, rollAngle);
 		if (result != 0) goto EXIT;

--- 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,9 +180,7 @@ 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();

--- a/MIDITrail/MTPianoKeyboardDesignMod.cpp
+++ b/MIDITrail/MTPianoKeyboardDesignMod.cpp
@@ -75,24 +75,162 @@ void MTPianoKeyboardDesignMod::_Initialize()
 }
 
 //******************************************************************************
+// ポート原点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 = MTPianoKeyboardDesign::GetPortOriginX(0);
+
+	//鍵盤の1/2の幅だけ高音側に移動
+	return originX + GetWhiteKeyStep() / 2.0f;
+}
+
+//******************************************************************************
 // ポート原点Y座標取得
 //******************************************************************************
 float MTPianoKeyboardDesignMod::GetPortOriginY(
-		unsigned char portNo
+		int keyboardIndex,
+		float antiResizeScale,
+		bool flip
 	)
 {
-	return 0;
+	// angle: 120°〜300°(rotateX: 90°, rotateZ: 90°)
+	//      +y                                    
+	//       |                                    
+	// +z<---0-----------------------------Ch.15------------>-z
+	//       |                                    
+	//       |            +--------------+        
+	//       |      portC +--------------@ Ch.0   
+	//       |                             Ch.15  
+	//       |                                    
+	//       |            +--------------+        
+	//       |      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  |
+	//                                            |
+	//                    +--------------+        |
+	//              portB +--------------@ Ch.0   |
+	//                                     Ch.15  |
+	//                                            |
+	//                    +--------------+        |
+	// +z<----------portC +--------------@ Ch.0---0-------------->-z
+	//                                            |
+	//                                            | @:OriginY(for portA,B,C)
+	//                                           -y
+
+	float portWidth = GetChStep() * 16.0f;
+
+	// TODO シングルキーボードの判定方法を再検討
+	int keyboardDispNum = GetKeyboardMaxDispNum() > 1 ? m_PortList.GetSize() : 1;
+
+	float originY = portWidth * (keyboardDispNum - keyboardIndex - 1);
+
+	if (!flip) {
+		originY = -(originY + GetChStep() * 15.0f);
+	}
+
+	//キーボードリサイズ後に正しいポート間隔となるよう逆比をかける
+	originY *= antiResizeScale;
+
+	//鍵盤の1/4の高さだけ下に
+	originY -= GetWhiteKeyHeight() / 4.0f;
+
+	return originY;
 }
 
 //******************************************************************************
 // ポート原点Z座標取得
 //******************************************************************************
 float MTPianoKeyboardDesignMod::GetPortOriginZ(
-		unsigned char portNo
+		int keyboardIndex,
+		float rippleMargin,
+		float antiResizeScale,
+		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;
+
+	//キーボードリサイズ後に正しいリップルマージンとなるよう逆比をかける
+	rippleMargin *= antiResizeScale;
+
+	if (!flip) {
+		originZ = -(GetWhiteKeyLen() + rippleMargin);
+	}
+	else {
+		originZ = rippleMargin;
+	}
 
-	return 0;
+	return originZ;
 }
 
 //******************************************************************************
@@ -171,17 +309,28 @@ D3DXCOLOR MTPianoKeyboardDesignMod::GetActiveKeyColor(
 // キーボード基準座標取得
 //******************************************************************************
 D3DXVECTOR3 MTPianoKeyboardDesignMod::GetKeyboardBasePos(
-		unsigned char portNo,
-		unsigned char chNo,
-		float scale
+		int keyboardIndex,
+		float rippleMargin,
+		float boardHeight,
+		float angle
 	)
 {
 	float ox, oy, oz = 0.0f;
 
+	//ロール角度によって描画方法を切り替える
+	angle += angle < 0.0f ? 360.0f : 0.0f;
+	bool flip = !((angle > 120.0f) && (angle < 300.0f));
+
+	float keyboardWidth = MTPianoKeyboardDesign::GetPortOriginX(0) * -2.0f;
+
+	//キーボード描画時にリサイズがかかってはならない相対座標用の逆リサイズ比
+	//対象：ポート間隔、リップルマージン
+	float antiResizeScale = keyboardWidth / boardHeight;
+
 	//ポート単位の原点座標
-	ox = GetPortOriginX(portNo);
-	oy = GetPortOriginY(portNo);
-	oz = GetPortOriginZ(portNo);
+	ox = GetPortOriginX();
+	oy = GetPortOriginY(keyboardIndex, antiResizeScale, flip);
+	oz = GetPortOriginZ(keyboardIndex, rippleMargin, antiResizeScale, flip);
 
 	return D3DXVECTOR3(ox, oy, oz);
 }

--- a/MIDITrail/MTPianoKeyboardDesignMod.h
+++ b/MIDITrail/MTPianoKeyboardDesignMod.h
@@ -28,8 +28,9 @@ public:
 	virtual int Initialize(const TCHAR* pSceneName, SMSeqData* pSeqData);
 
 	//ポート原点座標取得
-	virtual float GetPortOriginY(unsigned char portNo);
-	virtual float GetPortOriginZ(unsigned char portNo);
+	float GetPortOriginX();
+	float GetPortOriginY(int keyboardIndex, float antiResizeScale, bool flip);
+	float GetPortOriginZ(int keyboardIndex, float rippleMargin, float antiResizeScale, bool flip);
 
 	//チャンネル間隔取得
 	float GetChStep();
@@ -43,7 +44,7 @@ public:
 		);
 
 	//キーボード基準座標取得
-	virtual D3DXVECTOR3 GetKeyboardBasePos(unsigned char portNo, unsigned char chNo, float scale);
+	D3DXVECTOR3 GetKeyboardBasePos(int keyboardIndex, float rippleMargin, float boardHeight, float angle);
 
 protected:
 

--- a/MIDITrail/MTPianoKeyboardMod.cpp
+++ b/MIDITrail/MTPianoKeyboardMod.cpp
@@ -92,8 +92,7 @@ int MTPianoKeyboardMod::Transform(
 	D3DXMATRIX moveMatrix1;
 	D3DXMATRIX moveMatrix2;
 	D3DXMATRIX moveMatrix3;
-	D3DXMATRIX worldMatrix1;
-	D3DXMATRIX worldMatrix2;
+	D3DXMATRIX worldMatrix;
 
 	//行列初期化
 	D3DXMatrixIdentity(&scaleMatrix);
@@ -102,8 +101,7 @@ int MTPianoKeyboardMod::Transform(
 	D3DXMatrixIdentity(&rotateMatrix3);
 	D3DXMatrixIdentity(&moveMatrix1);
 	D3DXMatrixIdentity(&moveMatrix2);
-	D3DXMatrixIdentity(&worldMatrix1);
-	D3DXMatrixIdentity(&worldMatrix2);
+	D3DXMatrixIdentity(&worldMatrix);
 
 	//回転行列
 
@@ -112,11 +110,11 @@ 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));
@@ -130,15 +128,16 @@ int MTPianoKeyboardMod::Transform(
 	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, &moveMatrix1);
+	D3DXMatrixMultiply(&worldMatrix, &worldMatrix, &rotateMatrix1);
+	D3DXMatrixMultiply(&worldMatrix, &worldMatrix, &rotateMatrix2);
+	D3DXMatrixMultiply(&worldMatrix, &worldMatrix, &moveMatrix3);
+	D3DXMatrixMultiply(&worldMatrix, &worldMatrix, &rotateMatrix3);
+	D3DXMatrixMultiply(&worldMatrix, &worldMatrix, &scaleMatrix);
+	D3DXMatrixMultiply(&worldMatrix, &worldMatrix, &moveMatrix2);
 
 	//変換行列設定
-	m_PrimitiveKeyboard.Transform(worldMatrix2);
+	m_PrimitiveKeyboard.Transform(worldMatrix);
 
 //EXIT:;
 	return result;