TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 03:15:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes for ppremake+bullet

Browse Source
This commit is contained in:
rdb 2012-10-25 22:03:04 +00:00
parent 91e305789a
commit 21c922c7cd
4 changed files with 91 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dtool/Config.pp
View File

@ -1127,7 +1127,7 @@
#defer HAVE_ROCKET_PYTHON $[and $[HAVE_ROCKET],$[HAVE_PYTHON]] #defer HAVE_ROCKET_PYTHON $[and $[HAVE_ROCKET],$[HAVE_PYTHON]]
// Bullet is a physics engine // Bullet is a physics engine
#define BULLET_IPATH /usr/local/include #define BULLET_IPATH /usr/local/include/bullet
#define BULLET_LPATH /usr/local/lib #define BULLET_LPATH /usr/local/lib
#if $[WINDOWS_PLATFORM] #if $[WINDOWS_PLATFORM]
#define BULLET_LIBS BulletSoftBody.lib BulletDynamics.lib BulletCollision.lib LinearMath.lib #define BULLET_LIBS BulletSoftBody.lib BulletDynamics.lib BulletCollision.lib LinearMath.lib

2
dtool/src/parser-inc/Sources.pp
View File

@ -27,4 +27,4 @@
Core/Core.h Forest/Forest.h Renderers/OpenGL/OpenGLRenderer.h \ Core/Core.h Forest/Forest.h Renderers/OpenGL/OpenGLRenderer.h \
Renderers/DirectX9/DirectX9Renderer.h \ Renderers/DirectX9/DirectX9Renderer.h \
glew/glew.h Eigen/Dense Eigen/StdVector \ glew/glew.h Eigen/Dense Eigen/StdVector \
Rocket/Core/RenderInterface.h Rocket/Core/RenderInterface.h btBulletDynamicsCommon.h

246
panda/src/bullet/Sources.pp
View File

