From f03360b66641cbb572b72641b5d57c108b902717 Mon Sep 17 00:00:00 2001 From: elsid Date: Fri, 6 May 2022 20:12:17 +0200 Subject: [PATCH] Move RenderingManager::update call to World::update There is no need to do that in Scene::update and pass paused argument there. --- apps/openmw/mwworld/scene.cpp | 4 +--- apps/openmw/mwworld/scene.hpp | 2 +- apps/openmw/mwworld/worldimp.cpp | 4 +++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp index f24316045b..98bfc514ed 100644 --- a/apps/openmw/mwworld/scene.cpp +++ b/apps/openmw/mwworld/scene.cpp @@ -295,7 +295,7 @@ namespace MWWorld mPhysics->updateScale(ptr); } - void Scene::update (float duration, bool paused) + void Scene::update(float duration) { if (mChangeCellGridRequest.has_value()) { @@ -306,8 +306,6 @@ namespace MWWorld mPreloader->updateCache(mRendering.getReferenceTime()); preloadCells(duration); - - mRendering.update (duration, paused); } void Scene::unloadCell(CellStore* cell) diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp index 464088f223..371c3cbbc5 100644 --- a/apps/openmw/mwworld/scene.hpp +++ b/apps/openmw/mwworld/scene.hpp @@ -164,7 +164,7 @@ namespace MWWorld void markCellAsUnchanged(); - void update (float duration, bool paused); + void update(float duration); void addObjectToScene (const Ptr& ptr); ///< Add an object that already exists in the world model to the scene. diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index ff343e0828..1ba27ac8b6 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -1849,7 +1849,9 @@ namespace MWWorld mPhysics->debugDraw(); - mWorldScene->update (duration, paused); + mWorldScene->update(duration); + + mRendering->update(duration, paused); updateSoundListener();