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

removed some dependencies

Browse Source
This commit is contained in:
ejcoumans
2008-02-08 23:22:31 +00:00
parent c374217953
commit 7ca3020133
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
View File

@@ -91,14 +91,14 @@ btBvhTriangleMeshShape::~btBvhTriangleMeshShape()
} }
} }
void btBvhTriangleMeshShape::performRaycast (btTriangleRaycastCallback* callback, const btVector3& raySource, const btVector3& rayTarget) void btBvhTriangleMeshShape::performRaycast (btTriangleCallback* callback, const btVector3& raySource, const btVector3& rayTarget)
{ {
struct MyNodeOverlapCallback : public btNodeOverlapCallback struct MyNodeOverlapCallback : public btNodeOverlapCallback
{ {
btStridingMeshInterface* m_meshInterface; btStridingMeshInterface* m_meshInterface;
btTriangleRaycastCallback* m_callback; btTriangleCallback* m_callback;
MyNodeOverlapCallback(btTriangleRaycastCallback* callback,btStridingMeshInterface* meshInterface) MyNodeOverlapCallback(btTriangleCallback* callback,btStridingMeshInterface* meshInterface)
:m_meshInterface(meshInterface), :m_meshInterface(meshInterface),
m_callback(callback) m_callback(callback)
{ {
@@ -151,14 +151,14 @@ void btBvhTriangleMeshShape::performRaycast (btTriangleRaycastCallback* callback
m_bvh->reportRayOverlappingNodex(&myNodeCallback,raySource,rayTarget); m_bvh->reportRayOverlappingNodex(&myNodeCallback,raySource,rayTarget);
} }
void btBvhTriangleMeshShape::performConvexcast (btTriangleConvexcastCallback* callback, const btVector3& raySource, const btVector3& rayTarget, const btVector3& aabbMin, const btVector3& aabbMax) void btBvhTriangleMeshShape::performConvexcast (btTriangleCallback* callback, const btVector3& raySource, const btVector3& rayTarget, const btVector3& aabbMin, const btVector3& aabbMax)
{ {
struct MyNodeOverlapCallback : public btNodeOverlapCallback struct MyNodeOverlapCallback : public btNodeOverlapCallback
{ {
btStridingMeshInterface* m_meshInterface; btStridingMeshInterface* m_meshInterface;
btTriangleConvexcastCallback* m_callback; btTriangleCallback* m_callback;
MyNodeOverlapCallback(btTriangleConvexcastCallback* callback,btStridingMeshInterface* meshInterface) MyNodeOverlapCallback(btTriangleCallback* callback,btStridingMeshInterface* meshInterface)
:m_meshInterface(meshInterface), :m_meshInterface(meshInterface),
m_callback(callback) m_callback(callback)
{ {

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

@@ -19,7 +19,7 @@ subject to the following restrictions:
#include "btTriangleMeshShape.h" #include "btTriangleMeshShape.h"
#include "btOptimizedBvh.h" #include "btOptimizedBvh.h"
#include "LinearMath/btAlignedAllocator.h" #include "LinearMath/btAlignedAllocator.h"
#include "BulletCollision/NarrowPhaseCollision/btRaycastCallback.h"
///Bvh Concave triangle mesh is a static-triangle mesh shape with Bounding Volume Hierarchy optimization. ///Bvh Concave triangle mesh is a static-triangle mesh shape with Bounding Volume Hierarchy optimization.
///Uses an interface to access the triangles to allow for sharing graphics/physics triangles. ///Uses an interface to access the triangles to allow for sharing graphics/physics triangles.
@@ -48,8 +48,8 @@ public:
return TRIANGLE_MESH_SHAPE_PROXYTYPE; return TRIANGLE_MESH_SHAPE_PROXYTYPE;
} }
void performRaycast (btTriangleRaycastCallback* callback, const btVector3& raySource, const btVector3& rayTarget); void performRaycast (btTriangleCallback* 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 (btTriangleCallback* callback, const btVector3& boxSource, const btVector3& boxTarget, const btVector3& boxMin, const btVector3& boxMax);
virtual void processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const; virtual void processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const;

1
src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
View File

@@ -17,7 +17,6 @@ subject to the following restrictions:
#include "BulletCollision/CollisionShapes/btConvexShape.h" #include "BulletCollision/CollisionShapes/btConvexShape.h"
#include "BulletCollision/CollisionShapes/btTriangleShape.h" #include "BulletCollision/CollisionShapes/btTriangleShape.h"
#include "BulletCollision/CollisionDispatch/btCollisionWorld.h"
#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h" #include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
#include "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h" #include "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h"
#include "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h" #include "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h"