Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 17:35:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add CollisionInfo::getShapePairKey()

Browse source
This commit is contained in:
Andrew Meadows 2014-07-30 13:11:45 -07:00
parent 176d8d157d
commit f579d2a0e2
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/shared/src/CollisionInfo.cpp
View file

@ -26,6 +26,16 @@ CollisionInfo::CollisionInfo() :
_addedVelocity(0.f) { _addedVelocity(0.f) {
} }
quint64 CollisionInfo::getShapePairKey() const {
if (_shapeB == NULL || _shapeA == NULL) {
// zero is an invalid key
return 0;
}
quint32 idA = _shapeA->getID();
quint32 idB = _shapeB->getID();
return idA < idB ? ((quint64)idA << 32) + (quint64)idB : ((quint64)idB << 32) + (quint64)idA;
}
CollisionList::CollisionList(int maxSize) : CollisionList::CollisionList(int maxSize) :
_maxSize(maxSize), _maxSize(maxSize),
_size(0) { _size(0) {

4
libraries/shared/src/CollisionInfo.h
View file

@ -15,6 +15,7 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/quaternion.hpp> #include <glm/gtc/quaternion.hpp>
#include <QtGlobal>
#include <QVector> #include <QVector>
class Shape; class Shape;
@ -47,6 +48,9 @@ public:
Shape* getShapeA() const { return const_cast<Shape*>(_shapeA); } Shape* getShapeA() const { return const_cast<Shape*>(_shapeA); }
Shape* getShapeB() const { return const_cast<Shape*>(_shapeB); } Shape* getShapeB() const { return const_cast<Shape*>(_shapeB); }
/// \return unique key for shape pair
quint64 getShapePairKey() const;
const Shape* _shapeA; // pointer to shapeA in this collision const Shape* _shapeA; // pointer to shapeA in this collision
const Shape* _shapeB; // pointer to shapeB in this collision const Shape* _shapeB; // pointer to shapeB in this collision