mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 17:11:33 +00:00
Code Issues Releases Wiki Activity

Use unique_ptr to avoid possible memory leak

Browse source
This commit is contained in:
elsid 2021-10-30 03:38:38 +02:00
parent 8e71c246bf
commit ed5a4e195b
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
components/resource/bulletshapemanager.cpp
View file

@ -83,7 +83,8 @@ public:
return osg::ref_ptr<BulletShape>(); return osg::ref_ptr<BulletShape>();
osg::ref_ptr<BulletShape> shape (new BulletShape); osg::ref_ptr<BulletShape> shape (new BulletShape);
btBvhTriangleMeshShape* triangleMeshShape = new TriangleMeshShape(mTriangleMesh.release(), true);
auto triangleMeshShape = std::make_unique<TriangleMeshShape>(mTriangleMesh.release(), true);
btVector3 aabbMin = triangleMeshShape->getLocalAabbMin(); btVector3 aabbMin = triangleMeshShape->getLocalAabbMin();
btVector3 aabbMax = triangleMeshShape->getLocalAabbMax(); btVector3 aabbMax = triangleMeshShape->getLocalAabbMax();
shape->mCollisionBox.mExtents[0] = (aabbMax[0] - aabbMin[0]) / 2.0f; shape->mCollisionBox.mExtents[0] = (aabbMax[0] - aabbMin[0]) / 2.0f;
@ -92,7 +93,7 @@ public:
shape->mCollisionBox.mCenter = osg::Vec3f( (aabbMax[0] + aabbMin[0]) / 2.0f, shape->mCollisionBox.mCenter = osg::Vec3f( (aabbMax[0] + aabbMin[0]) / 2.0f,
(aabbMax[1] + aabbMin[1]) / 2.0f, (aabbMax[1] + aabbMin[1]) / 2.0f,
(aabbMax[2] + aabbMin[2]) / 2.0f ); (aabbMax[2] + aabbMin[2]) / 2.0f );
shape->mCollisionShape.reset(triangleMeshShape); shape->mCollisionShape.reset(triangleMeshShape.release());
return shape; return shape;
} }