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

expose the SphereTriangleDetector::collide method

Browse Source 
cmake build tweaks: only compile BlenderSerialize if necessary
This commit is contained in:
erwin.coumans
2010-02-24 19:27:24 +00:00
parent 6de5799d5d
commit 5a6afb2b8d
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Extras/Serialize/CMakeLists.txt
View File

@@ -1,11 +1,15 @@
IF (BUILD_BLEND_DEMO)
SUBDIRS(BlenderSerialize )
ENDIF()
IF(INTERNAL_UPDATE_SERIALIZATION_STRUCTURES) IF(INTERNAL_UPDATE_SERIALIZATION_STRUCTURES)
# makesdna and HeaderGenerator are for advanced use only # makesdna and HeaderGenerator are for advanced use only
# makesdna can re-generate the binary DNA representing the Bullet serialization structures # makesdna can re-generate the binary DNA representing the Bullet serialization structures
# Be very careful modifying any of this, otherwise the .bullet format becomes incompatible # Be very careful modifying any of this, otherwise the .bullet format becomes incompatible
SUBDIRS ( BulletFileLoader BulletWorldImporter BlenderSerialize HeaderGenerator makesdna) SUBDIRS ( BulletFileLoader BulletWorldImporter HeaderGenerator makesdna)
ELSE(INTERNAL_UPDATE_SERIALIZATION_STRUCTURES) ELSE(INTERNAL_UPDATE_SERIALIZATION_STRUCTURES)

4
src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
View File

@@ -34,9 +34,11 @@ struct SphereTriangleDetector : public btDiscreteCollisionDetectorInterface
virtual ~SphereTriangleDetector() {}; virtual ~SphereTriangleDetector() {};
bool collide(const btVector3& sphereCenter,btVector3 &point, btVector3& resultNormal, btScalar& depth, btScalar &timeOfImpact, btScalar contactBreakingThreshold);
private: private:
bool collide(const btVector3& sphereCenter,btVector3 &point, btVector3& resultNormal, btScalar& depth, btScalar &timeOfImpact, btScalar contactBreakingThreshold);
bool pointInTriangle(const btVector3 vertices[], const btVector3 &normal, btVector3 *p ); bool pointInTriangle(const btVector3 vertices[], const btVector3 &normal, btVector3 *p );
bool facecontains(const btVector3 &p,const btVector3* vertices,btVector3& normal); bool facecontains(const btVector3 &p,const btVector3* vertices,btVector3& normal);