mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 12:39:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'skip_async' into 'master'

Browse Source 
Don't put player in the air after going out of tcl

See merge request OpenMW/openmw!1009
This commit is contained in:
psi29a 2021-07-16 07:50:26 +00:00
commit 6d08a1d731
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwphysics/actor.cpp
View File

@ -124,11 +124,13 @@ void Actor::updatePosition()
mPositionOffset = osg::Vec3f(); mPositionOffset = osg::Vec3f();
mStandingOnPtr = nullptr; mStandingOnPtr = nullptr;
mSkipCollisions = true; mSkipCollisions = true;
mSkipSimulation = true;
} }
void Actor::setSimulationPosition(const osg::Vec3f& position) void Actor::setSimulationPosition(const osg::Vec3f& position)
{ {
mSimulationPosition = position; if (!std::exchange(mSkipSimulation, false))
mSimulationPosition = position;
} }
osg::Vec3f Actor::getSimulationPosition() const osg::Vec3f Actor::getSimulationPosition() const

1
apps/openmw/mwphysics/actor.hpp
View File

@ -204,6 +204,7 @@ namespace MWPhysics
osg::Vec3f mVelocity; osg::Vec3f mVelocity;
bool mWorldPositionChanged; bool mWorldPositionChanged;
bool mSkipCollisions; bool mSkipCollisions;
bool mSkipSimulation;
btTransform mLocalTransform; btTransform mLocalTransform;
mutable std::mutex mPositionMutex; mutable std::mutex mPositionMutex;