mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-25 04:11:33 +00:00
Code Issues Releases Wiki Activity

Use settings values for Physics settings

Browse source
This commit is contained in:
elsid 2023-10-01 10:48:37 +02:00
parent 575f43876b
commit 4a7886816e
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/engine.cpp
View file

@ -105,7 +105,7 @@ namespace
}); });
// the forEachUserStatsValue loop is "run" at compile time, hence the settings manager is not available. // the forEachUserStatsValue loop is "run" at compile time, hence the settings manager is not available.
// Unconditionnally add the async physics stats, and then remove it at runtime if necessary // Unconditionnally add the async physics stats, and then remove it at runtime if necessary
if (Settings::Manager::getInt("async num threads", "Physics") == 0) if (Settings::physics().mAsyncNumThreads == 0)
profiler.removeUserStatsLine(" -Async"); profiler.removeUserStatsLine(" -Async");
} }

10
apps/openmw/mwphysics/mtphysics.cpp
View file

@ -16,8 +16,8 @@
#include "components/debug/debuglog.hpp" #include "components/debug/debuglog.hpp"
#include "components/misc/convert.hpp" #include "components/misc/convert.hpp"
#include "components/settings/settings.hpp"
#include <components/misc/barrier.hpp> #include <components/misc/barrier.hpp>
#include <components/settings/values.hpp>
#include "../mwmechanics/actorutil.hpp" #include "../mwmechanics/actorutil.hpp"
#include "../mwmechanics/creaturestats.hpp" #include "../mwmechanics/creaturestats.hpp"
@ -314,7 +314,7 @@ namespace MWPhysics
LockingPolicy detectLockingPolicy() LockingPolicy detectLockingPolicy()
{ {
if (Settings::Manager::getInt("async num threads", "Physics") < 1) if (Settings::physics().mAsyncNumThreads < 1)
return LockingPolicy::NoLocks; return LockingPolicy::NoLocks;
if (getMaxBulletSupportedThreads() > 1) if (getMaxBulletSupportedThreads() > 1)
return LockingPolicy::AllowSharedLocks; return LockingPolicy::AllowSharedLocks;
@ -331,8 +331,8 @@ namespace MWPhysics
case LockingPolicy::ExclusiveLocksOnly: case LockingPolicy::ExclusiveLocksOnly:
return 1; return 1;
case LockingPolicy::AllowSharedLocks: case LockingPolicy::AllowSharedLocks:
return std::clamp<unsigned>( return static_cast<unsigned>(std::clamp<int>(
Settings::Manager::getInt("async num threads", "Physics"), 0, getMaxBulletSupportedThreads()); Settings::physics().mAsyncNumThreads, 0, static_cast<int>(getMaxBulletSupportedThreads())));
} }
throw std::runtime_error("Unsupported LockingPolicy: " throw std::runtime_error("Unsupported LockingPolicy: "
@ -407,7 +407,7 @@ namespace MWPhysics
, mNumThreads(getNumThreads(mLockingPolicy)) , mNumThreads(getNumThreads(mLockingPolicy))
, mNumJobs(0) , mNumJobs(0)
, mRemainingSteps(0) , mRemainingSteps(0)
, mLOSCacheExpiry(Settings::Manager::getInt("lineofsight keep inactive cache", "Physics")) , mLOSCacheExpiry(Settings::physics().mLineofsightKeepInactiveCache)
, mAdvanceSimulation(false) , mAdvanceSimulation(false)
, mNextJob(0) , mNextJob(0)
, mNextLOS(0) , mNextLOS(0)