Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor fixes, only btBvhTriangleMeshShape should provide getShapeType(), add get methods for motor limits in btHingeConstraint.

Browse Source
This commit is contained in:
ejcoumans
2007-12-06 01:41:07 +00:00
parent 1245995c84
commit d53f2875e5
5 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
View File

@@ -43,15 +43,11 @@ public:
virtual ~btBvhTriangleMeshShape(); virtual ~btBvhTriangleMeshShape();
/*
virtual int getShapeType() const virtual int getShapeType() const
{ {
return TRIANGLE_MESH_SHAPE_PROXYTYPE; return TRIANGLE_MESH_SHAPE_PROXYTYPE;
} }
*/
void performRaycast (btTriangleRaycastCallback* callback, const btVector3& raySource, const btVector3& rayTarget); void performRaycast (btTriangleRaycastCallback* callback, const btVector3& raySource, const btVector3& rayTarget);
void performConvexcast (btTriangleConvexcastCallback* callback, const btVector3& boxSource, const btVector3& boxTarget, const btVector3& boxMin, const btVector3& boxMax); void performConvexcast (btTriangleConvexcastCallback* callback, const btVector3& boxSource, const btVector3& boxTarget, const btVector3& boxMin, const btVector3& boxMax);

4
src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
View File

@@ -1211,7 +1211,7 @@ bool btOptimizedBvh::serialize(void *o_alignedDataBuffer, unsigned i_dataBufferS
return true; return true;
} }
btOptimizedBvh *btOptimizedBvh::deSerializeInPlace(void *i_alignedDataBuffer, unsigned i_dataBufferSize, bool i_swapEndian) btOptimizedBvh *btOptimizedBvh::deSerializeInPlace(void *i_alignedDataBuffer, unsigned int i_dataBufferSize, bool i_swapEndian)
{ {
if (i_alignedDataBuffer == NULL)// || (((unsigned)i_alignedDataBuffer & BVH_ALIGNMENT_MASK) != 0)) if (i_alignedDataBuffer == NULL)// || (((unsigned)i_alignedDataBuffer & BVH_ALIGNMENT_MASK) != 0))
@@ -1232,7 +1232,7 @@ btOptimizedBvh *btOptimizedBvh::deSerializeInPlace(void *i_alignedDataBuffer, un
bvh->m_subtreeHeaderCount = btSwapEndian(bvh->m_subtreeHeaderCount); bvh->m_subtreeHeaderCount = btSwapEndian(bvh->m_subtreeHeaderCount);
} }
int calculatedBufSize = bvh->calculateSerializeBufferSize(); unsigned int calculatedBufSize = bvh->calculateSerializeBufferSize();
btAssert(calculatedBufSize <= i_dataBufferSize); btAssert(calculatedBufSize <= i_dataBufferSize);
if (calculatedBufSize > i_dataBufferSize) if (calculatedBufSize > i_dataBufferSize)

2
src/BulletCollision/CollisionShapes/btOptimizedBvh.h
View File

@@ -381,7 +381,7 @@ public:
bool serialize(void *o_alignedDataBuffer, unsigned i_dataBufferSize, bool i_swapEndian); bool serialize(void *o_alignedDataBuffer, unsigned i_dataBufferSize, bool i_swapEndian);
///deSerializeInPlace loads and initializes a BVH from a buffer in memory 'in place' ///deSerializeInPlace loads and initializes a BVH from a buffer in memory 'in place'
static btOptimizedBvh *deSerializeInPlace(void *i_alignedDataBuffer, unsigned i_dataBufferSize, bool i_swapEndian); static btOptimizedBvh *deSerializeInPlace(void *i_alignedDataBuffer, unsigned int i_dataBufferSize, bool i_swapEndian);
static unsigned int getAlignmentSerializationPadding(); static unsigned int getAlignmentSerializationPadding();

5
src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
View File

@@ -46,11 +46,6 @@ public:
void recalcLocalAabb(); void recalcLocalAabb();
virtual int getShapeType() const
{
return TRIANGLE_MESH_SHAPE_PROXYTYPE;
}
virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const; virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
virtual void processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const; virtual void processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const;

11
src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
View File

@@ -109,6 +109,17 @@ public:
} }
btScalar getLowerLimit() const
{
return m_lowerLimit;
}
btScalar getUpperLimit() const
{
return m_upperLimit;
}
btScalar getHingeAngle(); btScalar getHingeAngle();