mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-10 06:44:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'no_more_twerking_pls' into 'master'

Browse Source 
Heavily mitigate jittery objects far from origin

See merge request OpenMW/openmw!1540
This commit is contained in:
psi29a 2022-01-06 22:01:28 +00:00
commit 69319cea31
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/openmw/mwphysics/ptrholder.hpp
View File

@ -4,6 +4,8 @@
#include <mutex> #include <mutex>
#include <memory> #include <memory>
#include <osg/Vec3d>
#include <BulletCollision/CollisionDispatch/btCollisionObject.h> #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
#include "../mwworld/ptr.hpp" #include "../mwworld/ptr.hpp"
@ -56,12 +58,12 @@ namespace MWPhysics
mPosition = position; mPosition = position;
} }
osg::Vec3f getPosition() const osg::Vec3d getPosition() const
{ {
return mPosition; return mPosition;
} }
osg::Vec3f getPreviousPosition() const osg::Vec3d getPreviousPosition() const
{ {
return mPreviousPosition; return mPreviousPosition;
} }
@ -71,8 +73,8 @@ namespace MWPhysics
std::unique_ptr<btCollisionObject> mCollisionObject; std::unique_ptr<btCollisionObject> mCollisionObject;
osg::Vec3f mVelocity; osg::Vec3f mVelocity;
osg::Vec3f mSimulationPosition; osg::Vec3f mSimulationPosition;
osg::Vec3f mPosition; osg::Vec3d mPosition;
osg::Vec3f mPreviousPosition; osg::Vec3d mPreviousPosition;
}; };
} }