mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 01:15:34 +00:00
Code Issues Releases Wiki Activity

Revert "Merge branch 'sceneleak' into 'master'"

Browse source 
This reverts merge request !3715
This commit is contained in:
Alexei Kotov 2024-01-08 20:04:20 +00:00
parent 97dee00263
commit caf5859fbe
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwphysics/actor.cpp
View file

@ -102,11 +102,7 @@ namespace MWPhysics
updateScaleUnsafe(); updateScaleUnsafe();
if (!mRotationallyInvariant) if (!mRotationallyInvariant)
{ mRotation = mPtr.getRefData().getBaseNode()->getAttitude();
const SceneUtil::PositionAttitudeTransform* baseNode = mPtr.getRefData().getBaseNode();
if (baseNode)
mRotation = baseNode->getAttitude();
}
addCollisionMask(getCollisionMask()); addCollisionMask(getCollisionMask());
updateCollisionObjectPositionUnsafe(); updateCollisionObjectPositionUnsafe();

3
apps/openmw/mwphysics/object.cpp
View file

@ -110,9 +110,6 @@ namespace MWPhysics
if (mShapeInstance->mAnimatedShapes.empty()) if (mShapeInstance->mAnimatedShapes.empty())
return false; return false;
if (!mPtr.getRefData().getBaseNode())
return false;
assert(mShapeInstance->mCollisionShape->isCompound()); assert(mShapeInstance->mCollisionShape->isCompound());
btCompoundShape* compound = static_cast<btCompoundShape*>(mShapeInstance->mCollisionShape.get()); btCompoundShape* compound = static_cast<btCompoundShape*>(mShapeInstance->mCollisionShape.get());

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

@ -115,7 +115,9 @@ namespace
if (!refnum.hasContentFile() || !std::binary_search(pagedRefs.begin(), pagedRefs.end(), refnum)) if (!refnum.hasContentFile() || !std::binary_search(pagedRefs.begin(), pagedRefs.end(), refnum))
ptr.getClass().insertObjectRendering(ptr, model, rendering); ptr.getClass().insertObjectRendering(ptr, model, rendering);
else else
ptr.getRefData().setBaseNode(nullptr); ptr.getRefData().setBaseNode(
new SceneUtil::PositionAttitudeTransform); // FIXME remove this when physics code is fixed not to depend
// on basenode
setNodeRotation(ptr, rendering, rotation); setNodeRotation(ptr, rendering, rotation);
if (ptr.getClass().useAnim()) if (ptr.getClass().useAnim())