Skip to content

Commit 0614b1d

Browse files
bobtistabobtista
committed
refactor(input): Remove unused m_inputFrame vars and rename mouse frame fields to boolean flags
1 parent e2e518d commit 0614b1d

File tree

12 files changed

+60
-127
lines changed

12 files changed

+60
-127
lines changed

‎Generals/Code/GameEngine/Include/GameClient/Keyboard.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ class Keyboard : public SubsystemInterface
158158
WideChar shifted2;
159159

160160
} m_keyNames[ KEY_COUNT ];
161-
UnsignedInt m_inputFrame; ///< frame input was gathered on
162161

163162
};
164163

‎Generals/Code/GameEngine/Include/GameClient/Mouse.h‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,15 @@ struct MouseIO
107107

108108
MouseButtonState leftState; // button state: Up, Down, DoubleClick (Which is also down)
109109
Int leftEvent; // Most important event this frame
110-
Int leftFrame; // last frame button state changed
110+
Bool leftButtonStateChanged; // TRUE if button state changed in this event
111111

112112
MouseButtonState rightState;
113113
Int rightEvent;
114-
Int rightFrame;
114+
Bool rightButtonStateChanged; // TRUE if button state changed in this event
115115

116116
MouseButtonState middleState;
117117
Int middleEvent;
118-
Int middleFrame;
118+
Bool middleButtonStateChanged; // TRUE if button state changed in this event
119119
};
120120

121121
class CursorInfo
@@ -393,9 +393,6 @@ class Mouse : public SubsystemInterface
393393
Int m_minY; ///< mouse is locked to this region
394394
Int m_maxY; ///< mouse is locked to this region
395395

