Commit: 886c22a2abbe462bafb6ec32ed18d4d0e3117802 - MIDITrailMod (git)

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

Commit MetaInfo

• Revision: 886c22a2abbe462bafb6ec32ed18d4d0e3117802 (tree)
• Time: 2016-10-30 13:12:00
• Author: yoshy <yoshy@user...>
• Commiter: yoshy

Log Message

[ADD] PianoRoll3D: 逆方向にライトを追加

Change Summary

• modified: MIDITrail/DXDirLight.cpp
• modified: MIDITrail/DXDirLight.h
• modified: MIDITrail/MIDITrail.rc
• modified: MIDITrail/MTScenePianoRoll3D.cpp
• modified: MIDITrail/MTScenePianoRoll3D.h
• modified: MIDITrail/MTScenePianoRoll3DMod.cpp
• modified: MIDITrail/MTScenePianoRoll3DMod.h

Incremental Difference

--- a/MIDITrail/DXDirLight.cpp
+++ b/MIDITrail/DXDirLight.cpp
@@ -107,11 +107,25 @@ D3DXVECTOR3 DXDirLight::GetDirection()
 //******************************************************************************
 // デバイス登録
 //******************************************************************************
+// >>> add 20121229 yossiepon begin
+//デバイスへのライト登録
 int DXDirLight::SetDevice(
 		LPDIRECT3DDEVICE9 pD3DDevice,
 		BOOL isLightON
 	)
 {
+	return SetDevice(pD3DDevice, 0, isLightON);
+}
+// <<< add 20121229 yossiepon end
+
+int DXDirLight::SetDevice(
+		LPDIRECT3DDEVICE9 pD3DDevice,
+// >>> add 20121229 yossiepon begin
+		DWORD index,
+// <<< add 20121229 yossiepon end
+		BOOL isLightON
+	)
+{
 	int result = 0;
 	HRESULT hresult = D3D_OK;
 
@@ -132,14 +146,14 @@ int DXDirLight::SetDevice(
 	}
 
 	// ライトをレンダリングパイプラインに設定
-	hresult = pD3DDevice->SetLight(0, &m_Light);
+	hresult = pD3DDevice->SetLight(index, &m_Light);
 	if (FAILED(hresult)) {
 		result = YN_SET_ERR("DirectX API error.", hresult, 0);
 		goto EXIT;
 	}
 
 	//ライト有効化
-	hresult = pD3DDevice->LightEnable(0, isLightON);
+	hresult = pD3DDevice->LightEnable(index, isLightON);
 	if (FAILED(hresult)) {
 		result = YN_SET_ERR("DirectX API error.", hresult, isLightON);
 		goto EXIT;

--- a/MIDITrail/DXDirLight.h
+++ b/MIDITrail/DXDirLight.h
@@ -43,6 +43,15 @@ public:
 			BOOL isLightON
 		);
 
+// >>> add 20121229 yossiepon begin
+	//デバイスへのライト登録
+	int SetDevice(
+			LPDIRECT3DDEVICE9 pD3DDevice,
+			DWORD index,
+			BOOL isLightON
+		);
+// <<< add 20121229 yossiepon end
+
 private:
 
 	D3DLIGHT9 m_Light;

--- a/MIDITrail/MIDITrail.rc
+++ b/MIDITrail/MIDITrail.rc
@@ -123,9 +123,9 @@ 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
-// >>> modify 20120728 yossiepon begin
-    CTEXT           "Version 1.2.0 mod. yossiepon_20120728",IDC_STATIC,16,63,138,8
-// <<< modify 20120728 yossiepon end
+// >>> modify 20121229 yossiepon begin
+    CTEXT           "Version 1.2.0 mod. yossiepon_20121229",IDC_STATIC,16,63,138,8
+// <<< modify 20121229 yossiepon end
     CTEXT           "Copyright (C) 2010-2012 WADA Masashi",IDC_STATIC,1,84,168,8
     DEFPUSHBUTTON   "OK",IDOK,58,108,53,14,WS_GROUP
 END
@@ -299,9 +299,9 @@ END
 
 STRINGTABLE 
 BEGIN
-// >>> modify 20120728 yossiepon begin
-    IDS_APP_TITLE           "MIDITrail 1.2.0 mod. yossiepon_20120728"
-// <<< modify 20120728 yossiepon end
+// >>> modify 20121229 yossiepon begin
+    IDS_APP_TITLE           "MIDITrail 1.2.0 mod. yossiepon_20121229"
+// <<< modify 20121229 yossiepon end
     IDC_MIDITRAIL           "MIDITRAIL"
 END
 

--- a/MIDITrail/MTScenePianoRoll3D.cpp
+++ b/MIDITrail/MTScenePianoRoll3D.cpp
@@ -94,7 +94,9 @@ int MTScenePianoRoll3D::Create(
 	m_DirLight.SetDirection(D3DXVECTOR3(1.0f, -1.0f, 2.0f));
 
 	//ライトのデバイス登録
-	result = m_DirLight.SetDevice(pD3DDevice, m_IsEnableLight);
+// >>> moidfy 20121229 yossiepon begin
+	result = m_DirLight.SetDevice(pD3DDevice, 0, m_IsEnableLight);
+// <<< moidfy 20121229 yossiepon end
 	if (result != 0) goto EXIT;
 
 	//----------------------------------

--- a/MIDITrail/MTScenePianoRoll3D.h
+++ b/MIDITrail/MTScenePianoRoll3D.h
@@ -133,6 +133,10 @@ protected:
 
 	virtual void _Reset();
 
+// >>> modify access level to protected 20121229 yossiepon begin
+	void _SetLightColor(DXDirLight* pLight);
+// <<< modify 20121229 yossiepon end
+
 // <<< modify 20120728 yossiepon end
 
 private:
@@ -156,7 +160,6 @@ private:
 	MTNoteDesign m_NoteDesign;
 
 // >>> modify 20120728 yossiepon begin
-	void _SetLightColor(DXDirLight* pLight);
 // <<< modify 20120728 yossiepon end
 
 };

--- a/MIDITrail/MTScenePianoRoll3DMod.cpp
+++ b/MIDITrail/MTScenePianoRoll3DMod.cpp
@@ -48,6 +48,23 @@ int MTScenePianoRoll3DMod::Create(
 	if (result != 0) goto EXIT;
 
 	//----------------------------------
+	// ライト2
+	//----------------------------------
+	//ライト2初期化
+	result = m_DirLightBack.Initialize();
+	if (result != 0) goto EXIT;
+
+	//ライト2色
+	_SetLightColor(&m_DirLightBack);
+
+	//ライト2方向
+	m_DirLightBack.SetDirection(D3DXVECTOR3(-1.0f, 1.0f, -2.0f));
+
+	//ライトのデバイス登録
+	result = m_DirLightBack.SetDevice(pD3DDevice, 1, m_IsEnableLight);
+	if (result != 0) goto EXIT;
+
+	//----------------------------------
 	// 描画オブジェクト
 	//----------------------------------
 

--- a/MIDITrail/MTScenePianoRoll3DMod.h
+++ b/MIDITrail/MTScenePianoRoll3DMod.h
@@ -59,6 +59,9 @@ protected:
 
 private:
 
+	// ライト2
+	DXDirLight m_DirLightBack;
+
 	//描画オブジェクト
 	MTGridBoxMod m_GridBoxMod;
 	MTNoteBoxMod m_NoteBoxMod;