Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup ShapeManager API and fix bitrot in tests

Browse source
This commit is contained in:
Andrew Meadows 2016-03-22 11:41:45 -07:00
parent a52ac3cc50
commit 119ef24d5d
5 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/physics/src/ShapeManager.cpp
View file

@ -58,7 +58,7 @@ btCollisionShape* ShapeManager::getShape(const ShapeInfo& info) {
}
// private helper method
bool ShapeManager::releaseShape(const DoubleHashKey& key) {
bool ShapeManager::releaseShapeByKey(const DoubleHashKey& key) {
ShapeReference* shapeRef = _shapeMap.find(key);
if (shapeRef) {
if (shapeRef->refCount > 0) {
@ -82,16 +82,12 @@ bool ShapeManager::releaseShape(const DoubleHashKey& key) {
return false;
}
bool ShapeManager::releaseShape(const ShapeInfo& info) {
return releaseShape(info.getHash());
}
bool ShapeManager::releaseShape(const btCollisionShape* shape) {
int numShapes = _shapeMap.size();
for (int i = 0; i < numShapes; ++i) {
ShapeReference* shapeRef = _shapeMap.getAtIndex(i);
if (shape == shapeRef->shape) {
return releaseShape(shapeRef->key);
return releaseShapeByKey(shapeRef->key);
}
}
return false;

5
libraries/physics/src/ShapeManager.h
View file

@ -29,7 +29,6 @@ public:
btCollisionShape* getShape(const ShapeInfo& info);
/// \return true if shape was found and released
bool releaseShape(const ShapeInfo& info);
bool releaseShape(const btCollisionShape* shape);
/// delete shapes that have zero references
@ -39,10 +38,10 @@ public:
int getNumShapes() const { return _shapeMap.size(); }
int getNumReferences(const ShapeInfo& info) const;
int getNumReferences(const btCollisionShape* shape) const;
bool hasShape(const btCollisionShape* shape) const;
bool hasShape(const btCollisionShape* shape) const;
private:
bool releaseShape(const DoubleHashKey& key);
bool releaseShapeByKey(const DoubleHashKey& key);
struct ShapeReference {
int refCount;

2
tests/physics/src/BulletTestUtils.h
View file

@ -14,6 +14,8 @@
#include <BulletUtil.h>
#include <functional>
// Implements functionality in QTestExtensions.h for glm types
// There are 3 functions in here (which need to be defined for all types that use them):
//

8
tests/physics/src/ShapeManagerTests.cpp
View file

@ -21,7 +21,7 @@ void ShapeManagerTests::testShapeAccounting() {
ShapeManager shapeManager;
ShapeInfo info;
info.setBox(glm::vec3(1.0f, 1.0f, 1.0f));
int numReferences = shapeManager.getNumReferences(info);
QCOMPARE(numReferences, 0);
@ -42,10 +42,10 @@ void ShapeManagerTests::testShapeAccounting() {
QCOMPARE(numReferences, expectedNumReferences);
// release all references
bool released = shapeManager.releaseShape(info);
bool released = shapeManager.releaseShape(shape);
numReferences--;
while (numReferences > 0) {
released = shapeManager.releaseShape(info) && released;
released = shapeManager.releaseShape(shape) && released;
numReferences--;
}
QCOMPARE(released, true);
@ -69,7 +69,7 @@ void ShapeManagerTests::testShapeAccounting() {
QCOMPARE(numReferences, 1);
// release reference and verify that it is collected as garbage
released = shapeManager.releaseShape(info);
released = shapeManager.releaseShape(shape);
shapeManager.collectGarbage();
QCOMPARE(shapeManager.getNumShapes(), 0);
QCOMPARE(shapeManager.hasShape(shape), false);

2
tests/physics/src/ShapeManagerTests.h
View file

@ -16,7 +16,7 @@
class ShapeManagerTests : public QObject {
Q_OBJECT
private slots:
void testShapeAccounting();
void addManyShapes();