1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-08 21:16:40 +00:00

Merge branch 'navmesh_agent_half_extents' into 'master'

Define default actor half extents in settings

See merge request OpenMW/openmw!1282
This commit is contained in:
psi29a 2021-10-12 07:01:13 +00:00
commit 444765e304
3 changed files with 15 additions and 2 deletions

View file

@ -135,7 +135,9 @@ namespace MWWorld
: mResourceSystem(resourceSystem), mLocalScripts (mStore), : mResourceSystem(resourceSystem), mLocalScripts (mStore),
mCells (mStore, mEsm), mSky (true), mCells (mStore, mEsm), mSky (true),
mGodMode(false), mScriptsEnabled(true), mDiscardMovements(true), mContentFiles (contentFiles), mGodMode(false), mScriptsEnabled(true), mDiscardMovements(true), mContentFiles (contentFiles),
mUserDataPath(userDataPath), mShouldUpdateNavigator(false), mUserDataPath(userDataPath),
mDefaultHalfExtents(Settings::Manager::getVector3("default actor pathfind half extents", "Game")),
mShouldUpdateNavigator(false),
mActivationDistanceOverride (activationDistanceOverride), mActivationDistanceOverride (activationDistanceOverride),
mStartCell(startCell), mDistanceToFacedObject(-1.f), mTeleportEnabled(true), mStartCell(startCell), mDistanceToFacedObject(-1.f), mTeleportEnabled(true),
mLevitationEnabled(true), mGoToJail(false), mDaysInPrison(0), mLevitationEnabled(true), mGoToJail(false), mDaysInPrison(0),
@ -2471,7 +2473,6 @@ namespace MWWorld
applyLoopingParticles(player); applyLoopingParticles(player);
mDefaultHalfExtents = mPhysics->getOriginalHalfExtents(getPlayerPtr());
mNavigator->addAgent(getPathfindingHalfExtents(getPlayerConstPtr())); mNavigator->addAgent(getPathfindingHalfExtents(getPlayerConstPtr()));
} }

View file

@ -455,3 +455,12 @@ If disabled actors without the ability to swim will not follow other actors to t
Has effect only when Navigator is enabled. Has effect only when Navigator is enabled.
This setting can be controlled in Advanced tab of the launcher. This setting can be controlled in Advanced tab of the launcher.
default actor pathfind half extents
-----------------------------------
:Type: 3D vector floating point
:Range: All components > 0
:Default: 29.27999496459961 28.479997634887695 66.5
Actor half extents used for exterior cells to generate navmesh.

View file

@ -373,6 +373,9 @@ graphic herbalism = true
# (true, false) # (true, false)
allow actors to follow over water surface = true allow actors to follow over water surface = true
# Default size of actor for navmesh generation
default actor pathfind half extents = 29.27999496459961 28.479997634887695 66.5
[General] [General]
# Anisotropy reduces distortion in textures at low angles (e.g. 0 to 16). # Anisotropy reduces distortion in textures at low angles (e.g. 0 to 16).