MIDITrail をピカピカにする。鍵盤方向自動切替・多ポート・歌詞対応等
Révision | d3d129bbd54e7d7e4de8815eb773c12a7cdfeff4 (tree) |
---|---|
l'heure | 2016-10-30 13:06:35 |
Auteur | yoshy <yoshy@user...> |
Commiter | yoshy |
[CLEAN] コメント追加
@@ -16,8 +16,10 @@ | ||
16 | 16 | #include "MTConfFile.h" |
17 | 17 | #include "MIDITrailApp.h" |
18 | 18 | #include "MTSceneTitle.h" |
19 | +// >>> modify 20120729 yossiepon begin | |
19 | 20 | #include "MTScenePianoRoll3DMod.h" |
20 | 21 | #include "MTScenePianoRoll2DMod.h" |
22 | +// <<< modify 20120729 yossiepon end | |
21 | 23 | #include "MTScenePianoRollRain.h" |
22 | 24 | #include "MTScenePianoRoll3DLive.h" |
23 | 25 | #include "MTScenePianoRoll2DLive.h" |
@@ -2066,10 +2068,14 @@ int MIDITrailApp::_CreateScene( | ||
2066 | 2068 | //プレイヤ用シーン生成 |
2067 | 2069 | if (pSeqData != NULL) { |
2068 | 2070 | if (type == PianoRoll3D) { |
2071 | +// >>> modify 20120729 yossiepon begin | |
2069 | 2072 | m_pScene = new MTScenePianoRoll3DMod(); |
2073 | +// <<< modify 20120729 yossiepon end | |
2070 | 2074 | } |
2071 | 2075 | else if (type == PianoRoll2D) { |
2076 | +// >>> modify 20120729 yossiepon begin | |
2072 | 2077 | m_pScene = new MTScenePianoRoll2DMod(); |
2078 | +// <<< modify 20120729 yossiepon end | |
2073 | 2079 | } |
2074 | 2080 | else if (type == PianoRollRain) { |
2075 | 2081 | m_pScene = new MTScenePianoRollRain(); |
@@ -265,6 +265,7 @@ EXIT:; | ||
265 | 265 | return result; |
266 | 266 | } |
267 | 267 | |
268 | +// >>> modify 20120729 yossiepon begin | |
268 | 269 | //****************************************************************************** |
269 | 270 | // 演奏時間登録(秒) |
270 | 271 | //****************************************************************************** |
@@ -274,7 +275,9 @@ void MTDashboard::SetPlayTimeSec( | ||
274 | 275 | { |
275 | 276 | m_PlayTimeSec = playTimeSec * 1000; |
276 | 277 | } |
278 | +// <<< modify 20120729 yossiepon end | |
277 | 279 | |
280 | +// >>> add 20120729 yossiepon begin | |
278 | 281 | //****************************************************************************** |
279 | 282 | // 演奏時間登録(ミリ秒) |
280 | 283 | //****************************************************************************** |
@@ -284,6 +287,7 @@ void MTDashboard::SetPlayTimeMSec( | ||
284 | 287 | { |
285 | 288 | m_PlayTimeSec = playTimeSec; |
286 | 289 | } |
290 | +// <<< add 20120729 yossiepon end | |
287 | 291 | |
288 | 292 | //****************************************************************************** |
289 | 293 | // 全体演奏時間登録(秒) |
@@ -74,7 +74,9 @@ public: | ||
74 | 74 | |
75 | 75 | //演奏経過時間と総演奏時間の登録 |
76 | 76 | void SetPlayTimeSec(unsigned long playTimeSec); |
77 | +// >>> add 20120729 yossiepon begin | |
77 | 78 | void SetPlayTimeMSec(unsigned long playTimeSec); |
79 | +// <<< add 20120729 yossiepon end | |
78 | 80 | void SetTotalPlayTimeSec(unsigned long totalPlayTimeSec); |
79 | 81 | |
80 | 82 | //テンポ登録 |
@@ -45,15 +45,20 @@ public: | ||
45 | 45 | //解放 |
46 | 46 | void Release(); |
47 | 47 | |
48 | +// >>> modify 20120728 yossiepon begin | |
48 | 49 | protected: |
49 | 50 | |
50 | 51 | DXPrimitive m_Primitive; |
51 | 52 | MTNoteDesign m_NoteDesign; |
52 | 53 | |
54 | +// <<< modify 20120728 yossiepon end | |
55 | + | |
53 | 56 | private: |
54 | 57 | |
58 | +// >>> modify 20120728 yossiepon begin | |
55 | 59 | unsigned long m_BarNum; |
56 | 60 | SMPortList m_PortList; |
61 | +// <<< modify 20120728 yossiepon end | |
57 | 62 | bool m_isVisible; |
58 | 63 | |
59 | 64 | //頂点バッファ構造体 |
@@ -509,10 +509,12 @@ void MTNoteBox::Release() | ||
509 | 509 | m_PrimitiveActiveNotes.Release(); |
510 | 510 | m_NoteList.Clear(); |
511 | 511 | |
512 | +// >>> modify 20120728 yossiepon begin | |
512 | 513 | if(m_pNoteStatus != NULL) { |
513 | 514 | delete [] m_pNoteStatus; |
514 | 515 | m_pNoteStatus = NULL; |
515 | 516 | } |
517 | +// <<< modify 20120728 yossiepon end | |
516 | 518 | } |
517 | 519 | |
518 | 520 | //****************************************************************************** |
@@ -47,7 +47,9 @@ public: | ||
47 | 47 | virtual ~MTNoteBox(void); |
48 | 48 | |
49 | 49 | //生成 |
50 | +// >>> modify 20120728 yossiepon begin | |
50 | 51 | virtual int Create( |
52 | +// <<< modify 20120728 yossiepon end | |
51 | 53 | LPDIRECT3DDEVICE9 pD3DDevice, |
52 | 54 | const TCHAR* pSceneName, |
53 | 55 | SMSeqData* pSeqData, |
@@ -55,23 +57,30 @@ public: | ||
55 | 57 | ); |
56 | 58 | |
57 | 59 | //更新 |
60 | +// >>> modify 20120728 yossiepon begin | |
58 | 61 | virtual int Transform(LPDIRECT3DDEVICE9 pD3DDevice, float rollAngle); |
62 | +// <<< modify 20120728 yossiepon end | |
59 | 63 | |
60 | 64 | //描画 |
61 | 65 | int Draw(LPDIRECT3DDEVICE9 pD3DDevice); |
62 | 66 | |
63 | 67 | //解放 |
68 | +// >>> modify 20120728 yossiepon begin | |
64 | 69 | virtual void Release(); |
70 | +// <<< modify 20120728 yossiepon end | |
65 | 71 | |
66 | 72 | //演奏チックタイム登録 |
67 | 73 | void SetCurTickTime(unsigned long curTickTime); |
68 | 74 | |
69 | 75 | //リセット |
76 | +// >>> modify 20120728 yossiepon begin | |
70 | 77 | virtual void Reset(); |
78 | +// <<< modify 20120728 yossiepon end | |
71 | 79 | |
72 | 80 | //スキップ状態 |
73 | 81 | void SetSkipStatus(bool isSkipping); |
74 | 82 | |
83 | +// >>> modify 20120728 yossiepon begin | |
75 | 84 | protected: |
76 | 85 | |
77 | 86 | //頂点バッファ構造体 |
@@ -111,14 +120,16 @@ protected: | ||
111 | 120 | unsigned long elapsedTime = 0xFFFFFFFF, |
112 | 121 | bool isEnablePitchBend = false |
113 | 122 | ); |
114 | - int _TransformActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice); | |
115 | 123 | |
124 | + int _TransformActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice); | |
116 | 125 | virtual int _UpdateStatusOfActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice); |
117 | 126 | virtual int _UpdateVertexOfActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice); |
118 | 127 | |
119 | 128 | int _HideNoteBox(unsigned long index); |
120 | 129 | int _ShowNoteBox(unsigned long index); |
121 | 130 | |
131 | +// <<< modify 20120728 yossiepon end | |
132 | + | |
122 | 133 | private: |
123 | 134 | |
124 | 135 | //発音ノート情報構造体 |
@@ -129,6 +140,7 @@ private: | ||
129 | 140 | unsigned long startTime; |
130 | 141 | }; |
131 | 142 | |
143 | +// >>> modify 20120728 yossiepon begin | |
132 | 144 | private: |
133 | 145 | |
134 | 146 | //発音中ノートボックス |
@@ -148,6 +160,8 @@ private: | ||
148 | 160 | void _MakeMaterial(D3DMATERIAL9* pMaterial); |
149 | 161 | void _MakeMaterialForActiveNote(D3DMATERIAL9* pMaterial); |
150 | 162 | |
163 | +// <<< modify 20120728 yossiepon end | |
164 | + | |
151 | 165 | }; |
152 | 166 | |
153 | 167 |
@@ -144,7 +144,9 @@ public: | ||
144 | 144 | |
145 | 145 | //ポート原点座標取得 |
146 | 146 | float GetPortOriginY(unsigned char portNo); |
147 | +// >>> modify 20120728 yossiepon begin | |
147 | 148 | virtual float GetPortOriginZ(unsigned char portNo); |
149 | +// <<< modify 20120728 yossiepon end | |
148 | 150 | |
149 | 151 | //世界座標配置移動ベクトル取得 |
150 | 152 | D3DXVECTOR3 GetWorldMoveVector(); |
@@ -173,6 +175,7 @@ public: | ||
173 | 175 | //再生面カラー取得 |
174 | 176 | D3DXCOLOR GetPlaybackSectionColor(); |
175 | 177 | |
178 | +// >>> modify 20120728 yossiepon begin | |
176 | 179 | protected: |
177 | 180 | |
178 | 181 | float m_RippleHeight; |
@@ -186,8 +189,11 @@ protected: | ||
186 | 189 | virtual void _Clear(); |
187 | 190 | virtual int _LoadConfFile(const TCHAR* pSceneName); |
188 | 191 | |
192 | +// <<< modify 20120728 yossiepon end | |
193 | + | |
189 | 194 | private: |
190 | 195 | |
196 | +// >>> modify 20120728 yossiepon begin | |
191 | 197 | unsigned long m_TimeDivision; |
192 | 198 | float m_QuarterNoteLength; |
193 | 199 | float m_NoteBoxHeight; |
@@ -196,17 +202,22 @@ private: | ||
196 | 202 | float m_ChStep; |
197 | 203 | float m_PictBoardRelativePos; |
198 | 204 | |
205 | +// <<< modify 20120728 yossiepon end | |
206 | + | |
199 | 207 | D3DXCOLOR m_NoteColor[16]; |
200 | 208 | D3DXCOLOR m_ActiveNoteEmissive; |
201 | 209 | D3DXCOLOR m_GridLineColor; |
202 | 210 | D3DXCOLOR m_PlaybackSectionColor; |
203 | 211 | |
212 | +// >>> modify 20120728 yossiepon begin | |
204 | 213 | int m_ActiveNoteDuration; |
205 | 214 | int m_RippleDuration; |
206 | 215 | |
207 | 216 | int m_LiveMonitorDisplayDuration; |
208 | 217 | float m_LiveNoteLengthPerSecond; |
209 | 218 | |
219 | +// <<< modify 20120728 yossiepon end | |
220 | + | |
210 | 221 | }; |
211 | 222 | |
212 | 223 |
@@ -263,10 +263,12 @@ void MTNoteRipple::Release() | ||
263 | 263 | m_pTexture = NULL; |
264 | 264 | } |
265 | 265 | |
266 | +// >>> modify 20120728 yossiepon begin | |
266 | 267 | if(m_pNoteStatus != NULL) { |
267 | 268 | delete [] m_pNoteStatus; |
268 | 269 | m_pNoteStatus = NULL; |
269 | 270 | } |
271 | +// <<< modify 20120728 yossiepon end | |
270 | 272 | } |
271 | 273 | |
272 | 274 | //****************************************************************************** |
@@ -44,7 +44,9 @@ public: | ||
44 | 44 | virtual ~MTNoteRipple(void); |
45 | 45 | |
46 | 46 | //生成 |
47 | +// >>> modify 20120728 yossiepon begin | |
47 | 48 | virtual int Create( |
49 | +// <<< modify 20120728 yossiepon end | |
48 | 50 | LPDIRECT3DDEVICE9 pD3DDevice, |
49 | 51 | const TCHAR* pSceneName, |
50 | 52 | SMSeqData* pSeqData, |
@@ -52,13 +54,19 @@ public: | ||
52 | 54 | ); |
53 | 55 | |
54 | 56 | //更新 |
57 | +// >>> modify 20120728 yossiepon begin | |
55 | 58 | virtual int Transform(LPDIRECT3DDEVICE9 pD3DDevice, D3DXVECTOR3 camVector, float rollAngle); |
59 | +// <<< modify 20120728 yossiepon end | |
56 | 60 | |
57 | 61 | //描画 |
62 | +// >>> modify 20120728 yossiepon begin | |
58 | 63 | virtual int Draw(LPDIRECT3DDEVICE9 pD3DDevice); |
64 | +// <<< modify 20120728 yossiepon end | |
59 | 65 | |
60 | 66 | //解放 |
67 | +// >>> modify 20120728 yossiepon begin | |
61 | 68 | virtual void Release(); |
69 | +// <<< modify 20120728 yossiepon end | |
62 | 70 | |
63 | 71 | //ノートOFF登録 |
64 | 72 | void SetNoteOff( |
@@ -79,7 +87,9 @@ public: | ||
79 | 87 | void SetCurTickTime(unsigned long curTickTime); |
80 | 88 | |
81 | 89 | //リセット |
90 | +// >>> modify 20120728 yossiepon begin | |
82 | 91 | virtual void Reset(); |
92 | +// <<< modify 20120728 yossiepon end | |
83 | 93 | |
84 | 94 | //表示設定 |
85 | 95 | void SetEnable(bool isEnable); |
@@ -87,6 +97,7 @@ public: | ||
87 | 97 | //スキップ状態 |
88 | 98 | void SetSkipStatus(bool isSkipping); |
89 | 99 | |
100 | +// >>> modify 20120728 yossiepon begin | |
90 | 101 | protected: |
91 | 102 | |
92 | 103 | //ノート発音状態構造体 |
@@ -143,8 +154,11 @@ protected: | ||
143 | 154 | virtual int _TransformRipple(LPDIRECT3DDEVICE9 pD3DDevice); |
144 | 155 | virtual int _UpdateVertexOfRipple(LPDIRECT3DDEVICE9 pD3DDevice); |
145 | 156 | |
157 | +// <<< modify 20120728 yossiepon end | |
158 | + | |
146 | 159 | private: |
147 | 160 | |
161 | +// >>> modify 20120728 yossiepon begin | |
148 | 162 | //描画系 |
149 | 163 | D3DMATERIAL9 m_Material; |
150 | 164 |
@@ -159,6 +173,9 @@ private: | ||
159 | 173 | unsigned long curTime, |
160 | 174 | bool* pIsTimeout |
161 | 175 | ); |
176 | + | |
177 | +// <<< modify 20120728 yossiepon end | |
178 | + | |
162 | 179 | }; |
163 | 180 | |
164 | 181 |
@@ -1571,6 +1571,7 @@ int MTPianoKeyboard::Transform( | ||
1571 | 1571 | return result; |
1572 | 1572 | } |
1573 | 1573 | |
1574 | +// >>> add 20120729 yossiepon begin | |
1574 | 1575 | //****************************************************************************** |
1575 | 1576 | // 移動 |
1576 | 1577 | //****************************************************************************** |
@@ -1585,6 +1586,7 @@ int MTPianoKeyboard::Transform( | ||
1585 | 1586 | { |
1586 | 1587 | return YN_SET_ERR("Program error.", 0, 0); |
1587 | 1588 | } |
1589 | +// <<< add 20120729 yossiepon end | |
1588 | 1590 | |
1589 | 1591 | //****************************************************************************** |
1590 | 1592 | // キーのリセット |
@@ -1641,6 +1643,7 @@ EXIT:; | ||
1641 | 1643 | return result; |
1642 | 1644 | } |
1643 | 1645 | |
1646 | +// >>> add 20120728 yossiepon begin | |
1644 | 1647 | //****************************************************************************** |
1645 | 1648 | // キーの押し込み |
1646 | 1649 | //****************************************************************************** |
@@ -1653,6 +1656,7 @@ int MTPianoKeyboard::PushKey( | ||
1653 | 1656 | { |
1654 | 1657 | return YN_SET_ERR("Program error.", 0, 0); |
1655 | 1658 | } |
1659 | +// <<< add 20120728 yossiepon end | |
1656 | 1660 | |
1657 | 1661 | //****************************************************************************** |
1658 | 1662 | // 描画 |
@@ -1668,7 +1672,9 @@ int MTPianoKeyboard::Draw( | ||
1668 | 1672 | pD3DDevice->SetTextureStageState(0, D3DTSS_COLOROP, D3DTOP_MODULATE); |
1669 | 1673 | pD3DDevice->SetTextureStageState(0, D3DTSS_COLORARG1, D3DTA_TEXTURE); |
1670 | 1674 | pD3DDevice->SetTextureStageState(0, D3DTSS_COLORARG2, D3DTA_DIFFUSE); |
1675 | +// >>> modify 20120728 yossiepon begin | |
1671 | 1676 | // アルファ演算:乗算 引数1:テクスチャ 引数2:ポリゴン |
1677 | +// <<< modify 20120728 yossiepon end | |
1672 | 1678 | pD3DDevice->SetTextureStageState(0, D3DTSS_ALPHAOP, D3DTOP_MODULATE); |
1673 | 1679 | pD3DDevice->SetTextureStageState(0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE); |
1674 | 1680 | pD3DDevice->SetTextureStageState(0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE); |
@@ -35,7 +35,9 @@ public: | ||
35 | 35 | virtual ~MTPianoKeyboard(void); |
36 | 36 | |
37 | 37 | //生成 |
38 | +// >>> modify 20120728 yossiepon begin | |
38 | 39 | virtual int Create( |
40 | +// <<< modify 20120728 yossiepon end | |
39 | 41 | LPDIRECT3DDEVICE9 pD3DDevice, |
40 | 42 | const TCHAR* pSceneName, |
41 | 43 | SMSeqData* pSeqData, |
@@ -44,7 +46,9 @@ public: | ||
44 | 46 | |
45 | 47 | //更新 |
46 | 48 | int Transform(LPDIRECT3DDEVICE9 pD3DDevice, D3DXVECTOR3 moveVector, float rollAngle); |
49 | +// >>> add 20120729 yossiepon begin | |
47 | 50 | virtual int Transform(LPDIRECT3DDEVICE9 pD3DDevice, D3DXVECTOR3 moveVector1, D3DXVECTOR3 moveVector2, float scale, float z, float rollAngle); |
51 | +// <<< add 20120729 yossiepon end | |
48 | 52 | |
49 | 53 | |
50 | 54 | //描画 |
@@ -56,11 +60,14 @@ public: | ||
56 | 60 | //キー状態変更 |
57 | 61 | int ResetKey(unsigned char noteNo); |
58 | 62 | int PushKey(unsigned char noteNo, float keyDownRate, unsigned long elapsedTime); |
63 | +// >>> modify 20120728 yossiepon begin | |
59 | 64 | virtual int PushKey(unsigned char chNo, unsigned char noteNo, float keyDownRate, unsigned long elapsedTime); |
65 | +// <<< modify 20120728 yossiepon end | |
60 | 66 | |
61 | 67 | //共有用テクスチャ取得 |
62 | 68 | LPDIRECT3DTEXTURE9 GetTexture(); |
63 | 69 | |
70 | +// >>> modify 20120728 yossiepon begin | |
64 | 71 | protected: |
65 | 72 | |
66 | 73 | //キーボードプリミティブ |
@@ -71,6 +78,8 @@ protected: | ||
71 | 78 | |
72 | 79 | int _RotateKey(unsigned char noteNo, float angle, D3DXCOLOR* pColor = NULL); |
73 | 80 | |
81 | +// <<< modify 20120728 yossiepon end | |
82 | + | |
74 | 83 | private: |
75 | 84 | |
76 | 85 | //頂点バッファ構造体 |
@@ -91,10 +100,13 @@ private: | ||
91 | 100 | |
92 | 101 | private: |
93 | 102 | |
103 | +// >>> modify 20120728 yossiepon begin | |
94 | 104 | //テクスチャ |
95 | 105 | LPDIRECT3DTEXTURE9 m_pTexture; |
96 | 106 | D3DXIMAGE_INFO m_ImgInfo; |
97 | 107 | |
108 | +// <<< modify 20120728 yossiepon end | |
109 | + | |
98 | 110 | //バッファ情報 |
99 | 111 | MTBufInfo m_BufInfo[SM_MAX_NOTE_NUM]; |
100 | 112 |
@@ -132,7 +144,9 @@ private: | ||
132 | 144 | int _LoadTexture(LPDIRECT3DDEVICE9 pD3DDevice, const TCHAR* pSceneName); |
133 | 145 | void _MakeMaterial(D3DMATERIAL9* pMaterial); |
134 | 146 | |
147 | +// >>> modify 20120728 yossiepon begin | |
135 | 148 | D3DXVECTOR3 _RotateYZ(float centerY, float centerZ, D3DXVECTOR3 p1, float angle); |
149 | +// <<< modify 20120728 yossiepon end | |
136 | 150 | |
137 | 151 | }; |
138 | 152 |
@@ -501,16 +501,13 @@ void MTPianoKeyboardCtrl::Release() | ||
501 | 501 | } |
502 | 502 | } |
503 | 503 | |
504 | -// >>> add 20120728 yossiepon begin | |
505 | - if(m_pNoteStatus != NULL) { | |
506 | -// <<< add 20120728 yossiepon end | |
507 | 504 | // >>> modify 20120728 yossiepon begin |
505 | + if(m_pNoteStatus != NULL) { | |
506 | + //20120728 yossiepon: delete を delete[] に修正 | |
508 | 507 | delete[] m_pNoteStatus; |
509 | -// <<< modify 20120728 yossiepon end | |
510 | 508 | m_pNoteStatus = NULL; |
511 | -// >>> add 20120728 yossiepon begin | |
512 | 509 | } |
513 | -// <<< add 20120728 yossiepon end | |
510 | +// <<< modify 20120728 yossiepon end | |
514 | 511 | } |
515 | 512 | |
516 | 513 | //****************************************************************************** |
@@ -37,7 +37,9 @@ public: | ||
37 | 37 | virtual ~MTPianoKeyboardCtrl(void); |
38 | 38 | |
39 | 39 | //生成 |
40 | +// >>> modify 20120728 yossiepon begin | |
40 | 41 | virtual int Create( |
42 | +// <<< modify 20120728 yossiepon end | |
41 | 43 | LPDIRECT3DDEVICE9 pD3DDevice, |
42 | 44 | const TCHAR* pSceneName, |
43 | 45 | SMSeqData* pSeqData, |
@@ -45,10 +47,14 @@ public: | ||
45 | 47 | ); |
46 | 48 | |
47 | 49 | //更新 |
50 | +// >>> modify 20120728 yossiepon begin | |
48 | 51 | virtual int Transform(LPDIRECT3DDEVICE9 pD3DDevice, float rollAngle); |
52 | +// <<< modify 20120728 yossiepon end | |
49 | 53 | |
50 | 54 | //描画 |
55 | +// >>> modify 20120728 yossiepon begin | |
51 | 56 | virtual int Draw(LPDIRECT3DDEVICE9 pD3DDevice); |
57 | +// <<< modify 20120728 yossiepon end | |
52 | 58 | |
53 | 59 | //解放 |
54 | 60 | void Release(); |
@@ -60,7 +66,9 @@ public: | ||
60 | 66 | void SetPlayTimeMSec(unsigned long playTimeMsec); |
61 | 67 | |
62 | 68 | //リセット |
69 | +// >>> modify 20120728 yossiepon begin | |
63 | 70 | virtual void Reset(); |
71 | +// <<< modify 20120728 yossiepon end | |
64 | 72 | |
65 | 73 | //表示設定 |
66 | 74 | void SetEnable(bool isEnable); |
@@ -68,6 +76,7 @@ public: | ||
68 | 76 | //スキップ状態 |
69 | 77 | void SetSkipStatus(bool isSkipping); |
70 | 78 | |
79 | +// >>> modify 20120728 yossiepon begin | |
71 | 80 | protected: |
72 | 81 | |
73 | 82 | //キー状態 |
@@ -85,6 +94,8 @@ protected: | ||
85 | 94 | float keyDownRate; |
86 | 95 | }; |
87 | 96 | |
97 | +protected: | |
98 | + | |
88 | 99 | //ノートデザイン |
89 | 100 | MTNoteDesign m_NoteDesign; |
90 | 101 |
@@ -124,12 +135,18 @@ protected: | ||
124 | 135 | virtual int _UpdateVertexOfActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice); |
125 | 136 | float _GetPichBendShiftPosX(unsigned char portNo, unsigned char chNo); |
126 | 137 | |
138 | +// <<< modify 20120728 yossiepon end | |
139 | + | |
127 | 140 | private: |
128 | 141 | |
142 | +// >>> modify 20120728 yossiepon begin | |
129 | 143 | //スキップ状態 |
130 | 144 | bool m_isSkipping; |
145 | +// <<< modify 20120728 yossiepon end | |
131 | 146 | |
147 | +// >>> modify 20120728 yossiepon begin | |
132 | 148 | int _UpdateStatusOfActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice); |
149 | +// <<< modify 20120728 yossiepon end | |
133 | 150 | |
134 | 151 | }; |
135 | 152 |
@@ -55,12 +55,16 @@ public: | ||
55 | 55 | virtual ~MTPianoKeyboardDesign(void); |
56 | 56 | |
57 | 57 | //初期化 |
58 | +// >>> modify 20120728 yossiepon begin | |
58 | 59 | virtual int Initialize(const TCHAR* pSceneName, SMSeqData* pSeqData); |
60 | +// <<< modify 20120728 yossiepon end | |
59 | 61 | |
60 | 62 | //ポート原点座標取得 |
61 | 63 | float GetPortOriginX(unsigned char portNo); |
64 | +// >>> modify 20120728 yossiepon begin | |
62 | 65 | virtual float GetPortOriginY(unsigned char portNo); |
63 | 66 | virtual float GetPortOriginZ(unsigned char portNo); |
67 | +// <<< modify 20120728 yossiepon end | |
64 | 68 | |
65 | 69 | //キー種別取得 |
66 | 70 | KeyType GetKeyType(unsigned char noteNo); |
@@ -168,11 +172,14 @@ public: | ||
168 | 172 | ); |
169 | 173 | |
170 | 174 | //キーボード基準座標取得 |
175 | +// >>> modify 20120728 yossiepon begin | |
171 | 176 | virtual D3DXVECTOR3 GetKeyboardBasePos(unsigned char portNo, unsigned char chNo); |
177 | +// <<< modify 20120728 yossiepon end | |
172 | 178 | |
173 | 179 | //キーボード最大表示数取得 |
174 | 180 | unsigned long GetKeyboardMaxDispNum(); |
175 | 181 | |
182 | +// >>> modify 20120728 yossiepon begin | |
176 | 183 | protected: |
177 | 184 | |
178 | 185 | //ポート情報 |
@@ -189,6 +196,8 @@ protected: | ||
189 | 196 | virtual void _Initialize(); |
190 | 197 | virtual int _LoadConfFile(const TCHAR* pSceneName); |
191 | 198 | |
199 | +// <<< modify 20120728 yossiepon end | |
200 | + | |
192 | 201 | private: |
193 | 202 | |
194 | 203 | //キー情報 |
@@ -197,9 +206,14 @@ private: | ||
197 | 206 | float keyCenterPosX; |
198 | 207 | } MTKeyInfo; |
199 | 208 | |
209 | +private: | |
210 | + | |
211 | +// >>> modify 20120728 yossiepon begin | |
200 | 212 | //キー情報配列 |
201 | 213 | MTKeyInfo m_KeyInfo[SM_MAX_NOTE_NUM]; |
202 | 214 | |
215 | +// <<< modify 20120728 yossiepon end | |
216 | + | |
203 | 217 | //スケール情報 |
204 | 218 | float m_WhiteKeyStep; |
205 | 219 | float m_WhiteKeyWidth; |
@@ -222,18 +236,24 @@ private: | ||
222 | 236 | int m_KeyUpDuration; |
223 | 237 | |
224 | 238 | //キーボード配置情報 |
239 | +// >>> modify 20120728 yossiepon begin | |
225 | 240 | float m_KeyboardStepZ; |
226 | 241 | int m_KeyboardMaxDispNum; |
242 | +// <<< modify 20120728 yossiepon end | |
227 | 243 | |
228 | 244 | //キー色情報 |
229 | 245 | D3DXCOLOR m_WhiteKeyColor; |
230 | 246 | D3DXCOLOR m_BlackKeyColor; |
231 | 247 | |
232 | 248 | //発音中キー色情報 |
249 | +// >>> modify 20120728 yossiepon begin | |
233 | 250 | D3DXCOLOR m_ActiveKeyColor; |
251 | +// <<< modify 20120728 yossiepon end | |
234 | 252 | |
253 | +// >>> modify 20120728 yossiepon begin | |
235 | 254 | void _InitKeyType(); |
236 | 255 | void _InitKeyPos(); |
256 | +// <<< modify 20120728 yossiepon end | |
237 | 257 | |
238 | 258 | }; |
239 | 259 |
@@ -38,7 +38,9 @@ public: | ||
38 | 38 | |
39 | 39 | //コンストラクタ/デストラクタl |
40 | 40 | MTScenePianoRoll3D(); |
41 | +// >>> modify 20120728 yossiepon begin | |
41 | 42 | virtual ~MTScenePianoRoll3D(); |
43 | +// <<< modify 20120728 yossiepon end | |
42 | 44 | |
43 | 45 | //名称取得 |
44 | 46 | const TCHAR* GetName(); |
@@ -51,13 +53,19 @@ public: | ||
51 | 53 | ); |
52 | 54 | |
53 | 55 | //変換 |
56 | +// >>> modify 20120728 yossiepon begin | |
54 | 57 | virtual int Transform(LPDIRECT3DDEVICE9 pD3DDevice); |
58 | +// <<< modify 20120728 yossiepon end | |
55 | 59 | |
56 | 60 | //描画 |
61 | +// >>> modify 20120728 yossiepon begin | |
57 | 62 | virtual int Draw(LPDIRECT3DDEVICE9 pD3DDevice); |
63 | +// <<< modify 20120728 yossiepon end | |
58 | 64 | |
59 | 65 | //破棄 |
66 | +// >>> modify 20120728 yossiepon begin | |
60 | 67 | virtual void Release(); |
68 | +// <<< modify 20120728 yossiepon end | |
61 | 69 | |
62 | 70 | //ウィンドウクリックイベント受信 |
63 | 71 | int OnWindowClicked( |
@@ -73,7 +81,9 @@ public: | ||
73 | 81 | int OnPlayEnd(LPDIRECT3DDEVICE9 pD3DDevice); |
74 | 82 | |
75 | 83 | //シーケンサメッセージ受信 |
84 | +// >>> modify 20120728 yossiepon begin | |
76 | 85 | virtual int OnRecvSequencerMsg( |
86 | +// <<< modify 20120728 yossiepon end | |
77 | 87 | unsigned long wParam, |
78 | 88 | unsigned long lParam |
79 | 89 | ); |
@@ -90,16 +100,16 @@ public: | ||
90 | 100 | void ResetViewpoint(); |
91 | 101 | |
92 | 102 | //エフェクト設定 |
103 | +// >>> modify 20120728 yossiepon begin | |
93 | 104 | virtual void SetEffect(MTScene::EffectType type, bool isEnable); |
105 | +// <<< modify 20120728 yossiepon end | |
94 | 106 | |
95 | 107 | //演奏速度設定 |
96 | 108 | void SetPlaySpeedRatio(unsigned long ratio); |
97 | 109 | |
110 | +// >>> modify 20120728 yossiepon begin | |
98 | 111 | protected: |
99 | 112 | |
100 | - ////ライト | |
101 | - //DXDirLight m_DirLight; | |
102 | - | |
103 | 113 | ////一人称カメラ |
104 | 114 | MTFirstPersonCam m_FirstPersonCam; |
105 | 115 |
@@ -115,18 +125,6 @@ protected: | ||
115 | 125 | //ピッチベンド情報 |
116 | 126 | MTNotePitchBend m_NotePitchBend; |
117 | 127 | |
118 | - ////マウス視線移動モード | |
119 | - //bool m_IsMouseCamMode; | |
120 | - | |
121 | - ////自動回転モード | |
122 | - //bool m_IsAutoRollMode; | |
123 | - | |
124 | - ////視点情報 | |
125 | - //MTViewParamMap m_ViewParamMap; | |
126 | - | |
127 | - ////ノートデザインオブジェクト | |
128 | - //MTNoteDesign m_NoteDesign; | |
129 | - | |
130 | 128 | //スキップ状態 |
131 | 129 | bool m_IsSkipping; |
132 | 130 |
@@ -135,11 +133,16 @@ protected: | ||
135 | 133 | |
136 | 134 | virtual void _Reset(); |
137 | 135 | |
136 | +// <<< modify 20120728 yossiepon end | |
137 | + | |
138 | 138 | private: |
139 | 139 | |
140 | +// >>> modify 20120728 yossiepon begin | |
140 | 141 | //ライト |
141 | 142 | DXDirLight m_DirLight; |
142 | 143 | |
144 | +// <<< modify 20120728 yossiepon end | |
145 | + | |
143 | 146 | //マウス視線移動モード |
144 | 147 | bool m_IsMouseCamMode; |
145 | 148 |
@@ -152,7 +155,9 @@ private: | ||
152 | 155 | //ノートデザインオブジェクト |
153 | 156 | MTNoteDesign m_NoteDesign; |
154 | 157 | |
158 | +// >>> modify 20120728 yossiepon begin | |
155 | 159 | void _SetLightColor(DXDirLight* pLight); |
160 | +// <<< modify 20120728 yossiepon end | |
156 | 161 | |
157 | 162 | }; |
158 | 163 |
@@ -26,7 +26,7 @@ namespace SMIDILib { | ||
26 | 26 | //****************************************************************************** |
27 | 27 | SMTrack::SMTrack(void) |
28 | 28 | // >>> modify 20120728 yossiepon begin |
29 | - : m_List(sizeof(SMDataSet), 1000), overwritePortNo(-1) | |
29 | + : m_List(sizeof(SMDataSet), 1000), m_OverwritePortNo(-1) | |
30 | 30 | // <<< modify 20120728 yossiepon end |
31 | 31 | { |
32 | 32 | } |
@@ -54,7 +54,7 @@ void SMTrack::Clear() | ||
54 | 54 | m_ExDataMap.clear(); |
55 | 55 | |
56 | 56 | // >>> add 20120728 yossiepon begin |
57 | - overwritePortNo = -1; | |
57 | + m_OverwritePortNo = -1; | |
58 | 58 | // <<< add 20120728 yossiepon end |
59 | 59 | |
60 | 60 | return; |
@@ -162,10 +162,10 @@ int SMTrack::GetDataSet( | ||
162 | 162 | //ポート番号 |
163 | 163 | if (pProtNo != NULL) { |
164 | 164 | // >>> modify 20120728 yossiepon begin |
165 | - if(overwritePortNo == -1) { | |
165 | + if(m_OverwritePortNo == -1) { | |
166 | 166 | *pProtNo = dataSet.portNo; |
167 | 167 | } else { |
168 | - *pProtNo = (unsigned char)overwritePortNo; | |
168 | + *pProtNo = (unsigned char)m_OverwritePortNo; | |
169 | 169 | } |
170 | 170 | // <<< modify 20120728 yossiepon end |
171 | 171 | } |
@@ -232,7 +232,7 @@ int SMTrack::OverwritePortNo(short portNo) | ||
232 | 232 | { |
233 | 233 | int result = 0; |
234 | 234 | |
235 | - overwritePortNo = portNo; | |
235 | + m_OverwritePortNo = portNo; | |
236 | 236 | |
237 | 237 | return result; |
238 | 238 | } |
@@ -513,8 +513,8 @@ unsigned long SMTrack::_GetNoteKey( | ||
513 | 513 | ) |
514 | 514 | { |
515 | 515 | // >>> add 20120728 yossiepon begin |
516 | - if(overwritePortNo != -1) { | |
517 | - portNo = (unsigned char)overwritePortNo; | |
516 | + if(m_OverwritePortNo != -1) { | |
517 | + portNo = (unsigned char)m_OverwritePortNo; | |
518 | 518 | } |
519 | 519 | // <<< add 20120728 yossiepon end |
520 | 520 |
@@ -113,7 +113,7 @@ private: | ||
113 | 113 | |
114 | 114 | // >>> add 20120728 yossiepon begin |
115 | 115 | |
116 | - short overwritePortNo; | |
116 | + short m_OverwritePortNo; | |
117 | 117 | |
118 | 118 | // <<< add 20120728 yossiepon end |
119 | 119 |