Skip to content

Commit fe6b2c3

Browse files
bobtistabobtista
committed
refactor(input): Use Msec naming convention for millisecond variables
1 parent dd956f5 commit fe6b2c3

File tree

8 files changed

+27
-22
lines changed

8 files changed

+27
-22
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ struct KeyboardIO
7777
UnsignedByte status; // StatusType, above
7878
UnsignedShort state; // KEY_STATE_* in KeyDefs.h
7979
UnsignedInt sequence; // sequence info from DirectX used for order
80-
UnsignedInt keyDownTimeMS; // real-time in milliseconds when key went down
80+
UnsignedInt keyDownTimeMsec; // real-time in milliseconds when key went down
8181

8282
};
8383

@@ -87,7 +87,7 @@ struct KeyboardIO
8787
class Keyboard : public SubsystemInterface
8888
{
8989

90-
enum { KEY_REPEAT_DELAY_MS = 250 };
90+
enum { KEY_REPEAT_DELAY_MSEC = 250 };
9191

9292
public:
9393

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class LookAtTranslator : public GameMessageTranslator
7676
Bool m_isRotating; // set to true if we are in the act of MMB rotating
7777
Bool m_isPitching; // set to true if we are in the act of ALT pitch rotation
7878
Bool m_isChangingFOV; // set to true if we are in the act of changing the field of view
79-
UnsignedInt m_middleButtonDownTimeMS; // real-time in milliseconds when middle button goes down
79+
UnsignedInt m_middleButtonDownTimeMsec; // real-time in milliseconds when middle button goes down
8080
DrawableID m_lastPlaneID;
8181
ViewLocation m_viewLocation[ MAX_VIEW_LOCS ];
8282
ScrollType m_scrollType;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ void Keyboard::updateKeys( void )
145145
// Update key down time for new key presses
146146
if( BitIsSet( m_keys[ index ].state, KEY_STATE_DOWN ) )
147147
{
148-
m_keyStatus[ m_keys[ index ].key ].keyDownTimeMS = timeGetTime();
148+
m_keyStatus[ m_keys[ index ].key ].keyDownTimeMsec = timeGetTime();
149149
}
150150

151151
// prevent ALT-TAB from causing a TAB event
@@ -227,7 +227,7 @@ Bool Keyboard::checkKeyRepeat( void )
227227
if( BitIsSet( m_keyStatus[ key ].state, KEY_STATE_DOWN ) )
228228
{
229229

230-
if( now - m_keyStatus[ key ].keyDownTimeMS > Keyboard::KEY_REPEAT_DELAY_MS )
230+
if( now - m_keyStatus[ key ].keyDownTimeMsec > Keyboard::KEY_REPEAT_DELAY_MSEC )
231231
{
232232
// Add key to this frame
233233
m_keys[ index ].key = (UnsignedByte)key;
@@ -242,8 +242,8 @@ Bool Keyboard::checkKeyRepeat( void )
242242
m_keyStatus[ index ].sequence = m_inputFrame;
243243

244244
// Set repeated key so it will repeat again after a short interval
245-
const UnsignedInt KEY_REPEAT_INTERVAL_MS = 67; // ~2 frames at 30 FPS
246-
m_keyStatus[ key ].keyDownTimeMS = now - (Keyboard::KEY_REPEAT_DELAY_MS - KEY_REPEAT_INTERVAL_MS);
245+
const UnsignedInt KEY_REPEAT_INTERVAL_MSEC = 67; // ~2 frames at 30 FPS
246+
m_keyStatus[ key ].keyDownTimeMsec = now - (Keyboard::KEY_REPEAT_DELAY_MSEC - KEY_REPEAT_INTERVAL_MSEC);
247247

248248
retVal = TRUE;
249249
break; // exit for key

‎Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ LookAtTranslator::LookAtTranslator() :
137137
m_isRotating(false),
138138
m_isPitching(false),
139139
m_isChangingFOV(false),
140-
m_middleButtonDownTimeMS(0),
140+
m_middleButtonDownTimeMsec(0),
141141
m_lastPlaneID(INVALID_DRAWABLE_ID),
142142
m_lastMouseMoveFrame(0),
143143
m_scrollType(SCROLL_NONE)
@@ -291,7 +291,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
291291
m_anchorAngle = TheTacticalView->getAngle();
292292
m_originalAnchor = msg->getArgument( 0 )->pixel;
293293
m_currentPos = msg->getArgument( 0 )->pixel;
294-
m_middleButtonDownTimeMS = timeGetTime();
294+
m_middleButtonDownTimeMsec = timeGetTime();
295295
break;
296296
}
297297

@@ -300,7 +300,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
300300
{
301301
m_lastMouseMoveFrame = TheGameLogic->getFrame();
302302

303-
const UnsignedInt CLICK_DURATION_MS = 167;
303+
const UnsignedInt CLICK_DURATION_MSEC = 167;
304304
const UnsignedInt PIXEL_OFFSET = 5;
305305

306306
m_isRotating = false;
@@ -309,7 +309,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
309309
Int dy = m_currentPos.y-m_originalAnchor.y;
310310
Bool didMove = dx>PIXEL_OFFSET || dy>PIXEL_OFFSET;
311311
// if middle button is "clicked", reset to "home" orientation
312-
if (!didMove && timeGetTime() - m_middleButtonDownTimeMS < CLICK_DURATION_MS)
312+
if (!didMove && timeGetTime() - m_middleButtonDownTimeMsec < CLICK_DURATION_MSEC)
313313
{
314314
TheTacticalView->setAngleAndPitchToDefault();
315315
TheTacticalView->setZoomToDefault();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ struct KeyboardIO
7777
UnsignedByte status; // StatusType, above
7878
UnsignedShort state; // KEY_STATE_* in KeyDefs.h
7979
UnsignedInt sequence; // sequence info from DirectX used for order
80-
UnsignedInt keyDownTimeMS; // real-time in milliseconds when key went down
80+
UnsignedInt keyDownTimeMsec; // real-time in milliseconds when key went down
8181

8282
};
8383

@@ -87,7 +87,7 @@ struct KeyboardIO
8787
class Keyboard : public SubsystemInterface
8888
{
8989

90-
enum { KEY_REPEAT_DELAY_MS = 250 };
90+
enum { KEY_REPEAT_DELAY_MSEC = 250 };
9191

9292
public:
9393

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class LookAtTranslator : public GameMessageTranslator
7676
Bool m_isRotating; // set to true if we are in the act of MMB rotating
7777
Bool m_isPitching; // set to true if we are in the act of ALT pitch rotation
7878
Bool m_isChangingFOV; // set to true if we are in the act of changing the field of view
79-
UnsignedInt m_middleButtonDownTimeMS; // real-time in milliseconds when middle button goes down
79+
UnsignedInt m_middleButtonDownTimeMsec; // real-time in milliseconds when middle button goes down
8080
DrawableID m_lastPlaneID;
8181
ViewLocation m_viewLocation[ MAX_VIEW_LOCS ];
8282
ScrollType m_scrollType;

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@ void Keyboard::updateKeys( void )
130130
}
131131
while( m_keys[ index++ ].key != KEY_NONE );
132132

133+
// Get current time once for all key updates
134+
UnsignedInt now = 0;
135+
133136
// update keyboard status array
134137
index = 0;
135138
while( m_keys[ index ].key != KEY_NONE )
@@ -145,7 +148,9 @@ void Keyboard::updateKeys( void )
145148
// Update key down time for new key presses
146149
if( BitIsSet( m_keys[ index ].state, KEY_STATE_DOWN ) )
147150
{
148-
m_keyStatus[ m_keys[ index ].key ].keyDownTimeMS = timeGetTime();
151+
if( !now )
152+
now = timeGetTime();
153+
m_keyStatus[ m_keys[ index ].key ].keyDownTimeMsec = now;
149154
}
150155

151156
// prevent ALT-TAB from causing a TAB event
@@ -227,7 +232,7 @@ Bool Keyboard::checkKeyRepeat( void )
227232
if( BitIsSet( m_keyStatus[ key ].state, KEY_STATE_DOWN ) )
228233
{
229234

230-
if( now - m_keyStatus[ key ].keyDownTimeMS > Keyboard::KEY_REPEAT_DELAY_MS )
235+
if( now - m_keyStatus[ key ].keyDownTimeMsec > Keyboard::KEY_REPEAT_DELAY_MSEC )
231236
{
232237
// Add key to this frame
233238
m_keys[ index ].key = (UnsignedByte)key;
@@ -242,8 +247,8 @@ Bool Keyboard::checkKeyRepeat( void )
242247
m_keyStatus[ index ].sequence = m_inputFrame;
243248

244249
// Set repeated key so it will repeat again after a short interval
245-
const UnsignedInt KEY_REPEAT_INTERVAL_MS = 67; // ~2 frames at 30 FPS
246-
m_keyStatus[ key ].keyDownTimeMS = now - (Keyboard::KEY_REPEAT_DELAY_MS - KEY_REPEAT_INTERVAL_MS);
250+
const UnsignedInt KEY_REPEAT_INTERVAL_MSEC = 67; // ~2 frames at 30 FPS
251+
m_keyStatus[ key ].keyDownTimeMsec = now - (Keyboard::KEY_REPEAT_DELAY_MSEC - KEY_REPEAT_INTERVAL_MSEC);
247252

248253
retVal = TRUE;
249254
break; // exit for key

‎GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ LookAtTranslator::LookAtTranslator() :
137137
m_isRotating(false),
138138
m_isPitching(false),
139139
m_isChangingFOV(false),
140-
m_middleButtonDownTimeMS(0),
140+
m_middleButtonDownTimeMsec(0),
141141
m_lastPlaneID(INVALID_DRAWABLE_ID),
142142
m_lastMouseMoveFrame(0),
143143
m_scrollType(SCROLL_NONE)
@@ -290,7 +290,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
290290
m_anchorAngle = TheTacticalView->getAngle();
291291
m_originalAnchor = msg->getArgument( 0 )->pixel;
292292
m_currentPos = msg->getArgument( 0 )->pixel;
293-
m_middleButtonDownTimeMS = timeGetTime();
293+
m_middleButtonDownTimeMsec = timeGetTime();
294294
break;
295295
}
296296

@@ -299,7 +299,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
299299
{
300300
m_lastMouseMoveFrame = TheGameLogic->getFrame();
301301

302-
const UnsignedInt CLICK_DURATION_MS = 167;
302+
const UnsignedInt CLICK_DURATION_MSEC = 167;
303303
const UnsignedInt PIXEL_OFFSET = 5;
304304

305305
m_isRotating = false;
@@ -308,7 +308,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
308308
Int dy = m_currentPos.y-m_originalAnchor.y;
309309
Bool didMove = dx>PIXEL_OFFSET || dy>PIXEL_OFFSET;
310310
// if middle button is "clicked", reset to "home" orientation
311-
if (!didMove && timeGetTime() - m_middleButtonDownTimeMS < CLICK_DURATION_MS)
311+
if (!didMove && timeGetTime() - m_middleButtonDownTimeMsec < CLICK_DURATION_MSEC)
312312
{
313313
TheTacticalView->setAngleAndPitchToDefault();
314314
TheTacticalView->setZoomToDefault();

0 commit comments

Comments
 (0)