Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 06:53:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove wrong template from RigidBodyResultCallback function definitions

Browse source
This commit is contained in:
sabrina-shanman 2018-07-23 13:47:02 -07:00
parent 66f355e5ba
commit a3560d1a1b
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/raypick/CollisionPick.cpp
View file

@ -300,7 +300,6 @@ PickResultPointer CollisionPick::getHUDIntersection(const CollisionRegion& pick)
return getDefaultResult(QVariantMap());
}
template <typename T = ObjectMotionState>
RigidBodyFilterResultCallback::RigidBodyFilterResultCallback(const ShapeInfo& shapeInfo, const Transform& transform) :
btCollisionWorld::ContactResultCallback(), collisionObject() {
const btCollisionShape* collisionShape = ObjectMotionState::getShapeManager()->getShape(shapeInfo);
@ -314,12 +313,10 @@ RigidBodyFilterResultCallback::RigidBodyFilterResultCallback(const ShapeInfo& sh
collisionObject.setWorldTransform(bulletTransform);
}
template <typename T = ObjectMotionState>
RigidBodyFilterResultCallback::~RigidBodyFilterResultCallback() {
ObjectMotionState::getShapeManager()->releaseShape(collisionObject.getCollisionShape());
}
template <typename T = ObjectMotionState>
btScalar RigidBodyFilterResultCallback::addSingleResult(btManifoldPoint& cp, const btCollisionObjectWrapper* colObj0, int partId0, int index0, const btCollisionObjectWrapper* colObj1, int partId1, int index1) {
const btCollisionObject* otherBody;
btVector3 point;