396-
UnsignedInt m_inputFrame; ///< frame input was gathered on
397-
UnsignedInt m_deadInputFrame; ///< Frame which last input occured
398-
399396
Bool m_inputMovesAbsolute; /**< if TRUE, when processing mouse position
400397
chanages the movement will be done treating
401398
the coords as ABSOLUTE positions and NOT

‎Generals/Code/GameEngine/Source/GameClient/Input/Keyboard.cpp‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,6 @@ Keyboard::Keyboard( void )
701701
m_shift2Key = KEY_NONE;
702702

703703
memset( m_keyNames, 0, sizeof( m_keyNames ) );
704-
m_inputFrame = 0;
705704

706705
}
707706

@@ -721,9 +720,6 @@ void Keyboard::init( void )
721720
// initialize the key names
722721
initKeyNames();
723722

724-
// first input frame
725-
m_inputFrame = 0;
726-
727723
}
728724

729725
//-------------------------------------------------------------------------------------------------
@@ -740,9 +736,6 @@ void Keyboard::reset( void )
740736
void Keyboard::update( void )
741737
{
742738

743-
// increment input frame
744-
m_inputFrame++;
745-
746739
// update the key data
747740
updateKeys();
748741

‎Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp‎

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,6 @@ void Mouse::updateMouseData( )
183183
else
184184
m_eventsThisFrame = 0;
185185

186-
if( index != 0 )
187-
m_deadInputFrame = m_inputFrame;
188-
189186
}
190187

191188
//-------------------------------------------------------------------------------------------------
@@ -221,7 +218,7 @@ void Mouse::processMouseEvent( Int index )
221218
m_currMouse.wheelPos += m_mouseEvents[ index ].wheelPos;
222219

223220
// Check Left Mouse State
224-
if( m_mouseEvents[ index ].leftFrame )
221+
if( m_mouseEvents[ index ].leftButtonStateChanged )
225222
{
226223
if( m_currMouse.leftState != m_mouseEvents[ index ].leftState )
227224
{
@@ -231,21 +228,21 @@ void Mouse::processMouseEvent( Int index )
231228
// Mouse Down
232229
m_currMouse.leftEvent = GWM_LEFT_DOWN;
233230
m_currMouse.leftState = MBS_Down;
234-
m_currMouse.leftFrame = m_inputFrame;
231+
m_currMouse.leftButtonStateChanged = TRUE;
235232
}
236233
else if ( m_mouseEvents[ index ].leftState == MBS_DoubleClick )
237234
{
238235
// Mouse Double Click
239236
m_currMouse.leftEvent = GWM_LEFT_DOUBLE_CLICK;
240237
m_currMouse.leftState = MBS_DoubleClick;
241-
m_currMouse.leftFrame = m_inputFrame;
238+
m_currMouse.leftButtonStateChanged = TRUE;
242239
}
243240
else
244241
{
245242
// Mouse Up
246243
m_currMouse.leftEvent = GWM_LEFT_UP;
247244
m_currMouse.leftState = MBS_Up;
248-
m_currMouse.leftFrame = m_inputFrame;
245+
m_currMouse.leftButtonStateChanged = TRUE;
249246
}
250247
}
251248
}
@@ -257,7 +254,7 @@ void Mouse::processMouseEvent( Int index )
257254
}
258255

259256
// Check Right Mouse State
260-
if( m_mouseEvents[ index ].rightFrame )
257+
if( m_mouseEvents[ index ].rightButtonStateChanged )
261258
{
262259
if( m_currMouse.rightState != m_mouseEvents[ index ].rightState )
263260
{
@@ -267,21 +264,21 @@ void Mouse::processMouseEvent( Int index )
267264
// Mouse Down
268265
m_currMouse.rightEvent = GWM_RIGHT_DOWN;
269266
m_currMouse.rightState = MBS_Down;
270-
m_currMouse.rightFrame = m_inputFrame;
267+
m_currMouse.rightButtonStateChanged = TRUE;
271268
}
272269
else if( m_mouseEvents[ index ].rightState == MBS_DoubleClick )
273270
{
274271
// Mouse Double Click
275272
m_currMouse.rightEvent = GWM_RIGHT_DOUBLE_CLICK;
276273
m_currMouse.rightState = MBS_DoubleClick;
277-
m_currMouse.rightFrame = m_inputFrame;
274+
m_currMouse.rightButtonStateChanged = TRUE;
278275
}
279276
else
280277
{
281278
// Mouse Up
282279
m_currMouse.rightEvent = GWM_RIGHT_UP;
283280
m_currMouse.rightState = MBS_Up;
284-
m_currMouse.rightFrame = m_inputFrame;
281+
m_currMouse.rightButtonStateChanged = TRUE;
285282
}
286283
}
287284
}
@@ -293,7 +290,7 @@ void Mouse::processMouseEvent( Int index )
293290
}
294291

295292
// Check Middle Mouse State
296-
if( m_mouseEvents[ index ].middleFrame )
293+
if( m_mouseEvents[ index ].middleButtonStateChanged )
297294
{
298295
if( m_currMouse.middleState != m_mouseEvents[index].middleState )
299296
{
@@ -302,20 +299,20 @@ void Mouse::processMouseEvent( Int index )
302299
{
303300
m_currMouse.middleEvent = GWM_MIDDLE_DOWN;
304301
m_currMouse.middleState = MBS_Down;
305-
m_currMouse.middleFrame = m_inputFrame;
302+
m_currMouse.middleButtonStateChanged = TRUE;
306303
}
307304
else if( m_mouseEvents[index].middleState == MBS_DoubleClick )
308305
{
309306
m_currMouse.middleEvent = GWM_MIDDLE_DOUBLE_CLICK;
310307
m_currMouse.middleState = MBS_DoubleClick;
311-
m_currMouse.middleFrame = m_inputFrame;
308+
m_currMouse.middleButtonStateChanged = TRUE;
312309
}
313310
else
314311
{
315312
// Mouse Up
316313
m_currMouse.middleEvent = GWM_MIDDLE_UP;
317314
m_currMouse.middleState = MBS_Up;
318-
m_currMouse.middleFrame = m_inputFrame;
315+
m_currMouse.middleButtonStateChanged = TRUE;
319316
}
320317
}
321318
}
@@ -328,7 +325,7 @@ void Mouse::processMouseEvent( Int index )
328325

329326
m_currMouse.deltaPos.x = m_currMouse.pos.x - m_prevMouse.pos.x;
330327
m_currMouse.deltaPos.y = m_currMouse.pos.y - m_prevMouse.pos.y;
331-
// DEBUG_LOG(("Mouse dx %d, dy %d, index %d, frame %d", m_currMouse.deltaPos.x, m_currMouse.deltaPos.y, index, m_inputFrame));
328+
// DEBUG_LOG(("Mouse dx %d, dy %d, index %d", m_currMouse.deltaPos.x, m_currMouse.deltaPos.y, index));
332329
// // check if mouse is still and flag tooltip
333330
// if( ((dx*dx) + (dy*dy)) < CURSOR_MOVE_TOL_SQ )
334331
// {
@@ -474,9 +471,6 @@ Mouse::Mouse( void )
474471
m_maxY = 0;
475472
m_eventsThisFrame = 0;
476473

477-
m_inputFrame = 0;
478-
m_deadInputFrame =0;
479-
480474
m_inputMovesAbsolute = FALSE;
481475

482476
m_currentCursor = ARROW;
@@ -590,8 +584,6 @@ void Mouse::init( void )
590584
m_minY = 0;
591585
m_maxY = 599;
592586

593-
m_inputFrame = 0;
594-
m_deadInputFrame =0;
595587

596588
m_inputMovesAbsolute = FALSE;
597589
m_eventsThisFrame = 0;
@@ -676,9 +668,6 @@ void Mouse::reset( void )
676668
void Mouse::update( void )
677669
{
678670

679-
// increment input frame
680-
m_inputFrame++;
681-
682671
// update the mouse data
683672
updateMouseData( );
684673

‎Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIMouse.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ UnsignedByte DirectInputMouse::getMouseEvent( MouseIO *result, Bool flush )
202202

203203
/* set these to defaults */
204204
result->leftState = result->middleState = result->rightState = FALSE;
205-
result->leftFrame = result->middleFrame = result->rightFrame = 0;
205+
result->leftButtonStateChanged = result->middleButtonStateChanged = result->rightButtonStateChanged = FALSE;
206206
result->pos.x = result->pos.y = result->wheelPos = 0;
207207

