Commit: f1bebbec186165b6cd1acfc45d3c4f7fcc7f34ba - MIDITrailMod (git)

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

Commit MetaInfo

• Revisión: f1bebbec186165b6cd1acfc45d3c4f7fcc7f34ba (tree)
• Tiempo: 2019-08-28 07:06:19
• Autor: yoshy <yoshy@user...>
• Commiter: yoshy

Log Message

[UPDATE] カメラ位置によるキーボード描画順の変更を実装

Cambiar Resumen

• modified: MIDITrail/MTPianoKeyboard.cpp
• modified: MIDITrail/MTPianoKeyboard.h
• modified: MIDITrail/MTPianoKeyboardCtrlMod.cpp
• modified: MIDITrail/MTPianoKeyboardCtrlMod.h
• modified: MIDITrail/MTPianoKeyboardMod.cpp
• modified: MIDITrail/MTPianoKeyboardMod.h
• modified: MIDITrail/MTScenePianoRoll3DMod.cpp

Diferencia incremental

--- a/MIDITrail/MTPianoKeyboard.cpp
+++ b/MIDITrail/MTPianoKeyboard.cpp
@@ -1611,6 +1611,8 @@ int MTPianoKeyboard::Transform(
 		LPDIRECT3DDEVICE9 pD3DDevice,
 		D3DXVECTOR3 basePosVector,
 		D3DXVECTOR3 playbackPosVector,
+		D3DXVECTOR3 camVector,
+		D3DXVECTOR3 lookVector,
 		float rollAngle
 	)
 {

--- a/MIDITrail/MTPianoKeyboard.h
+++ b/MIDITrail/MTPianoKeyboard.h
@@ -47,14 +47,16 @@ public:
 	//更新
 	int Transform(LPDIRECT3DDEVICE9 pD3DDevice, D3DXVECTOR3 moveVector, float rollAngle);
 // >>> add 20120729 yossiepon begin
-// >>> modify 20180411 yossiepon begin
+// >>> modify 20180414 yossiepon begin
 	virtual int Transform(
 			LPDIRECT3DDEVICE9 pD3DDevice,
 			D3DXVECTOR3 basePosVector,
 			D3DXVECTOR3 playbackPosVector,
+			D3DXVECTOR3 camVector,
+			D3DXVECTOR3 lookVector,
 			float rollAngle
 		);
-// <<< modify 20180411 yossiepon end
+// <<< modify 20180414 yossiepon end
 // <<< add 20120729 yossiepon end
 
 // >>> modify function decl to virtual 20180412 yossiepon begin

--- a/MIDITrail/MTPianoKeyboardCtrlMod.cpp
+++ b/MIDITrail/MTPianoKeyboardCtrlMod.cpp
@@ -139,6 +139,7 @@ EXIT:;
 int MTPianoKeyboardCtrlMod::Transform(
 		LPDIRECT3DDEVICE9 pD3DDevice,
 		D3DXVECTOR3 camVector,
+		D3DXVECTOR3 lookVector,
 		float rollAngle
 	)
 {
@@ -171,7 +172,7 @@ int MTPianoKeyboardCtrlMod::Transform(
 		basePosVector.x += _GetMaxPitchBendShift(index);
 
 		//キーボード移動
-		result = m_pPianoKeyboard[index]->Transform(pD3DDevice, basePosVector, playbackPosVector, rollAngle);
+		result = m_pPianoKeyboard[index]->Transform(pD3DDevice, basePosVector, playbackPosVector, camVector, lookVector, rollAngle);
 		if (result != 0) goto EXIT;
 	}
 

--- a/MIDITrail/MTPianoKeyboardCtrlMod.h
+++ b/MIDITrail/MTPianoKeyboardCtrlMod.h
@@ -39,6 +39,7 @@ public:
 	int Transform(
 			LPDIRECT3DDEVICE9 pD3DDevice,
 			D3DXVECTOR3 camVector,
+			D3DXVECTOR3 lookVector,
 			float rollAngle
 		);
 

--- a/MIDITrail/MTPianoKeyboardMod.cpp
+++ b/MIDITrail/MTPianoKeyboardMod.cpp
@@ -42,6 +42,10 @@ MTPianoKeyboardMod::MTPianoKeyboardMod(void)
 	m_pRevIndexBuffer = NULL;
 	m_RevIndexNum = 0;
 	m_IsRevIndexLocked = false;
+
+	//キーボード描画範囲
+	m_noteNoLow = -1;
+	m_noteNoHigh = -1;
 }
 
 //******************************************************************************
@@ -103,12 +107,16 @@ int MTPianoKeyboardMod::Draw(
 	pD3DDevice->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
 
 	//正順側キーボードの描画
-	result = m_PrimitiveKeyboard.Draw(pD3DDevice, m_pTexture, m_BufInfo[63].indexTotal / 3);
-	if (result != 0) goto EXIT;
+	if (m_noteNoLow != -1) {
+		result = m_PrimitiveKeyboard.Draw(pD3DDevice, m_pTexture, m_BufInfo[m_noteNoLow].indexTotal / 3);
+		if (result != 0) goto EXIT;
+	}
 
 	//逆順側キーボードの描画
-	result = m_PrimitiveKeyboard.Draw(pD3DDevice, m_pRevIndexBuffer, m_pTexture, m_BufInfo[64].revIndexTotal / 3);
-	if (result != 0) goto EXIT;
+	if (m_noteNoHigh != -1) {
+		result = m_PrimitiveKeyboard.Draw(pD3DDevice, m_pRevIndexBuffer, m_pTexture, m_BufInfo[m_noteNoHigh].revIndexTotal / 3);
+		if (result != 0) goto EXIT;
+	}
 
 EXIT:;
 	return result;
@@ -121,6 +129,8 @@ int MTPianoKeyboardMod::Transform(
 		LPDIRECT3DDEVICE9 pD3DDevice,
 		D3DXVECTOR3 basePosVector,
 		D3DXVECTOR3 playbackPosVector,
+		D3DXVECTOR3 camVector,
+		D3DXVECTOR3 lookVector,
 		float rollAngle
 	)
 {
@@ -176,6 +186,9 @@ int MTPianoKeyboardMod::Transform(
 	//変換行列設定
 	m_PrimitiveKeyboard.Transform(worldMatrix);
 
+	//キーボード描画順の生成
+	_MakeRenderingOrder(basePosVector, camVector, lookVector);
+
 //EXIT:;
 	return result;
 }
@@ -217,6 +230,46 @@ EXIT:;
 }
 
 //******************************************************************************
+// 描画順の作成
+//******************************************************************************
+int MTPianoKeyboardMod::_MakeRenderingOrder(
+		D3DXVECTOR3 basePosVector,
+		D3DXVECTOR3 camVector,
+		D3DXVECTOR3 lookVector
+	)
+{
+	float origin = basePosVector.x;
+
+	float camPos = -camVector.z;
+
+	m_noteNoLow = (int)::floor((camPos - origin) / m_KeyboardDesignMod.GetNoteStep());
+	m_noteNoHigh = m_noteNoLow + 1;
+
+	//char buf[256];
+	//::sprintf(buf, "O:%f, P:%f, L:%d, H:%d\n", origin, camPos, m_noteNoLow, m_noteNoHigh);
+	//::OutputDebugStringA(buf);
+
+	if (m_noteNoLow < 0) {
+		m_noteNoLow = -1;
+	}
+
+	if (m_noteNoLow >= SM_MAX_NOTE_NUM) {
+		m_noteNoLow = SM_MAX_NOTE_NUM - 1;
+	}
+
+
+	if (m_noteNoHigh < 0) {
+		m_noteNoHigh = 0;
+	}
+
+	if (m_noteNoHigh >= SM_MAX_NOTE_NUM) {
+		m_noteNoHigh = -1;
+	}
+
+	return 0;
+}
+
+//******************************************************************************
 // 逆順インデックス生成
 //******************************************************************************
 int MTPianoKeyboardMod::_CreateRevIndex(LPDIRECT3DDEVICE9 pD3DDevice)

--- a/MIDITrail/MTPianoKeyboardMod.h
+++ b/MIDITrail/MTPianoKeyboardMod.h
@@ -41,6 +41,8 @@ public:
 			LPDIRECT3DDEVICE9 pD3DDevice,
 			D3DXVECTOR3 basePosVector,
 			D3DXVECTOR3 playbackPosVector,
+			D3DXVECTOR3 camVector,
+			D3DXVECTOR3 lookVector,
 			float rollAngle
 		);
 
@@ -55,6 +57,13 @@ public:
 
 private:
 
+	//描画順の作成
+	int _MakeRenderingOrder(
+			D3DXVECTOR3 basePosVector,
+			D3DXVECTOR3 camVector,
+			D3DXVECTOR3 lookVector
+		);
+
 	//逆順インデックスの生成
 	int _CreateRevIndex(LPDIRECT3DDEVICE9 pD3DDevice);
 
@@ -106,6 +115,10 @@ private:
 	LPDIRECT3DINDEXBUFFER9 m_pRevIndexBuffer;
 	unsigned long m_RevIndexNum;
 	bool m_IsRevIndexLocked;
+
+	//キーボード描画範囲
+	int m_noteNoLow;
+	int m_noteNoHigh;
 };
 
 

