MIDITrail をピカピカにする。鍵盤方向自動切替・多ポート・歌詞対応等
Revision | 3a045a83814e6999b5d1d25ca920cc3dd5aee227 (tree) |
---|---|
Zeit | 2016-12-24 14:10:30 |
Autor | yoshy <yoshy@user...> |
Commiter | yoshy |
[CLEAN] ヘッダファイルのアクセスレベル修正を元ソースの順番を残すように変更
@@ -45,20 +45,29 @@ public: | ||
45 | 45 | //解放 |
46 | 46 | void Release(); |
47 | 47 | |
48 | -// >>> modify 20120728 yossiepon begin | |
48 | +// >>> modify access level to protected 20161224 yossiepon begin | |
49 | 49 | protected: |
50 | +// <<< modify 20161224 yossiepon end | |
50 | 51 | |
51 | 52 | DXPrimitive m_Primitive; |
52 | - MTNoteDesign m_NoteDesign; | |
53 | - | |
54 | -// <<< modify 20120728 yossiepon end | |
55 | 53 | |
54 | +// >>> modify access level 20161224 yossiepon begin | |
56 | 55 | private: |
56 | +// <<< modify 20161224 yossiepon end | |
57 | 57 | |
58 | -// >>> modify 20120728 yossiepon begin | |
59 | 58 | unsigned long m_BarNum; |
60 | 59 | SMPortList m_PortList; |
61 | -// <<< modify 20120728 yossiepon end | |
60 | + | |
61 | +// >>> modify access level to protected 20161224 yossiepon begin | |
62 | +protected: | |
63 | +// <<< modify 20161224 yossiepon end | |
64 | + | |
65 | + MTNoteDesign m_NoteDesign; | |
66 | + | |
67 | +// >>> modify access level 20161224 yossiepon begin | |
68 | +private: | |
69 | +// <<< modify 20161224 yossiepon end | |
70 | + | |
62 | 71 | bool m_isVisible; |
63 | 72 | |
64 | 73 | //頂点バッファ構造体 |
@@ -80,8 +80,19 @@ public: | ||
80 | 80 | //スキップ状態 |
81 | 81 | void SetSkipStatus(bool isSkipping); |
82 | 82 | |
83 | -// >>> modify 20120728 yossiepon begin | |
83 | +private: | |
84 | + | |
85 | + //発音ノート情報構造体 | |
86 | + struct NoteStatus { | |
87 | + bool isActive; | |
88 | + bool isHide; | |
89 | + unsigned long index; | |
90 | + unsigned long startTime; | |
91 | + }; | |
92 | + | |
93 | +// >>> modify access level to protected 20161224 yossiepon begin | |
84 | 94 | protected: |
95 | +// <<< modify 20161224 yossiepon end | |
85 | 96 | |
86 | 97 | //頂点バッファ構造体 |
87 | 98 | struct MTNOTEBOX_VERTEX { |
@@ -90,7 +101,8 @@ protected: | ||
90 | 101 | DWORD c; //ディフューズ色 |
91 | 102 | }; |
92 | 103 | |
93 | -protected: | |
104 | +// >>> modify access level to protected 20161224 yossiepon begin | |
105 | +// <<< modify 20161224 yossiepon end | |
94 | 106 | |
95 | 107 | //ノートデザイン |
96 | 108 | MTNoteDesign m_NoteDesign; |
@@ -107,10 +119,39 @@ protected: | ||
107 | 119 | unsigned long m_CurNoteIndex; |
108 | 120 | unsigned long m_ActiveNoteNum; |
109 | 121 | |
122 | +// >>> modify access level 20161224 yossiepon begin | |
123 | +private: | |
124 | +// <<< modify 20161224 yossiepon end | |
125 | + | |
126 | + NoteStatus* m_pNoteStatus; | |
127 | + | |
128 | + //スキップ状態 | |
129 | + bool m_isSkipping; | |
130 | + | |
131 | +// >>> modify access level to protected 20161224 yossiepon begin | |
132 | +protected: | |
133 | +// <<< modify 20161224 yossiepon end | |
134 | + | |
110 | 135 | //ピッチベンド情報 |
111 | 136 | MTNotePitchBend* m_pNotePitchBend; |
112 | 137 | |
138 | +// >>> modify access level 20161224 yossiepon begin | |
139 | +private: | |
140 | +// <<< modify 20161224 yossiepon end | |
141 | + | |
142 | + //頂点バッファFVFフォーマット | |
143 | + DWORD _GetFVFFormat(){ return (D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_DIFFUSE); } | |
144 | + | |
145 | + int _CreateAllNoteBox(LPDIRECT3DDEVICE9 pD3DDevice); | |
146 | + int _CreateActiveNoteBox(LPDIRECT3DDEVICE9 pD3DDevice); | |
147 | + | |
148 | +// >>> modify access level to protected 20161224 yossiepon begin | |
149 | +protected: | |
150 | +// <<< modify 20161224 yossiepon end | |
151 | + | |
152 | +// >>> modify 20120728 yossiepon begin | |
113 | 153 | virtual int _CreateNoteStatus(); |
154 | +// <<< modify 20120728 yossiepon end | |
114 | 155 | |
115 | 156 | int _CreateVertexOfNote( |
116 | 157 | SMNote note, |
@@ -121,47 +162,28 @@ protected: | ||
121 | 162 | bool isEnablePitchBend = false |
122 | 163 | ); |
123 | 164 | |
124 | - int _TransformActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice); | |
125 | - virtual int _UpdateStatusOfActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice); | |
126 | - virtual int _UpdateVertexOfActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice); | |
127 | - | |
128 | - int _HideNoteBox(unsigned long index); | |
129 | - int _ShowNoteBox(unsigned long index); | |
130 | - | |
131 | -// <<< modify 20120728 yossiepon end | |
132 | - | |
165 | +// >>> modify access level 20161224 yossiepon begin | |
133 | 166 | private: |
134 | - | |
135 | - //発音ノート情報構造体 | |
136 | - struct NoteStatus { | |
137 | - bool isActive; | |
138 | - bool isHide; | |
139 | - unsigned long index; | |
140 | - unsigned long startTime; | |
141 | - }; | |
142 | - | |
143 | -// >>> modify 20120728 yossiepon begin | |
144 | -private: | |
145 | - | |
146 | - //発音中ノートボックス | |
147 | - NoteStatus* m_pNoteStatus; | |
148 | - | |
149 | - //スキップ状態 | |
150 | - bool m_isSkipping; | |
151 | - | |
152 | - //頂点バッファFVFフォーマット | |
153 | - DWORD _GetFVFFormat(){ return (D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_DIFFUSE); } | |
154 | - | |
155 | - int _CreateAllNoteBox(LPDIRECT3DDEVICE9 pD3DDevice); | |
156 | - int _CreateActiveNoteBox(LPDIRECT3DDEVICE9 pD3DDevice); | |
167 | +// <<< modify 20161224 yossiepon end | |
157 | 168 | |
158 | 169 | unsigned long _GetVertexIndexOfNote(unsigned long index); |
159 | 170 | |
160 | 171 | void _MakeMaterial(D3DMATERIAL9* pMaterial); |
161 | 172 | void _MakeMaterialForActiveNote(D3DMATERIAL9* pMaterial); |
162 | 173 | |
174 | +// >>> modify access level to protected 20161224 yossiepon begin | |
175 | +protected: | |
176 | +// <<< modify 20161224 yossiepon end | |
177 | + | |
178 | + int _TransformActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice); | |
179 | +// >>> modify 20120728 yossiepon begin | |
180 | + virtual int _UpdateStatusOfActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice); | |
181 | + virtual int _UpdateVertexOfActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice); | |
163 | 182 | // <<< modify 20120728 yossiepon end |
164 | 183 | |
184 | + int _HideNoteBox(unsigned long index); | |
185 | + int _ShowNoteBox(unsigned long index); | |
186 | + | |
165 | 187 | }; |
166 | 188 | |
167 | 189 |
@@ -4,7 +4,7 @@ | ||
4 | 4 | // |
5 | 5 | // ノートデザインクラス |
6 | 6 | // |
7 | -// Copyright (C) 2010-2012 WADA Masashi. All Rights Reserved. | |
7 | +// Copyright (C) 2010-2013 WADA Masashi. All Rights Reserved. | |
8 | 8 | // |
9 | 9 | //****************************************************************************** |
10 | 10 |
@@ -175,22 +175,6 @@ public: | ||
175 | 175 | //再生面カラー取得 |
176 | 176 | D3DXCOLOR GetPlaybackSectionColor(); |
177 | 177 | |
178 | -// >>> modify 20120728 yossiepon begin | |
179 | -protected: | |
180 | - | |
181 | - float m_RippleHeight; | |
182 | - float m_RippleWidth; | |
183 | - | |
184 | - SMPortList m_PortList; | |
185 | - unsigned char m_PortIndex[256]; | |
186 | - | |
187 | - float m_ActiveNoteWhiteRate; | |
188 | - | |
189 | - virtual void _Clear(); | |
190 | - virtual int _LoadConfFile(const TCHAR* pSceneName); | |
191 | - | |
192 | -// <<< modify 20120728 yossiepon end | |
193 | - | |
194 | 178 | private: |
195 | 179 | |
196 | 180 | enum NoteColorType { |
@@ -198,16 +182,36 @@ private: | ||
198 | 182 | Scale |
199 | 183 | }; |
200 | 184 | |
201 | -// >>> modify 20120728 yossiepon begin | |
202 | 185 | unsigned long m_TimeDivision; |
203 | 186 | float m_QuarterNoteLength; |
204 | 187 | float m_NoteBoxHeight; |
205 | 188 | float m_NoteBoxWidth; |
206 | 189 | float m_NoteStep; |
207 | 190 | float m_ChStep; |
191 | + | |
192 | +// >>> modify access level to protected 20161224 yossiepon begin | |
193 | +protected: | |
194 | +// <<< modify 20161224 yossiepon end | |
195 | + | |
196 | + float m_RippleHeight; | |
197 | + float m_RippleWidth; | |
198 | + | |
199 | +// >>> modify access level 20161224 yossiepon begin | |
200 | +private: | |
201 | +// <<< modify 20161224 yossiepon end | |
202 | + | |
208 | 203 | float m_PictBoardRelativePos; |
209 | 204 | |
210 | -// <<< modify 20120728 yossiepon end | |
205 | +// >>> modify access level to protected 20161224 yossiepon begin | |
206 | +protected: | |
207 | +// <<< modify 20161224 yossiepon end | |
208 | + | |
209 | + SMPortList m_PortList; | |
210 | + unsigned char m_PortIndex[256]; | |
211 | + | |
212 | +// >>> modify access level 20161224 yossiepon begin | |
213 | +private: | |
214 | +// <<< modify 20161224 yossiepon end | |
211 | 215 | |
212 | 216 | NoteColorType m_NoteColorType; |
213 | 217 | D3DXCOLOR m_NoteColor[16]; |
@@ -216,13 +220,30 @@ private: | ||
216 | 220 | D3DXCOLOR m_GridLineColor; |
217 | 221 | D3DXCOLOR m_PlaybackSectionColor; |
218 | 222 | |
219 | -// >>> modify 20120728 yossiepon begin | |
220 | 223 | int m_ActiveNoteDuration; |
224 | + | |
225 | +// >>> modify access level to protected 20161224 yossiepon begin | |
226 | +protected: | |
227 | +// <<< modify 20161224 yossiepon end | |
228 | + | |
229 | + float m_ActiveNoteWhiteRate; | |
230 | + | |
231 | +// >>> modify access level 20161224 yossiepon begin | |
232 | +private: | |
233 | +// <<< modify 20161224 yossiepon end | |
234 | + | |
221 | 235 | int m_RippleDuration; |
222 | 236 | |
223 | 237 | int m_LiveMonitorDisplayDuration; |
224 | 238 | float m_LiveNoteLengthPerSecond; |
225 | 239 | |
240 | +// >>> modify access level to protected 20161224 yossiepon begin | |
241 | +protected: | |
242 | +// <<< modify 20161224 yossiepon end | |
243 | + | |
244 | +// >>> modify 20120728 yossiepon begin | |
245 | + virtual void _Clear(); | |
246 | + virtual int _LoadConfFile(const TCHAR* pSceneName); | |
226 | 247 | // <<< modify 20120728 yossiepon end |
227 | 248 | |
228 | 249 | }; |
@@ -97,8 +97,9 @@ public: | ||
97 | 97 | //スキップ状態 |
98 | 98 | void SetSkipStatus(bool isSkipping); |
99 | 99 | |
100 | -// >>> modify 20120728 yossiepon begin | |
100 | +// >>> modify access level to protected 20120728 yossiepon begin | |
101 | 101 | protected: |
102 | +// >>> modify 20120728 yossiepon end | |
102 | 103 | |
103 | 104 | //ノート発音状態構造体 |
104 | 105 | struct NoteStatus { |
@@ -121,11 +122,21 @@ protected: | ||
121 | 122 | //頂点バッファFVFフォーマット |
122 | 123 | DWORD _GetFVFFormat(){ return (D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_TEX1); } |
123 | 124 | |
124 | -protected: | |
125 | +// >>> modify access level to protected 20161224 yossiepon begin | |
126 | +// >>> modify 20161224 yossiepon end | |
125 | 127 | |
126 | 128 | //描画系 |
127 | 129 | DXPrimitive m_Primitive; |
128 | 130 | LPDIRECT3DTEXTURE9 m_pTexture; |
131 | +// >>> modify access level 20161224 yossiepon begin | |
132 | +private: | |
133 | +// >>> modify 20161224 yossiepon end | |
134 | + | |
135 | + D3DMATERIAL9 m_Material; | |
136 | + | |
137 | +// >>> modify access level to protected 20161224 yossiepon begin | |
138 | +protected: | |
139 | +// >>> modify 20161224 yossiepon end | |
129 | 140 | |
130 | 141 | //再生時刻 |
131 | 142 | unsigned long m_CurTickTime; |
@@ -140,6 +151,17 @@ protected: | ||
140 | 151 | MTNotePitchBend* m_pNotePitchBend; |
141 | 152 | |
142 | 153 | //ノート発音状態情報 |
154 | + | |
155 | +// >>> modify access level 20161224 yossiepon begin | |
156 | +private: | |
157 | +// >>> modify 20161224 yossiepon end | |
158 | + | |
159 | + NoteStatus* m_pNoteStatus; | |
160 | + | |
161 | +// >>> modify access level to protected 20161224 yossiepon begin | |
162 | +protected: | |
163 | +// >>> modify 20161224 yossiepon end | |
164 | + | |
143 | 165 | unsigned long m_ActiveNoteNum; |
144 | 166 | |
145 | 167 | //表示可否 |
@@ -148,24 +170,23 @@ protected: | ||
148 | 170 | //スキップ状態 |
149 | 171 | bool m_isSkipping; |
150 | 172 | |
151 | - virtual int _CreateNoteStatus(); | |
152 | - virtual int _CreateVertex(LPDIRECT3DDEVICE9 pD3DDevice); | |
153 | - virtual void _MakeMaterial(D3DMATERIAL9* pMaterial); | |
154 | - virtual int _TransformRipple(LPDIRECT3DDEVICE9 pD3DDevice); | |
155 | - virtual int _UpdateVertexOfRipple(LPDIRECT3DDEVICE9 pD3DDevice); | |
173 | +// >>> modify access level 20161224 yossiepon begin | |
174 | +private: | |
175 | +// >>> modify 20161224 yossiepon end | |
156 | 176 | |
157 | -// <<< modify 20120728 yossiepon end | |
177 | + int _CreateTexture(LPDIRECT3DDEVICE9 pD3DDevice, const TCHAR* pSceneName); | |
158 | 178 | |
159 | -private: | |
179 | +// >>> modify access level to protected 20161224 yossiepon begin | |
180 | +protected: | |
181 | +// >>> modify 20161224 yossiepon end | |
160 | 182 | |
161 | -// >>> modify 20120728 yossiepon begin | |
162 | - //描画系 | |
163 | - D3DMATERIAL9 m_Material; | |
183 | + virtual int _CreateNoteStatus(); | |
184 | + virtual int _CreateVertex(LPDIRECT3DDEVICE9 pD3DDevice); | |
164 | 185 | |
165 | - //ノート発音状態情報 | |
166 | - NoteStatus* m_pNoteStatus; | |
186 | +// >>> modify access level 20161224 yossiepon begin | |
187 | +private: | |
188 | +// >>> modify 20161224 yossiepon end | |
167 | 189 | |
168 | - int _CreateTexture(LPDIRECT3DDEVICE9 pD3DDevice, const TCHAR* pSceneName); | |
169 | 190 | int _SetVertexPosition( |
170 | 191 | MTNOTERIPPLE_VERTEX* pVertex, |
171 | 192 | NoteStatus* pNoteStatus, |
@@ -174,7 +195,13 @@ private: | ||
174 | 195 | bool* pIsTimeout |
175 | 196 | ); |
176 | 197 | |
177 | -// <<< modify 20120728 yossiepon end | |
198 | +// >>> modify access level to protected 20161224 yossiepon begin | |
199 | +protected: | |
200 | +// >>> modify 20161224 yossiepon end | |
201 | + | |
202 | + virtual void _MakeMaterial(D3DMATERIAL9* pMaterial); | |
203 | + virtual int _TransformRipple(LPDIRECT3DDEVICE9 pD3DDevice); | |
204 | + virtual int _UpdateVertexOfRipple(LPDIRECT3DDEVICE9 pD3DDevice); | |
178 | 205 | |
179 | 206 | }; |
180 | 207 |
@@ -80,19 +80,6 @@ public: | ||
80 | 80 | //共有用テクスチャ取得 |
81 | 81 | LPDIRECT3DTEXTURE9 GetTexture(); |
82 | 82 | |
83 | -// >>> modify 20120728 yossiepon begin | |
84 | -protected: | |
85 | - | |
86 | - //キーボードプリミティブ | |
87 | - DXPrimitive m_PrimitiveKeyboard; | |
88 | - | |
89 | - //キーボードデザイン | |
90 | - MTPianoKeyboardDesign m_KeyboardDesign; | |
91 | - | |
92 | - int _RotateKey(unsigned char noteNo, float angle, D3DXCOLOR* pColor = NULL); | |
93 | - | |
94 | -// <<< modify 20120728 yossiepon end | |
95 | - | |
96 | 83 | private: |
97 | 84 | |
98 | 85 | //頂点バッファ構造体 |
@@ -111,14 +98,31 @@ private: | ||
111 | 98 | unsigned long indexNum; |
112 | 99 | } MTBufInfo; |
113 | 100 | |
101 | +// >>> modify access level to protected 20161224 yossiepon begin | |
102 | +protected: | |
103 | +// <<< modify 20161224 yossiepon end | |
104 | + | |
105 | + //キーボードプリミティブ | |
106 | + DXPrimitive m_PrimitiveKeyboard; | |
107 | + | |
108 | +// >>> modify access level 20161224 yossiepon begin | |
114 | 109 | private: |
110 | +// <<< modify 20161224 yossiepon end | |
115 | 111 | |
116 | -// >>> modify 20120728 yossiepon begin | |
117 | 112 | //テクスチャ |
118 | 113 | LPDIRECT3DTEXTURE9 m_pTexture; |
119 | 114 | D3DXIMAGE_INFO m_ImgInfo; |
120 | 115 | |
121 | -// <<< modify 20120728 yossiepon end | |
116 | +// >>> modify access level to protected 20161224 yossiepon begin | |
117 | +protected: | |
118 | +// <<< modify 20161224 yossiepon end | |
119 | + | |
120 | + //キーボードデザイン | |
121 | + MTPianoKeyboardDesign m_KeyboardDesign; | |
122 | + | |
123 | +// >>> modify access level 20161224 yossiepon begin | |
124 | +private: | |
125 | +// <<< modify 20161224 yossiepon end | |
122 | 126 | |
123 | 127 | //バッファ情報 |
124 | 128 | MTBufInfo m_BufInfo[SM_MAX_NOTE_NUM]; |
@@ -157,9 +161,17 @@ private: | ||
157 | 161 | int _LoadTexture(LPDIRECT3DDEVICE9 pD3DDevice, const TCHAR* pSceneName); |
158 | 162 | void _MakeMaterial(D3DMATERIAL9* pMaterial); |
159 | 163 | |
160 | -// >>> modify 20120728 yossiepon begin | |
164 | +// >>> modify access level to protected 20161224 yossiepon begin | |
165 | +protected: | |
166 | +// <<< modify 20161224 yossiepon end | |
167 | + | |
168 | + int _RotateKey(unsigned char noteNo, float angle, D3DXCOLOR* pColor = NULL); | |
169 | + | |
170 | +// >>> modify access level 20161224 yossiepon begin | |
171 | +private: | |
172 | +// <<< modify 20161224 yossiepon end | |
173 | + | |
161 | 174 | D3DXVECTOR3 _RotateYZ(float centerY, float centerZ, D3DXVECTOR3 p1, float angle); |
162 | -// <<< modify 20120728 yossiepon end | |
163 | 175 | |
164 | 176 | int _HideKey(unsigned char noteNo); |
165 | 177 |
@@ -77,8 +77,9 @@ public: | ||
77 | 77 | //スキップ状態 |
78 | 78 | void SetSkipStatus(bool isSkipping); |
79 | 79 | |
80 | -// >>> modify 20120728 yossiepon begin | |
80 | +// >>> modify access level to protected 20161224 yossiepon begin | |
81 | 81 | protected: |
82 | +// <<< modify 20161224 yossiepon end | |
82 | 83 | |
83 | 84 | //キー状態 |
84 | 85 | enum KeyStatus { |
@@ -95,13 +96,8 @@ protected: | ||
95 | 96 | float keyDownRate; |
96 | 97 | }; |
97 | 98 | |
98 | -// >>> modify 20140920 yossiepon begin | |
99 | -protected: | |
100 | - //シングルキーボードフラグ | |
101 | - bool m_isSingleKeyboard; | |
102 | -// <<< modify 20120920 yossiepon end | |
103 | - | |
104 | -protected: | |
99 | +// >>> modify access level to protected 20161224 yossiepon begin | |
100 | +// <<< modify 20161224 yossiepon end | |
105 | 101 | |
106 | 102 | //ノートデザイン |
107 | 103 | MTNoteDesign m_NoteDesign; |
@@ -122,16 +118,44 @@ protected: | ||
122 | 118 | NoteStatus* m_pNoteStatus; |
123 | 119 | float m_KeyDownRate[SM_MAX_CH_NUM][SM_MAX_NOTE_NUM]; |
124 | 120 | |
121 | +// >>> modify access level 20161224 yossiepon begin | |
122 | +private: | |
123 | +// <<< modify 20161224 yossiepon end | |
124 | + | |
125 | + //スキップ状態 | |
126 | + bool m_isSkipping; | |
127 | + | |
128 | +// >>> modify access level to protected 20161224 yossiepon begin | |
129 | +protected: | |
130 | +// <<< modify 20161224 yossiepon end | |
131 | + | |
125 | 132 | //ピッチベンド情報 |
126 | 133 | MTNotePitchBend* m_pNotePitchBend; |
127 | 134 | |
128 | 135 | //表示可否 |
129 | 136 | bool m_isEnable; |
130 | 137 | |
138 | + //シングルキーボードフラグ | |
139 | + bool m_isSingleKeyboard; | |
140 | + | |
131 | 141 | int _CreateNoteStatus(); |
142 | +// >>> modify 20120728 yossiepon begin | |
132 | 143 | virtual int _CreateKeyboards(LPDIRECT3DDEVICE9 pD3DDevice, const TCHAR* pSceneName, SMSeqData* pSeqData); |
144 | +// <<< modify 20120728 yossiepon end | |
133 | 145 | |
134 | 146 | int _TransformActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice); |
147 | + | |
148 | +// >>> modify access level 20161224 yossiepon begin | |
149 | +private: | |
150 | +// <<< modify 20161224 yossiepon end | |
151 | + | |
152 | + int _UpdateStatusOfActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice); | |
153 | + | |
154 | +// >>> modify access level to protected 20161224 yossiepon begin | |
155 | +protected: | |
156 | +// <<< modify 20161224 yossiepon end | |
157 | + | |
158 | +// >>> modify 20120728 yossiepon begin | |
135 | 159 | virtual int _UpdateNoteStatus( |
136 | 160 | unsigned long playTimeMSec, |
137 | 161 | unsigned long keyDownDuration, |
@@ -140,20 +164,8 @@ protected: | ||
140 | 164 | NoteStatus* pNoteStatus |
141 | 165 | ); |
142 | 166 | virtual int _UpdateVertexOfActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice); |
143 | - float _GetPichBendShiftPosX(unsigned char portNo, unsigned char chNo); | |
144 | - | |
145 | -// <<< modify 20120728 yossiepon end | |
146 | - | |
147 | -private: | |
148 | - | |
149 | -// >>> modify 20120728 yossiepon begin | |
150 | - //スキップ状態 | |
151 | - bool m_isSkipping; | |
152 | -// <<< modify 20120728 yossiepon end | |
153 | - | |
154 | -// >>> modify 20120728 yossiepon begin | |
155 | - int _UpdateStatusOfActiveNotes(LPDIRECT3DDEVICE9 pD3DDevice); | |
156 | 167 | // <<< modify 20120728 yossiepon end |
168 | + float _GetPichBendShiftPosX(unsigned char portNo, unsigned char chNo); | |
157 | 169 | |
158 | 170 | }; |
159 | 171 |
@@ -194,29 +194,6 @@ public: | ||
194 | 194 | unsigned char GetKeyDispRangeEnd(); |
195 | 195 | bool IsKeyDisp(unsigned char noteNo); |
196 | 196 | |
197 | -// >>> modify 20120728 yossiepon begin | |
198 | -protected: | |
199 | - | |
200 | - //ポート情報 | |
201 | - SMPortList m_PortList; | |
202 | - unsigned char m_PortIndex[SM_MAX_PORT_NUM]; | |
203 | - | |
204 | - //キーボード配置情報 | |
205 | - float m_KeyboardStepY; | |
206 | - | |
207 | - //発音中キー色情報 | |
208 | - int m_ActiveKeyColorDuration; | |
209 | - float m_ActiveKeyColorTailRate; | |
210 | - | |
211 | - virtual void _Initialize(); | |
212 | - virtual int _LoadConfFile(const TCHAR* pSceneName); | |
213 | - | |
214 | -// <<< modify 20120728 yossiepon end | |
215 | - | |
216 | -// >>> modify 20140920 yossiepon begin | |
217 | - ActiveKeyColorType m_ActiveKeyColorType; | |
218 | -// <<< modify 20120920 yossiepon end | |
219 | - | |
220 | 197 | private: |
221 | 198 | |
222 | 199 | //キー情報 |
@@ -227,11 +204,20 @@ private: | ||
227 | 204 | |
228 | 205 | private: |
229 | 206 | |
230 | -// >>> modify 20120728 yossiepon begin | |
231 | 207 | //キー情報配列 |
232 | 208 | MTKeyInfo m_KeyInfo[SM_MAX_NOTE_NUM]; |
233 | 209 | |
234 | -// <<< modify 20120728 yossiepon end | |
210 | +// >>> modify access level to protected 20161224 yossiepon begin | |
211 | +protected: | |
212 | +// <<< modify 20161224 yossiepon end | |
213 | + | |
214 | + //ポート情報 | |
215 | + SMPortList m_PortList; | |
216 | + unsigned char m_PortIndex[SM_MAX_PORT_NUM]; | |
217 | + | |
218 | +// >>> modify access level 20161224 yossiepon begin | |
219 | +private: | |
220 | +// <<< modify 20161224 yossiepon end | |
235 | 221 | |
236 | 222 | //スケール情報 |
237 | 223 | float m_WhiteKeyStep; |
@@ -255,27 +241,64 @@ private: | ||
255 | 241 | int m_KeyUpDuration; |
256 | 242 | |
257 | 243 | //キーボード配置情報 |
258 | -// >>> modify 20120728 yossiepon begin | |
244 | + | |
245 | +// >>> modify access level to protected 20161224 yossiepon begin | |
246 | +protected: | |
247 | +// <<< modify 20161224 yossiepon end | |
248 | + | |
249 | + float m_KeyboardStepY; | |
250 | + | |
251 | +// >>> modify access level 20161224 yossiepon begin | |
252 | +private: | |
253 | +// <<< modify 20161224 yossiepon end | |
254 | + | |
259 | 255 | float m_KeyboardStepZ; |
260 | 256 | int m_KeyboardMaxDispNum; |
261 | -// <<< modify 20120728 yossiepon end | |
262 | 257 | |
263 | 258 | //キー色情報 |
264 | 259 | D3DXCOLOR m_WhiteKeyColor; |
265 | 260 | D3DXCOLOR m_BlackKeyColor; |
266 | 261 | |
267 | 262 | //発音中キー色情報 |
268 | -// >>> modify 20120728 yossiepon begin | |
269 | 263 | D3DXCOLOR m_ActiveKeyColor; |
270 | -// <<< modify 20120728 yossiepon end | |
271 | 264 | |
272 | -// >>> modify 20120728 yossiepon begin | |
265 | +// >>> modify access level to protected 20161224 yossiepon begin | |
266 | +protected: | |
267 | +// <<< modify 20161224 yossiepon end | |
268 | + | |
269 | + int m_ActiveKeyColorDuration; | |
270 | + float m_ActiveKeyColorTailRate; | |
271 | + ActiveKeyColorType m_ActiveKeyColorType; | |
272 | + | |
273 | +// >>> modify access level 20161224 yossiepon begin | |
274 | +private: | |
275 | +// <<< modify 20161224 yossiepon end | |
276 | + | |
273 | 277 | //キー表示範囲 |
274 | 278 | int m_KeyDispRangeStart; |
275 | 279 | int m_KeyDispRangeEnd; |
276 | 280 | |
281 | +// >>> modify access level to protected 20161224 yossiepon begin | |
282 | +protected: | |
283 | +// <<< modify 20161224 yossiepon end | |
284 | + | |
285 | +// >>> modify 20120728 yossiepon begin | |
286 | + virtual void _Initialize(); | |
287 | +// <<< modify 20120728 yossiepon end | |
288 | + | |
289 | +// >>> modify access level 20161224 yossiepon begin | |
290 | +private: | |
291 | +// <<< modify 20161224 yossiepon end | |
292 | + | |
277 | 293 | void _InitKeyType(); |
278 | 294 | void _InitKeyPos(); |
295 | + | |
296 | +// >>> modify access level to protected 20161224 yossiepon begin | |
297 | +protected: | |
298 | +// <<< modify 20161224 yossiepon end | |
299 | + | |
300 | +// >>> modify 20120728 yossiepon begin | |
301 | + virtual int _LoadConfFile(const TCHAR* pSceneName); | |
279 | 302 | // <<< modify 20120728 yossiepon end |
280 | 303 | |
281 | 304 | }; |
@@ -121,6 +121,7 @@ private: | ||
121 | 121 | |
122 | 122 | // >>> modify access level to protected 20161223 yossiepon begin |
123 | 123 | protected: |
124 | +// <<< modify 20161223 yossiepon end | |
124 | 125 | |
125 | 126 | //一人称カメラ |
126 | 127 | MTFirstPersonCam m_FirstPersonCam; |
@@ -137,11 +138,9 @@ protected: | ||
137 | 138 | MTMeshCtrl m_MeshCtrl; |
138 | 139 | MTBackgroundImage m_BackgroundImage; |
139 | 140 | |
140 | -// <<< modify 20161223 yossiepon end | |
141 | - | |
142 | -// >>> add 20161223 yossiepon begin | |
141 | +// >>> modify access level 20161223 yossiepon begin | |
143 | 142 | private: |
144 | -// <<< add 20161223 yossiepon end | |
143 | +// <<< modify access level 20161223 yossiepon end | |
145 | 144 | |
146 | 145 | //マウス視線移動モード |
147 | 146 | bool m_IsMouseCamMode; |
@@ -157,6 +156,7 @@ private: | ||
157 | 156 | |
158 | 157 | // >>> modify access level to protected 20161223 yossiepon begin |
159 | 158 | protected: |
159 | +// <<< modify 20161223 yossiepon end | |
160 | 160 | |
161 | 161 | //スキップ状態 |
162 | 162 | bool m_IsSkipping; |
@@ -166,11 +166,9 @@ protected: | ||
166 | 166 | // <<< modify 20120728 yossiepon end |
167 | 167 | void _SetLightColor(DXDirLight* pLight); |
168 | 168 | |
169 | -// <<< modify 20161223 yossiepon end | |
170 | - | |
171 | -// >>> add 20161223 yossiepon begin | |
169 | +// >>> modify access level 20161223 yossiepon begin | |
172 | 170 | private: |
173 | -// <<< add 20161223 yossiepon end | |
171 | +// <<< modify access level 20161223 yossiepon end | |
174 | 172 | |
175 | 173 | int _LoadConf(); |
176 | 174 |