diff --git a/Extras/Serialize/CMakeLists.txt b/Extras/Serialize/CMakeLists.txt index ea6a234fa..50a436f8d 100644 --- a/Extras/Serialize/CMakeLists.txt +++ b/Extras/Serialize/CMakeLists.txt @@ -1,11 +1,15 @@ +IF (BUILD_BLEND_DEMO) + SUBDIRS(BlenderSerialize ) +ENDIF() + IF(INTERNAL_UPDATE_SERIALIZATION_STRUCTURES) # makesdna and HeaderGenerator are for advanced use only # 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 - SUBDIRS ( BulletFileLoader BulletWorldImporter BlenderSerialize HeaderGenerator makesdna) + SUBDIRS ( BulletFileLoader BulletWorldImporter HeaderGenerator makesdna) ELSE(INTERNAL_UPDATE_SERIALIZATION_STRUCTURES) diff --git a/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h b/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h index 981bd54e7..f656e5c32 100644 --- a/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h +++ b/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h @@ -34,9 +34,11 @@ struct SphereTriangleDetector : public btDiscreteCollisionDetectorInterface virtual ~SphereTriangleDetector() {}; + bool collide(const btVector3& sphereCenter,btVector3 &point, btVector3& resultNormal, btScalar& depth, btScalar &timeOfImpact, btScalar contactBreakingThreshold); + 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 facecontains(const btVector3 &p,const btVector3* vertices,btVector3& normal);