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

Don't mess around with btEmptyShape. Use nullptr instead.

Browse source
This commit is contained in:
unelsson 2023-03-28 23:54:26 +03:00
parent e19a3e07aa
commit 3d4da02b18
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
components/resource/bulletshapemanager.cpp
View file

@ -7,7 +7,6 @@
#include <osg/Transform> #include <osg/Transform>
#include <osg/TriangleFunctor> #include <osg/TriangleFunctor>
#include <BulletCollision/CollisionShapes/btEmptyShape.h>
#include <BulletCollision/CollisionShapes/btTriangleMesh.h> #include <BulletCollision/CollisionShapes/btTriangleMesh.h>
#include <components/misc/osguservalues.hpp> #include <components/misc/osguservalues.hpp>
@ -75,22 +74,9 @@ namespace Resource
osg::ref_ptr<BulletShape> getShape() osg::ref_ptr<BulletShape> getShape()
{ {
if (!mTriangleMesh) if (!mTriangleMesh || mTriangleMesh->getNumTriangles() == 0)
return osg::ref_ptr<BulletShape>(); return osg::ref_ptr<BulletShape>();
if (mTriangleMesh->getNumTriangles() == 0)
{
osg::ref_ptr<BulletShape> shape(new BulletShape);
mTriangleMesh.reset(nullptr);
auto emptyShape = std::make_unique<btEmptyShape>();
shape->mCollisionBox.mExtents[0] = 0.0f;
shape->mCollisionBox.mExtents[1] = 0.0f;
shape->mCollisionBox.mExtents[2] = 0.0f;
shape->mCollisionBox.mCenter = osg::Vec3f(0, 0, 0);
shape->mCollisionShape.reset(emptyShape.release());
return shape;
}
osg::ref_ptr<BulletShape> shape(new BulletShape); osg::ref_ptr<BulletShape> shape(new BulletShape);
auto triangleMeshShape = std::make_unique<TriangleMeshShape>(mTriangleMesh.release(), true); auto triangleMeshShape = std::make_unique<TriangleMeshShape>(mTriangleMesh.release(), true);