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

This reverts merge request !3715
revert-c3c8fa1e
Alexei Kotov 4 months ago
parent 97dee00263
commit caf5859fbe

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

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

@ -115,7 +115,9 @@ namespace
if (!refnum.hasContentFile() || !std::binary_search(pagedRefs.begin(), pagedRefs.end(), refnum))
ptr.getClass().insertObjectRendering(ptr, model, rendering);
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);
if (ptr.getClass().useAnim())

Loading…
Cancel
Save