move constructor for abstract class in protected
This commit is contained in:
@@ -41,6 +41,10 @@ struct btBroadphaseRayCallback : public btBroadphaseAabbCallback
|
|||||||
btScalar m_lambda_max;
|
btScalar m_lambda_max;
|
||||||
|
|
||||||
virtual ~btBroadphaseRayCallback() {}
|
virtual ~btBroadphaseRayCallback() {}
|
||||||
|
|
||||||
|
protected:
|
||||||
|
|
||||||
|
btBroadphaseRayCallback() {}
|
||||||
};
|
};
|
||||||
|
|
||||||
#include "LinearMath/btVector3.h"
|
#include "LinearMath/btVector3.h"
|
||||||
|
|||||||
@@ -23,6 +23,9 @@ struct btBroadphasePair;
|
|||||||
///The btOverlappingPairCallback class is an additional optional broadphase user callback for adding/removing overlapping pairs, similar interface to btOverlappingPairCache.
|
///The btOverlappingPairCallback class is an additional optional broadphase user callback for adding/removing overlapping pairs, similar interface to btOverlappingPairCache.
|
||||||
class btOverlappingPairCallback
|
class btOverlappingPairCallback
|
||||||
{
|
{
|
||||||
|
protected:
|
||||||
|
btOverlappingPairCallback() {}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
virtual ~btOverlappingPairCallback()
|
virtual ~btOverlappingPairCallback()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -24,12 +24,13 @@ class btActivatingCollisionAlgorithm : public btCollisionAlgorithm
|
|||||||
// btCollisionObject* m_colObj0;
|
// btCollisionObject* m_colObj0;
|
||||||
// btCollisionObject* m_colObj1;
|
// btCollisionObject* m_colObj1;
|
||||||
|
|
||||||
public:
|
protected:
|
||||||
|
|
||||||
btActivatingCollisionAlgorithm (const btCollisionAlgorithmConstructionInfo& ci);
|
btActivatingCollisionAlgorithm (const btCollisionAlgorithmConstructionInfo& ci);
|
||||||
|
|
||||||
btActivatingCollisionAlgorithm (const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap);
|
btActivatingCollisionAlgorithm (const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap);
|
||||||
|
|
||||||
|
public:
|
||||||
virtual ~btActivatingCollisionAlgorithm();
|
virtual ~btActivatingCollisionAlgorithm();
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -93,10 +93,12 @@ protected:
|
|||||||
aabbMax = m_localAabbMax;
|
aabbMax = m_localAabbMax;
|
||||||
}
|
}
|
||||||
|
|
||||||
public:
|
protected:
|
||||||
|
|
||||||
btPolyhedralConvexAabbCachingShape();
|
btPolyhedralConvexAabbCachingShape();
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
inline void getNonvirtualAabb(const btTransform& trans,btVector3& aabbMin,btVector3& aabbMax, btScalar margin) const
|
inline void getNonvirtualAabb(const btTransform& trans,btVector3& aabbMin,btVector3& aabbMax, btScalar margin) const
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -67,10 +67,12 @@ struct btStorageResult : public btDiscreteCollisionDetectorInterface::Result
|
|||||||
btVector3 m_closestPointInB;
|
btVector3 m_closestPointInB;
|
||||||
btScalar m_distance; //negative means penetration !
|
btScalar m_distance; //negative means penetration !
|
||||||
|
|
||||||
|
protected:
|
||||||
btStorageResult() : m_distance(btScalar(BT_LARGE_FLOAT))
|
btStorageResult() : m_distance(btScalar(BT_LARGE_FLOAT))
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public:
|
||||||
virtual ~btStorageResult() {};
|
virtual ~btStorageResult() {};
|
||||||
|
|
||||||
virtual void addContactPoint(const btVector3& normalOnBInWorld,const btVector3& pointInWorld,btScalar depth)
|
virtual void addContactPoint(const btVector3& normalOnBInWorld,const btVector3& pointInWorld,btScalar depth)
|
||||||
|
|||||||
@@ -28,11 +28,13 @@ protected:
|
|||||||
|
|
||||||
btPersistentManifold m_contactManifold;
|
btPersistentManifold m_contactManifold;
|
||||||
|
|
||||||
public:
|
protected:
|
||||||
|
|
||||||
|
|
||||||
btContactConstraint(btPersistentManifold* contactManifold,btRigidBody& rbA,btRigidBody& rbB);
|
btContactConstraint(btPersistentManifold* contactManifold,btRigidBody& rbA,btRigidBody& rbB);
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
void setContactManifold(btPersistentManifold* contactManifold);
|
void setContactManifold(btPersistentManifold* contactManifold);
|
||||||
|
|
||||||
btPersistentManifold* getContactManifold()
|
btPersistentManifold* getContactManifold()
|
||||||
|
|||||||
Reference in New Issue
Block a user