Skip to content

Commit 57e97f5

Browse files
committed
perf(input): Reuse timeGetTime value in middle mouse button handlers
1 parent 5b9176e commit 57e97f5

File tree

2 files changed

+12
-8
lines changed
  • GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream
  • Generals/Code/GameEngine/Source/GameClient/MessageStream

2 files changed

+12
-8
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,21 +288,23 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
288288
//-----------------------------------------------------------------------------
289289
case GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_DOWN:
290290
{
291-
m_lastMouseMoveTimeMsec = timeGetTime();
291+
UnsignedInt now = timeGetTime();
292+
m_lastMouseMoveTimeMsec = now;
292293

293294
m_isRotating = true;
294295
m_anchor = msg->getArgument( 0 )->pixel;
295296
m_anchorAngle = TheTacticalView->getAngle();
296297
m_originalAnchor = msg->getArgument( 0 )->pixel;
297298
m_currentPos = msg->getArgument( 0 )->pixel;
298-
m_middleButtonDownTimeMsec = timeGetTime();
299+
m_middleButtonDownTimeMsec = now;
299300
break;
300301
}
301302

302303
//-----------------------------------------------------------------------------
303304
case GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_UP:
304305
{
305-
m_lastMouseMoveTimeMsec = timeGetTime();
306+
UnsignedInt now = timeGetTime();
307+
m_lastMouseMoveTimeMsec = now;
306308

307309
const UnsignedInt CLICK_DURATION_MSEC = 167;
308310
const UnsignedInt PIXEL_OFFSET = 5;
@@ -313,7 +315,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
313315
Int dy = m_currentPos.y-m_originalAnchor.y;
314316
Bool didMove = dx>PIXEL_OFFSET || dy>PIXEL_OFFSET;
315317
// if middle button is "clicked", reset to "home" orientation
316-
if (!didMove && timeGetTime() - m_middleButtonDownTimeMsec < CLICK_DURATION_MSEC)
318+
if (!didMove && now - m_middleButtonDownTimeMsec < CLICK_DURATION_MSEC)
317319
{
318320
TheTacticalView->setAngleAndPitchToDefault();
319321
TheTacticalView->setZoomToDefault();

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,21 +287,23 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
287287
//-----------------------------------------------------------------------------
288288
case GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_DOWN:
289289
{
290-
m_lastMouseMoveTimeMsec = timeGetTime();
290+
UnsignedInt now = timeGetTime();
291+
m_lastMouseMoveTimeMsec = now;
291292

292293
m_isRotating = true;
293294
m_anchor = msg->getArgument( 0 )->pixel;
294295
m_anchorAngle = TheTacticalView->getAngle();
295296
m_originalAnchor = msg->getArgument( 0 )->pixel;
296297
m_currentPos = msg->getArgument( 0 )->pixel;
297-
m_middleButtonDownTimeMsec = timeGetTime();
298+
m_middleButtonDownTimeMsec = now;
298299
break;
299300
}
300301

301302
//-----------------------------------------------------------------------------
302303
case GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_UP:
303304
{
304-
m_lastMouseMoveTimeMsec = timeGetTime();
305+
UnsignedInt now = timeGetTime();
306+
m_lastMouseMoveTimeMsec = now;
305307

306308
const UnsignedInt CLICK_DURATION_MSEC = 167;
307309
const UnsignedInt PIXEL_OFFSET = 5;
@@ -312,7 +314,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
312314
Int dy = m_currentPos.y-m_originalAnchor.y;
313315
Bool didMove = dx>PIXEL_OFFSET || dy>PIXEL_OFFSET;
314316
// if middle button is "clicked", reset to "home" orientation
315-
if (!didMove && timeGetTime() - m_middleButtonDownTimeMsec < CLICK_DURATION_MSEC)
317+
if (!didMove && now - m_middleButtonDownTimeMsec < CLICK_DURATION_MSEC)
316318
{
317319
TheTacticalView->setAngleAndPitchToDefault();
318320
TheTacticalView->setZoomToDefault();

0 commit comments

Comments
 (0)