208208
if( m_pMouseDevice )
@@ -283,17 +283,17 @@ void DirectInputMouse::mapDirectInputMouse( MouseIO *mouse,
283283
{
284284
case DIMOFS_BUTTON0:
285285
mouse->leftState = (( mdat->dwData & 0x0080 ) ? TRUE : FALSE);
286-
mouse->leftFrame = mdat->dwSequence;
286+
mouse->leftButtonStateChanged = TRUE;
287287
break;
288288

289289
case DIMOFS_BUTTON1:
290290
mouse->rightState = (( mdat->dwData & 0x0080 ) ? TRUE : FALSE);
291-
mouse->rightFrame = mdat->dwSequence;
291+
mouse->rightButtonStateChanged = TRUE;
292292
break;
293293

294294
case DIMOFS_BUTTON2:
295295
mouse->middleState = (( mdat->dwData & 0x0080 ) ? TRUE : FALSE);
296-
mouse->middleFrame = mdat->dwSequence;
296+
mouse->middleButtonStateChanged = TRUE;
297297
break;
298298

299299
case DIMOFS_BUTTON3:

‎Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32Mouse.cpp‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,10 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
8585
UINT msg = m_eventBuffer[ eventIndex ].msg;
8686
WPARAM wParam = m_eventBuffer[ eventIndex ].wParam;
8787
LPARAM lParam = m_eventBuffer[ eventIndex ].lParam;
88-
UnsignedInt frame;
89-
90-
//
91-
// get the current input frame from the client, if we don't have
92-
// a client (like in the GUI editor) we just use frame 1 so it
93-
// registers with the system
94-
//
95-
if( TheGameClient )
96-
frame = TheGameClient->getFrame();
97-
else
98-
frame = 1;
9988

10089
// set these to defaults
10190
result->leftState = result->middleState = result->rightState = MBS_Up;
102-
result->leftFrame = result->middleFrame = result->rightFrame = 0;
91+
result->leftButtonStateChanged = result->middleButtonStateChanged = result->rightButtonStateChanged = FALSE;
10392
result->pos.x = result->pos.y = result->wheelPos = 0;
10493

10594
// Time is the same for all events
@@ -113,7 +102,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
113102
{
114103

115104
result->leftState = MBS_Down;
116-
result->leftFrame = frame;
105+
result->leftButtonStateChanged = TRUE;
117106
result->pos.x = LOWORD( lParam );
118107
result->pos.y = HIWORD( lParam );
119108
break;
@@ -125,7 +114,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
125114
{
126115

127116
result->leftState = MBS_Up;
128-
result->leftFrame = frame;
117+
result->leftButtonStateChanged = TRUE;
129118
result->pos.x = LOWORD( lParam );
130119
result->pos.y = HIWORD( lParam );
131120
break;
@@ -137,7 +126,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
137126
{
138127

139128
result->leftState = MBS_DoubleClick;
140-
result->leftFrame = frame;
129+
result->leftButtonStateChanged = TRUE;
141130
result->pos.x = LOWORD( lParam );
142131
result->pos.y = HIWORD( lParam );
143132
break;
@@ -149,7 +138,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
149138
{
150139

151140
result->middleState = MBS_Down;
152-
result->middleFrame = frame;
141+
result->middleButtonStateChanged = TRUE;
153142
result->pos.x = LOWORD( lParam );
154143
result->pos.y = HIWORD( lParam );
155144
break;
@@ -161,7 +150,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
161150
{
162151

163152
result->middleState = MBS_Up;
164-
result->middleFrame = frame;
153+
result->middleButtonStateChanged = TRUE;
165154
result->pos.x = LOWORD( lParam );
166155
result->pos.y = HIWORD( lParam );
167156
break;
@@ -173,7 +162,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
173162
{
174163

175164
result->middleState = MBS_DoubleClick;
176-
result->middleFrame = frame;
165+
result->middleButtonStateChanged = TRUE;
177166
result->pos.x = LOWORD( lParam );
178167
result->pos.y = HIWORD( lParam );
179168
break;
@@ -185,7 +174,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
185174
{
186175

187176
result->rightState = MBS_Down;
188-
result->rightFrame = frame;
177+
result->rightButtonStateChanged = TRUE;
189178
result->pos.x = LOWORD( lParam );
190179
result->pos.y = HIWORD( lParam );
191180
break;
@@ -197,7 +186,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
197186
{
198187

199188
result->rightState = MBS_Up;
200-
result->rightFrame = frame;
189+
result->rightButtonStateChanged = TRUE;
201190
result->pos.x = LOWORD( lParam );
202191
result->pos.y = HIWORD( lParam );
203192
break;
@@ -209,7 +198,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
209198
{
210199

211200
result->rightState = MBS_DoubleClick;
212-
result->rightFrame = frame;
201+
result->rightButtonStateChanged = TRUE;
213202
result->pos.x = LOWORD( lParam );
214203
result->pos.y = HIWORD( lParam );
215204
break;

‎GeneralsMD/Code/GameEngine/Include/GameClient/Keyboard.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ class Keyboard : public SubsystemInterface
158158
WideChar shifted2;
159159

160160
} m_keyNames[ KEY_COUNT ];
161-
UnsignedInt m_inputFrame; ///< frame input was gathered on
162161

163162
};
164163

‎GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,15 @@ struct MouseIO
107107

108108
MouseButtonState leftState; // button state: Up, Down, DoubleClick (Which is also down)
109109
Int leftEvent; // Most important event this frame
110-
Int leftFrame; // last frame button state changed
110+
Bool leftButtonStateChanged; // TRUE if button state changed in this event
111111

112112
MouseButtonState rightState;
113113
Int rightEvent;
114-
Int rightFrame;
114+
Bool rightButtonStateChanged; // TRUE if button state changed in this event
115115

116116
MouseButtonState middleState;
117117
Int middleEvent;
118-
Int middleFrame;
118+
Bool middleButtonStateChanged; // TRUE if button state changed in this event
119119
};
120120

121121
class CursorInfo
@@ -394,9 +394,6 @@ class Mouse : public SubsystemInterface
394394
Int m_minY; ///< mouse is locked to this region
395395
Int m_maxY; ///< mouse is locked to this region
396396

397-
UnsignedInt m_inputFrame; ///< frame input was gathered on
398-
UnsignedInt m_deadInputFrame; ///< Frame which last input occured
399-
400397
Bool m_inputMovesAbsolute; /**< if TRUE, when processing mouse position
401398
chanages the movement will be done treating
402399
the coords as ABSOLUTE positions and NOT

0 commit comments

Comments
 (0)