bullet: Add missing includes and declarations for non-composite build

2025-09-30 16:58:40 -04:00 · 2018-09-02 14:33:57 -06:00 · 2018-09-02 14:33:57 -06:00 · 8c09477e37
commit 8c09477e37
parent b168fa6a85
49 changed files with 128 additions and 4 deletions
--- 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"
--- 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;
-
 /**
 *
 */
--- 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;
--- 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;

 /**
--- 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
--- 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;

 /**
--- 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"

--- 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;

--- 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"
--- 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"

 /**
 *
--- 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;
--- 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;
--- 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"
--- 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;
+
 /**
 *
 */
--- 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;

--- 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;

--- 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;

 /**
--- 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;

--- a/panda/src/bullet/bulletHelper.h
+++ b/panda/src/bullet/bulletHelper.h
@ -23,6 +23,8 @@
 #include "nodePath.h"
 #include "nodePathCollection.h"

+class BulletSoftBodyNode;
+
 /**
 *
 */
--- 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"

--- a/panda/src/bullet/bulletManifoldPoint.cxx
+++ b/panda/src/bullet/bulletManifoldPoint.cxx
@ -13,6 +13,8 @@

 #include "bulletManifoldPoint.h"

+#include "bulletWorld.h"
+
 /**
 *
 */
--- 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;

 /**
--- 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;
--- 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"

--- 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"

 /**
 *
--- 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;

 /**
--- 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;

--- a/panda/src/bullet/bulletRotationalLimitMotor.cxx
+++ b/panda/src/bullet/bulletRotationalLimitMotor.cxx
@ -13,6 +13,8 @@

 #include "bulletRotationalLimitMotor.h"

+#include "bulletWorld.h"
+
 /**
 *
 */
--- 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;
--- 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"

 /**
--- 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"

--- 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"
+
 /**
 *
 */
--- a/panda/src/bullet/bulletSoftBodyConfig.h
+++ b/panda/src/bullet/bulletSoftBodyConfig.h
@ -18,6 +18,8 @@

 #include "bullet_includes.h"

+#include "numeric_types.h"
+
 /**
 *
 */
--- a/panda/src/bullet/bulletSoftBodyMaterial.cxx
+++ b/panda/src/bullet/bulletSoftBodyMaterial.cxx
@ -13,6 +13,8 @@

 #include "bulletSoftBodyMaterial.h"

+#include "bulletWorld.h"
+
 /**
 *
 */
--- a/panda/src/bullet/bulletSoftBodyMaterial.h
+++ b/panda/src/bullet/bulletSoftBodyMaterial.h
@ -18,6 +18,8 @@

 #include "bullet_includes.h"

+#include "numeric_types.h"
+
 /**
 *
 */
--- 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"
--- 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;
--- 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;

--- a/panda/src/bullet/bulletSoftBodyWorldInfo.cxx
+++ b/panda/src/bullet/bulletSoftBodyWorldInfo.cxx
@ -13,6 +13,8 @@

 #include "bulletSoftBodyWorldInfo.h"

+#include "bulletWorld.h"
+
 /**
 *
 */
--- 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;

 /**
--- 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;

--- a/panda/src/bullet/bulletTranslationalLimitMotor.cxx
+++ b/panda/src/bullet/bulletTranslationalLimitMotor.cxx
@ -13,6 +13,8 @@

 #include "bulletTranslationalLimitMotor.h"

+#include "bulletWorld.h"
+
 /**
 *
 */
--- 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"

--- 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"
--- 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;
--- 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"
--- a/panda/src/bullet/bulletWheel.cxx
+++ b/panda/src/bullet/bulletWheel.cxx
@ -13,6 +13,8 @@

 #include "bulletWheel.h"

+#include "bulletWorld.h"
+
 /**
 *
 */
--- 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"
--- 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