Commit: c701ef24464dec0d6505c55d8dfc6d9db4c8dbb3 - MIDITrailMod (git)

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

Commit MetaInfo

• Revision: c701ef24464dec0d6505c55d8dfc6d9db4c8dbb3 (tree)
• Time: 2023-08-06 14:38:45
• Author: yoshy <yoshy@user...>
• Commiter: yoshy

Log Message

[WORKING] PianoRollRingシーンのノートボックスオブジェクトをMod化

Change Summary

• modified: MIDITrail/MIDITrail.vcxproj
• modified: MIDITrail/MIDITrail.vcxproj.filters
• modified: MIDITrail/MTNoteBoxMod.cpp
• modified: MIDITrail/MTNoteBoxMod.h
• add: MIDITrail/MTNoteBoxRingMod.cpp
• add: MIDITrail/MTNoteBoxRingMod.h
• modified: MIDITrail/MTNoteRippleMod.h
• modified: MIDITrail/MTScenePianoRollRingMod.cpp
• modified: MIDITrail/MTScenePianoRollRingMod.h

Incremental Difference

--- a/MIDITrail/MIDITrail.vcxproj
+++ b/MIDITrail/MIDITrail.vcxproj
@@ -197,6 +197,7 @@
     <ResourceCompile Include="MIDITrail.rc" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="MTNoteBoxRingMod.cpp" />
     <ClCompile Include="MTNoteDesignRingMod.cpp" />
     <ClCompile Include="MTNoteRippleRingMod.cpp" />
     <ClCompile Include="MTGridRingMod.cpp" />
@@ -289,6 +290,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="MTNoteBoxRingMod.h" />
     <ClInclude Include="MTNoteDesignRingMod.h" />
     <ClInclude Include="MTNoteRippleRingMod.h" />
     <ClInclude Include="MTGridRingMod.h" />

--- a/MIDITrail/MIDITrail.vcxproj.filters
+++ b/MIDITrail/MIDITrail.vcxproj.filters
@@ -305,6 +305,9 @@
     <ClCompile Include="MTNoteDesignRingMod.cpp">
       <Filter>Sources\SceneObject</Filter>
     </ClCompile>
+    <ClCompile Include="MTNoteBoxRingMod.cpp">
+      <Filter>Sources\SceneObject</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="MIDITrailApp.h">
@@ -574,5 +577,8 @@
     <ClInclude Include="MTNoteDesignRingMod.h">
       <Filter>Sources\SceneObject</Filter>
     </ClInclude>
+    <ClInclude Include="MTNoteBoxRingMod.h">
+      <Filter>Sources\SceneObject</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

--- a/MIDITrail/MTNoteBoxMod.cpp
+++ b/MIDITrail/MTNoteBoxMod.cpp
@@ -29,6 +29,7 @@ using namespace YNBaseLib;
 //******************************************************************************
 MTNoteBoxMod::MTNoteBoxMod(void) : MTNoteBox()
 {
+	m_pNoteDesignMod = NULL;
 	m_pNoteStatusMod = NULL;
 	ZeroMemory(m_KeyDownRate, sizeof(float) * MT_NOTEBOX_MAX_PORT_NUM * SM_MAX_CH_NUM * SM_MAX_NOTE_NUM);
 }
@@ -60,10 +61,6 @@ int MTNoteBoxMod::Create(
 	result = MTNoteBox::Create(pD3DDevice, pSceneName, pSeqData, pNotePitchBend);
 	if (result != 0) goto EXIT;
 
-	//ノートデザインModオブジェクト初期化
-	result = m_NoteDesignMod.Initialize(pSceneName, pSeqData);
-	if (result != 0) goto EXIT;
-
 	//トラック取得
 	result = pSeqData->GetMergedTrack(&track);
 	if (result != 0) goto EXIT;
@@ -77,6 +74,26 @@ EXIT:;
 }
 
 //******************************************************************************
+// ノートデザイン生成
+//******************************************************************************
+int MTNoteBoxMod::_CreateNoteDesign()
+{
+	int result = 0;
+
+	try {
+		m_pNoteDesignMod = new MTNoteDesignMod();
+		m_pNoteDesign = m_pNoteDesignMod;
+	}
+	catch (std::bad_alloc) {
+		result = YN_SET_ERR("Could not allocate memory.", 0, 0);
+		goto EXIT;
+	}
+
+EXIT:;
+	return result;
+}
+
+//******************************************************************************
 // ノート情報配列生成
 //******************************************************************************
 int MTNoteBoxMod::_CreateNoteStatus()
