mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-03 20:39:40 +00:00
Code Issues Releases Wiki Activity

Merge branch 'profiler_fix' into 'master'

Browse source 
Fix profiler glitches (#5850)

See merge request OpenMW/openmw!605
This commit is contained in:
elsid 2021-02-15 00:01:06 +00:00
commit 561628087c
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwworld/worldimp.cpp
View file

@ -1867,6 +1867,13 @@ namespace MWWorld
{ {
doPhysics (duration, frameStart, frameNumber, stats); doPhysics (duration, frameStart, frameNumber, stats);
} }
else
{
// zero the async stats if we are paused
stats.setAttribute(frameNumber, "physicsworker_time_begin", 0);
stats.setAttribute(frameNumber, "physicsworker_time_taken", 0);
stats.setAttribute(frameNumber, "physicsworker_time_end", 0);
}
} }
void World::updatePlayer() void World::updatePlayer()

2
components/resource/stats.cpp
View file

@ -127,7 +127,7 @@ bool Profiler::handle(const osgGA::GUIEventAdapter &ea, osgGA::GUIActionAdapter
if (viewer) if (viewer)
{ {
// Add/remove openmw stats to the osd as necessary // Add/remove openmw stats to the osd as necessary
viewer->getViewerStats()->collectStats("engine", _statsType == StatsHandler::StatsType::VIEWER_STATS); viewer->getViewerStats()->collectStats("engine", _statsType >= StatsHandler::StatsType::VIEWER_STATS);
if (_offlineCollect) if (_offlineCollect)
CollectStatistics(viewer); CollectStatistics(viewer);