--- a/MIDITrail/MTScenePianoRoll3DMod.cpp
+++ b/MIDITrail/MTScenePianoRoll3DMod.cpp
@@ -106,6 +106,11 @@ int MTScenePianoRoll3DMod::Transform(
 	int result = 0;
 	float rollAngle = 0.0f;
 	D3DXVECTOR3 camVector;
+	D3DXVECTOR3 lookVector;
+	float phi;
+	float phiRad;
+	float theta;
+	float thetaRad;
 
 	//基底クラスの変換処理を呼び出す
 	result = MTScenePianoRoll3D::Transform(pD3DDevice);
@@ -114,6 +119,16 @@ int MTScenePianoRoll3DMod::Transform(
 	//カメラ座標取得
 	m_FirstPersonCam.GetPosition(&camVector);
 
+	//カメラ視線方向取得
+	m_FirstPersonCam.GetDirection(&phi, &theta);
+
+	//視線ベクトル（極座標から直交座標へ変換）
+	phiRad    = D3DXToRadian(phi);
+	thetaRad  = D3DXToRadian(theta);
+	lookVector.x = 10.0f * sin(thetaRad) * cos(phiRad);
+	lookVector.y = 10.0f * cos(thetaRad);
+	lookVector.z = 10.0f * sin(thetaRad) * sin(phiRad);
+
 	//回転角度取得
 	rollAngle = m_FirstPersonCam.GetManualRollAngle();
 
@@ -134,7 +149,7 @@ int MTScenePianoRoll3DMod::Transform(
 	if (result != 0) goto EXIT;
 
 	//ピアノキーボード更新
-	result = m_PianoKeyboardCtrlMod.Transform(pD3DDevice, camVector, rollAngle);
+	result = m_PianoKeyboardCtrlMod.Transform(pD3DDevice, camVector, lookVector, rollAngle);
 	if (result != 0) goto EXIT;
 
 EXIT:;