@ -10,90 +10,54 @@
#define COMBINED_SOURCES $[TARGET]_composite.cxx #define COMBINED_SOURCES $[TARGET]_composite.cxx
#define SOURCES \ #define SOURCES \
bulletAllHitsRayResult.I \ bulletAllHitsRayResult.h bulletAllHitsRayResult.I \
bulletAllHitsRayResult.h \ bulletBaseCharacterControllerNode.h bulletBaseCharacterControllerNode.I \
bulletBodyNode.I \ bulletBodyNode.h bulletBodyNode.I \
bulletBodyNode.h \ bulletBoxShape.h bulletBoxShape.I \
bulletBoxShape.I \ bulletCapsuleShape.h bulletCapsuleShape.I \
bulletBoxShape.h \ bulletCharacterControllerNode.h bulletCharacterControllerNode.I \
bulletCapsuleShape.I \ bulletClosestHitRayResult.h bulletClosestHitRayResult.I \
bulletCapsuleShape.h \ bulletClosestHitSweepResult.h bulletClosestHitSweepResult.I \
bulletCharacterControllerNode.I \ bulletConeShape.h bulletConeShape.I \
bulletCharacterControllerNode.h \ bulletConeTwistConstraint.h bulletConeTwistConstraint.I \
bulletClosestHitRayResult.I \ bulletConstraint.h bulletConstraint.I \
bulletClosestHitRayResult.h \
bulletClosestHitSweepResult.I \
bulletClosestHitSweepResult.h \
bulletConeShape.I \
bulletConeShape.h \
bulletConeTwistConstraint.I \
bulletConeTwistConstraint.h \
bulletConstraint.I \
bulletConstraint.h \
bulletContactCallbacks.h \ bulletContactCallbacks.h \
bulletContactResult.I \ bulletContactResult.h bulletContactResult.I \
bulletContactResult.h \ bulletConvexHullShape.h bulletConvexHullShape.I \
bulletConvexHullShape.I \ bulletConvexPointCloudShape.h bulletConvexPointCloudShape.I \
bulletConvexHullShape.h \ bulletCylinderShape.h bulletCylinderShape.I \
bulletConvexPointCloudShape.I \ bulletDebugNode.h bulletDebugNode.I \
bulletConvexPointCloudShape.h \ bulletGenericConstraint.h bulletGenericConstraint.I \
bulletCylinderShape.I \ bulletGhostNode.h bulletGhostNode.I \
bulletCylinderShape.h \ bulletHeightfieldShape.h bulletHeightfieldShape.I \
bulletDebugNode.I \ bulletHelper.h bulletHelper.I \
bulletDebugNode.h \ bulletHingeConstraint.h bulletHingeConstraint.I \
bulletGenericConstraint.I \ bulletManifoldPoint.h bulletManifoldPoint.I \
bulletGenericConstraint.h \ bulletMultiSphereShape.h bulletMultiSphereShape.I \
bulletGhostNode.I \ bulletPersistentManifold.h bulletPersistentManifold.I \
bulletGhostNode.h \ bulletPlaneShape.h bulletPlaneShape.I \
bulletHeightfieldShape.I \ bulletRigidBodyNode.h bulletRigidBodyNode.I \
bulletHeightfieldShape.h \ bulletShape.h bulletShape.I \
bulletHelper.I \ bulletSliderConstraint.h bulletSliderConstraint.I \
bulletHelper.h \ bulletSoftBodyConfig.h bulletSoftBodyConfig.I \
bulletHingeConstraint.I \ bulletSoftBodyMaterial.h bulletSoftBodyMaterial.I \
bulletHingeConstraint.h \ bulletSoftBodyNode.h bulletSoftBodyNode.I \
bulletManifoldPoint.I \ bulletSoftBodyShape.h bulletSoftBodyShape.I \
bulletManifoldPoint.h \ bulletSoftBodyWorldInfo.h bulletSoftBodyWorldInfo.I \
bulletPersistentManifold.I \ bulletSphereShape.h bulletSphereShape.I \
bulletPersistentManifold.h \ bulletSphericalConstraint.h bulletSphericalConstraint.I \
bulletPlaneShape.I \ bulletTriangleMesh.h bulletTriangleMesh.I \
bulletPlaneShape.h \ bulletTriangleMeshShape.h bulletTriangleMeshShape.I \
bulletRigidBodyNode.I \ bulletVehicle.h bulletVehicle.I \
bulletRigidBodyNode.h \ bulletWheel.h bulletWheel.I \
bulletShape.I \ bulletWorld.h bulletWorld.I \
bulletShape.h \
bulletSliderConstraint.I \
bulletSliderConstraint.h \
bulletSoftBodyConfig.I \
bulletSoftBodyConfig.h \
bulletSoftBodyMaterial.I \
bulletSoftBodyMaterial.h \
bulletSoftBodyNode.I \
bulletSoftBodyNode.h \
bulletSoftBodyShape.I \
bulletSoftBodyShape.h \
bulletSoftBodyWorldInfo.I \
bulletSoftBodyWorldInfo.h \
bulletSphereShape.I \
bulletSphereShape.h \
bulletSphericalConstraint.I \
bulletSphericalConstraint.h \
bulletTriangleMesh.I \
bulletTriangleMesh.h \
bulletTriangleMeshShape.I \
bulletTriangleMeshShape.h \
bulletVehicle.I \
bulletVehicle.h \
bulletWheel.I \
bulletWheel.h \
bulletWorld.I \
bulletWorld.h \
bullet_includes.h \ bullet_includes.h \
bullet_utils.I \ bullet_utils.h bullet_utils.I \
bullet_utils.h \ config_bullet.h
config_bullet.h \
#define INCLUDED_SOURCES \ #define INCLUDED_SOURCES \
bulletAllHitsRayResult.cxx \ bulletAllHitsRayResult.cxx \
bulletBaseCharacterControllerNode.cxx \
bulletBodyNode.cxx \ bulletBodyNode.cxx \
bulletBoxShape.cxx \ bulletBoxShape.cxx \
bulletCapsuleShape.cxx \ bulletCapsuleShape.cxx \
@ -114,6 +78,7 @@
bulletHelper.cxx \ bulletHelper.cxx \
bulletHingeConstraint.cxx \ bulletHingeConstraint.cxx \
bulletManifoldPoint.cxx \ bulletManifoldPoint.cxx \
bulletMultiSphereShape.cxx \
bulletPersistentManifold.cxx \ bulletPersistentManifold.cxx \
bulletPlaneShape.cxx \ bulletPlaneShape.cxx \
bulletRigidBodyNode.cxx \ bulletRigidBodyNode.cxx \
@ -131,91 +96,54 @@
bulletVehicle.cxx \ bulletVehicle.cxx \
bulletWheel.cxx \ bulletWheel.cxx \
bulletWorld.cxx \ bulletWorld.cxx \
p3bullet_composite.cxx \
bullet_utils.cxx \ bullet_utils.cxx \
config_bullet.cxx \ config_bullet.cxx
#define INSTALL_HEADERS \ #define INSTALL_HEADERS \
bulletAllHitsRayResult.I \ bulletAllHitsRayResult.h bulletAllHitsRayResult.I \
bulletAllHitsRayResult.h \ bulletBaseCharacterControllerNode.h bulletBaseCharacterControllerNode.I \
bulletBodyNode.I \ bulletBodyNode.h bulletBodyNode.I \
bulletBodyNode.h \ bulletBoxShape.h bulletBoxShape.I \
bulletBoxShape.I \ bulletCapsuleShape.h bulletCapsuleShape.I \
bulletBoxShape.h \ bulletCharacterControllerNode.h bulletCharacterControllerNode.I \
bulletCapsuleShape.I \ bulletClosestHitRayResult.h bulletClosestHitRayResult.I \
bulletCapsuleShape.h \ bulletClosestHitSweepResult.h bulletClosestHitSweepResult.I \
bulletCharacterControllerNode.I \ bulletConeShape.h bulletConeShape.I \
bulletCharacterControllerNode.h \ bulletConeTwistConstraint.h bulletConeTwistConstraint.I \
bulletClosestHitRayResult.I \ bulletConstraint.h bulletConstraint.I \
bulletClosestHitRayResult.h \
bulletClosestHitSweepResult.I \
bulletClosestHitSweepResult.h \
bulletConeShape.I \
bulletConeShape.h \
bulletConeTwistConstraint.I \
bulletConeTwistConstraint.h \
bulletConstraint.I \
bulletConstraint.h \
bulletContactCallbacks.h \ bulletContactCallbacks.h \
bulletContactResult.I \ bulletContactResult.h bulletContactResult.I \
bulletContactResult.h \ bulletConvexHullShape.h bulletConvexHullShape.I \
bulletConvexHullShape.I \ bulletConvexPointCloudShape.h bulletConvexPointCloudShape.I \
bulletConvexHullShape.h \ bulletCylinderShape.h bulletCylinderShape.I \
bulletConvexPointCloudShape.I \ bulletDebugNode.h bulletDebugNode.I \
bulletConvexPointCloudShape.h \ bulletGenericConstraint.h bulletGenericConstraint.I \
bulletCylinderShape.I \ bulletGhostNode.h bulletGhostNode.I \
bulletCylinderShape.h \ bulletHeightfieldShape.h bulletHeightfieldShape.I \
bulletDebugNode.I \ bulletHelper.h bulletHelper.I \
bulletDebugNode.h \ bulletHingeConstraint.h bulletHingeConstraint.I \
bulletGenericConstraint.I \ bulletManifoldPoint.h bulletManifoldPoint.I \
bulletGenericConstraint.h \ bulletMultiSphereShape.h bulletMultiSphereShape.I \
bulletGhostNode.I \ bulletPersistentManifold.h bulletPersistentManifold.I \
bulletGhostNode.h \ bulletPlaneShape.h bulletPlaneShape.I \
bulletHeightfieldShape.I \ bulletRigidBodyNode.h bulletRigidBodyNode.I \
bulletHeightfieldShape.h \ bulletShape.h bulletShape.I \
bulletHelper.I \ bulletSliderConstraint.h bulletSliderConstraint.I \
bulletHelper.h \ bulletSoftBodyConfig.h bulletSoftBodyConfig.I \
bulletHingeConstraint.I \ bulletSoftBodyMaterial.h bulletSoftBodyMaterial.I \
bulletHingeConstraint.h \ bulletSoftBodyNode.h bulletSoftBodyNode.I \
bulletManifoldPoint.I \ bulletSoftBodyShape.h bulletSoftBodyShape.I \
bulletManifoldPoint.h \ bulletSoftBodyWorldInfo.h bulletSoftBodyWorldInfo.I \
bulletPersistentManifold.I \ bulletSphereShape.h bulletSphereShape.I \
bulletPersistentManifold.h \ bulletSphericalConstraint.h bulletSphericalConstraint.I \
bulletPlaneShape.I \ bulletTriangleMesh.h bulletTriangleMesh.I \
bulletPlaneShape.h \ bulletTriangleMeshShape.h bulletTriangleMeshShape.I \
bulletRigidBodyNode.I \ bulletVehicle.h bulletVehicle.I \
bulletRigidBodyNode.h \ bulletWheel.h bulletWheel.I \
bulletShape.I \ bulletWorld.h bulletWorld.I \
bulletShape.h \
bulletSliderConstraint.I \
bulletSliderConstraint.h \
bulletSoftBodyConfig.I \
bulletSoftBodyConfig.h \
bulletSoftBodyMaterial.I \
bulletSoftBodyMaterial.h \
bulletSoftBodyNode.I \
bulletSoftBodyNode.h \
bulletSoftBodyShape.I \
bulletSoftBodyShape.h \
bulletSoftBodyWorldInfo.I \
bulletSoftBodyWorldInfo.h \
bulletSphereShape.I \
bulletSphereShape.h \
bulletSphericalConstraint.I \
bulletSphericalConstraint.h \
bulletTriangleMesh.I \
bulletTriangleMesh.h \
bulletTriangleMeshShape.I \
bulletTriangleMeshShape.h \
bulletVehicle.I \
bulletVehicle.h \
bulletWheel.I \
bulletWheel.h \
bulletWorld.I \
bulletWorld.h \
bullet_includes.h \ bullet_includes.h \
bullet_utils.I \ bullet_utils.h bullet_utils.I \
bullet_utils.h \ config_bullet.h
#define IGATESCAN all #define IGATESCAN all

4
panda/src/bullet/bulletBaseCharacterControllerNode.h
View File

@ -43,8 +43,8 @@ public:
virtual bool safe_to_combine_children() const; virtual bool safe_to_combine_children() const;
virtual bool safe_to_flatten_below() const; virtual bool safe_to_flatten_below() const;
INLINE virtual btPairCachingGhostObject *get_ghost() const = 0; virtual btPairCachingGhostObject *get_ghost() const = 0;
INLINE virtual btCharacterControllerInterface *get_character() const = 0; virtual btCharacterControllerInterface *get_character() const = 0;
virtual void sync_p2b(PN_stdfloat dt, int num_substeps) = 0; virtual void sync_p2b(PN_stdfloat dt, int num_substeps) = 0;
virtual void sync_b2p() = 0; virtual void sync_b2p() = 0;