mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-04 06:19:40 +00:00
Code Issues 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

(cherry picked from commit 6d08a1d7318ae076839738d173b884fcc7b1a348)

6ad2cf8e Skip simulation result after calling Actor::updatePosition(). Otherwise
This commit is contained in:
psi29a 2021-07-16 07:50:26 +00:00
parent d1c0cfa524
commit 59da0a0da9
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();
mStandingOnPtr = nullptr;
mSkipCollisions = true;
mSkipSimulation = true;
}
void Actor::setSimulationPosition(const osg::Vec3f& position)
{
mSimulationPosition = position;
if (!std::exchange(mSkipSimulation, false))
mSimulationPosition = position;
}
osg::Vec3f Actor::getSimulationPosition() const

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

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