mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-03 17:39:42 +00:00
Code Issues Releases Wiki Activity

Remove redundant Scene::updatePosition function

Browse source
This commit is contained in:
elsid 2022-09-17 00:23:38 +02:00
parent aeb4611d6c
commit feb645d15f
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
3 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw/mwworld/scene.cpp
View file

@ -286,15 +286,6 @@ namespace MWWorld
}
}
void Scene::updateObjectPosition(const Ptr &ptr, const osg::Vec3f &pos, bool movePhysics)
{
mRendering.moveObject(ptr, pos);
if (movePhysics)
{
mPhysics->updatePosition(ptr);
}
}
void Scene::updateObjectRotation(const Ptr &ptr, RotationOrder order)
{
const auto rot = makeNodeRotation(ptr, order);

1
apps/openmw/mwworld/scene.hpp
View file

@ -188,7 +188,6 @@ namespace MWWorld
void updateObjectRotation(const Ptr& ptr, RotationOrder order);
void updateObjectScale(const Ptr& ptr);
void updateObjectPosition(const Ptr &ptr, const osg::Vec3f &pos, bool movePhysics);
bool isCellActive(const CellStore &cell);

5
apps/openmw/mwworld/worldimp.cpp
View file

@ -1260,10 +1260,11 @@ namespace MWWorld
}
if (haveToMove && newPtr.getRefData().getBaseNode())
{
mWorldScene->updateObjectPosition(newPtr, position, movePhysics);
mRendering->moveObject(newPtr, position);
if (movePhysics)
{
if (const auto object = mPhysics->getObject(ptr))
mPhysics->updatePosition(newPtr);
if (const MWPhysics::Object* object = mPhysics->getObject(newPtr))
updateNavigatorObject(*object);
}
}