From 8c09477e374bc85ff2c01dfbe48ebb0b11f57622 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Sun, 2 Sep 2018 14:33:57 -0600 Subject: [PATCH] bullet: Add missing includes and declarations for non-composite build --- panda/src/bullet/bulletBodyNode.cxx | 10 +++++++++- panda/src/bullet/bulletBodyNode.h | 4 ++-- panda/src/bullet/bulletBoxShape.cxx | 3 +++ panda/src/bullet/bulletCapsuleShape.cxx | 2 ++ panda/src/bullet/bulletCharacterControllerNode.cxx | 4 ++++ panda/src/bullet/bulletConeShape.cxx | 4 ++++ panda/src/bullet/bulletConeTwistConstraint.cxx | 2 ++ panda/src/bullet/bulletConstraint.cxx | 2 ++ panda/src/bullet/bulletConvexHullShape.cxx | 2 ++ panda/src/bullet/bulletConvexHullShape.h | 1 + panda/src/bullet/bulletConvexPointCloudShape.cxx | 4 ++++ panda/src/bullet/bulletCylinderShape.cxx | 2 ++ panda/src/bullet/bulletDebugNode.cxx | 4 ++++ panda/src/bullet/bulletDebugNode.h | 5 +++++ panda/src/bullet/bulletGenericConstraint.cxx | 2 ++ panda/src/bullet/bulletGhostNode.cxx | 2 ++ panda/src/bullet/bulletHeightfieldShape.cxx | 4 ++++ panda/src/bullet/bulletHelper.cxx | 4 ++++ panda/src/bullet/bulletHelper.h | 2 ++ panda/src/bullet/bulletHingeConstraint.cxx | 2 ++ panda/src/bullet/bulletManifoldPoint.cxx | 2 ++ panda/src/bullet/bulletMinkowskiSumShape.cxx | 2 ++ panda/src/bullet/bulletMultiSphereShape.cxx | 2 ++ panda/src/bullet/bulletMultiSphereShape.h | 1 + panda/src/bullet/bulletPersistentManifold.cxx | 2 ++ panda/src/bullet/bulletPlaneShape.cxx | 2 ++ panda/src/bullet/bulletRigidBodyNode.cxx | 4 ++++ panda/src/bullet/bulletRotationalLimitMotor.cxx | 2 ++ panda/src/bullet/bulletShape.cxx | 3 +++ panda/src/bullet/bulletShape.h | 2 +- panda/src/bullet/bulletSliderConstraint.cxx | 2 ++ panda/src/bullet/bulletSoftBodyConfig.cxx | 4 ++++ panda/src/bullet/bulletSoftBodyConfig.h | 2 ++ panda/src/bullet/bulletSoftBodyMaterial.cxx | 2 ++ panda/src/bullet/bulletSoftBodyMaterial.h | 2 ++ panda/src/bullet/bulletSoftBodyNode.cxx | 2 ++ panda/src/bullet/bulletSoftBodyNode.h | 1 + panda/src/bullet/bulletSoftBodyShape.cxx | 2 ++ panda/src/bullet/bulletSoftBodyWorldInfo.cxx | 2 ++ panda/src/bullet/bulletSphereShape.cxx | 2 ++ panda/src/bullet/bulletSphericalConstraint.cxx | 2 ++ panda/src/bullet/bulletTranslationalLimitMotor.cxx | 2 ++ panda/src/bullet/bulletTriangleMesh.cxx | 3 +++ panda/src/bullet/bulletTriangleMeshShape.cxx | 4 ++++ panda/src/bullet/bulletTriangleMeshShape.h | 1 + panda/src/bullet/bulletVehicle.cxx | 3 +++ panda/src/bullet/bulletWheel.cxx | 2 ++ panda/src/bullet/bulletWorld.cxx | 5 +++++ panda/src/bullet/bullet_utils.h | 2 ++ 49 files changed, 128 insertions(+), 4 deletions(-) diff --git a/panda/src/bullet/bulletBodyNode.cxx b/panda/src/bullet/bulletBodyNode.cxx index 9067999599..81a056adc2 100644 --- a/panda/src/bullet/bulletBodyNode.cxx +++ b/panda/src/bullet/bulletBodyNode.cxx @@ -12,9 +12,17 @@ */ #include "bulletBodyNode.h" + +#include "config_bullet.h" + #include "bulletShape.h" -#include "bulletWorld.h" +#include "bulletBoxShape.h" +#include "bulletCapsuleShape.h" +#include "bulletPlaneShape.h" +#include "bulletSphereShape.h" +#include "bulletTriangleMeshShape.h" #include "bulletTriangleMesh.h" +#include "bulletWorld.h" #include "collisionBox.h" #include "collisionPlane.h" diff --git a/panda/src/bullet/bulletBodyNode.h b/panda/src/bullet/bulletBodyNode.h index 90578eb62b..09f2ffe7c1 100644 --- a/panda/src/bullet/bulletBodyNode.h +++ b/panda/src/bullet/bulletBodyNode.h @@ -16,6 +16,8 @@ #include "pandabase.h" +#include "bulletShape.h" + #include "bullet_includes.h" #include "bullet_utils.h" @@ -25,8 +27,6 @@ #include "transformState.h" #include "boundingSphere.h" -class BulletShape; - /** * */ diff --git a/panda/src/bullet/bulletBoxShape.cxx b/panda/src/bullet/bulletBoxShape.cxx index 1e18d77899..d2d6912605 100644 --- a/panda/src/bullet/bulletBoxShape.cxx +++ b/panda/src/bullet/bulletBoxShape.cxx @@ -12,6 +12,9 @@ */ #include "bulletBoxShape.h" + +#include "bulletWorld.h" + #include "bullet_utils.h" TypeHandle BulletBoxShape::_type_handle; diff --git a/panda/src/bullet/bulletCapsuleShape.cxx b/panda/src/bullet/bulletCapsuleShape.cxx index ba9e02ab83..8ff2b3e37a 100644 --- a/panda/src/bullet/bulletCapsuleShape.cxx +++ b/panda/src/bullet/bulletCapsuleShape.cxx @@ -13,6 +13,8 @@ #include "bulletCapsuleShape.h" +#include "config_bullet.h" + TypeHandle BulletCapsuleShape::_type_handle; /** diff --git a/panda/src/bullet/bulletCharacterControllerNode.cxx b/panda/src/bullet/bulletCharacterControllerNode.cxx index e9652de7e5..44a6137c0a 100644 --- a/panda/src/bullet/bulletCharacterControllerNode.cxx +++ b/panda/src/bullet/bulletCharacterControllerNode.cxx @@ -13,6 +13,10 @@ #include "bulletCharacterControllerNode.h" +#include "config_bullet.h" + +#include "bulletWorld.h" + #if BT_BULLET_VERSION >= 285 static const btVector3 up_vectors[3] = {btVector3(1.0f, 0.0f, 0.0f), btVector3(0.0f, 1.0f, 0.0f), btVector3(0.0f, 0.0f, 1.0f)}; #endif diff --git a/panda/src/bullet/bulletConeShape.cxx b/panda/src/bullet/bulletConeShape.cxx index c4c554ba2f..f9c952402d 100644 --- a/panda/src/bullet/bulletConeShape.cxx +++ b/panda/src/bullet/bulletConeShape.cxx @@ -13,6 +13,10 @@ #include "bulletConeShape.h" +#include "config_bullet.h" + +#include "bulletWorld.h" + TypeHandle BulletConeShape::_type_handle; /** diff --git a/panda/src/bullet/bulletConeTwistConstraint.cxx b/panda/src/bullet/bulletConeTwistConstraint.cxx index 9b60ab31ce..b5ccc17d05 100644 --- a/panda/src/bullet/bulletConeTwistConstraint.cxx +++ b/panda/src/bullet/bulletConeTwistConstraint.cxx @@ -12,7 +12,9 @@ */ #include "bulletConeTwistConstraint.h" + #include "bulletRigidBodyNode.h" +#include "bulletWorld.h" #include "deg_2_rad.h" diff --git a/panda/src/bullet/bulletConstraint.cxx b/panda/src/bullet/bulletConstraint.cxx index 28efe703ff..44eddc37e5 100644 --- a/panda/src/bullet/bulletConstraint.cxx +++ b/panda/src/bullet/bulletConstraint.cxx @@ -12,7 +12,9 @@ */ #include "bulletConstraint.h" + #include "bulletRigidBodyNode.h" +#include "bulletShape.h" TypeHandle BulletConstraint::_type_handle; diff --git a/panda/src/bullet/bulletConvexHullShape.cxx b/panda/src/bullet/bulletConvexHullShape.cxx index 487219c7fd..b61722e773 100644 --- a/panda/src/bullet/bulletConvexHullShape.cxx +++ b/panda/src/bullet/bulletConvexHullShape.cxx @@ -13,6 +13,8 @@ #include "bulletConvexHullShape.h" +#include "bulletWorld.h" + #include "nodePathCollection.h" #include "geomNode.h" #include "geomVertexReader.h" diff --git a/panda/src/bullet/bulletConvexHullShape.h b/panda/src/bullet/bulletConvexHullShape.h index 78485ed12c..27e006f1d0 100644 --- a/panda/src/bullet/bulletConvexHullShape.h +++ b/panda/src/bullet/bulletConvexHullShape.h @@ -22,6 +22,7 @@ #include "luse.h" #include "geom.h" #include "pta_LVecBase3.h" +#include "transformState.h" /** * diff --git a/panda/src/bullet/bulletConvexPointCloudShape.cxx b/panda/src/bullet/bulletConvexPointCloudShape.cxx index 1a4cb6e16c..8b7ca82f79 100644 --- a/panda/src/bullet/bulletConvexPointCloudShape.cxx +++ b/panda/src/bullet/bulletConvexPointCloudShape.cxx @@ -13,6 +13,10 @@ #include "bulletConvexPointCloudShape.h" +#include "bulletWorld.h" + +#include "bullet_utils.h" + #include "geomVertexReader.h" TypeHandle BulletConvexPointCloudShape::_type_handle; diff --git a/panda/src/bullet/bulletCylinderShape.cxx b/panda/src/bullet/bulletCylinderShape.cxx index 976daac96e..8b2d7986a3 100644 --- a/panda/src/bullet/bulletCylinderShape.cxx +++ b/panda/src/bullet/bulletCylinderShape.cxx @@ -13,6 +13,8 @@ #include "bulletCylinderShape.h" +#include "config_bullet.h" + using std::endl; TypeHandle BulletCylinderShape::_type_handle; diff --git a/panda/src/bullet/bulletDebugNode.cxx b/panda/src/bullet/bulletDebugNode.cxx index ce0c044758..2f221eb447 100644 --- a/panda/src/bullet/bulletDebugNode.cxx +++ b/panda/src/bullet/bulletDebugNode.cxx @@ -13,6 +13,10 @@ #include "bulletDebugNode.h" +#include "config_bullet.h" + +#include "bulletWorld.h" + #include "cullHandler.h" #include "cullTraverser.h" #include "cullableObject.h" diff --git a/panda/src/bullet/bulletDebugNode.h b/panda/src/bullet/bulletDebugNode.h index c780429a79..f42bd4722d 100644 --- a/panda/src/bullet/bulletDebugNode.h +++ b/panda/src/bullet/bulletDebugNode.h @@ -16,8 +16,13 @@ #include "pandabase.h" +#include "pandaNode.h" + #include "bullet_includes.h" +class CullTraverser; +class CullTraverserData; + /** * */ diff --git a/panda/src/bullet/bulletGenericConstraint.cxx b/panda/src/bullet/bulletGenericConstraint.cxx index de98b5d40b..dfd1fe5b68 100644 --- a/panda/src/bullet/bulletGenericConstraint.cxx +++ b/panda/src/bullet/bulletGenericConstraint.cxx @@ -12,7 +12,9 @@ */ #include "bulletGenericConstraint.h" + #include "bulletRigidBodyNode.h" +#include "bulletWorld.h" TypeHandle BulletGenericConstraint::_type_handle; diff --git a/panda/src/bullet/bulletGhostNode.cxx b/panda/src/bullet/bulletGhostNode.cxx index b4008820a1..d3dcb7aaf5 100644 --- a/panda/src/bullet/bulletGhostNode.cxx +++ b/panda/src/bullet/bulletGhostNode.cxx @@ -12,7 +12,9 @@ */ #include "bulletGhostNode.h" + #include "bulletShape.h" +#include "bulletWorld.h" TypeHandle BulletGhostNode::_type_handle; diff --git a/panda/src/bullet/bulletHeightfieldShape.cxx b/panda/src/bullet/bulletHeightfieldShape.cxx index 15e8d6f75f..08f91bd036 100644 --- a/panda/src/bullet/bulletHeightfieldShape.cxx +++ b/panda/src/bullet/bulletHeightfieldShape.cxx @@ -13,6 +13,10 @@ #include "bulletHeightfieldShape.h" +#include "config_bullet.h" + +#include "bulletWorld.h" + TypeHandle BulletHeightfieldShape::_type_handle; /** diff --git a/panda/src/bullet/bulletHelper.cxx b/panda/src/bullet/bulletHelper.cxx index e786e34d40..fcf0678f1a 100644 --- a/panda/src/bullet/bulletHelper.cxx +++ b/panda/src/bullet/bulletHelper.cxx @@ -12,13 +12,17 @@ */ #include "bulletHelper.h" + #include "bulletRigidBodyNode.h" +#include "bulletSoftBodyNode.h" #include "bulletGhostNode.h" #include "geomLines.h" #include "geomTriangles.h" #include "geomVertexRewriter.h" +#include "bullet_utils.h" + PT(InternalName) BulletHelper::_sb_index; PT(InternalName) BulletHelper::_sb_flip; diff --git a/panda/src/bullet/bulletHelper.h b/panda/src/bullet/bulletHelper.h index f2195d4d92..4633c40928 100644 --- a/panda/src/bullet/bulletHelper.h +++ b/panda/src/bullet/bulletHelper.h @@ -23,6 +23,8 @@ #include "nodePath.h" #include "nodePathCollection.h" +class BulletSoftBodyNode; + /** * */ diff --git a/panda/src/bullet/bulletHingeConstraint.cxx b/panda/src/bullet/bulletHingeConstraint.cxx index 5cbfa44d94..9e96c82cf4 100644 --- a/panda/src/bullet/bulletHingeConstraint.cxx +++ b/panda/src/bullet/bulletHingeConstraint.cxx @@ -12,7 +12,9 @@ */ #include "bulletHingeConstraint.h" + #include "bulletRigidBodyNode.h" +#include "bulletWorld.h" #include "deg_2_rad.h" diff --git a/panda/src/bullet/bulletManifoldPoint.cxx b/panda/src/bullet/bulletManifoldPoint.cxx index b56244ed29..c32a437ac2 100644 --- a/panda/src/bullet/bulletManifoldPoint.cxx +++ b/panda/src/bullet/bulletManifoldPoint.cxx @@ -13,6 +13,8 @@ #include "bulletManifoldPoint.h" +#include "bulletWorld.h" + /** * */ diff --git a/panda/src/bullet/bulletMinkowskiSumShape.cxx b/panda/src/bullet/bulletMinkowskiSumShape.cxx index d750e22244..586968ae6d 100644 --- a/panda/src/bullet/bulletMinkowskiSumShape.cxx +++ b/panda/src/bullet/bulletMinkowskiSumShape.cxx @@ -13,6 +13,8 @@ #include "bulletMinkowskiSumShape.h" +#include "bulletWorld.h" + TypeHandle BulletMinkowskiSumShape::_type_handle; /** diff --git a/panda/src/bullet/bulletMultiSphereShape.cxx b/panda/src/bullet/bulletMultiSphereShape.cxx index 52d1edc42f..2cbf63fcfd 100644 --- a/panda/src/bullet/bulletMultiSphereShape.cxx +++ b/panda/src/bullet/bulletMultiSphereShape.cxx @@ -13,6 +13,8 @@ #include "bulletMultiSphereShape.h" +#include "bulletWorld.h" + #include "geomVertexReader.h" TypeHandle BulletMultiSphereShape::_type_handle; diff --git a/panda/src/bullet/bulletMultiSphereShape.h b/panda/src/bullet/bulletMultiSphereShape.h index d6fd7af7b7..2beb123bf5 100644 --- a/panda/src/bullet/bulletMultiSphereShape.h +++ b/panda/src/bullet/bulletMultiSphereShape.h @@ -19,6 +19,7 @@ #include "bullet_includes.h" #include "bulletShape.h" +#include "factoryParams.h" #include "pta_LVecBase3.h" #include "pta_stdfloat.h" diff --git a/panda/src/bullet/bulletPersistentManifold.cxx b/panda/src/bullet/bulletPersistentManifold.cxx index 67d760e8df..9876ff35ee 100644 --- a/panda/src/bullet/bulletPersistentManifold.cxx +++ b/panda/src/bullet/bulletPersistentManifold.cxx @@ -12,7 +12,9 @@ */ #include "bulletPersistentManifold.h" + #include "bulletManifoldPoint.h" +#include "bulletWorld.h" /** * diff --git a/panda/src/bullet/bulletPlaneShape.cxx b/panda/src/bullet/bulletPlaneShape.cxx index 98dce53577..f5dc9f9514 100644 --- a/panda/src/bullet/bulletPlaneShape.cxx +++ b/panda/src/bullet/bulletPlaneShape.cxx @@ -13,6 +13,8 @@ #include "bulletPlaneShape.h" +#include "bulletWorld.h" + TypeHandle BulletPlaneShape::_type_handle; /** diff --git a/panda/src/bullet/bulletRigidBodyNode.cxx b/panda/src/bullet/bulletRigidBodyNode.cxx index b0d36f705e..6f5bff0d46 100644 --- a/panda/src/bullet/bulletRigidBodyNode.cxx +++ b/panda/src/bullet/bulletRigidBodyNode.cxx @@ -12,7 +12,11 @@ */ #include "bulletRigidBodyNode.h" + +#include "config_bullet.h" + #include "bulletShape.h" +#include "bulletWorld.h" TypeHandle BulletRigidBodyNode::_type_handle; diff --git a/panda/src/bullet/bulletRotationalLimitMotor.cxx b/panda/src/bullet/bulletRotationalLimitMotor.cxx index d521b7ad94..3fed47f4f7 100644 --- a/panda/src/bullet/bulletRotationalLimitMotor.cxx +++ b/panda/src/bullet/bulletRotationalLimitMotor.cxx @@ -13,6 +13,8 @@ #include "bulletRotationalLimitMotor.h" +#include "bulletWorld.h" + /** * */ diff --git a/panda/src/bullet/bulletShape.cxx b/panda/src/bullet/bulletShape.cxx index 49bd6e4f92..dcc41f1243 100644 --- a/panda/src/bullet/bulletShape.cxx +++ b/panda/src/bullet/bulletShape.cxx @@ -12,6 +12,9 @@ */ #include "bulletShape.h" + +#include "bulletWorld.h" + #include "bullet_utils.h" TypeHandle BulletShape::_type_handle; diff --git a/panda/src/bullet/bulletShape.h b/panda/src/bullet/bulletShape.h index e9dd08bf14..7b368c987c 100644 --- a/panda/src/bullet/bulletShape.h +++ b/panda/src/bullet/bulletShape.h @@ -18,7 +18,7 @@ #include "bullet_includes.h" -#include "typedReferenceCount.h" +#include "typedWritableReferenceCount.h" #include "boundingSphere.h" /** diff --git a/panda/src/bullet/bulletSliderConstraint.cxx b/panda/src/bullet/bulletSliderConstraint.cxx index c803f509cd..6712120cd8 100644 --- a/panda/src/bullet/bulletSliderConstraint.cxx +++ b/panda/src/bullet/bulletSliderConstraint.cxx @@ -12,7 +12,9 @@ */ #include "bulletSliderConstraint.h" + #include "bulletRigidBodyNode.h" +#include "bulletWorld.h" #include "deg_2_rad.h" diff --git a/panda/src/bullet/bulletSoftBodyConfig.cxx b/panda/src/bullet/bulletSoftBodyConfig.cxx index a6db77cb96..861387a397 100644 --- a/panda/src/bullet/bulletSoftBodyConfig.cxx +++ b/panda/src/bullet/bulletSoftBodyConfig.cxx @@ -13,6 +13,10 @@ #include "bulletSoftBodyConfig.h" +#include "bulletWorld.h" + +#include "lightMutexHolder.h" + /** * */ diff --git a/panda/src/bullet/bulletSoftBodyConfig.h b/panda/src/bullet/bulletSoftBodyConfig.h index 18bbd49dfa..3d2bf30e42 100644 --- a/panda/src/bullet/bulletSoftBodyConfig.h +++ b/panda/src/bullet/bulletSoftBodyConfig.h @@ -18,6 +18,8 @@ #include "bullet_includes.h" +#include "numeric_types.h" + /** * */ diff --git a/panda/src/bullet/bulletSoftBodyMaterial.cxx b/panda/src/bullet/bulletSoftBodyMaterial.cxx index d40a7bd984..a7a66a5f62 100644 --- a/panda/src/bullet/bulletSoftBodyMaterial.cxx +++ b/panda/src/bullet/bulletSoftBodyMaterial.cxx @@ -13,6 +13,8 @@ #include "bulletSoftBodyMaterial.h" +#include "bulletWorld.h" + /** * */ diff --git a/panda/src/bullet/bulletSoftBodyMaterial.h b/panda/src/bullet/bulletSoftBodyMaterial.h index bf8c8589a9..3df77904d8 100644 --- a/panda/src/bullet/bulletSoftBodyMaterial.h +++ b/panda/src/bullet/bulletSoftBodyMaterial.h @@ -18,6 +18,8 @@ #include "bullet_includes.h" +#include "numeric_types.h" + /** * */ diff --git a/panda/src/bullet/bulletSoftBodyNode.cxx b/panda/src/bullet/bulletSoftBodyNode.cxx index cf027f208d..f4ae8d2120 100644 --- a/panda/src/bullet/bulletSoftBodyNode.cxx +++ b/panda/src/bullet/bulletSoftBodyNode.cxx @@ -12,12 +12,14 @@ */ #include "bulletSoftBodyNode.h" + #include "bulletSoftBodyConfig.h" #include "bulletSoftBodyControl.h" #include "bulletSoftBodyMaterial.h" #include "bulletSoftBodyShape.h" #include "bulletSoftBodyWorldInfo.h" #include "bulletHelper.h" +#include "bulletWorld.h" #include "geomVertexRewriter.h" #include "geomVertexReader.h" diff --git a/panda/src/bullet/bulletSoftBodyNode.h b/panda/src/bullet/bulletSoftBodyNode.h index 26d7cc6fce..e19b6c730f 100644 --- a/panda/src/bullet/bulletSoftBodyNode.h +++ b/panda/src/bullet/bulletSoftBodyNode.h @@ -29,6 +29,7 @@ #include "nurbsSurfaceEvaluator.h" #include "pta_LVecBase3.h" +class BulletRigidBodyNode; class BulletSoftBodyConfig; class BulletSoftBodyControl; class BulletSoftBodyMaterial; diff --git a/panda/src/bullet/bulletSoftBodyShape.cxx b/panda/src/bullet/bulletSoftBodyShape.cxx index c6df128687..0f47e470e0 100644 --- a/panda/src/bullet/bulletSoftBodyShape.cxx +++ b/panda/src/bullet/bulletSoftBodyShape.cxx @@ -12,7 +12,9 @@ */ #include "bulletSoftBodyShape.h" + #include "bulletSoftBodyNode.h" +#include "bulletWorld.h" TypeHandle BulletSoftBodyShape::_type_handle; diff --git a/panda/src/bullet/bulletSoftBodyWorldInfo.cxx b/panda/src/bullet/bulletSoftBodyWorldInfo.cxx index 2fb6957c29..eb18b9d6fc 100644 --- a/panda/src/bullet/bulletSoftBodyWorldInfo.cxx +++ b/panda/src/bullet/bulletSoftBodyWorldInfo.cxx @@ -13,6 +13,8 @@ #include "bulletSoftBodyWorldInfo.h" +#include "bulletWorld.h" + /** * */ diff --git a/panda/src/bullet/bulletSphereShape.cxx b/panda/src/bullet/bulletSphereShape.cxx index b05e09e418..a2965bb16a 100644 --- a/panda/src/bullet/bulletSphereShape.cxx +++ b/panda/src/bullet/bulletSphereShape.cxx @@ -13,6 +13,8 @@ #include "bulletSphereShape.h" +#include "bulletWorld.h" + TypeHandle BulletSphereShape::_type_handle; /** diff --git a/panda/src/bullet/bulletSphericalConstraint.cxx b/panda/src/bullet/bulletSphericalConstraint.cxx index 8686e1d546..b07d96c649 100644 --- a/panda/src/bullet/bulletSphericalConstraint.cxx +++ b/panda/src/bullet/bulletSphericalConstraint.cxx @@ -12,7 +12,9 @@ */ #include "bulletSphericalConstraint.h" + #include "bulletRigidBodyNode.h" +#include "bulletWorld.h" TypeHandle BulletSphericalConstraint::_type_handle; diff --git a/panda/src/bullet/bulletTranslationalLimitMotor.cxx b/panda/src/bullet/bulletTranslationalLimitMotor.cxx index 48dd7ae3e8..fb5e6b93a4 100644 --- a/panda/src/bullet/bulletTranslationalLimitMotor.cxx +++ b/panda/src/bullet/bulletTranslationalLimitMotor.cxx @@ -13,6 +13,8 @@ #include "bulletTranslationalLimitMotor.h" +#include "bulletWorld.h" + /** * */ diff --git a/panda/src/bullet/bulletTriangleMesh.cxx b/panda/src/bullet/bulletTriangleMesh.cxx index 368aa22fac..ac487be61e 100644 --- a/panda/src/bullet/bulletTriangleMesh.cxx +++ b/panda/src/bullet/bulletTriangleMesh.cxx @@ -13,7 +13,10 @@ #include "bulletTriangleMesh.h" +#include "bulletWorld.h" + #include "pvector.h" +#include "geomTriangles.h" #include "geomVertexData.h" #include "geomVertexReader.h" diff --git a/panda/src/bullet/bulletTriangleMeshShape.cxx b/panda/src/bullet/bulletTriangleMeshShape.cxx index 8416c52cbc..688bccd478 100644 --- a/panda/src/bullet/bulletTriangleMeshShape.cxx +++ b/panda/src/bullet/bulletTriangleMeshShape.cxx @@ -12,7 +12,11 @@ */ #include "bulletTriangleMeshShape.h" + +#include "config_bullet.h" + #include "bulletTriangleMesh.h" +#include "bulletWorld.h" #include "nodePathCollection.h" #include "geomNode.h" diff --git a/panda/src/bullet/bulletTriangleMeshShape.h b/panda/src/bullet/bulletTriangleMeshShape.h index 199efb75d1..fcfb9281a0 100644 --- a/panda/src/bullet/bulletTriangleMeshShape.h +++ b/panda/src/bullet/bulletTriangleMeshShape.h @@ -19,6 +19,7 @@ #include "bullet_includes.h" #include "bulletShape.h" +#include "factoryParams.h" #include "luse.h" class BulletTriangleMesh; diff --git a/panda/src/bullet/bulletVehicle.cxx b/panda/src/bullet/bulletVehicle.cxx index 5dbb70cc7f..f4321cd911 100644 --- a/panda/src/bullet/bulletVehicle.cxx +++ b/panda/src/bullet/bulletVehicle.cxx @@ -12,6 +12,9 @@ */ #include "bulletVehicle.h" + +#include "config_bullet.h" + #include "bulletWorld.h" #include "bulletRigidBodyNode.h" #include "bulletWheel.h" diff --git a/panda/src/bullet/bulletWheel.cxx b/panda/src/bullet/bulletWheel.cxx index c24369546b..21a6eefd76 100644 --- a/panda/src/bullet/bulletWheel.cxx +++ b/panda/src/bullet/bulletWheel.cxx @@ -13,6 +13,8 @@ #include "bulletWheel.h" +#include "bulletWorld.h" + /** * */ diff --git a/panda/src/bullet/bulletWorld.cxx b/panda/src/bullet/bulletWorld.cxx index e1e416a2bb..930fe10111 100644 --- a/panda/src/bullet/bulletWorld.cxx +++ b/panda/src/bullet/bulletWorld.cxx @@ -12,9 +12,14 @@ */ #include "bulletWorld.h" + +#include "config_bullet.h" + +#include "bulletFilterCallbackData.h" #include "bulletPersistentManifold.h" #include "bulletShape.h" #include "bulletSoftBodyWorldInfo.h" +#include "bulletTickCallbackData.h" #include "collideMask.h" #include "lightMutexHolder.h" diff --git a/panda/src/bullet/bullet_utils.h b/panda/src/bullet/bullet_utils.h index b1577ede5e..080c70986a 100644 --- a/panda/src/bullet/bullet_utils.h +++ b/panda/src/bullet/bullet_utils.h @@ -44,6 +44,8 @@ EXPCL_PANDABULLET CPT(TransformState) btTrans_to_TransformState( EXPCL_PANDABULLET btTransform TransformState_to_btTrans( CPT(TransformState) ts); +EXPCL_PANDABULLET void get_node_transform(btTransform &trans, PandaNode *node); + // UpAxis BEGIN_PUBLISH