@@ -162,8 +179,8 @@ int MTNoteBoxMod::_UpdateStatusOfActiveNotes(
 	SMNote note;
 
 	//波紋ディケイ・リリース時間(msec)
-	unsigned long decayDuration = m_NoteDesignMod.GetRippleDecayDuration();
-	unsigned long releaseDuration   = m_NoteDesignMod.GetRippleReleaseDuration();
+	unsigned long decayDuration = m_pNoteDesignMod->GetRippleDecayDuration();
+	unsigned long releaseDuration   = m_pNoteDesignMod->GetRippleReleaseDuration();
 
 	//ノート情報を更新する
 	for (i = 0; i < MTNOTEBOX_MAX_ACTIVENOTE_NUM; i++) {
@@ -393,8 +410,14 @@ EXIT:;
 //******************************************************************************
 void MTNoteBoxMod::Release()
 {
+	delete m_pNoteDesignMod;
+	m_pNoteDesignMod = NULL;
+	m_pNoteDesign = NULL;
+
 	delete [] m_pNoteStatusMod;
 	m_pNoteStatusMod = NULL;
+
+	MTNoteBox::Release();
 }
 
 //******************************************************************************
@@ -439,7 +462,7 @@ int MTNoteBoxMod::_CreateVertexOfNote(
 	//ノートボックス頂点座標取得
 	if (keyDownRate == 0.0f) {
 		//通常ノートの場合
-		m_NoteDesignMod.GetNoteBoxVirtexPos(
+		m_pNoteDesignMod->GetNoteBoxVirtexPos(
 				note.startTime,
 				note.portNo,
 				note.chNo,
@@ -451,7 +474,7 @@ int MTNoteBoxMod::_CreateVertexOfNote(
 				pitchBendValue,
 				pitchBendSensitivity
 			);
-		m_NoteDesignMod.GetNoteBoxVirtexPos(
+		m_pNoteDesignMod->GetNoteBoxVirtexPos(
 				note.endTime,
 				note.portNo,
 				note.chNo,
@@ -466,7 +489,7 @@ int MTNoteBoxMod::_CreateVertexOfNote(
 	}
 	else {
 		//発音中ノートの場合：キー押し下げ率でサイズが変化する
-		m_NoteDesignMod.GetActiveNoteBoxVirtexPos(
+		m_pNoteDesignMod->GetActiveNoteBoxVirtexPos(
 				note.startTime,
 				note.portNo,
 				note.chNo,
@@ -479,7 +502,7 @@ int MTNoteBoxMod::_CreateVertexOfNote(
 				pitchBendSensitivity,
 				keyDownRate
 			);
-		m_NoteDesignMod.GetActiveNoteBoxVirtexPos(
+		m_pNoteDesignMod->GetActiveNoteBoxVirtexPos(
 				note.endTime,
 				note.portNo,
 				note.chNo,
@@ -560,11 +583,11 @@ int MTNoteBoxMod::_CreateVertexOfNote(
 
 	//各頂点のディフューズ色
 	if (keyDownRate == 0.0f) {
-		color = m_NoteDesignMod.GetNoteBoxColor(note.portNo, note.chNo, note.noteNo);
+		color = m_pNoteDesignMod->GetNoteBoxColor(note.portNo, note.chNo, note.noteNo);
 	}
 	else {
 		//発音中はキー押し下げ率によって色が変化する
-		color = m_NoteDesignMod.GetActiveNoteBoxColor(note.portNo, note.chNo, note.noteNo, keyDownRate);
+		color = m_pNoteDesignMod->GetActiveNoteBoxColor(note.portNo, note.chNo, note.noteNo, keyDownRate);
 	}
 
 	//頂点の色設定完了

--- a/MIDITrail/MTNoteBoxMod.h
+++ b/MIDITrail/MTNoteBoxMod.h
@@ -52,7 +52,7 @@ public:
 	//リセット
 	virtual void Reset();
 
-private:
+protected:
 
 	//キー状態
 	enum KeyStatus {
@@ -70,16 +70,6 @@ private:
 		float keyDownRate;
 	};
 
-protected:
-
-	virtual int _UpdateStatusOfActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice);
-	virtual int _UpdateVertexOfActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice);
-
-private:
-
-	//ノートデザイン
-	MTNoteDesignMod m_NoteDesignMod;
-
 	//ノートリスト
 	SMNoteList m_NoteListRT;
 
@@ -87,9 +77,16 @@ private:
 	unsigned long m_PlayTimeMSec;
 	float m_KeyDownRate[MT_NOTEBOX_MAX_PORT_NUM][SM_MAX_CH_NUM][SM_MAX_NOTE_NUM];
 
+	//ノートデザイン
+	MTNoteDesignMod *m_pNoteDesignMod;
+
 	//ノート発音状態情報
 	NoteStatusMod* m_pNoteStatusMod;
 
+	virtual int _UpdateStatusOfActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice);
+	virtual int _UpdateVertexOfActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice);
+
+	virtual int _CreateNoteDesign();
 	virtual int _CreateNoteStatus();
 
 	int _CreateVertexOfNote(

--- /dev/null
+++ b/MIDITrail/MTNoteBoxRingMod.cpp
@@ -0,0 +1,51 @@
+//******************************************************************************
+//
+// MIDITrail / MTNoteBoxRingMod
+//
+// ノートボックスリング描画Modクラス
+//
+// Copyright (C) 2019 Yossiepon Oniichan. All Rights Reserved.
+//
+//******************************************************************************
+
+#include "StdAfx.h"
+#include "YNBaseLib.h"
+#include "MTNoteDesignRingMod.h"
+#include "MTNoteBoxRingMod.h"
+
+using namespace YNBaseLib;
+
+
+//******************************************************************************
+// コンストラクタ
+//******************************************************************************
+MTNoteBoxRingMod::MTNoteBoxRingMod(void)
+{
+}
+
+//******************************************************************************
+// デストラクタ
+//******************************************************************************
+MTNoteBoxRingMod::~MTNoteBoxRingMod(void)
+{
+}
+
+//******************************************************************************
+// ノートデザイン生成
+//******************************************************************************
+int MTNoteBoxRingMod::_CreateNoteDesign()
+{
+	int result = 0;
+
+	try {
+		m_pNoteDesignMod = new MTNoteDesignRingMod();
+		m_pNoteDesign = m_pNoteDesignMod;
+	}
+	catch (std::bad_alloc) {
+		result = YN_SET_ERR("Could not allocate memory.", 0, 0);
+		goto EXIT;
+	}
+
+EXIT:;
+	return result;
+}

--- /dev/null
+++ b/MIDITrail/MTNoteBoxRingMod.h
@@ -0,0 +1,33 @@
+//******************************************************************************
+//
+// MIDITrail / MTNoteBoxRingMod
+//
+// ノートボックスリング描画Modクラス
+//
+// Copyright (C) 2019 Yossiepon Oniichan. All Rights Reserved.
+//
+//******************************************************************************
+
+#pragma once
+
+#include "MTNoteBoxMod.h"
+
+
+//******************************************************************************
+// ノートボックスリング描画クラス
+//******************************************************************************
+class MTNoteBoxRingMod : public MTNoteBoxMod
+{
+public:
+
+	//コンストラクタ／デストラクタ
+	MTNoteBoxRingMod(void);
+	virtual ~MTNoteBoxRingMod(void);
+
+private:
+
+	virtual int _CreateNoteDesign();
+
+};
+
+

--- a/MIDITrail/MTNoteRippleMod.h
+++ b/MIDITrail/MTNoteRippleMod.h
@@ -54,14 +54,6 @@ public:
 
 protected:
 
-	virtual int _CreateNoteStatus();
-	virtual int _CreateVertex(LPDIRECT3DDEVICE9 pD3DDevice);
-	virtual void _MakeMaterial(D3DMATERIAL9* pMaterial);
-	virtual int _TransformRipple(LPDIRECT3DDEVICE9 pD3DDevice);
-	virtual int _UpdateVertexOfRipple(LPDIRECT3DDEVICE9 pD3DDevice);
-
-private:
-
 	//ノート発音状態構造体
 	//キー状態
 	enum KeyStatus {
@@ -78,13 +70,6 @@ private:
 		float keyDownRate;
 	};
 
-protected:
-
-	//ノートデザイン
-	MTNoteDesignMod *m_pNoteDesignMod;
-
-private:
-
 	//ノートリスト
 	SMNoteList m_NoteListRT;
 
@@ -93,9 +78,18 @@ private:
 	unsigned long m_CurNoteIndex;
 	float m_KeyDownRate[MTNOTERIPPLE_MAX_PORT_NUM][SM_MAX_CH_NUM][SM_MAX_NOTE_NUM];
 
+	//ノートデザイン
+	MTNoteDesignMod *m_pNoteDesignMod;
+
 	//ノート発音状態情報
 	NoteStatusMod* m_pNoteStatusMod;
 
+	virtual int _CreateNoteStatus();
+	virtual int _CreateVertex(LPDIRECT3DDEVICE9 pD3DDevice);
+	virtual void _MakeMaterial(D3DMATERIAL9* pMaterial);
+	virtual int _TransformRipple(LPDIRECT3DDEVICE9 pD3DDevice);
+	virtual int _UpdateVertexOfRipple(LPDIRECT3DDEVICE9 pD3DDevice);
+
 	virtual int _CreateNoteDesign();
 
 	int _SetVertexPosition(

--- a/MIDITrail/MTScenePianoRollRingMod.cpp
+++ b/MIDITrail/MTScenePianoRollRingMod.cpp
@@ -63,6 +63,10 @@ int MTScenePianoRollRingMod::Create(
 	//----------------------------------
 	// 描画オブジェクト
 	//----------------------------------
+	//ノートボックス生成
+	result = m_NoteBoxMod.Create(pD3DDevice, GetName(), pSeqData, &m_NotePitchBend);
+	if (result != 0) goto EXIT;
+
 	//ノート波紋生成
 	result = m_NoteRippleMod.Create(pD3DDevice, GetName(), pSeqData, &m_NotePitchBend);
 	if (result != 0) goto EXIT;
@@ -100,6 +104,10 @@ int MTScenePianoRollRingMod::Transform(
 	//回転角度取得
 	rollAngle = m_FirstPersonCam.GetManualRollAngle();
 
+	//ノートボックス更新
+	result = m_NoteBoxMod.Transform(pD3DDevice, rollAngle);
+	if (result != 0) goto EXIT;
+
 	//グリッドリング更新
 	result = m_GridRingMod.Transform(pD3DDevice, rollAngle);
 	if (result != 0) goto EXIT;
@@ -143,7 +151,7 @@ int MTScenePianoRollRingMod::Draw(
 	if (result != 0) goto EXIT;
 
 	//ノートボックス描画
-	result = m_NoteBox.Draw(pD3DDevice);
+	result = m_NoteBoxMod.Draw(pD3DDevice);
 	if (result != 0) goto EXIT;
 
 	//ピクチャボード描画
@@ -179,6 +187,7 @@ EXIT:;
 //******************************************************************************
 void MTScenePianoRollRingMod::Release()
 {
+	m_NoteBoxMod.Release();
 	m_GridRingMod.Release();
 	m_TimeIndicatorMod.Release();
 	m_NoteRippleMod.Release();
@@ -219,7 +228,8 @@ int MTScenePianoRollRingMod::OnRecvSequencerMsg(
 		m_NoteRippleMod.SetPlayTimeMSec(parser.GetPlayTimeMSec());
 		m_NoteRippleMod.SetCurTickTime(parser.GetPlayTickTime());
 		m_PictBoard.SetCurTickTime(parser.GetPlayTickTime());
-		m_NoteBox.SetCurTickTime(parser.GetPlayTickTime());
+		m_NoteBoxMod.SetPlayTimeMSec(parser.GetPlayTimeMSec());
+		m_NoteBoxMod.SetCurTickTime(parser.GetPlayTickTime());
 	}
 	//テンポ変更通知
 	else if (parser.GetMsg() == SMMsgParser::MsgTempo) {
@@ -251,8 +261,8 @@ int MTScenePianoRollRingMod::OnRecvSequencerMsg(
 		if (parser.GetSkipStartDirection() == SMMsgParser::SkipBack) {
 			m_NotePitchBend.Reset();
 		}
-		m_NoteBox.Reset();
-		m_NoteBox.SetSkipStatus(true);
+		m_NoteBoxMod.Reset();
+		m_NoteBoxMod.SetSkipStatus(true);
 		m_NoteRippleMod.Reset();
 		m_NoteRippleMod.SetSkipStatus(true);
 		m_IsSkipping = true;
@@ -260,7 +270,7 @@ int MTScenePianoRollRingMod::OnRecvSequencerMsg(
 	//スキップ終了通知
 	else if (parser.GetMsg() == SMMsgParser::MsgSkipEnd) {
 		m_Dashboard.SetNotesCount(parser.GetSkipEndNotesCount());
-		m_NoteBox.SetSkipStatus(false);
+		m_NoteBoxMod.SetSkipStatus(false);
 		m_NoteRippleMod.SetSkipStatus(false);
 		m_IsSkipping = false;
 	}
@@ -277,6 +287,7 @@ void MTScenePianoRollRingMod::_Reset()
 	MTScenePianoRollRing::_Reset();
 
 	m_TimeIndicatorMod.Reset();
+	m_NoteBoxMod.Reset();
 	m_NoteRippleMod.Reset();
 }
 

--- a/MIDITrail/MTScenePianoRollRingMod.h
+++ b/MIDITrail/MTScenePianoRollRingMod.h
@@ -10,6 +10,7 @@
 
 #pragma once
 
+#include "MTNoteBoxRingMod.h"
 #include "MTNoteRippleRingMod.h"
 #include "MTGridRingMod.h"
 #include "MTTimeIndicatorRingMod.h"
@@ -60,6 +61,7 @@ public:
 protected:
 
 	//描画オブジェクト
+	MTNoteBoxRingMod m_NoteBoxMod;
 	MTNoteRippleRingMod m_NoteRippleMod;
 	MTGridRingMod m_GridRingMod;
 	MTTimeIndicatorRingMod m_TimeIndicatorMod;