Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 330 vs 331 for /trunk/Source Code/Core/ApplicationTimer.cpp

Diff revisions: vs.
  @@ -68,9 +68,10 @@
68 68
69 69 void ApplicationTimer::removeTimer(ProfileTimer* const timer) {
70 70 const stringImpl& timerName = timer->name();
71 - _profileTimers.erase(std::remove_if(_profileTimers.begin(), _profileTimers.end(), [&timerName](ProfileTimer* tTimer)->bool {
72 - return tTimer->name().compare(timerName) == 0;
73 - }),
71 + _profileTimers.erase(std::remove_if(_profileTimers.begin(), _profileTimers.end(),
72 + [&timerName](ProfileTimer* tTimer)->bool {
73 + return tTimer->name().compare(timerName) == 0;
74 + }),
74 75 _profileTimers.end());
75 76 }
76 77
  @@ -124,7 +125,8 @@
124 125 LI currentTicks = getCurrentTicksInternal();
125 126 _elapsedTimeUs = getElapsedTimeInternal(currentTicks);
126 127
127 - _speedfactor = static_cast<F32>((currentTicks.QuadPart - _frameDelay.QuadPart) / (_ticksPerSecond.QuadPart / static_cast<F32>(_targetFrameRate)));
128 + _speedfactor = static_cast<F32>((currentTicks.QuadPart - _frameDelay.QuadPart) /
129 + (_ticksPerSecond.QuadPart / static_cast<F32>(_targetFrameRate)));
128 130 _frameDelay = currentTicks;
129 131
130 132 if (_speedfactor <= 0.0f) {