From c93dfb0602432b9c5cde8d5ac6da21a0e0aec45c Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 17 Mar 2022 23:20:34 +0100 Subject: [PATCH] Also ran it on bullet. --- .../BroadPhaseCollision/b3BroadphaseCallback.h | 6 ++++-- .../Bullet3Collision/BroadPhaseCollision/b3DynamicBvh.h | 6 ++++-- .../BroadPhaseCollision/b3DynamicBvhBroadphase.h | 6 ++++-- .../BroadPhaseCollision/b3OverlappingPair.h | 6 ++++-- .../BroadPhaseCollision/b3OverlappingPairCache.h | 6 ++++-- .../Bullet3Collision/NarrowPhaseCollision/b3Contact4.h | 6 ++++-- .../Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.h | 6 ++++-- .../Bullet3Collision/NarrowPhaseCollision/b3RigidBodyCL.h | 6 ++++-- .../NarrowPhaseCollision/shared/b3MprPenetration.h | 6 ++++-- thirdparty/bullet/Bullet3Common/b3AlignedAllocator.h | 6 ++++-- thirdparty/bullet/Bullet3Common/b3AlignedObjectArray.h | 6 ++++-- thirdparty/bullet/Bullet3Common/b3HashMap.h | 6 ++++-- thirdparty/bullet/Bullet3Common/b3Matrix3x3.h | 6 ++++-- thirdparty/bullet/Bullet3Common/b3MinMax.h | 6 ++++-- thirdparty/bullet/Bullet3Common/b3PoolAllocator.h | 6 ++++-- thirdparty/bullet/Bullet3Common/b3QuadWord.h | 6 ++++-- thirdparty/bullet/Bullet3Common/b3Quaternion.h | 6 ++++-- thirdparty/bullet/Bullet3Common/b3Random.h | 6 ++++-- thirdparty/bullet/Bullet3Common/b3Scalar.h | 6 ++++-- thirdparty/bullet/Bullet3Common/b3StackAlloc.h | 6 ++++-- thirdparty/bullet/Bullet3Common/b3Transform.h | 6 ++++-- thirdparty/bullet/Bullet3Common/b3TransformUtil.h | 6 ++++-- thirdparty/bullet/Bullet3Common/b3Vector3.h | 6 ++++-- thirdparty/bullet/Bullet3Common/shared/b3Int2.h | 6 ++++-- .../Bullet3Dynamics/ConstraintSolver/b3ContactSolverInfo.h | 6 ++++-- .../ConstraintSolver/b3Generic6DofConstraint.h | 6 ++++-- .../Bullet3Dynamics/ConstraintSolver/b3JacobianEntry.h | 6 ++++-- .../ConstraintSolver/b3Point2PointConstraint.h | 6 ++++-- .../bullet/Bullet3Dynamics/ConstraintSolver/b3SolverBody.h | 6 ++++-- .../Bullet3Dynamics/ConstraintSolver/b3SolverConstraint.h | 6 ++++-- .../Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.h | 6 ++++-- thirdparty/bullet/Bullet3Dynamics/b3CpuRigidBodyPipeline.h | 6 ++++-- thirdparty/bullet/Bullet3Geometry/b3AabbUtil.h | 6 ++++-- thirdparty/bullet/Bullet3Geometry/b3ConvexHullComputer.h | 6 ++++-- thirdparty/bullet/Bullet3Geometry/b3GeometryUtil.h | 6 ++++-- .../bullet/Bullet3Geometry/b3GrahamScan2dConvexHull.h | 6 ++++-- .../BroadphaseCollision/b3GpuParallelLinearBvh.h | 6 ++++-- .../BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.h | 6 ++++-- .../bullet/Bullet3OpenCL/Initialize/b3OpenCLInclude.h | 6 ++++-- thirdparty/bullet/Bullet3OpenCL/Initialize/b3OpenCLUtils.h | 6 ++++-- .../Bullet3OpenCL/NarrowphaseCollision/b3ContactCache.h | 6 ++++-- .../bullet/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.h | 6 ++++-- .../Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.h | 6 ++++-- .../Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.h | 6 ++++-- .../NarrowphaseCollision/b3StridingMeshInterface.h | 6 ++++-- .../Bullet3OpenCL/NarrowphaseCollision/b3TriangleCallback.h | 6 ++++-- .../NarrowphaseCollision/b3TriangleIndexVertexArray.h | 6 ++++-- .../NarrowphaseCollision/b3VoronoiSimplexSolver.h | 6 ++++-- .../Bullet3OpenCL/ParallelPrimitives/b3BoundSearchCL.h | 6 ++++-- .../bullet/Bullet3OpenCL/RigidBody/b3GpuGenericConstraint.h | 6 ++++-- .../Bullet3OpenCL/RigidBody/b3GpuPgsConstraintSolver.h | 6 ++++-- .../bullet/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipeline.h | 6 ++++-- .../RigidBody/b3GpuRigidBodyPipelineInternalData.h | 6 ++++-- thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuSolverBody.h | 6 ++++-- .../bullet/Bullet3OpenCL/RigidBody/b3GpuSolverConstraint.h | 6 ++++-- thirdparty/bullet/Bullet3OpenCL/RigidBody/b3Solver.h | 6 ++++-- .../Bullet2FileLoader/autogenerated/bullet2.h | 6 ++++-- .../Bullet3Serialize/Bullet2FileLoader/b3BulletFile.h | 6 ++++-- .../bullet/Bullet3Serialize/Bullet2FileLoader/b3Chunk.h | 6 ++++-- .../bullet/Bullet3Serialize/Bullet2FileLoader/b3Common.h | 6 ++++-- .../bullet/Bullet3Serialize/Bullet2FileLoader/b3DNA.h | 6 ++++-- .../bullet/Bullet3Serialize/Bullet2FileLoader/b3Defines.h | 6 ++++-- .../bullet/Bullet3Serialize/Bullet2FileLoader/b3File.h | 6 ++++-- .../Bullet3Serialize/Bullet2FileLoader/b3Serializer.h | 6 ++++-- .../BulletCollision/BroadphaseCollision/btAxisSweep3.h | 6 ++++-- .../BroadphaseCollision/btAxisSweep3Internal.h | 6 ++++-- .../BroadphaseCollision/btBroadphaseInterface.h | 6 ++++-- .../BulletCollision/BroadphaseCollision/btBroadphaseProxy.h | 6 ++++-- .../BroadphaseCollision/btCollisionAlgorithm.h | 6 ++++-- .../bullet/BulletCollision/BroadphaseCollision/btDbvt.h | 6 ++++-- .../BulletCollision/BroadphaseCollision/btDbvtBroadphase.h | 6 ++++-- .../BulletCollision/BroadphaseCollision/btDispatcher.h | 6 ++++-- .../BroadphaseCollision/btOverlappingPairCache.h | 6 ++++-- .../BroadphaseCollision/btOverlappingPairCallback.h | 6 ++++-- .../BulletCollision/BroadphaseCollision/btQuantizedBvh.h | 6 ++++-- .../BroadphaseCollision/btSimpleBroadphase.h | 6 ++++-- .../CollisionDispatch/SphereTriangleDetector.h | 6 ++++-- .../CollisionDispatch/btActivatingCollisionAlgorithm.h | 6 ++++-- .../CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h | 6 ++++-- .../CollisionDispatch/btBoxBoxCollisionAlgorithm.h | 6 ++++-- .../BulletCollision/CollisionDispatch/btBoxBoxDetector.h | 6 ++++-- .../CollisionDispatch/btCollisionConfiguration.h | 6 ++++-- .../CollisionDispatch/btCollisionCreateFunc.h | 6 ++++-- .../CollisionDispatch/btCollisionDispatcher.h | 6 ++++-- .../CollisionDispatch/btCollisionDispatcherMt.h | 6 ++++-- .../BulletCollision/CollisionDispatch/btCollisionObject.h | 6 ++++-- .../BulletCollision/CollisionDispatch/btCollisionWorld.h | 6 ++++-- .../CollisionDispatch/btCollisionWorldImporter.h | 6 ++++-- .../CollisionDispatch/btCompoundCollisionAlgorithm.h | 6 ++++-- .../btCompoundCompoundCollisionAlgorithm.h | 6 ++++-- .../CollisionDispatch/btConvex2dConvex2dAlgorithm.h | 6 ++++-- .../CollisionDispatch/btConvexConcaveCollisionAlgorithm.h | 6 ++++-- .../CollisionDispatch/btConvexConvexAlgorithm.h | 6 ++++-- .../CollisionDispatch/btConvexPlaneCollisionAlgorithm.h | 6 ++++-- .../CollisionDispatch/btDefaultCollisionConfiguration.h | 6 ++++-- .../CollisionDispatch/btEmptyCollisionAlgorithm.h | 6 ++++-- .../BulletCollision/CollisionDispatch/btGhostObject.h | 6 ++++-- .../CollisionDispatch/btHashedSimplePairCache.h | 6 ++++-- .../BulletCollision/CollisionDispatch/btManifoldResult.h | 6 ++++-- .../CollisionDispatch/btSimulationIslandManager.h | 6 ++++-- .../CollisionDispatch/btSphereBoxCollisionAlgorithm.h | 6 ++++-- .../CollisionDispatch/btSphereSphereCollisionAlgorithm.h | 6 ++++-- .../CollisionDispatch/btSphereTriangleCollisionAlgorithm.h | 6 ++++-- .../bullet/BulletCollision/CollisionDispatch/btUnionFind.h | 6 ++++-- .../bullet/BulletCollision/CollisionShapes/btBox2dShape.h | 6 ++++-- .../bullet/BulletCollision/CollisionShapes/btBoxShape.h | 6 ++++-- .../CollisionShapes/btBvhTriangleMeshShape.h | 6 ++++-- .../bullet/BulletCollision/CollisionShapes/btCapsuleShape.h | 6 ++++-- .../BulletCollision/CollisionShapes/btCollisionMargin.h | 6 ++++-- .../BulletCollision/CollisionShapes/btCollisionShape.h | 6 ++++-- .../BulletCollision/CollisionShapes/btCompoundShape.h | 6 ++++-- .../bullet/BulletCollision/CollisionShapes/btConcaveShape.h | 6 ++++-- .../bullet/BulletCollision/CollisionShapes/btConeShape.h | 6 ++++-- .../BulletCollision/CollisionShapes/btConvex2dShape.h | 6 ++++-- .../BulletCollision/CollisionShapes/btConvexHullShape.h | 6 ++++-- .../BulletCollision/CollisionShapes/btConvexInternalShape.h | 6 ++++-- .../CollisionShapes/btConvexPointCloudShape.h | 6 ++++-- .../BulletCollision/CollisionShapes/btConvexPolyhedron.h | 6 ++++-- .../bullet/BulletCollision/CollisionShapes/btConvexShape.h | 6 ++++-- .../CollisionShapes/btConvexTriangleMeshShape.h | 6 ++++-- .../BulletCollision/CollisionShapes/btCylinderShape.h | 6 ++++-- .../bullet/BulletCollision/CollisionShapes/btEmptyShape.h | 6 ++++-- .../CollisionShapes/btHeightfieldTerrainShape.h | 6 ++++-- .../bullet/BulletCollision/CollisionShapes/btMaterial.h | 6 ++++-- .../BulletCollision/CollisionShapes/btMinkowskiSumShape.h | 6 ++++-- .../BulletCollision/CollisionShapes/btMultiSphereShape.h | 6 ++++-- .../CollisionShapes/btMultimaterialTriangleMeshShape.h | 6 ++++-- .../bullet/BulletCollision/CollisionShapes/btOptimizedBvh.h | 6 ++++-- .../CollisionShapes/btPolyhedralConvexShape.h | 6 ++++-- .../CollisionShapes/btScaledBvhTriangleMeshShape.h | 6 ++++-- .../bullet/BulletCollision/CollisionShapes/btShapeHull.h | 6 ++++-- .../bullet/BulletCollision/CollisionShapes/btSphereShape.h | 6 ++++-- .../BulletCollision/CollisionShapes/btStaticPlaneShape.h | 6 ++++-- .../CollisionShapes/btStridingMeshInterface.h | 6 ++++-- .../BulletCollision/CollisionShapes/btTetrahedronShape.h | 6 ++++-- .../BulletCollision/CollisionShapes/btTriangleBuffer.h | 6 ++++-- .../BulletCollision/CollisionShapes/btTriangleCallback.h | 6 ++++-- .../CollisionShapes/btTriangleIndexVertexArray.h | 6 ++++-- .../CollisionShapes/btTriangleIndexVertexMaterialArray.h | 6 ++++-- .../BulletCollision/CollisionShapes/btTriangleInfoMap.h | 6 ++++-- .../bullet/BulletCollision/CollisionShapes/btTriangleMesh.h | 6 ++++-- .../BulletCollision/CollisionShapes/btTriangleMeshShape.h | 6 ++++-- .../BulletCollision/CollisionShapes/btTriangleShape.h | 6 ++++-- .../BulletCollision/CollisionShapes/btUniformScalingShape.h | 6 ++++-- .../BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h | 6 ++++-- .../bullet/BulletCollision/Gimpact/btGImpactMassUtil.h | 6 ++++-- .../bullet/BulletCollision/Gimpact/btGenericPoolAllocator.h | 6 ++++-- .../bullet/BulletCollision/Gimpact/btTriangleShapeEx.h | 6 ++++-- .../NarrowPhaseCollision/btComputeGjkEpaPenetration.h | 6 ++++-- .../NarrowPhaseCollision/btContinuousConvexCollision.h | 6 ++++-- .../BulletCollision/NarrowPhaseCollision/btConvexCast.h | 6 ++++-- .../NarrowPhaseCollision/btConvexPenetrationDepthSolver.h | 6 ++++-- .../btDiscreteCollisionDetectorInterface.h | 6 ++++-- .../NarrowPhaseCollision/btGjkCollisionDescription.h | 6 ++++-- .../BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h | 6 ++++-- .../bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h | 6 ++++-- .../bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa3.h | 6 ++++-- .../NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h | 6 ++++-- .../NarrowPhaseCollision/btGjkPairDetector.h | 6 ++++-- .../BulletCollision/NarrowPhaseCollision/btManifoldPoint.h | 6 ++++-- .../btMinkowskiPenetrationDepthSolver.h | 6 ++++-- .../BulletCollision/NarrowPhaseCollision/btMprPenetration.h | 6 ++++-- .../NarrowPhaseCollision/btPersistentManifold.h | 6 ++++-- .../BulletCollision/NarrowPhaseCollision/btPointCollector.h | 6 ++++-- .../NarrowPhaseCollision/btPolyhedralContactClipping.h | 6 ++++-- .../NarrowPhaseCollision/btRaycastCallback.h | 6 ++++-- .../NarrowPhaseCollision/btSimplexSolverInterface.h | 6 ++++-- .../NarrowPhaseCollision/btSubSimplexConvexCast.h | 6 ++++-- .../NarrowPhaseCollision/btVoronoiSimplexSolver.h | 6 ++++-- .../Character/btCharacterControllerInterface.h | 6 ++++-- .../Character/btKinematicCharacterController.h | 6 ++++-- .../BulletDynamics/ConstraintSolver/btBatchedConstraints.h | 6 ++++-- .../BulletDynamics/ConstraintSolver/btConeTwistConstraint.h | 6 ++++-- .../BulletDynamics/ConstraintSolver/btConstraintSolver.h | 6 ++++-- .../BulletDynamics/ConstraintSolver/btContactConstraint.h | 6 ++++-- .../BulletDynamics/ConstraintSolver/btContactSolverInfo.h | 6 ++++-- .../BulletDynamics/ConstraintSolver/btFixedConstraint.h | 6 ++++-- .../BulletDynamics/ConstraintSolver/btGearConstraint.h | 6 ++++-- .../ConstraintSolver/btGeneric6DofConstraint.h | 6 ++++-- .../ConstraintSolver/btGeneric6DofSpring2Constraint.h | 6 ++++-- .../ConstraintSolver/btGeneric6DofSpringConstraint.h | 6 ++++-- .../BulletDynamics/ConstraintSolver/btHinge2Constraint.h | 6 ++++-- .../BulletDynamics/ConstraintSolver/btHingeConstraint.h | 6 ++++-- .../BulletDynamics/ConstraintSolver/btJacobianEntry.h | 6 ++++-- .../ConstraintSolver/btNNCGConstraintSolver.h | 6 ++++-- .../ConstraintSolver/btPoint2PointConstraint.h | 6 ++++-- .../ConstraintSolver/btSequentialImpulseConstraintSolver.h | 6 ++++-- .../btSequentialImpulseConstraintSolverMt.h | 6 ++++-- .../BulletDynamics/ConstraintSolver/btSliderConstraint.h | 6 ++++-- .../ConstraintSolver/btSolve2LinearConstraint.h | 6 ++++-- .../bullet/BulletDynamics/ConstraintSolver/btSolverBody.h | 6 ++++-- .../BulletDynamics/ConstraintSolver/btSolverConstraint.h | 6 ++++-- .../BulletDynamics/ConstraintSolver/btTypedConstraint.h | 6 ++++-- .../BulletDynamics/ConstraintSolver/btUniversalConstraint.h | 6 ++++-- .../bullet/BulletDynamics/Dynamics/btActionInterface.h | 6 ++++-- .../BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h | 6 ++++-- .../BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h | 6 ++++-- thirdparty/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h | 6 ++++-- thirdparty/bullet/BulletDynamics/Dynamics/btRigidBody.h | 6 ++++-- .../bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h | 6 ++++-- .../BulletDynamics/Dynamics/btSimulationIslandManagerMt.h | 6 ++++-- thirdparty/bullet/BulletDynamics/Featherstone/btMultiBody.h | 6 ++++-- .../BulletDynamics/Featherstone/btMultiBodyConstraint.h | 6 ++++-- .../Featherstone/btMultiBodyConstraintSolver.h | 6 ++++-- .../BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h | 6 ++++-- .../Featherstone/btMultiBodyFixedConstraint.h | 6 ++++-- .../BulletDynamics/Featherstone/btMultiBodyGearConstraint.h | 6 ++++-- .../Featherstone/btMultiBodyInplaceSolverIslandCallback.h | 6 ++++-- .../BulletDynamics/Featherstone/btMultiBodyJointFeedback.h | 6 ++++-- .../Featherstone/btMultiBodyJointLimitConstraint.h | 6 ++++-- .../BulletDynamics/Featherstone/btMultiBodyJointMotor.h | 6 ++++-- .../bullet/BulletDynamics/Featherstone/btMultiBodyLink.h | 6 ++++-- .../BulletDynamics/Featherstone/btMultiBodyLinkCollider.h | 6 ++++-- .../Featherstone/btMultiBodyMLCPConstraintSolver.h | 6 ++++-- .../BulletDynamics/Featherstone/btMultiBodyPoint2Point.h | 6 ++++-- .../Featherstone/btMultiBodySliderConstraint.h | 6 ++++-- .../Featherstone/btMultiBodySolverConstraint.h | 6 ++++-- .../Featherstone/btMultiBodySphericalJointMotor.h | 6 ++++-- thirdparty/bullet/BulletDynamics/MLCPSolvers/btDantzigLCP.h | 6 ++++-- .../bullet/BulletDynamics/MLCPSolvers/btDantzigSolver.h | 6 ++++-- .../bullet/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.h | 6 ++++-- .../bullet/BulletDynamics/MLCPSolvers/btLemkeSolver.h | 6 ++++-- thirdparty/bullet/BulletDynamics/MLCPSolvers/btMLCPSolver.h | 6 ++++-- .../BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h | 6 ++++-- thirdparty/bullet/BulletDynamics/MLCPSolvers/btPATHSolver.h | 6 ++++-- .../MLCPSolvers/btSolveProjectedGaussSeidel.h | 6 ++++-- thirdparty/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h | 6 ++++-- .../bullet/BulletDynamics/Vehicle/btVehicleRaycaster.h | 6 ++++-- thirdparty/bullet/BulletDynamics/Vehicle/btWheelInfo.h | 6 ++++-- .../DeformableBodyInplaceSolverIslandCallback.h | 6 ++++-- thirdparty/bullet/BulletSoftBody/btCGProjection.h | 6 ++++-- thirdparty/bullet/BulletSoftBody/btConjugateGradient.h | 6 ++++-- thirdparty/bullet/BulletSoftBody/btConjugateResidual.h | 6 ++++-- thirdparty/bullet/BulletSoftBody/btDefaultSoftBodySolver.h | 6 ++++-- .../BulletSoftBody/btDeformableBackwardEulerObjective.h | 6 ++++-- thirdparty/bullet/BulletSoftBody/btDeformableBodySolver.h | 6 ++++-- .../bullet/BulletSoftBody/btDeformableContactConstraint.h | 6 ++++-- .../bullet/BulletSoftBody/btDeformableContactProjection.h | 6 ++++-- .../bullet/BulletSoftBody/btDeformableCorotatedForce.h | 6 ++++-- thirdparty/bullet/BulletSoftBody/btDeformableGravityForce.h | 6 ++++-- .../bullet/BulletSoftBody/btDeformableLagrangianForce.h | 6 ++++-- .../BulletSoftBody/btDeformableLinearElasticityForce.h | 6 ++++-- .../bullet/BulletSoftBody/btDeformableMassSpringForce.h | 6 ++++-- .../bullet/BulletSoftBody/btDeformableMousePickingForce.h | 6 ++++-- .../BulletSoftBody/btDeformableMultiBodyConstraintSolver.h | 6 ++++-- .../BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h | 6 ++++-- .../bullet/BulletSoftBody/btDeformableNeoHookeanForce.h | 6 ++++-- thirdparty/bullet/BulletSoftBody/btKrylovSolver.h | 6 ++++-- thirdparty/bullet/BulletSoftBody/btPreconditioner.h | 6 ++++-- thirdparty/bullet/BulletSoftBody/btSoftBody.h | 6 ++++-- .../BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h | 6 ++++-- thirdparty/bullet/BulletSoftBody/btSoftBodyData.h | 6 ++++-- thirdparty/bullet/BulletSoftBody/btSoftBodyHelpers.h | 6 ++++-- thirdparty/bullet/BulletSoftBody/btSoftBodyInternals.h | 6 ++++-- .../btSoftBodyRigidBodyCollisionConfiguration.h | 6 ++++-- .../bullet/BulletSoftBody/btSoftBodySolverVertexBuffer.h | 6 ++++-- thirdparty/bullet/BulletSoftBody/btSoftBodySolvers.h | 6 ++++-- .../bullet/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h | 6 ++++-- .../bullet/BulletSoftBody/btSoftRigidCollisionAlgorithm.h | 6 ++++-- thirdparty/bullet/BulletSoftBody/btSoftRigidDynamicsWorld.h | 6 ++++-- .../bullet/BulletSoftBody/btSoftSoftCollisionAlgorithm.h | 6 ++++-- thirdparty/bullet/BulletSoftBody/btSparseSDF.h | 6 ++++-- thirdparty/bullet/BulletSoftBody/poly34.h | 6 ++++-- .../LinearMath/TaskScheduler/btThreadSupportInterface.h | 6 ++++-- thirdparty/bullet/LinearMath/btAabbUtil2.h | 6 ++++-- thirdparty/bullet/LinearMath/btAlignedAllocator.h | 6 ++++-- thirdparty/bullet/LinearMath/btAlignedObjectArray.h | 6 ++++-- thirdparty/bullet/LinearMath/btConvexHull.h | 6 ++++-- thirdparty/bullet/LinearMath/btConvexHullComputer.h | 6 ++++-- thirdparty/bullet/LinearMath/btGeometryUtil.h | 6 ++++-- thirdparty/bullet/LinearMath/btGrahamScan2dConvexHull.h | 6 ++++-- thirdparty/bullet/LinearMath/btHashMap.h | 6 ++++-- thirdparty/bullet/LinearMath/btIDebugDraw.h | 6 ++++-- thirdparty/bullet/LinearMath/btImplicitQRSVD.h | 6 ++++-- thirdparty/bullet/LinearMath/btList.h | 6 ++++-- thirdparty/bullet/LinearMath/btMatrix3x3.h | 6 ++++-- thirdparty/bullet/LinearMath/btMatrixX.h | 6 ++++-- thirdparty/bullet/LinearMath/btMinMax.h | 6 ++++-- thirdparty/bullet/LinearMath/btModifiedGramSchmidt.h | 6 ++++-- thirdparty/bullet/LinearMath/btMotionState.h | 6 ++++-- thirdparty/bullet/LinearMath/btPoolAllocator.h | 6 ++++-- thirdparty/bullet/LinearMath/btQuadWord.h | 6 ++++-- thirdparty/bullet/LinearMath/btQuaternion.h | 6 ++++-- thirdparty/bullet/LinearMath/btQuickprof.h | 6 ++++-- thirdparty/bullet/LinearMath/btRandom.h | 6 ++++-- thirdparty/bullet/LinearMath/btReducedVector.h | 6 ++++-- thirdparty/bullet/LinearMath/btScalar.h | 6 ++++-- thirdparty/bullet/LinearMath/btSerializer.h | 6 ++++-- thirdparty/bullet/LinearMath/btSpatialAlgebra.h | 6 ++++-- thirdparty/bullet/LinearMath/btStackAlloc.h | 6 ++++-- thirdparty/bullet/LinearMath/btThreads.h | 6 ++++-- thirdparty/bullet/LinearMath/btTransform.h | 6 ++++-- thirdparty/bullet/LinearMath/btTransformUtil.h | 6 ++++-- thirdparty/bullet/LinearMath/btVector3.h | 6 ++++-- thirdparty/bullet/btBulletCollisionCommon.h | 6 ++++-- thirdparty/bullet/btBulletDynamicsCommon.h | 6 ++++-- 296 files changed, 1184 insertions(+), 592 deletions(-) diff --git a/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3BroadphaseCallback.h b/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3BroadphaseCallback.h index bec0800a6..a01d36c5c 100644 --- a/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3BroadphaseCallback.h +++ b/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3BroadphaseCallback.h @@ -1,3 +1,5 @@ +#ifndef B3_BROADPHASE_CALLBACK_H +#define B3_BROADPHASE_CALLBACK_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_BROADPHASE_CALLBACK_H -#define B3_BROADPHASE_CALLBACK_H + + #include "Bullet3Common/b3Vector3.h" struct b3BroadphaseProxy; diff --git a/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3DynamicBvh.h b/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3DynamicBvh.h index f44e3377f..603b1d597 100644 --- a/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3DynamicBvh.h +++ b/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3DynamicBvh.h @@ -1,3 +1,5 @@ +#ifndef B3_DYNAMIC_BOUNDING_VOLUME_TREE_H +#define B3_DYNAMIC_BOUNDING_VOLUME_TREE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -14,8 +16,8 @@ subject to the following restrictions: */ ///b3DynamicBvh implementation by Nathanael Presson -#ifndef B3_DYNAMIC_BOUNDING_VOLUME_TREE_H -#define B3_DYNAMIC_BOUNDING_VOLUME_TREE_H + + #include "Bullet3Common/b3AlignedObjectArray.h" #include "Bullet3Common/b3Vector3.h" diff --git a/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3DynamicBvhBroadphase.h b/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3DynamicBvhBroadphase.h index c235e4014..1ff48d060 100644 --- a/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3DynamicBvhBroadphase.h +++ b/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3DynamicBvhBroadphase.h @@ -1,3 +1,5 @@ +#ifndef B3_DBVT_BROADPHASE_H +#define B3_DBVT_BROADPHASE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -14,8 +16,8 @@ subject to the following restrictions: */ ///b3DynamicBvhBroadphase implementation by Nathanael Presson -#ifndef B3_DBVT_BROADPHASE_H -#define B3_DBVT_BROADPHASE_H + + #include "Bullet3Collision/BroadPhaseCollision/b3DynamicBvh.h" #include "Bullet3Collision/BroadPhaseCollision/b3OverlappingPairCache.h" diff --git a/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3OverlappingPair.h b/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3OverlappingPair.h index 4ff9ebae8..1909d4f8c 100644 --- a/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3OverlappingPair.h +++ b/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3OverlappingPair.h @@ -1,3 +1,5 @@ +#ifndef B3_OVERLAPPING_PAIR_H +#define B3_OVERLAPPING_PAIR_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_OVERLAPPING_PAIR_H -#define B3_OVERLAPPING_PAIR_H + + #include "Bullet3Common/shared/b3Int4.h" diff --git a/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3OverlappingPairCache.h b/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3OverlappingPairCache.h index f1de1d94e..87fc090f2 100644 --- a/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3OverlappingPairCache.h +++ b/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3OverlappingPairCache.h @@ -1,3 +1,5 @@ +#ifndef B3_OVERLAPPING_PAIR_CACHE_H +#define B3_OVERLAPPING_PAIR_CACHE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_OVERLAPPING_PAIR_CACHE_H -#define B3_OVERLAPPING_PAIR_CACHE_H + + #include "Bullet3Common/shared/b3Int2.h" #include "Bullet3Common/b3AlignedObjectArray.h" diff --git a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3Contact4.h b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3Contact4.h index c2cd3c729..f55600bd9 100644 --- a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3Contact4.h +++ b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3Contact4.h @@ -1,3 +1,5 @@ +#ifndef B3_CONTACT4_H +#define B3_CONTACT4_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_CONTACT4_H -#define B3_CONTACT4_H + + #include "Bullet3Common/b3Vector3.h" #include "Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h" diff --git a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.h b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.h index 4c8a88cbd..92a5c2847 100644 --- a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.h +++ b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.h @@ -1,3 +1,5 @@ +#ifndef _BT_CONVEX_UTILITY_H +#define _BT_CONVEX_UTILITY_H /* Copyright (c) 2012 Advanced Micro Devices, Inc. @@ -14,8 +16,8 @@ subject to the following restrictions: */ //Originally written by Erwin Coumans -#ifndef _BT_CONVEX_UTILITY_H -#define _BT_CONVEX_UTILITY_H + + #include "Bullet3Common/b3AlignedObjectArray.h" #include "Bullet3Common/b3Transform.h" diff --git a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3RigidBodyCL.h b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3RigidBodyCL.h index be1be57f0..119e56095 100644 --- a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3RigidBodyCL.h +++ b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3RigidBodyCL.h @@ -1,3 +1,5 @@ +#ifndef B3_RIGID_BODY_CL +#define B3_RIGID_BODY_CL /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_RIGID_BODY_CL -#define B3_RIGID_BODY_CL + + #include "Bullet3Common/b3Scalar.h" #include "Bullet3Common/b3Matrix3x3.h" diff --git a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3MprPenetration.h b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3MprPenetration.h index a3bfbf299..509c23ea4 100644 --- a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3MprPenetration.h +++ b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3MprPenetration.h @@ -1,3 +1,5 @@ +#ifndef B3_MPR_PENETRATION_H +#define B3_MPR_PENETRATION_H /*** * --------------------------------- @@ -15,8 +17,8 @@ * See the License for more information. */ -#ifndef B3_MPR_PENETRATION_H -#define B3_MPR_PENETRATION_H + + #include "Bullet3Common/shared/b3PlatformDefinitions.h" #include "Bullet3Common/shared/b3Float4.h" diff --git a/thirdparty/bullet/Bullet3Common/b3AlignedAllocator.h b/thirdparty/bullet/Bullet3Common/b3AlignedAllocator.h index bcff9f128..124f7d490 100644 --- a/thirdparty/bullet/Bullet3Common/b3AlignedAllocator.h +++ b/thirdparty/bullet/Bullet3Common/b3AlignedAllocator.h @@ -1,3 +1,5 @@ +#ifndef B3_ALIGNED_ALLOCATOR +#define B3_ALIGNED_ALLOCATOR /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_ALIGNED_ALLOCATOR -#define B3_ALIGNED_ALLOCATOR + + ///we probably replace this with our own aligned memory allocator ///so we replace _aligned_malloc and _aligned_free with our own diff --git a/thirdparty/bullet/Bullet3Common/b3AlignedObjectArray.h b/thirdparty/bullet/Bullet3Common/b3AlignedObjectArray.h index 7d31b56d0..aba6e8dea 100644 --- a/thirdparty/bullet/Bullet3Common/b3AlignedObjectArray.h +++ b/thirdparty/bullet/Bullet3Common/b3AlignedObjectArray.h @@ -1,3 +1,5 @@ +#ifndef B3_OBJECT_ARRAY__ +#define B3_OBJECT_ARRAY__ /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_OBJECT_ARRAY__ -#define B3_OBJECT_ARRAY__ + + #include "b3Scalar.h" // has definitions like B3_FORCE_INLINE #include "b3AlignedAllocator.h" diff --git a/thirdparty/bullet/Bullet3Common/b3HashMap.h b/thirdparty/bullet/Bullet3Common/b3HashMap.h index 3009e2cf2..0523f36d3 100644 --- a/thirdparty/bullet/Bullet3Common/b3HashMap.h +++ b/thirdparty/bullet/Bullet3Common/b3HashMap.h @@ -1,3 +1,5 @@ +#ifndef B3_HASH_MAP_H +#define B3_HASH_MAP_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_HASH_MAP_H -#define B3_HASH_MAP_H + + #include "b3AlignedObjectArray.h" diff --git a/thirdparty/bullet/Bullet3Common/b3Matrix3x3.h b/thirdparty/bullet/Bullet3Common/b3Matrix3x3.h index 6c46536a8..be7c066ce 100644 --- a/thirdparty/bullet/Bullet3Common/b3Matrix3x3.h +++ b/thirdparty/bullet/Bullet3Common/b3Matrix3x3.h @@ -1,3 +1,5 @@ +#ifndef B3_MATRIX3x3_H +#define B3_MATRIX3x3_H /* Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans http://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_MATRIX3x3_H -#define B3_MATRIX3x3_H + + #include "b3Vector3.h" #include "b3Quaternion.h" diff --git a/thirdparty/bullet/Bullet3Common/b3MinMax.h b/thirdparty/bullet/Bullet3Common/b3MinMax.h index c09c3db3f..72880c496 100644 --- a/thirdparty/bullet/Bullet3Common/b3MinMax.h +++ b/thirdparty/bullet/Bullet3Common/b3MinMax.h @@ -1,3 +1,5 @@ +#ifndef B3_GEN_MINMAX_H +#define B3_GEN_MINMAX_H /* Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans http://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_GEN_MINMAX_H -#define B3_GEN_MINMAX_H + + #include "b3Scalar.h" diff --git a/thirdparty/bullet/Bullet3Common/b3PoolAllocator.h b/thirdparty/bullet/Bullet3Common/b3PoolAllocator.h index ed56bc627..a1d2c74c7 100644 --- a/thirdparty/bullet/Bullet3Common/b3PoolAllocator.h +++ b/thirdparty/bullet/Bullet3Common/b3PoolAllocator.h @@ -1,3 +1,5 @@ +#ifndef _BT_POOL_ALLOCATOR_H +#define _BT_POOL_ALLOCATOR_H /* Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans http://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _BT_POOL_ALLOCATOR_H -#define _BT_POOL_ALLOCATOR_H + + #include "b3Scalar.h" #include "b3AlignedAllocator.h" diff --git a/thirdparty/bullet/Bullet3Common/b3QuadWord.h b/thirdparty/bullet/Bullet3Common/b3QuadWord.h index 0def305fa..6c12e4b21 100644 --- a/thirdparty/bullet/Bullet3Common/b3QuadWord.h +++ b/thirdparty/bullet/Bullet3Common/b3QuadWord.h @@ -1,3 +1,5 @@ +#ifndef B3_SIMD_QUADWORD_H +#define B3_SIMD_QUADWORD_H /* Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans http://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_SIMD_QUADWORD_H -#define B3_SIMD_QUADWORD_H + + #include "b3Scalar.h" #include "b3MinMax.h" diff --git a/thirdparty/bullet/Bullet3Common/b3Quaternion.h b/thirdparty/bullet/Bullet3Common/b3Quaternion.h index 4fdd72dcc..eb4c76529 100644 --- a/thirdparty/bullet/Bullet3Common/b3Quaternion.h +++ b/thirdparty/bullet/Bullet3Common/b3Quaternion.h @@ -1,3 +1,5 @@ +#ifndef B3_SIMD__QUATERNION_H_ +#define B3_SIMD__QUATERNION_H_ /* Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans http://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_SIMD__QUATERNION_H_ -#define B3_SIMD__QUATERNION_H_ + + #include "b3Vector3.h" #include "b3QuadWord.h" diff --git a/thirdparty/bullet/Bullet3Common/b3Random.h b/thirdparty/bullet/Bullet3Common/b3Random.h index c2e21496c..11b0ad0c2 100644 --- a/thirdparty/bullet/Bullet3Common/b3Random.h +++ b/thirdparty/bullet/Bullet3Common/b3Random.h @@ -1,3 +1,5 @@ +#ifndef B3_GEN_RANDOM_H +#define B3_GEN_RANDOM_H /* Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans http://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_GEN_RANDOM_H -#define B3_GEN_RANDOM_H + + #include "b3Scalar.h" diff --git a/thirdparty/bullet/Bullet3Common/b3Scalar.h b/thirdparty/bullet/Bullet3Common/b3Scalar.h index eeb70ed63..a1a502c8b 100644 --- a/thirdparty/bullet/Bullet3Common/b3Scalar.h +++ b/thirdparty/bullet/Bullet3Common/b3Scalar.h @@ -1,3 +1,5 @@ +#ifndef B3_SCALAR_H +#define B3_SCALAR_H /* Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans http://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_SCALAR_H -#define B3_SCALAR_H + + #ifdef B3_MANAGED_CODE //Aligned data types not supported in managed code diff --git a/thirdparty/bullet/Bullet3Common/b3StackAlloc.h b/thirdparty/bullet/Bullet3Common/b3StackAlloc.h index 4972236ac..b1b1b6839 100644 --- a/thirdparty/bullet/Bullet3Common/b3StackAlloc.h +++ b/thirdparty/bullet/Bullet3Common/b3StackAlloc.h @@ -1,3 +1,5 @@ +#ifndef B3_STACK_ALLOC +#define B3_STACK_ALLOC /* Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans http://bulletphysics.org @@ -17,8 +19,8 @@ StackAlloc extracted from GJK-EPA collision solver by Nathanael Presson Nov.2006 */ -#ifndef B3_STACK_ALLOC -#define B3_STACK_ALLOC + + #include "b3Scalar.h" //for b3Assert #include "b3AlignedAllocator.h" diff --git a/thirdparty/bullet/Bullet3Common/b3Transform.h b/thirdparty/bullet/Bullet3Common/b3Transform.h index 149da9d14..6206af4b1 100644 --- a/thirdparty/bullet/Bullet3Common/b3Transform.h +++ b/thirdparty/bullet/Bullet3Common/b3Transform.h @@ -1,3 +1,5 @@ +#ifndef B3_TRANSFORM_H +#define B3_TRANSFORM_H /* Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans http://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_TRANSFORM_H -#define B3_TRANSFORM_H + + #include "b3Matrix3x3.h" diff --git a/thirdparty/bullet/Bullet3Common/b3TransformUtil.h b/thirdparty/bullet/Bullet3Common/b3TransformUtil.h index 1850a9be5..068ffd04b 100644 --- a/thirdparty/bullet/Bullet3Common/b3TransformUtil.h +++ b/thirdparty/bullet/Bullet3Common/b3TransformUtil.h @@ -1,3 +1,5 @@ +#ifndef B3_TRANSFORM_UTIL_H +#define B3_TRANSFORM_UTIL_H /* Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans http://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_TRANSFORM_UTIL_H -#define B3_TRANSFORM_UTIL_H + + #include "b3Transform.h" #define B3_ANGULAR_MOTION_THRESHOLD b3Scalar(0.5) * B3_HALF_PI diff --git a/thirdparty/bullet/Bullet3Common/b3Vector3.h b/thirdparty/bullet/Bullet3Common/b3Vector3.h index a70d68d6e..8f8dd9e20 100644 --- a/thirdparty/bullet/Bullet3Common/b3Vector3.h +++ b/thirdparty/bullet/Bullet3Common/b3Vector3.h @@ -1,3 +1,5 @@ +#ifndef B3_VECTOR3_H +#define B3_VECTOR3_H /* Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans http://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_VECTOR3_H -#define B3_VECTOR3_H + + //#include #include "b3Scalar.h" diff --git a/thirdparty/bullet/Bullet3Common/shared/b3Int2.h b/thirdparty/bullet/Bullet3Common/shared/b3Int2.h index 7b84de443..f21339e8f 100644 --- a/thirdparty/bullet/Bullet3Common/shared/b3Int2.h +++ b/thirdparty/bullet/Bullet3Common/shared/b3Int2.h @@ -1,3 +1,5 @@ +#ifndef B3_INT2_H +#define B3_INT2_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_INT2_H -#define B3_INT2_H + + #ifdef __cplusplus diff --git a/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3ContactSolverInfo.h b/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3ContactSolverInfo.h index e946c2ae5..532fe2d3e 100644 --- a/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3ContactSolverInfo.h +++ b/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3ContactSolverInfo.h @@ -1,3 +1,5 @@ +#ifndef B3_CONTACT_SOLVER_INFO +#define B3_CONTACT_SOLVER_INFO /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_CONTACT_SOLVER_INFO -#define B3_CONTACT_SOLVER_INFO + + #include "Bullet3Common/b3Scalar.h" diff --git a/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3Generic6DofConstraint.h b/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3Generic6DofConstraint.h index d162d58fe..ca27ba7b8 100644 --- a/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3Generic6DofConstraint.h +++ b/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3Generic6DofConstraint.h @@ -1,3 +1,5 @@ +#ifndef B3_GENERIC_6DOF_CONSTRAINT_H +#define B3_GENERIC_6DOF_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -23,8 +25,8 @@ email: projectileman@yahoo.com http://gimpact.sf.net */ -#ifndef B3_GENERIC_6DOF_CONSTRAINT_H -#define B3_GENERIC_6DOF_CONSTRAINT_H + + #include "Bullet3Common/b3Vector3.h" #include "b3JacobianEntry.h" diff --git a/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3JacobianEntry.h b/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3JacobianEntry.h index 3cc4f6026..df73bebb7 100644 --- a/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3JacobianEntry.h +++ b/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3JacobianEntry.h @@ -1,3 +1,5 @@ +#ifndef B3_JACOBIAN_ENTRY_H +#define B3_JACOBIAN_ENTRY_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_JACOBIAN_ENTRY_H -#define B3_JACOBIAN_ENTRY_H + + #include "Bullet3Common/b3Matrix3x3.h" diff --git a/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.h b/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.h index a6c21d20a..05042e0c2 100644 --- a/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.h +++ b/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.h @@ -1,3 +1,5 @@ +#ifndef B3_POINT2POINTCONSTRAINT_H +#define B3_POINT2POINTCONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_POINT2POINTCONSTRAINT_H -#define B3_POINT2POINTCONSTRAINT_H + + #include "Bullet3Common/b3Vector3.h" //#include "b3JacobianEntry.h" diff --git a/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3SolverBody.h b/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3SolverBody.h index c9056ec4a..dbbd62194 100644 --- a/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3SolverBody.h +++ b/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3SolverBody.h @@ -1,3 +1,5 @@ +#ifndef B3_SOLVER_BODY_H +#define B3_SOLVER_BODY_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_SOLVER_BODY_H -#define B3_SOLVER_BODY_H + + #include "Bullet3Common/b3Vector3.h" #include "Bullet3Common/b3Matrix3x3.h" diff --git a/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3SolverConstraint.h b/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3SolverConstraint.h index 1e9533fb7..b1bdb56c8 100644 --- a/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3SolverConstraint.h +++ b/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3SolverConstraint.h @@ -1,3 +1,5 @@ +#ifndef B3_SOLVER_CONSTRAINT_H +#define B3_SOLVER_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_SOLVER_CONSTRAINT_H -#define B3_SOLVER_CONSTRAINT_H + + #include "Bullet3Common/b3Vector3.h" #include "Bullet3Common/b3Matrix3x3.h" diff --git a/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.h b/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.h index 82075db2a..8c84a3c2d 100644 --- a/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.h +++ b/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.h @@ -1,3 +1,5 @@ +#ifndef B3_TYPED_CONSTRAINT_H +#define B3_TYPED_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2010 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_TYPED_CONSTRAINT_H -#define B3_TYPED_CONSTRAINT_H + + #include "Bullet3Common/b3Scalar.h" #include "b3SolverConstraint.h" diff --git a/thirdparty/bullet/Bullet3Dynamics/b3CpuRigidBodyPipeline.h b/thirdparty/bullet/Bullet3Dynamics/b3CpuRigidBodyPipeline.h index 9c65419f2..6ef7e7597 100644 --- a/thirdparty/bullet/Bullet3Dynamics/b3CpuRigidBodyPipeline.h +++ b/thirdparty/bullet/Bullet3Dynamics/b3CpuRigidBodyPipeline.h @@ -1,3 +1,5 @@ +#ifndef B3_CPU_RIGIDBODY_PIPELINE_H +#define B3_CPU_RIGIDBODY_PIPELINE_H /* Copyright (c) 2013 Advanced Micro Devices, Inc. @@ -13,8 +15,8 @@ subject to the following restrictions: */ //Originally written by Erwin Coumans -#ifndef B3_CPU_RIGIDBODY_PIPELINE_H -#define B3_CPU_RIGIDBODY_PIPELINE_H + + #include "Bullet3Common/b3AlignedObjectArray.h" #include "Bullet3Collision/NarrowPhaseCollision/b3RaycastInfo.h" diff --git a/thirdparty/bullet/Bullet3Geometry/b3AabbUtil.h b/thirdparty/bullet/Bullet3Geometry/b3AabbUtil.h index 04c52d8dc..f624822fe 100644 --- a/thirdparty/bullet/Bullet3Geometry/b3AabbUtil.h +++ b/thirdparty/bullet/Bullet3Geometry/b3AabbUtil.h @@ -1,3 +1,5 @@ +#ifndef B3_AABB_UTIL2 +#define B3_AABB_UTIL2 /* Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans https://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_AABB_UTIL2 -#define B3_AABB_UTIL2 + + #include "Bullet3Common/b3Transform.h" #include "Bullet3Common/b3Vector3.h" diff --git a/thirdparty/bullet/Bullet3Geometry/b3ConvexHullComputer.h b/thirdparty/bullet/Bullet3Geometry/b3ConvexHullComputer.h index 8852c5a52..cce3a22be 100644 --- a/thirdparty/bullet/Bullet3Geometry/b3ConvexHullComputer.h +++ b/thirdparty/bullet/Bullet3Geometry/b3ConvexHullComputer.h @@ -1,3 +1,5 @@ +#ifndef B3_CONVEX_HULL_COMPUTER_H +#define B3_CONVEX_HULL_COMPUTER_H /* Copyright (c) 2011 Ole Kniemeyer, MAXON, www.maxon.net @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_CONVEX_HULL_COMPUTER_H -#define B3_CONVEX_HULL_COMPUTER_H + + #include "Bullet3Common/b3Vector3.h" #include "Bullet3Common/b3AlignedObjectArray.h" diff --git a/thirdparty/bullet/Bullet3Geometry/b3GeometryUtil.h b/thirdparty/bullet/Bullet3Geometry/b3GeometryUtil.h index 9a7bf7e3a..460109cb2 100644 --- a/thirdparty/bullet/Bullet3Geometry/b3GeometryUtil.h +++ b/thirdparty/bullet/Bullet3Geometry/b3GeometryUtil.h @@ -1,3 +1,5 @@ +#ifndef B3_GEOMETRY_UTIL_H +#define B3_GEOMETRY_UTIL_H /* Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans https://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_GEOMETRY_UTIL_H -#define B3_GEOMETRY_UTIL_H + + #include "Bullet3Common/b3Vector3.h" #include "Bullet3Common/b3AlignedObjectArray.h" diff --git a/thirdparty/bullet/Bullet3Geometry/b3GrahamScan2dConvexHull.h b/thirdparty/bullet/Bullet3Geometry/b3GrahamScan2dConvexHull.h index 8881c9a63..23e76126a 100644 --- a/thirdparty/bullet/Bullet3Geometry/b3GrahamScan2dConvexHull.h +++ b/thirdparty/bullet/Bullet3Geometry/b3GrahamScan2dConvexHull.h @@ -1,3 +1,5 @@ +#ifndef B3_GRAHAM_SCAN_2D_CONVEX_HULL_H +#define B3_GRAHAM_SCAN_2D_CONVEX_HULL_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2011 Advanced Micro Devices, Inc. http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_GRAHAM_SCAN_2D_CONVEX_HULL_H -#define B3_GRAHAM_SCAN_2D_CONVEX_HULL_H + + #include "Bullet3Common/b3Vector3.h" #include "Bullet3Common/b3AlignedObjectArray.h" diff --git a/thirdparty/bullet/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvh.h b/thirdparty/bullet/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvh.h index b39077512..4db043176 100644 --- a/thirdparty/bullet/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvh.h +++ b/thirdparty/bullet/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvh.h @@ -1,3 +1,5 @@ +#ifndef B3_GPU_PARALLEL_LINEAR_BVH_H +#define B3_GPU_PARALLEL_LINEAR_BVH_H /* This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -11,8 +13,8 @@ subject to the following restrictions: */ //Initial Author Jackson Lee, 2014 -#ifndef B3_GPU_PARALLEL_LINEAR_BVH_H -#define B3_GPU_PARALLEL_LINEAR_BVH_H + + //#include "Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h" #include "Bullet3OpenCL/BroadphaseCollision/b3SapAabb.h" diff --git a/thirdparty/bullet/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.h b/thirdparty/bullet/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.h index dda0eea7b..80302b24d 100644 --- a/thirdparty/bullet/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.h +++ b/thirdparty/bullet/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.h @@ -1,3 +1,5 @@ +#ifndef B3_GPU_PARALLEL_LINEAR_BVH_BROADPHASE_H +#define B3_GPU_PARALLEL_LINEAR_BVH_BROADPHASE_H /* This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -11,8 +13,8 @@ subject to the following restrictions: */ //Initial Author Jackson Lee, 2014 -#ifndef B3_GPU_PARALLEL_LINEAR_BVH_BROADPHASE_H -#define B3_GPU_PARALLEL_LINEAR_BVH_BROADPHASE_H + + #include "Bullet3OpenCL/BroadphaseCollision/b3GpuBroadphaseInterface.h" diff --git a/thirdparty/bullet/Bullet3OpenCL/Initialize/b3OpenCLInclude.h b/thirdparty/bullet/Bullet3OpenCL/Initialize/b3OpenCLInclude.h index 614653826..337474fd4 100644 --- a/thirdparty/bullet/Bullet3OpenCL/Initialize/b3OpenCLInclude.h +++ b/thirdparty/bullet/Bullet3OpenCL/Initialize/b3OpenCLInclude.h @@ -1,3 +1,5 @@ +#ifndef B3_OPENCL_INCLUDE_H +#define B3_OPENCL_INCLUDE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2011 Advanced Micro Devices, Inc. http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_OPENCL_INCLUDE_H -#define B3_OPENCL_INCLUDE_H + + #ifdef B3_USE_CLEW #include "clew/clew.h" diff --git a/thirdparty/bullet/Bullet3OpenCL/Initialize/b3OpenCLUtils.h b/thirdparty/bullet/Bullet3OpenCL/Initialize/b3OpenCLUtils.h index 6c82eed2a..a3c946bf8 100644 --- a/thirdparty/bullet/Bullet3OpenCL/Initialize/b3OpenCLUtils.h +++ b/thirdparty/bullet/Bullet3OpenCL/Initialize/b3OpenCLUtils.h @@ -1,3 +1,5 @@ +#ifndef B3_OPENCL_UTILS_H +#define B3_OPENCL_UTILS_H /* Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org Copyright (C) 2006 - 2011 Sony Computer Entertainment Inc. @@ -16,8 +18,8 @@ subject to the following restrictions: //original author: Roman Ponomarev //cleanup by Erwin Coumans -#ifndef B3_OPENCL_UTILS_H -#define B3_OPENCL_UTILS_H + + #include "b3OpenCLInclude.h" diff --git a/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3ContactCache.h b/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3ContactCache.h index a15fd0b2a..adf6cc324 100644 --- a/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3ContactCache.h +++ b/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3ContactCache.h @@ -1,3 +1,5 @@ +#ifndef B3_CONTACT_CACHE_H +#define B3_CONTACT_CACHE_H /* Bullet Continuous Collision Detection and Physics Library @@ -14,8 +16,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_CONTACT_CACHE_H -#define B3_CONTACT_CACHE_H + + #include "Bullet3Common/b3Vector3.h" #include "Bullet3Common/b3Transform.h" diff --git a/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.h b/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.h index 1a67a5118..d8274f1ce 100644 --- a/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.h +++ b/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.h @@ -1,3 +1,5 @@ +#ifndef B3_GJK_EPA2_H +#define B3_GJK_EPA2_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2008 Erwin Coumans https://bulletphysics.org @@ -22,8 +24,8 @@ misrepresented as being the original software. /* GJK-EPA collision solver by Nathanael Presson, 2008 */ -#ifndef B3_GJK_EPA2_H -#define B3_GJK_EPA2_H + + #include "Bullet3Common/b3AlignedObjectArray.h" #include "Bullet3Common/b3Transform.h" diff --git a/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.h b/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.h index 128655293..fe29bc163 100644 --- a/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.h +++ b/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.h @@ -1,3 +1,5 @@ +#ifndef B3_OPTIMIZED_BVH_H +#define B3_OPTIMIZED_BVH_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -15,8 +17,8 @@ subject to the following restrictions: ///Contains contributions from Disney Studio's -#ifndef B3_OPTIMIZED_BVH_H -#define B3_OPTIMIZED_BVH_H + + #include "b3QuantizedBvh.h" diff --git a/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.h b/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.h index 13470829d..7d950c5a9 100644 --- a/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.h +++ b/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.h @@ -1,3 +1,5 @@ +#ifndef B3_QUANTIZED_BVH_H +#define B3_QUANTIZED_BVH_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_QUANTIZED_BVH_H -#define B3_QUANTIZED_BVH_H + + class b3Serializer; diff --git a/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3StridingMeshInterface.h b/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3StridingMeshInterface.h index 2b1e63be7..39707aca2 100644 --- a/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3StridingMeshInterface.h +++ b/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3StridingMeshInterface.h @@ -1,3 +1,5 @@ +#ifndef B3_STRIDING_MESHINTERFACE_H +#define B3_STRIDING_MESHINTERFACE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_STRIDING_MESHINTERFACE_H -#define B3_STRIDING_MESHINTERFACE_H + + #include "Bullet3Common/b3Vector3.h" #include "b3TriangleCallback.h" diff --git a/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3TriangleCallback.h b/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3TriangleCallback.h index a0fd3e7ac..33641bbc5 100644 --- a/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3TriangleCallback.h +++ b/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3TriangleCallback.h @@ -1,3 +1,5 @@ +#ifndef B3_TRIANGLE_CALLBACK_H +#define B3_TRIANGLE_CALLBACK_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_TRIANGLE_CALLBACK_H -#define B3_TRIANGLE_CALLBACK_H + + #include "Bullet3Common/b3Vector3.h" diff --git a/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3TriangleIndexVertexArray.h b/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3TriangleIndexVertexArray.h index 57cbf03dc..6cc7c0957 100644 --- a/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3TriangleIndexVertexArray.h +++ b/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3TriangleIndexVertexArray.h @@ -1,3 +1,5 @@ +#ifndef B3_TRIANGLE_INDEX_VERTEX_ARRAY_H +#define B3_TRIANGLE_INDEX_VERTEX_ARRAY_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_TRIANGLE_INDEX_VERTEX_ARRAY_H -#define B3_TRIANGLE_INDEX_VERTEX_ARRAY_H + + #include "b3StridingMeshInterface.h" #include "Bullet3Common/b3AlignedObjectArray.h" diff --git a/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3VoronoiSimplexSolver.h b/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3VoronoiSimplexSolver.h index 46e36a3ae..3376f407e 100644 --- a/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3VoronoiSimplexSolver.h +++ b/thirdparty/bullet/Bullet3OpenCL/NarrowphaseCollision/b3VoronoiSimplexSolver.h @@ -1,3 +1,5 @@ +#ifndef B3_VORONOI_SIMPLEX_SOLVER_H +#define B3_VORONOI_SIMPLEX_SOLVER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_VORONOI_SIMPLEX_SOLVER_H -#define B3_VORONOI_SIMPLEX_SOLVER_H + + #include "Bullet3Common/b3Vector3.h" diff --git a/thirdparty/bullet/Bullet3OpenCL/ParallelPrimitives/b3BoundSearchCL.h b/thirdparty/bullet/Bullet3OpenCL/ParallelPrimitives/b3BoundSearchCL.h index 0d633e3d2..b69d4e1b4 100644 --- a/thirdparty/bullet/Bullet3OpenCL/ParallelPrimitives/b3BoundSearchCL.h +++ b/thirdparty/bullet/Bullet3OpenCL/ParallelPrimitives/b3BoundSearchCL.h @@ -1,3 +1,5 @@ +#ifndef B3_BOUNDSEARCH_H +#define B3_BOUNDSEARCH_H /* Copyright (c) 2012 Advanced Micro Devices, Inc. @@ -13,8 +15,8 @@ subject to the following restrictions: */ //Originally written by Takahiro Harada -#ifndef B3_BOUNDSEARCH_H -#define B3_BOUNDSEARCH_H + + #pragma once diff --git a/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuGenericConstraint.h b/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuGenericConstraint.h index 1f163ba7d..17639ea46 100644 --- a/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuGenericConstraint.h +++ b/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuGenericConstraint.h @@ -1,3 +1,5 @@ +#ifndef B3_GPU_GENERIC_CONSTRAINT_H +#define B3_GPU_GENERIC_CONSTRAINT_H /* Copyright (c) 2013 Advanced Micro Devices, Inc. @@ -13,8 +15,8 @@ subject to the following restrictions: */ //Originally written by Erwin Coumans -#ifndef B3_GPU_GENERIC_CONSTRAINT_H -#define B3_GPU_GENERIC_CONSTRAINT_H + + #include "Bullet3Common/b3Quaternion.h" struct b3RigidBodyData; diff --git a/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuPgsConstraintSolver.h b/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuPgsConstraintSolver.h index 00bc544f0..4eaf2e20e 100644 --- a/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuPgsConstraintSolver.h +++ b/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuPgsConstraintSolver.h @@ -1,3 +1,5 @@ +#ifndef B3_GPU_PGS_CONSTRAINT_SOLVER_H +#define B3_GPU_PGS_CONSTRAINT_SOLVER_H /* Copyright (c) 2013 Advanced Micro Devices, Inc. @@ -13,8 +15,8 @@ subject to the following restrictions: */ //Originally written by Erwin Coumans -#ifndef B3_GPU_PGS_CONSTRAINT_SOLVER_H -#define B3_GPU_PGS_CONSTRAINT_SOLVER_H + + struct b3Contact4; struct b3ContactPoint; diff --git a/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipeline.h b/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipeline.h index 0e5c6fec1..f9396dad9 100644 --- a/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipeline.h +++ b/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipeline.h @@ -1,3 +1,5 @@ +#ifndef B3_GPU_RIGIDBODY_PIPELINE_H +#define B3_GPU_RIGIDBODY_PIPELINE_H /* Copyright (c) 2013 Advanced Micro Devices, Inc. @@ -13,8 +15,8 @@ subject to the following restrictions: */ //Originally written by Erwin Coumans -#ifndef B3_GPU_RIGIDBODY_PIPELINE_H -#define B3_GPU_RIGIDBODY_PIPELINE_H + + #include "Bullet3OpenCL/Initialize/b3OpenCLInclude.h" #include "Bullet3Collision/NarrowPhaseCollision/b3Config.h" diff --git a/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipelineInternalData.h b/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipelineInternalData.h index e0a26fda1..3d1136704 100644 --- a/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipelineInternalData.h +++ b/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipelineInternalData.h @@ -1,3 +1,5 @@ +#ifndef B3_GPU_RIGIDBODY_PIPELINE_INTERNAL_DATA_H +#define B3_GPU_RIGIDBODY_PIPELINE_INTERNAL_DATA_H /* Copyright (c) 2013 Advanced Micro Devices, Inc. @@ -13,8 +15,8 @@ subject to the following restrictions: */ //Originally written by Erwin Coumans -#ifndef B3_GPU_RIGIDBODY_PIPELINE_INTERNAL_DATA_H -#define B3_GPU_RIGIDBODY_PIPELINE_INTERNAL_DATA_H + + #include "Bullet3OpenCL/Initialize/b3OpenCLInclude.h" #include "Bullet3Common/b3AlignedObjectArray.h" diff --git a/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuSolverBody.h b/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuSolverBody.h index db815d9b3..95260c5e1 100644 --- a/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuSolverBody.h +++ b/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuSolverBody.h @@ -1,3 +1,5 @@ +#ifndef B3_GPU_SOLVER_BODY_H +#define B3_GPU_SOLVER_BODY_H /* Copyright (c) 2013 Advanced Micro Devices, Inc. @@ -13,8 +15,8 @@ subject to the following restrictions: */ //Originally written by Erwin Coumans -#ifndef B3_GPU_SOLVER_BODY_H -#define B3_GPU_SOLVER_BODY_H + + #include "Bullet3Common/b3Vector3.h" #include "Bullet3Common/b3Matrix3x3.h" diff --git a/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuSolverConstraint.h b/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuSolverConstraint.h index 7d9eea243..3e86a5a30 100644 --- a/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuSolverConstraint.h +++ b/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuSolverConstraint.h @@ -1,3 +1,5 @@ +#ifndef B3_GPU_SOLVER_CONSTRAINT_H +#define B3_GPU_SOLVER_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2013 Erwin Coumans http://github.com/erwincoumans/bullet3 @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_GPU_SOLVER_CONSTRAINT_H -#define B3_GPU_SOLVER_CONSTRAINT_H + + #include "Bullet3Common/b3Vector3.h" #include "Bullet3Common/b3Matrix3x3.h" diff --git a/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3Solver.h b/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3Solver.h index ee63531d7..ae46ea40f 100644 --- a/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3Solver.h +++ b/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3Solver.h @@ -1,3 +1,5 @@ +#ifndef __ADL_SOLVER_H +#define __ADL_SOLVER_H /* Copyright (c) 2012 Advanced Micro Devices, Inc. @@ -13,8 +15,8 @@ subject to the following restrictions: */ //Originally written by Takahiro Harada -#ifndef __ADL_SOLVER_H -#define __ADL_SOLVER_H + + #include "Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h" #include "b3GpuConstraint4.h" diff --git a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/autogenerated/bullet2.h b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/autogenerated/bullet2.h index eaa27dfe8..29a58bbf4 100644 --- a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/autogenerated/bullet2.h +++ b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/autogenerated/bullet2.h @@ -1,3 +1,5 @@ +#ifndef __BULLET2_H__ +#define __BULLET2_H__ /* Copyright (C) 2011 Erwin Coumans & Charlie C * * This software is provided 'as-is', without any express or implied @@ -17,8 +19,8 @@ * 3. This notice may not be removed or altered from any source distribution. */ // Auto generated from Bullet/Extras/HeaderGenerator/bulletGenerate.py -#ifndef __BULLET2_H__ -#define __BULLET2_H__ + + namespace Bullet3SerializeBullet2 { // put an empty struct in the case diff --git a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.h b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.h index ede1d378a..d7dcc4f4b 100644 --- a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.h +++ b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.h @@ -1,3 +1,5 @@ +#ifndef B3_BULLET_FILE_H +#define B3_BULLET_FILE_H /* bParse Copyright (c) 2006-2010 Charlie C & Erwin Coumans http://gamekit.googlecode.com @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_BULLET_FILE_H -#define B3_BULLET_FILE_H + + #include "b3File.h" #include "Bullet3Common/b3AlignedObjectArray.h" diff --git a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Chunk.h b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Chunk.h index c9d0f37d9..4d162eea9 100644 --- a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Chunk.h +++ b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Chunk.h @@ -1,3 +1,5 @@ +#ifndef __BCHUNK_H__ +#define __BCHUNK_H__ /* bParse Copyright (c) 2006-2009 Charlie C & Erwin Coumans http://gamekit.googlecode.com @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef __BCHUNK_H__ -#define __BCHUNK_H__ + + #if defined(_WIN32) && !defined(__MINGW32__) #define b3Long64 __int64 diff --git a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Common.h b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Common.h index 5884fad4d..b8edf8213 100644 --- a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Common.h +++ b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Common.h @@ -1,3 +1,5 @@ +#ifndef __BCOMMON_H__ +#define __BCOMMON_H__ /* bParse Copyright (c) 2006-2009 Charlie C & Erwin Coumans http://gamekit.googlecode.com @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef __BCOMMON_H__ -#define __BCOMMON_H__ + + #include //#include "bLog.h" diff --git a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3DNA.h b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3DNA.h index ca6004d96..7db1d5df1 100644 --- a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3DNA.h +++ b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3DNA.h @@ -1,3 +1,5 @@ +#ifndef __BDNA_H__ +#define __BDNA_H__ /* bParse Copyright (c) 2006-2009 Charlie C & Erwin Coumans http://gamekit.googlecode.com @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef __BDNA_H__ -#define __BDNA_H__ + + #include "b3Common.h" diff --git a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Defines.h b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Defines.h index 0524c94db..657913b5c 100644 --- a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Defines.h +++ b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Defines.h @@ -1,3 +1,5 @@ +#ifndef __B_DEFINES_H__ +#define __B_DEFINES_H__ /* Copyright (C) 2006-2009 Charlie C & Erwin Coumans http://gamekit.googlecode.com * * This software is provided 'as-is', without any express or implied @@ -16,8 +18,8 @@ * misrepresented as being the original software. * 3. This notice may not be removed or altered from any source distribution. */ -#ifndef __B_DEFINES_H__ -#define __B_DEFINES_H__ + + // MISC defines, see BKE_global.h, BKE_utildefines.h #define B3_SIZEOFBLENDERHEADER 12 diff --git a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3File.h b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3File.h index bda229cfb..35701cb33 100644 --- a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3File.h +++ b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3File.h @@ -1,3 +1,5 @@ +#ifndef __BFILE_H__ +#define __BFILE_H__ /* bParse Copyright (c) 2006-2009 Charlie C & Erwin Coumans http://gamekit.googlecode.com @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef __BFILE_H__ -#define __BFILE_H__ + + #include "b3Common.h" #include "b3Chunk.h" diff --git a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Serializer.h b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Serializer.h index d9e153e23..418ac8b6c 100644 --- a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Serializer.h +++ b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Serializer.h @@ -1,3 +1,5 @@ +#ifndef B3_SERIALIZER_H +#define B3_SERIALIZER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef B3_SERIALIZER_H -#define B3_SERIALIZER_H + + #include "Bullet3Common/b3Scalar.h" // has definitions like B3_FORCE_INLINE #include "Bullet3Common/b3StackAlloc.h" diff --git a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h index 4f5f614e1..69ee5fb96 100644 --- a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h +++ b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h @@ -1,3 +1,5 @@ +#ifndef BT_AXIS_SWEEP_3_H +#define BT_AXIS_SWEEP_3_H //Bullet Continuous Collision Detection and Physics Library //Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -16,8 +18,8 @@ // // 3. This notice may not be removed or altered from any source distribution. -#ifndef BT_AXIS_SWEEP_3_H -#define BT_AXIS_SWEEP_3_H + + #include "LinearMath/btVector3.h" #include "btOverlappingPairCache.h" diff --git a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3Internal.h b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3Internal.h index e481fdc21..7371cdf56 100644 --- a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3Internal.h +++ b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3Internal.h @@ -1,3 +1,5 @@ +#ifndef BT_AXIS_SWEEP_3_INTERNAL_H +#define BT_AXIS_SWEEP_3_INTERNAL_H //Bullet Continuous Collision Detection and Physics Library //Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -16,8 +18,8 @@ // // 3. This notice may not be removed or altered from any source distribution. -#ifndef BT_AXIS_SWEEP_3_INTERNAL_H -#define BT_AXIS_SWEEP_3_INTERNAL_H + + #include "LinearMath/btVector3.h" #include "btOverlappingPairCache.h" diff --git a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h index 4176256f3..829852b1d 100644 --- a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h +++ b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h @@ -1,3 +1,5 @@ +#ifndef BT_BROADPHASE_INTERFACE_H +#define BT_BROADPHASE_INTERFACE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_BROADPHASE_INTERFACE_H -#define BT_BROADPHASE_INTERFACE_H + + struct btDispatcherInfo; class btDispatcher; diff --git a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h index fb23281aa..f8397eebd 100644 --- a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h +++ b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h @@ -1,3 +1,5 @@ +#ifndef BT_BROADPHASE_PROXY_H +#define BT_BROADPHASE_PROXY_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_BROADPHASE_PROXY_H -#define BT_BROADPHASE_PROXY_H + + #include "LinearMath/btScalar.h" //for SIMD_FORCE_INLINE #include "LinearMath/btVector3.h" diff --git a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h index 25a347e28..fdfb88123 100644 --- a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h +++ b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h @@ -1,3 +1,5 @@ +#ifndef BT_COLLISION_ALGORITHM_H +#define BT_COLLISION_ALGORITHM_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_COLLISION_ALGORITHM_H -#define BT_COLLISION_ALGORITHM_H + + #include "LinearMath/btScalar.h" #include "LinearMath/btAlignedObjectArray.h" diff --git a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btDbvt.h b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btDbvt.h index 430f5771c..b92522cc4 100644 --- a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btDbvt.h +++ b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btDbvt.h @@ -1,3 +1,5 @@ +#ifndef BT_DYNAMIC_BOUNDING_VOLUME_TREE_H +#define BT_DYNAMIC_BOUNDING_VOLUME_TREE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2007 Erwin Coumans https://bulletphysics.org @@ -14,8 +16,8 @@ subject to the following restrictions: */ ///btDbvt implementation by Nathanael Presson -#ifndef BT_DYNAMIC_BOUNDING_VOLUME_TREE_H -#define BT_DYNAMIC_BOUNDING_VOLUME_TREE_H + + #include "LinearMath/btAlignedObjectArray.h" #include "LinearMath/btVector3.h" diff --git a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h index a71feef53..643b5539f 100644 --- a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h +++ b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h @@ -1,3 +1,5 @@ +#ifndef BT_DBVT_BROADPHASE_H +#define BT_DBVT_BROADPHASE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -14,8 +16,8 @@ subject to the following restrictions: */ ///btDbvtBroadphase implementation by Nathanael Presson -#ifndef BT_DBVT_BROADPHASE_H -#define BT_DBVT_BROADPHASE_H + + #include "BulletCollision/BroadphaseCollision/btDbvt.h" #include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h" diff --git a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h index d59441cf5..12d122d3a 100644 --- a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h +++ b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h @@ -1,3 +1,5 @@ +#ifndef BT_DISPATCHER_H +#define BT_DISPATCHER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_DISPATCHER_H -#define BT_DISPATCHER_H + + #include "LinearMath/btScalar.h" class btCollisionAlgorithm; diff --git a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h index 1d8272647..bd60f9dec 100644 --- a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h +++ b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h @@ -1,3 +1,5 @@ +#ifndef BT_OVERLAPPING_PAIR_CACHE_H +#define BT_OVERLAPPING_PAIR_CACHE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_OVERLAPPING_PAIR_CACHE_H -#define BT_OVERLAPPING_PAIR_CACHE_H + + #include "btBroadphaseInterface.h" #include "btBroadphaseProxy.h" diff --git a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h index 36e5068e0..b12094e6c 100644 --- a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h +++ b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h @@ -1,3 +1,5 @@ +#ifndef OVERLAPPING_PAIR_CALLBACK_H +#define OVERLAPPING_PAIR_CALLBACK_H /* Bullet Continuous Collision Detection and Physics Library @@ -14,8 +16,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef OVERLAPPING_PAIR_CALLBACK_H -#define OVERLAPPING_PAIR_CALLBACK_H + + class btDispatcher; struct btBroadphasePair; diff --git a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.h b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.h index 1a01992f5..3cb73b151 100644 --- a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.h +++ b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.h @@ -1,3 +1,5 @@ +#ifndef BT_QUANTIZED_BVH_H +#define BT_QUANTIZED_BVH_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_QUANTIZED_BVH_H -#define BT_QUANTIZED_BVH_H + + class btSerializer; diff --git a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h index f97073c58..8f61c3526 100644 --- a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h +++ b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h @@ -1,3 +1,5 @@ +#ifndef BT_SIMPLE_BROADPHASE_H +#define BT_SIMPLE_BROADPHASE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SIMPLE_BROADPHASE_H -#define BT_SIMPLE_BROADPHASE_H + + #include "btOverlappingPairCache.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.h index 01ebfe447..e19de0a3e 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.h @@ -1,3 +1,5 @@ +#ifndef BT_SPHERE_TRIANGLE_DETECTOR_H +#define BT_SPHERE_TRIANGLE_DETECTOR_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SPHERE_TRIANGLE_DETECTOR_H -#define BT_SPHERE_TRIANGLE_DETECTOR_H + + #include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h index 862060571..ff9639394 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h @@ -1,3 +1,5 @@ +#ifndef __BT_ACTIVATING_COLLISION_ALGORITHM_H +#define __BT_ACTIVATING_COLLISION_ALGORITHM_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2008 Erwin Coumans http://bulletphysics.com @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef __BT_ACTIVATING_COLLISION_ALGORITHM_H -#define __BT_ACTIVATING_COLLISION_ALGORITHM_H + + #include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h index f14fdc083..51533e8a1 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h @@ -1,3 +1,5 @@ +#ifndef BT_BOX_2D_BOX_2D__COLLISION_ALGORITHM_H +#define BT_BOX_2D_BOX_2D__COLLISION_ALGORITHM_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_BOX_2D_BOX_2D__COLLISION_ALGORITHM_H -#define BT_BOX_2D_BOX_2D__COLLISION_ALGORITHM_H + + #include "BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h index d657242f4..e785b9c0e 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h @@ -1,3 +1,5 @@ +#ifndef BT_BOX_BOX__COLLISION_ALGORITHM_H +#define BT_BOX_BOX__COLLISION_ALGORITHM_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_BOX_BOX__COLLISION_ALGORITHM_H -#define BT_BOX_BOX__COLLISION_ALGORITHM_H + + #include "btActivatingCollisionAlgorithm.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.h index 9b1b36b67..f85b5b454 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.h @@ -1,3 +1,5 @@ +#ifndef BT_BOX_BOX_DETECTOR_H +#define BT_BOX_BOX_DETECTOR_H /* * Box-Box collision detection re-distributed under the ZLib license with permission from Russell L. Smith * Original version is from Open Dynamics Engine, Copyright (C) 2001,2002 Russell L. Smith. @@ -16,8 +18,8 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_BOX_BOX_DETECTOR_H -#define BT_BOX_BOX_DETECTOR_H + + class btBoxShape; #include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionConfiguration.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionConfiguration.h index 3f578d66e..bd9fca185 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionConfiguration.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionConfiguration.h @@ -1,3 +1,5 @@ +#ifndef BT_COLLISION_CONFIGURATION +#define BT_COLLISION_CONFIGURATION /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_COLLISION_CONFIGURATION -#define BT_COLLISION_CONFIGURATION + + struct btCollisionAlgorithmCreateFunc; diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h index 597f26022..3aa9a7666 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h @@ -1,3 +1,5 @@ +#ifndef BT_COLLISION_CREATE_FUNC +#define BT_COLLISION_CREATE_FUNC /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_COLLISION_CREATE_FUNC -#define BT_COLLISION_CREATE_FUNC + + #include "LinearMath/btAlignedObjectArray.h" class btCollisionAlgorithm; diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h index 1399148fa..40e810e3d 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h @@ -1,3 +1,5 @@ +#ifndef BT_COLLISION__DISPATCHER_H +#define BT_COLLISION__DISPATCHER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_COLLISION__DISPATCHER_H -#define BT_COLLISION__DISPATCHER_H + + #include "BulletCollision/BroadphaseCollision/btDispatcher.h" #include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcherMt.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcherMt.h index 094e928bf..1108ce74a 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcherMt.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcherMt.h @@ -1,3 +1,5 @@ +#ifndef BT_COLLISION_DISPATCHER_MT_H +#define BT_COLLISION_DISPATCHER_MT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_COLLISION_DISPATCHER_MT_H -#define BT_COLLISION_DISPATCHER_MT_H + + #include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h" #include "LinearMath/btThreads.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h index d1456a909..cc2fdb477 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h @@ -1,3 +1,5 @@ +#ifndef BT_COLLISION_OBJECT_H +#define BT_COLLISION_OBJECT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_COLLISION_OBJECT_H -#define BT_COLLISION_OBJECT_H + + #include "LinearMath/btTransform.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h index fd0e5b9bb..96d787c61 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h @@ -1,3 +1,5 @@ +#ifndef BT_COLLISION_WORLD_H +#define BT_COLLISION_WORLD_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -66,8 +68,8 @@ subject to the following restrictions: * */ -#ifndef BT_COLLISION_WORLD_H -#define BT_COLLISION_WORLD_H + + class btCollisionShape; class btConvexShape; diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionWorldImporter.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionWorldImporter.h index 5e8bc9534..099439632 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionWorldImporter.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionWorldImporter.h @@ -1,3 +1,5 @@ +#ifndef BT_COLLISION_WORLD_IMPORTER_H +#define BT_COLLISION_WORLD_IMPORTER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2014 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_COLLISION_WORLD_IMPORTER_H -#define BT_COLLISION_WORLD_IMPORTER_H + + #include "LinearMath/btTransform.h" #include "LinearMath/btVector3.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h index 1193bd4a8..b70f5d561 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h @@ -1,3 +1,5 @@ +#ifndef BT_COMPOUND_COLLISION_ALGORITHM_H +#define BT_COMPOUND_COLLISION_ALGORITHM_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -14,8 +16,8 @@ subject to the following restrictions: */ -#ifndef BT_COMPOUND_COLLISION_ALGORITHM_H -#define BT_COMPOUND_COLLISION_ALGORITHM_H + + #include "btActivatingCollisionAlgorithm.h" #include "BulletCollision/BroadphaseCollision/btDispatcher.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h index a940d840e..0118c05ff 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h @@ -1,3 +1,5 @@ +#ifndef BT_COMPOUND_COMPOUND_COLLISION_ALGORITHM_H +#define BT_COMPOUND_COMPOUND_COLLISION_ALGORITHM_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -14,8 +16,8 @@ subject to the following restrictions: */ -#ifndef BT_COMPOUND_COMPOUND_COLLISION_ALGORITHM_H -#define BT_COMPOUND_COMPOUND_COLLISION_ALGORITHM_H + + #include "btCompoundCollisionAlgorithm.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h index e6a2504a9..62c73c4a3 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h @@ -1,3 +1,5 @@ +#ifndef BT_CONVEX_2D_CONVEX_2D_ALGORITHM_H +#define BT_CONVEX_2D_CONVEX_2D_ALGORITHM_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONVEX_2D_CONVEX_2D_ALGORITHM_H -#define BT_CONVEX_2D_CONVEX_2D_ALGORITHM_H + + #include "BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h" #include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h index 8d86dafd2..3d2284760 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h @@ -1,3 +1,5 @@ +#ifndef BT_CONVEX_CONCAVE_COLLISION_ALGORITHM_H +#define BT_CONVEX_CONCAVE_COLLISION_ALGORITHM_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONVEX_CONCAVE_COLLISION_ALGORITHM_H -#define BT_CONVEX_CONCAVE_COLLISION_ALGORITHM_H + + #include "btActivatingCollisionAlgorithm.h" #include "BulletCollision/BroadphaseCollision/btDispatcher.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h index 9b7616226..0feb78a53 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h @@ -1,3 +1,5 @@ +#ifndef BT_CONVEX_CONVEX_ALGORITHM_H +#define BT_CONVEX_CONVEX_ALGORITHM_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONVEX_CONVEX_ALGORITHM_H -#define BT_CONVEX_CONVEX_ALGORITHM_H + + #include "btActivatingCollisionAlgorithm.h" #include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h index 63402d9ae..a64e3b46c 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h @@ -1,3 +1,5 @@ +#ifndef BT_CONVEX_PLANE_COLLISION_ALGORITHM_H +#define BT_CONVEX_PLANE_COLLISION_ALGORITHM_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONVEX_PLANE_COLLISION_ALGORITHM_H -#define BT_CONVEX_PLANE_COLLISION_ALGORITHM_H + + #include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h index adab540c0..1fa1f9410 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h @@ -1,3 +1,5 @@ +#ifndef BT_DEFAULT_COLLISION_CONFIGURATION +#define BT_DEFAULT_COLLISION_CONFIGURATION /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_DEFAULT_COLLISION_CONFIGURATION -#define BT_DEFAULT_COLLISION_CONFIGURATION + + #include "btCollisionConfiguration.h" class btVoronoiSimplexSolver; diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h index fef2f275b..b88713230 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h @@ -1,3 +1,5 @@ +#ifndef BT_EMPTY_ALGORITH +#define BT_EMPTY_ALGORITH /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_EMPTY_ALGORITH -#define BT_EMPTY_ALGORITH + + #include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" #include "btCollisionCreateFunc.h" #include "btCollisionDispatcher.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btGhostObject.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btGhostObject.h index aa7f48d5c..c6ba0e7e8 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btGhostObject.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btGhostObject.h @@ -1,3 +1,5 @@ +#ifndef BT_GHOST_OBJECT_H +#define BT_GHOST_OBJECT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2008 Erwin Coumans http://bulletphysics.com @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_GHOST_OBJECT_H -#define BT_GHOST_OBJECT_H + + #include "btCollisionObject.h" #include "BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h index e6acbb8ef..ef7a18cf5 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h @@ -1,3 +1,5 @@ +#ifndef BT_HASHED_SIMPLE_PAIR_CACHE_H +#define BT_HASHED_SIMPLE_PAIR_CACHE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_HASHED_SIMPLE_PAIR_CACHE_H -#define BT_HASHED_SIMPLE_PAIR_CACHE_H + + #include "LinearMath/btAlignedObjectArray.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btManifoldResult.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btManifoldResult.h index 1a8f46f2b..1fee3d775 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btManifoldResult.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btManifoldResult.h @@ -1,3 +1,5 @@ +#ifndef BT_MANIFOLD_RESULT_H +#define BT_MANIFOLD_RESULT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_MANIFOLD_RESULT_H -#define BT_MANIFOLD_RESULT_H + + class btCollisionObject; struct btCollisionObjectWrapper; diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.h index bd222a19d..4c8f0f6b3 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.h @@ -1,3 +1,5 @@ +#ifndef BT_SIMULATION_ISLAND_MANAGER_H +#define BT_SIMULATION_ISLAND_MANAGER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SIMULATION_ISLAND_MANAGER_H -#define BT_SIMULATION_ISLAND_MANAGER_H + + #include "BulletCollision/CollisionDispatch/btUnionFind.h" #include "btCollisionCreateFunc.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h index 33060e83c..51e39b429 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h @@ -1,3 +1,5 @@ +#ifndef BT_SPHERE_BOX_COLLISION_ALGORITHM_H +#define BT_SPHERE_BOX_COLLISION_ALGORITHM_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SPHERE_BOX_COLLISION_ALGORITHM_H -#define BT_SPHERE_BOX_COLLISION_ALGORITHM_H + + #include "btActivatingCollisionAlgorithm.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h index 399c9279d..c0bf7eca4 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h @@ -1,3 +1,5 @@ +#ifndef BT_SPHERE_SPHERE_COLLISION_ALGORITHM_H +#define BT_SPHERE_SPHERE_COLLISION_ALGORITHM_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SPHERE_SPHERE_COLLISION_ALGORITHM_H -#define BT_SPHERE_SPHERE_COLLISION_ALGORITHM_H + + #include "btActivatingCollisionAlgorithm.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h index 73c6fd1dd..3146189b6 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h @@ -1,3 +1,5 @@ +#ifndef BT_SPHERE_TRIANGLE_COLLISION_ALGORITHM_H +#define BT_SPHERE_TRIANGLE_COLLISION_ALGORITHM_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SPHERE_TRIANGLE_COLLISION_ALGORITHM_H -#define BT_SPHERE_TRIANGLE_COLLISION_ALGORITHM_H + + #include "btActivatingCollisionAlgorithm.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btUnionFind.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btUnionFind.h index 59a30b169..69ff1d9ea 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btUnionFind.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btUnionFind.h @@ -1,3 +1,5 @@ +#ifndef BT_UNION_FIND_H +#define BT_UNION_FIND_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_UNION_FIND_H -#define BT_UNION_FIND_H + + #include "LinearMath/btAlignedObjectArray.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btBox2dShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btBox2dShape.h index 6c6e72927..53ac26043 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btBox2dShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btBox2dShape.h @@ -1,3 +1,5 @@ +#ifndef BT_OBB_BOX_2D_SHAPE_H +#define BT_OBB_BOX_2D_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_OBB_BOX_2D_SHAPE_H -#define BT_OBB_BOX_2D_SHAPE_H + + #include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h" #include "BulletCollision/CollisionShapes/btCollisionMargin.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btBoxShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btBoxShape.h index 3c65505d5..8521ae7a1 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btBoxShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btBoxShape.h @@ -1,3 +1,5 @@ +#ifndef BT_OBB_BOX_MINKOWSKI_H +#define BT_OBB_BOX_MINKOWSKI_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_OBB_BOX_MINKOWSKI_H -#define BT_OBB_BOX_MINKOWSKI_H + + #include "btPolyhedralConvexShape.h" #include "btCollisionMargin.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h index 8b2f2ee85..d170e46c5 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h @@ -1,3 +1,5 @@ +#ifndef BT_BVH_TRIANGLE_MESH_SHAPE_H +#define BT_BVH_TRIANGLE_MESH_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_BVH_TRIANGLE_MESH_SHAPE_H -#define BT_BVH_TRIANGLE_MESH_SHAPE_H + + #include "btTriangleMeshShape.h" #include "btOptimizedBvh.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btCapsuleShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btCapsuleShape.h index 138d0c0f7..63748c194 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btCapsuleShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btCapsuleShape.h @@ -1,3 +1,5 @@ +#ifndef BT_CAPSULE_SHAPE_H +#define BT_CAPSULE_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CAPSULE_SHAPE_H -#define BT_CAPSULE_SHAPE_H + + #include "btConvexInternalShape.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btCollisionMargin.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btCollisionMargin.h index abd8ab3eb..367371ae9 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btCollisionMargin.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btCollisionMargin.h @@ -1,3 +1,5 @@ +#ifndef BT_COLLISION_MARGIN_H +#define BT_COLLISION_MARGIN_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_COLLISION_MARGIN_H -#define BT_COLLISION_MARGIN_H + + ///The CONVEX_DISTANCE_MARGIN is a default collision margin for convex collision shapes derived from btConvexInternalShape. ///This collision margin is used by Gjk and some other algorithms diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btCollisionShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btCollisionShape.h index 16f9e0c77..3ce89cde8 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btCollisionShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btCollisionShape.h @@ -1,3 +1,5 @@ +#ifndef BT_COLLISION_SHAPE_H +#define BT_COLLISION_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_COLLISION_SHAPE_H -#define BT_COLLISION_SHAPE_H + + #include "LinearMath/btTransform.h" #include "LinearMath/btVector3.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btCompoundShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btCompoundShape.h index 7e2d0eb81..14a65c84f 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btCompoundShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btCompoundShape.h @@ -1,3 +1,5 @@ +#ifndef BT_COMPOUND_SHAPE_H +#define BT_COMPOUND_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_COMPOUND_SHAPE_H -#define BT_COMPOUND_SHAPE_H + + #include "btCollisionShape.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btConcaveShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btConcaveShape.h index 716624e18..822a54523 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btConcaveShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btConcaveShape.h @@ -1,3 +1,5 @@ +#ifndef BT_CONCAVE_SHAPE_H +#define BT_CONCAVE_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONCAVE_SHAPE_H -#define BT_CONCAVE_SHAPE_H + + #include "btCollisionShape.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btConeShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btConeShape.h index 49f26bc4e..7990d1969 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btConeShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btConeShape.h @@ -1,3 +1,5 @@ +#ifndef BT_CONE_MINKOWSKI_H +#define BT_CONE_MINKOWSKI_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONE_MINKOWSKI_H -#define BT_CONE_MINKOWSKI_H + + #include "btConvexInternalShape.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btConvex2dShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btConvex2dShape.h index cd4f1ef7b..c73c1951e 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btConvex2dShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btConvex2dShape.h @@ -1,3 +1,5 @@ +#ifndef BT_CONVEX_2D_SHAPE_H +#define BT_CONVEX_2D_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONVEX_2D_SHAPE_H -#define BT_CONVEX_2D_SHAPE_H + + #include "BulletCollision/CollisionShapes/btConvexShape.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexHullShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexHullShape.h index 96136d7dd..f88f02072 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexHullShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexHullShape.h @@ -1,3 +1,5 @@ +#ifndef BT_CONVEX_HULL_SHAPE_H +#define BT_CONVEX_HULL_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONVEX_HULL_SHAPE_H -#define BT_CONVEX_HULL_SHAPE_H + + #include "btPolyhedralConvexShape.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.h index a28c57de4..e57831099 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.h @@ -1,3 +1,5 @@ +#ifndef BT_CONVEX_INTERNAL_SHAPE_H +#define BT_CONVEX_INTERNAL_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONVEX_INTERNAL_SHAPE_H -#define BT_CONVEX_INTERNAL_SHAPE_H + + #include "btConvexShape.h" #include "LinearMath/btAabbUtil2.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.h index c7d554a4d..380502a8f 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.h @@ -1,3 +1,5 @@ +#ifndef BT_CONVEX_POINT_CLOUD_SHAPE_H +#define BT_CONVEX_POINT_CLOUD_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONVEX_POINT_CLOUD_SHAPE_H -#define BT_CONVEX_POINT_CLOUD_SHAPE_H + + #include "btPolyhedralConvexShape.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexPolyhedron.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexPolyhedron.h index 638aa9b3d..85fa2ea54 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexPolyhedron.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexPolyhedron.h @@ -1,3 +1,5 @@ +#ifndef _BT_POLYHEDRAL_FEATURES_H +#define _BT_POLYHEDRAL_FEATURES_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2011 Advanced Micro Devices, Inc. http://bulletphysics.org @@ -15,8 +17,8 @@ subject to the following restrictions: ///This file was written by Erwin Coumans -#ifndef _BT_POLYHEDRAL_FEATURES_H -#define _BT_POLYHEDRAL_FEATURES_H + + #include "LinearMath/btTransform.h" #include "LinearMath/btAlignedObjectArray.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexShape.h index d3b3ed816..7632ff6a1 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexShape.h @@ -1,3 +1,5 @@ +#ifndef BT_CONVEX_SHAPE_INTERFACE1 +#define BT_CONVEX_SHAPE_INTERFACE1 /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONVEX_SHAPE_INTERFACE1 -#define BT_CONVEX_SHAPE_INTERFACE1 + + #include "btCollisionShape.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h index 6dac9fff0..51b2e1295 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h @@ -1,3 +1,5 @@ +#ifndef BT_CONVEX_TRIANGLEMESH_SHAPE_H +#define BT_CONVEX_TRIANGLEMESH_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONVEX_TRIANGLEMESH_SHAPE_H -#define BT_CONVEX_TRIANGLEMESH_SHAPE_H + + #include "btPolyhedralConvexShape.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btCylinderShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btCylinderShape.h index d3f64508b..016e60302 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btCylinderShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btCylinderShape.h @@ -1,3 +1,5 @@ +#ifndef BT_CYLINDER_MINKOWSKI_H +#define BT_CYLINDER_MINKOWSKI_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CYLINDER_MINKOWSKI_H -#define BT_CYLINDER_MINKOWSKI_H + + #include "btBoxShape.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btEmptyShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btEmptyShape.h index d2e21173b..c33b97a89 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btEmptyShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btEmptyShape.h @@ -1,3 +1,5 @@ +#ifndef BT_EMPTY_SHAPE_H +#define BT_EMPTY_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_EMPTY_SHAPE_H -#define BT_EMPTY_SHAPE_H + + #include "btConcaveShape.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h index 7e251fa71..b292efb8f 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h @@ -1,3 +1,5 @@ +#ifndef BT_HEIGHTFIELD_TERRAIN_SHAPE_H +#define BT_HEIGHTFIELD_TERRAIN_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_HEIGHTFIELD_TERRAIN_SHAPE_H -#define BT_HEIGHTFIELD_TERRAIN_SHAPE_H + + #include "btConcaveShape.h" #include "LinearMath/btAlignedObjectArray.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btMaterial.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btMaterial.h index c9a436bf2..1d5f3391a 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btMaterial.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btMaterial.h @@ -1,3 +1,5 @@ +#ifndef BT_MATERIAL_H +#define BT_MATERIAL_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -15,8 +17,8 @@ subject to the following restrictions: /// This file was created by Alex Silverman -#ifndef BT_MATERIAL_H -#define BT_MATERIAL_H + + // Material class to be used by btMultimaterialTriangleMeshShape to store triangle properties class btMaterial diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.h index 3b5150f6d..c3ec33c20 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.h @@ -1,3 +1,5 @@ +#ifndef BT_MINKOWSKI_SUM_SHAPE_H +#define BT_MINKOWSKI_SUM_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_MINKOWSKI_SUM_SHAPE_H -#define BT_MINKOWSKI_SUM_SHAPE_H + + #include "btConvexInternalShape.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.h index 2d79c07ca..c30b464d0 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.h @@ -1,3 +1,5 @@ +#ifndef BT_MULTI_SPHERE_MINKOWSKI_H +#define BT_MULTI_SPHERE_MINKOWSKI_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_MULTI_SPHERE_MINKOWSKI_H -#define BT_MULTI_SPHERE_MINKOWSKI_H + + #include "btConvexInternalShape.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h index d1d42f8e0..6aa21c42b 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h @@ -1,3 +1,5 @@ +#ifndef BT_BVH_TRIANGLE_MATERIAL_MESH_SHAPE_H +#define BT_BVH_TRIANGLE_MATERIAL_MESH_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -15,8 +17,8 @@ subject to the following restrictions: /// This file was created by Alex Silverman -#ifndef BT_BVH_TRIANGLE_MATERIAL_MESH_SHAPE_H -#define BT_BVH_TRIANGLE_MATERIAL_MESH_SHAPE_H + + #include "btBvhTriangleMeshShape.h" #include "btMaterial.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.h index 22f131c8b..c848f77e1 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.h @@ -1,3 +1,5 @@ +#ifndef BT_OPTIMIZED_BVH_H +#define BT_OPTIMIZED_BVH_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -15,8 +17,8 @@ subject to the following restrictions: ///Contains contributions from Disney Studio's -#ifndef BT_OPTIMIZED_BVH_H -#define BT_OPTIMIZED_BVH_H + + #include "BulletCollision/BroadphaseCollision/btQuantizedBvh.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h index b3ffab7a2..21b9cc460 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h @@ -1,3 +1,5 @@ +#ifndef BT_POLYHEDRAL_CONVEX_SHAPE_H +#define BT_POLYHEDRAL_CONVEX_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_POLYHEDRAL_CONVEX_SHAPE_H -#define BT_POLYHEDRAL_CONVEX_SHAPE_H + + #include "LinearMath/btMatrix3x3.h" #include "btConvexInternalShape.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h index 4d6feb61a..abad4ace0 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h @@ -1,3 +1,5 @@ +#ifndef BT_SCALED_BVH_TRIANGLE_MESH_SHAPE_H +#define BT_SCALED_BVH_TRIANGLE_MESH_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SCALED_BVH_TRIANGLE_MESH_SHAPE_H -#define BT_SCALED_BVH_TRIANGLE_MESH_SHAPE_H + + #include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btShapeHull.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btShapeHull.h index 54439f9ca..d39d37e60 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btShapeHull.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btShapeHull.h @@ -1,3 +1,5 @@ +#ifndef BT_SHAPE_HULL_H +#define BT_SHAPE_HULL_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -15,8 +17,8 @@ subject to the following restrictions: ///btShapeHull implemented by John McCutchan. -#ifndef BT_SHAPE_HULL_H -#define BT_SHAPE_HULL_H + + #include "LinearMath/btAlignedObjectArray.h" #include "BulletCollision/CollisionShapes/btConvexShape.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btSphereShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btSphereShape.h index 75e4fd8e1..83ba6e9c4 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btSphereShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btSphereShape.h @@ -1,3 +1,5 @@ +#ifndef BT_SPHERE_MINKOWSKI_H +#define BT_SPHERE_MINKOWSKI_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SPHERE_MINKOWSKI_H -#define BT_SPHERE_MINKOWSKI_H + + #include "btConvexInternalShape.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h index 1cda8bbc7..066a79402 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h @@ -1,3 +1,5 @@ +#ifndef BT_STATIC_PLANE_SHAPE_H +#define BT_STATIC_PLANE_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_STATIC_PLANE_SHAPE_H -#define BT_STATIC_PLANE_SHAPE_H + + #include "btConcaveShape.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.h index 68a41dfb4..6c2c7668e 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.h @@ -1,3 +1,5 @@ +#ifndef BT_STRIDING_MESHINTERFACE_H +#define BT_STRIDING_MESHINTERFACE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_STRIDING_MESHINTERFACE_H -#define BT_STRIDING_MESHINTERFACE_H + + #include "LinearMath/btVector3.h" #include "btTriangleCallback.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.h index f5e2209ed..7533ff2d7 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.h @@ -1,3 +1,5 @@ +#ifndef BT_SIMPLEX_1TO4_SHAPE +#define BT_SIMPLEX_1TO4_SHAPE /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SIMPLEX_1TO4_SHAPE -#define BT_SIMPLEX_1TO4_SHAPE + + #include "btPolyhedralConvexShape.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.h index a89b9cd8a..c0dacb1ec 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.h @@ -1,3 +1,5 @@ +#ifndef BT_TRIANGLE_BUFFER_H +#define BT_TRIANGLE_BUFFER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_TRIANGLE_BUFFER_H -#define BT_TRIANGLE_BUFFER_H + + #include "btTriangleCallback.h" #include "LinearMath/btAlignedObjectArray.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleCallback.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleCallback.h index d3644891e..e8e028bf3 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleCallback.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleCallback.h @@ -1,3 +1,5 @@ +#ifndef BT_TRIANGLE_CALLBACK_H +#define BT_TRIANGLE_CALLBACK_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_TRIANGLE_CALLBACK_H -#define BT_TRIANGLE_CALLBACK_H + + #include "LinearMath/btVector3.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h index 556aa3fef..60bfb483d 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h @@ -1,3 +1,5 @@ +#ifndef BT_TRIANGLE_INDEX_VERTEX_ARRAY_H +#define BT_TRIANGLE_INDEX_VERTEX_ARRAY_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_TRIANGLE_INDEX_VERTEX_ARRAY_H -#define BT_TRIANGLE_INDEX_VERTEX_ARRAY_H + + #include "btStridingMeshInterface.h" #include "LinearMath/btAlignedObjectArray.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h index 315b1e21f..c1026114d 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h @@ -1,3 +1,5 @@ +#ifndef BT_MULTIMATERIAL_TRIANGLE_INDEX_VERTEX_ARRAY_H +#define BT_MULTIMATERIAL_TRIANGLE_INDEX_VERTEX_ARRAY_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -15,8 +17,8 @@ subject to the following restrictions: ///This file was created by Alex Silverman -#ifndef BT_MULTIMATERIAL_TRIANGLE_INDEX_VERTEX_ARRAY_H -#define BT_MULTIMATERIAL_TRIANGLE_INDEX_VERTEX_ARRAY_H + + #include "btTriangleIndexVertexArray.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleInfoMap.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleInfoMap.h index 8ee35ef5f..7a7883602 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleInfoMap.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleInfoMap.h @@ -1,3 +1,5 @@ +#ifndef _BT_TRIANGLE_INFO_MAP_H +#define _BT_TRIANGLE_INFO_MAP_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2010 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _BT_TRIANGLE_INFO_MAP_H -#define _BT_TRIANGLE_INFO_MAP_H + + #include "LinearMath/btHashMap.h" #include "LinearMath/btSerializer.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleMesh.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleMesh.h index a8a362355..4735ba3e6 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleMesh.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleMesh.h @@ -1,3 +1,5 @@ +#ifndef BT_TRIANGLE_MESH_H +#define BT_TRIANGLE_MESH_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_TRIANGLE_MESH_H -#define BT_TRIANGLE_MESH_H + + #include "btTriangleIndexVertexArray.h" #include "LinearMath/btVector3.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.h index 4a70e283f..ca36568b6 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.h @@ -1,3 +1,5 @@ +#ifndef BT_TRIANGLE_MESH_SHAPE_H +#define BT_TRIANGLE_MESH_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_TRIANGLE_MESH_SHAPE_H -#define BT_TRIANGLE_MESH_SHAPE_H + + #include "btConcaveShape.h" #include "btStridingMeshInterface.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleShape.h index 190cbdae6..22d542aff 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleShape.h @@ -1,3 +1,5 @@ +#ifndef BT_OBB_TRIANGLE_MINKOWSKI_H +#define BT_OBB_TRIANGLE_MINKOWSKI_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_OBB_TRIANGLE_MINKOWSKI_H -#define BT_OBB_TRIANGLE_MINKOWSKI_H + + #include "btConvexShape.h" #include "btBoxShape.h" diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.h index 4dfe34efb..d4798b56a 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.h +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.h @@ -1,3 +1,5 @@ +#ifndef BT_UNIFORM_SCALING_SHAPE_H +#define BT_UNIFORM_SCALING_SHAPE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_UNIFORM_SCALING_SHAPE_H -#define BT_UNIFORM_SCALING_SHAPE_H + + #include "btConvexShape.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types diff --git a/thirdparty/bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h b/thirdparty/bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h index a368c8a0c..99c5973a3 100644 --- a/thirdparty/bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h +++ b/thirdparty/bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h @@ -1,3 +1,5 @@ +#ifndef BT_GIMPACT_BVH_CONCAVE_COLLISION_ALGORITHM_H +#define BT_GIMPACT_BVH_CONCAVE_COLLISION_ALGORITHM_H /*! \file btGImpactShape.h \author Francisco Leon Najera */ @@ -21,8 +23,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_GIMPACT_BVH_CONCAVE_COLLISION_ALGORITHM_H -#define BT_GIMPACT_BVH_CONCAVE_COLLISION_ALGORITHM_H + + #include "BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h" #include "BulletCollision/BroadphaseCollision/btDispatcher.h" diff --git a/thirdparty/bullet/BulletCollision/Gimpact/btGImpactMassUtil.h b/thirdparty/bullet/BulletCollision/Gimpact/btGImpactMassUtil.h index 1cde46ed8..4af5628b1 100644 --- a/thirdparty/bullet/BulletCollision/Gimpact/btGImpactMassUtil.h +++ b/thirdparty/bullet/BulletCollision/Gimpact/btGImpactMassUtil.h @@ -1,3 +1,5 @@ +#ifndef GIMPACT_MASS_UTIL_H +#define GIMPACT_MASS_UTIL_H /*! \file btGImpactMassUtil.h \author Francisco Leon Najera */ @@ -21,8 +23,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef GIMPACT_MASS_UTIL_H -#define GIMPACT_MASS_UTIL_H + + #include "LinearMath/btTransform.h" diff --git a/thirdparty/bullet/BulletCollision/Gimpact/btGenericPoolAllocator.h b/thirdparty/bullet/BulletCollision/Gimpact/btGenericPoolAllocator.h index 197af4fad..fb7fd396d 100644 --- a/thirdparty/bullet/BulletCollision/Gimpact/btGenericPoolAllocator.h +++ b/thirdparty/bullet/BulletCollision/Gimpact/btGenericPoolAllocator.h @@ -1,3 +1,5 @@ +#ifndef BT_GENERIC_POOL_ALLOCATOR_H +#define BT_GENERIC_POOL_ALLOCATOR_H /*! \file btGenericPoolAllocator.h \author Francisco Leon Najera. email projectileman@yahoo.com @@ -18,8 +20,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_GENERIC_POOL_ALLOCATOR_H -#define BT_GENERIC_POOL_ALLOCATOR_H + + #include #include diff --git a/thirdparty/bullet/BulletCollision/Gimpact/btTriangleShapeEx.h b/thirdparty/bullet/BulletCollision/Gimpact/btTriangleShapeEx.h index 568a1ce81..1ba27b603 100644 --- a/thirdparty/bullet/BulletCollision/Gimpact/btTriangleShapeEx.h +++ b/thirdparty/bullet/BulletCollision/Gimpact/btTriangleShapeEx.h @@ -1,3 +1,5 @@ +#ifndef GIMPACT_TRIANGLE_SHAPE_EX_H +#define GIMPACT_TRIANGLE_SHAPE_EX_H /*! \file btGImpactShape.h \author Francisco Leon Najera */ @@ -21,8 +23,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef GIMPACT_TRIANGLE_SHAPE_EX_H -#define GIMPACT_TRIANGLE_SHAPE_EX_H + + #include "BulletCollision/CollisionShapes/btCollisionShape.h" #include "BulletCollision/CollisionShapes/btTriangleShape.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btComputeGjkEpaPenetration.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btComputeGjkEpaPenetration.h index 3c8213303..b8855fc66 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btComputeGjkEpaPenetration.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btComputeGjkEpaPenetration.h @@ -1,3 +1,5 @@ +#ifndef BT_GJK_EPA_PENETATION_CONVEX_COLLISION_H +#define BT_GJK_EPA_PENETATION_CONVEX_COLLISION_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2014 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_GJK_EPA_PENETATION_CONVEX_COLLISION_H -#define BT_GJK_EPA_PENETATION_CONVEX_COLLISION_H + + #include "LinearMath/btTransform.h" // Note that btVector3 might be double precision... #include "btGjkEpa3.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h index 76c7731ee..812aa90dd 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h @@ -1,3 +1,5 @@ +#ifndef BT_CONTINUOUS_COLLISION_CONVEX_CAST_H +#define BT_CONTINUOUS_COLLISION_CONVEX_CAST_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONTINUOUS_COLLISION_CONVEX_CAST_H -#define BT_CONTINUOUS_COLLISION_CONVEX_CAST_H + + #include "btConvexCast.h" #include "btSimplexSolverInterface.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btConvexCast.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btConvexCast.h index 85476e611..38e89162b 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btConvexCast.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btConvexCast.h @@ -1,3 +1,5 @@ +#ifndef BT_CONVEX_CAST_H +#define BT_CONVEX_CAST_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONVEX_CAST_H -#define BT_CONVEX_CAST_H + + #include "LinearMath/btTransform.h" #include "LinearMath/btVector3.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h index 7672a4129..32521e3da 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h @@ -1,3 +1,5 @@ +#ifndef BT_CONVEX_PENETRATION_DEPTH_H +#define BT_CONVEX_PENETRATION_DEPTH_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONVEX_PENETRATION_DEPTH_H -#define BT_CONVEX_PENETRATION_DEPTH_H + + class btVector3; #include "btSimplexSolverInterface.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h index 973975f3c..ba8728c8d 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h @@ -1,3 +1,5 @@ +#ifndef BT_DISCRETE_COLLISION_DETECTOR1_INTERFACE_H +#define BT_DISCRETE_COLLISION_DETECTOR1_INTERFACE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_DISCRETE_COLLISION_DETECTOR1_INTERFACE_H -#define BT_DISCRETE_COLLISION_DETECTOR1_INTERFACE_H + + #include "LinearMath/btTransform.h" #include "LinearMath/btVector3.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkCollisionDescription.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkCollisionDescription.h index c9fd84beb..b51017a3c 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkCollisionDescription.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkCollisionDescription.h @@ -1,3 +1,5 @@ +#ifndef GJK_COLLISION_DESCRIPTION_H +#define GJK_COLLISION_DESCRIPTION_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2014 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef GJK_COLLISION_DESCRIPTION_H -#define GJK_COLLISION_DESCRIPTION_H + + #include "LinearMath/btVector3.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h index 0ee46a59c..06b0efca6 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h @@ -1,3 +1,5 @@ +#ifndef BT_GJK_CONVEX_CAST_H +#define BT_GJK_CONVEX_CAST_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_GJK_CONVEX_CAST_H -#define BT_GJK_CONVEX_CAST_H + + #include "BulletCollision/CollisionShapes/btCollisionMargin.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h index e2cf633a4..446ec8055 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h @@ -1,3 +1,5 @@ +#ifndef BT_GJK_EPA2_H +#define BT_GJK_EPA2_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2008 Erwin Coumans https://bulletphysics.org @@ -22,8 +24,8 @@ misrepresented as being the original software. /* GJK-EPA collision solver by Nathanael Presson, 2008 */ -#ifndef BT_GJK_EPA2_H -#define BT_GJK_EPA2_H + + #include "BulletCollision/CollisionShapes/btConvexShape.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa3.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa3.h index fd67c3759..e13742b97 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa3.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa3.h @@ -1,3 +1,5 @@ +#ifndef BT_GJK_EPA3_H +#define BT_GJK_EPA3_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2014 Erwin Coumans https://bulletphysics.org @@ -23,8 +25,8 @@ misrepresented as being the original software. Initial GJK-EPA collision solver by Nathanael Presson, 2008 Improvements and refactoring by Erwin Coumans, 2008-2014 */ -#ifndef BT_GJK_EPA3_H -#define BT_GJK_EPA3_H + + #include "LinearMath/btTransform.h" #include "btGjkCollisionDescription.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h index 90f0c174e..cdc268a3b 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h @@ -1,3 +1,5 @@ +#ifndef BT_GJP_EPA_PENETRATION_DEPTH_H +#define BT_GJP_EPA_PENETRATION_DEPTH_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -14,8 +16,8 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_GJP_EPA_PENETRATION_DEPTH_H -#define BT_GJP_EPA_PENETRATION_DEPTH_H + + #include "btConvexPenetrationDepthSolver.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h index eee2f7dab..770c38971 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h @@ -1,3 +1,5 @@ +#ifndef BT_GJK_PAIR_DETECTOR_H +#define BT_GJK_PAIR_DETECTOR_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_GJK_PAIR_DETECTOR_H -#define BT_GJK_PAIR_DETECTOR_H + + #include "btDiscreteCollisionDetectorInterface.h" #include "BulletCollision/CollisionShapes/btCollisionMargin.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h index 70915366e..63f623ff6 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h @@ -1,3 +1,5 @@ +#ifndef BT_MANIFOLD_CONTACT_POINT_H +#define BT_MANIFOLD_CONTACT_POINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_MANIFOLD_CONTACT_POINT_H -#define BT_MANIFOLD_CONTACT_POINT_H + + #include "LinearMath/btVector3.h" #include "LinearMath/btTransformUtil.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h index 2ad663b12..b419e7269 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h @@ -1,3 +1,5 @@ +#ifndef BT_MINKOWSKI_PENETRATION_DEPTH_SOLVER_H +#define BT_MINKOWSKI_PENETRATION_DEPTH_SOLVER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_MINKOWSKI_PENETRATION_DEPTH_SOLVER_H -#define BT_MINKOWSKI_PENETRATION_DEPTH_SOLVER_H + + #include "btConvexPenetrationDepthSolver.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btMprPenetration.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btMprPenetration.h index 534a66d3f..83dca8c0e 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btMprPenetration.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btMprPenetration.h @@ -1,3 +1,5 @@ +#ifndef BT_MPR_PENETRATION_H +#define BT_MPR_PENETRATION_H /*** * --------------------------------- @@ -18,8 +20,8 @@ ///2014 Oct, Erwin Coumans, Use templates to avoid void* casts -#ifndef BT_MPR_PENETRATION_H -#define BT_MPR_PENETRATION_H + + #define BT_DEBUG_MPR1 diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h index b07e48688..0ce0e0de7 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h @@ -1,3 +1,5 @@ +#ifndef BT_PERSISTENT_MANIFOLD_H +#define BT_PERSISTENT_MANIFOLD_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_PERSISTENT_MANIFOLD_H -#define BT_PERSISTENT_MANIFOLD_H + + #include "LinearMath/btVector3.h" #include "LinearMath/btTransform.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btPointCollector.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btPointCollector.h index adebcbee3..0dc916290 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btPointCollector.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btPointCollector.h @@ -1,3 +1,5 @@ +#ifndef BT_POINT_COLLECTOR_H +#define BT_POINT_COLLECTOR_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_POINT_COLLECTOR_H -#define BT_POINT_COLLECTOR_H + + #include "btDiscreteCollisionDetectorInterface.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h index 328f6424b..ce0745aeb 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h @@ -1,3 +1,5 @@ +#ifndef BT_POLYHEDRAL_CONTACT_CLIPPING_H +#define BT_POLYHEDRAL_CONTACT_CLIPPING_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2011 Advanced Micro Devices, Inc. http://bulletphysics.org @@ -15,8 +17,8 @@ subject to the following restrictions: ///This file was written by Erwin Coumans -#ifndef BT_POLYHEDRAL_CONTACT_CLIPPING_H -#define BT_POLYHEDRAL_CONTACT_CLIPPING_H + + #include "LinearMath/btAlignedObjectArray.h" #include "LinearMath/btTransform.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h index 58a48c7a7..e781033b5 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h @@ -1,3 +1,5 @@ +#ifndef BT_RAYCAST_TRI_CALLBACK_H +#define BT_RAYCAST_TRI_CALLBACK_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_RAYCAST_TRI_CALLBACK_H -#define BT_RAYCAST_TRI_CALLBACK_H + + #include "BulletCollision/CollisionShapes/btTriangleCallback.h" #include "LinearMath/btTransform.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h index b994aca91..ccf232348 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h @@ -1,3 +1,5 @@ +#ifndef BT_SIMPLEX_SOLVER_INTERFACE_H +#define BT_SIMPLEX_SOLVER_INTERFACE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SIMPLEX_SOLVER_INTERFACE_H -#define BT_SIMPLEX_SOLVER_INTERFACE_H + + #include "LinearMath/btVector3.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h index e2b6bbcfc..7fcd5273b 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h @@ -1,3 +1,5 @@ +#ifndef BT_SUBSIMPLEX_CONVEX_CAST_H +#define BT_SUBSIMPLEX_CONVEX_CAST_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SUBSIMPLEX_CONVEX_CAST_H -#define BT_SUBSIMPLEX_CONVEX_CAST_H + + #include "btConvexCast.h" #include "btSimplexSolverInterface.h" diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h index 5ed896f2f..4f885714b 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h @@ -1,3 +1,5 @@ +#ifndef BT_VORONOI_SIMPLEX_SOLVER_H +#define BT_VORONOI_SIMPLEX_SOLVER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_VORONOI_SIMPLEX_SOLVER_H -#define BT_VORONOI_SIMPLEX_SOLVER_H + + #include "btSimplexSolverInterface.h" diff --git a/thirdparty/bullet/BulletDynamics/Character/btCharacterControllerInterface.h b/thirdparty/bullet/BulletDynamics/Character/btCharacterControllerInterface.h index 2ccf317b9..d0cf80d64 100644 --- a/thirdparty/bullet/BulletDynamics/Character/btCharacterControllerInterface.h +++ b/thirdparty/bullet/BulletDynamics/Character/btCharacterControllerInterface.h @@ -1,3 +1,5 @@ +#ifndef BT_CHARACTER_CONTROLLER_INTERFACE_H +#define BT_CHARACTER_CONTROLLER_INTERFACE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2008 Erwin Coumans http://bulletphysics.com @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CHARACTER_CONTROLLER_INTERFACE_H -#define BT_CHARACTER_CONTROLLER_INTERFACE_H + + #include "LinearMath/btVector3.h" #include "BulletDynamics/Dynamics/btActionInterface.h" diff --git a/thirdparty/bullet/BulletDynamics/Character/btKinematicCharacterController.h b/thirdparty/bullet/BulletDynamics/Character/btKinematicCharacterController.h index ff34fc871..87291f5b4 100644 --- a/thirdparty/bullet/BulletDynamics/Character/btKinematicCharacterController.h +++ b/thirdparty/bullet/BulletDynamics/Character/btKinematicCharacterController.h @@ -1,3 +1,5 @@ +#ifndef BT_KINEMATIC_CHARACTER_CONTROLLER_H +#define BT_KINEMATIC_CHARACTER_CONTROLLER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2008 Erwin Coumans http://bulletphysics.com @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_KINEMATIC_CHARACTER_CONTROLLER_H -#define BT_KINEMATIC_CHARACTER_CONTROLLER_H + + #include "LinearMath/btVector3.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btBatchedConstraints.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btBatchedConstraints.h index 651df7a90..ed2849643 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btBatchedConstraints.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btBatchedConstraints.h @@ -1,3 +1,5 @@ +#ifndef BT_BATCHED_CONSTRAINTS_H +#define BT_BATCHED_CONSTRAINTS_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_BATCHED_CONSTRAINTS_H -#define BT_BATCHED_CONSTRAINTS_H + + #include "LinearMath/btThreads.h" #include "LinearMath/btAlignedObjectArray.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h index 64f44df1c..ee238c20f 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_CONETWISTCONSTRAINT_H +#define BT_CONETWISTCONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library btConeTwistConstraint is Copyright (c) 2007 Starbreeze Studios @@ -29,8 +31,8 @@ twist is along the x-axis, and swing 1 and 2 are along the z and y axes respectively. */ -#ifndef BT_CONETWISTCONSTRAINT_H -#define BT_CONETWISTCONSTRAINT_H + + #include "LinearMath/btVector3.h" #include "btJacobianEntry.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h index 777eccf9e..527b1a85c 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h @@ -1,3 +1,5 @@ +#ifndef BT_CONSTRAINT_SOLVER_H +#define BT_CONSTRAINT_SOLVER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONSTRAINT_SOLVER_H -#define BT_CONSTRAINT_SOLVER_H + + #include "LinearMath/btScalar.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h index b213a385f..1c2bbe397 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_CONTACT_CONSTRAINT_H +#define BT_CONTACT_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONTACT_CONSTRAINT_H -#define BT_CONTACT_CONSTRAINT_H + + #include "LinearMath/btVector3.h" #include "btJacobianEntry.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h index 630416776..f554a4cc4 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h @@ -1,3 +1,5 @@ +#ifndef BT_CONTACT_SOLVER_INFO +#define BT_CONTACT_SOLVER_INFO /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONTACT_SOLVER_INFO -#define BT_CONTACT_SOLVER_INFO + + #include "LinearMath/btScalar.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btFixedConstraint.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btFixedConstraint.h index 6d474ea81..58453d9ec 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btFixedConstraint.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btFixedConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_FIXED_CONSTRAINT_H +#define BT_FIXED_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2013 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_FIXED_CONSTRAINT_H -#define BT_FIXED_CONSTRAINT_H + + #include "btGeneric6DofSpring2Constraint.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGearConstraint.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGearConstraint.h index 64b15dfbc..8017926e1 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGearConstraint.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGearConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_GEAR_CONSTRAINT_H +#define BT_GEAR_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2012 Advanced Micro Devices, Inc. http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_GEAR_CONSTRAINT_H -#define BT_GEAR_CONSTRAINT_H + + #include "BulletDynamics/ConstraintSolver/btTypedConstraint.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h index 1febc2bc0..b9dc23e09 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_GENERIC_6DOF_CONSTRAINT_H +#define BT_GENERIC_6DOF_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -23,8 +25,8 @@ email: projectileman@yahoo.com http://gimpact.sf.net */ -#ifndef BT_GENERIC_6DOF_CONSTRAINT_H -#define BT_GENERIC_6DOF_CONSTRAINT_H + + #include "LinearMath/btVector3.h" #include "btJacobianEntry.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h index d2fe24b8e..a6c1c3192 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h @@ -1,3 +1,5 @@ +#ifndef BT_GENERIC_6DOF_CONSTRAINT2_H +#define BT_GENERIC_6DOF_CONSTRAINT2_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -37,8 +39,8 @@ email: projectileman@yahoo.com http://gimpact.sf.net */ -#ifndef BT_GENERIC_6DOF_CONSTRAINT2_H -#define BT_GENERIC_6DOF_CONSTRAINT2_H + + #include "LinearMath/btVector3.h" #include "btJacobianEntry.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h index 02b9d4d05..6dd75b886 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_GENERIC_6DOF_SPRING_CONSTRAINT_H +#define BT_GENERIC_6DOF_SPRING_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org Copyright (C) 2006, 2007 Sony Computer Entertainment Inc. @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_GENERIC_6DOF_SPRING_CONSTRAINT_H -#define BT_GENERIC_6DOF_SPRING_CONSTRAINT_H + + #include "LinearMath/btVector3.h" #include "btTypedConstraint.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btHinge2Constraint.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btHinge2Constraint.h index 95f604a89..66a7aec6a 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btHinge2Constraint.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btHinge2Constraint.h @@ -1,3 +1,5 @@ +#ifndef BT_HINGE2_CONSTRAINT_H +#define BT_HINGE2_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org Copyright (C) 2006, 2007 Sony Computer Entertainment Inc. @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_HINGE2_CONSTRAINT_H -#define BT_HINGE2_CONSTRAINT_H + + #include "LinearMath/btVector3.h" #include "btTypedConstraint.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h index 8b1f1afdd..3913d7604 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_HINGECONSTRAINT_H +#define BT_HINGECONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -15,8 +17,8 @@ subject to the following restrictions: /* Hinge Constraint by Dirk Gregorius. Limits added by Marcus Hennix at Starbreeze Studios */ -#ifndef BT_HINGECONSTRAINT_H -#define BT_HINGECONSTRAINT_H + + #define _BT_USE_CENTER_LIMIT_ 1 diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btJacobianEntry.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btJacobianEntry.h index a251073ea..2f1e97fdb 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btJacobianEntry.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btJacobianEntry.h @@ -1,3 +1,5 @@ +#ifndef BT_JACOBIAN_ENTRY_H +#define BT_JACOBIAN_ENTRY_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_JACOBIAN_ENTRY_H -#define BT_JACOBIAN_ENTRY_H + + #include "LinearMath/btMatrix3x3.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.h index a01f34c9d..74a5e0e57 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.h @@ -1,3 +1,5 @@ +#ifndef BT_NNCG_CONSTRAINT_SOLVER_H +#define BT_NNCG_CONSTRAINT_SOLVER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_NNCG_CONSTRAINT_SOLVER_H -#define BT_NNCG_CONSTRAINT_SOLVER_H + + #include "btSequentialImpulseConstraintSolver.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h index c0b94e9c8..3c0e172a1 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_POINT2POINTCONSTRAINT_H +#define BT_POINT2POINTCONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_POINT2POINTCONSTRAINT_H -#define BT_POINT2POINTCONSTRAINT_H + + #include "LinearMath/btVector3.h" #include "btJacobianEntry.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h index cd00967d0..216ba8fa9 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h @@ -1,3 +1,5 @@ +#ifndef BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H +#define BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H -#define BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H + + class btIDebugDraw; class btPersistentManifold; diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.h index 73a99153e..729fc773c 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.h @@ -1,3 +1,5 @@ +#ifndef BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_MT_H +#define BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_MT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_MT_H -#define BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_MT_H + + #include "btSequentialImpulseConstraintSolver.h" #include "btBatchedConstraints.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h index 75b185754..bc5c19fea 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_SLIDER_CONSTRAINT_H +#define BT_SLIDER_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -22,8 +24,8 @@ TODO: - add conversion for ODE constraint solver */ -#ifndef BT_SLIDER_CONSTRAINT_H -#define BT_SLIDER_CONSTRAINT_H + + #include "LinearMath/btScalar.h" //for BT_USE_DOUBLE_PRECISION diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h index 0a8c901bc..52c05a948 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_SOLVE_2LINEAR_CONSTRAINT_H +#define BT_SOLVE_2LINEAR_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SOLVE_2LINEAR_CONSTRAINT_H -#define BT_SOLVE_2LINEAR_CONSTRAINT_H + + #include "LinearMath/btMatrix3x3.h" #include "LinearMath/btVector3.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h index 8d2f108fa..111e58725 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h @@ -1,3 +1,5 @@ +#ifndef BT_SOLVER_BODY_H +#define BT_SOLVER_BODY_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SOLVER_BODY_H -#define BT_SOLVER_BODY_H + + class btRigidBody; #include "LinearMath/btVector3.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h index 9749b3315..1a25fa625 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_SOLVER_CONSTRAINT_H +#define BT_SOLVER_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SOLVER_CONSTRAINT_H -#define BT_SOLVER_CONSTRAINT_H + + class btRigidBody; #include "LinearMath/btVector3.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h index 3d6b08d71..52de18865 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_TYPED_CONSTRAINT_H +#define BT_TYPED_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2010 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_TYPED_CONSTRAINT_H -#define BT_TYPED_CONSTRAINT_H + + #include "LinearMath/btScalar.h" #include "btSolverConstraint.h" diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btUniversalConstraint.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btUniversalConstraint.h index 8c24d93a6..b313d3d64 100644 --- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btUniversalConstraint.h +++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btUniversalConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_UNIVERSAL_CONSTRAINT_H +#define BT_UNIVERSAL_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org Copyright (C) 2006, 2007 Sony Computer Entertainment Inc. @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_UNIVERSAL_CONSTRAINT_H -#define BT_UNIVERSAL_CONSTRAINT_H + + #include "LinearMath/btVector3.h" #include "btTypedConstraint.h" diff --git a/thirdparty/bullet/BulletDynamics/Dynamics/btActionInterface.h b/thirdparty/bullet/BulletDynamics/Dynamics/btActionInterface.h index 51a3fa473..9d226f339 100644 --- a/thirdparty/bullet/BulletDynamics/Dynamics/btActionInterface.h +++ b/thirdparty/bullet/BulletDynamics/Dynamics/btActionInterface.h @@ -1,3 +1,5 @@ +#ifndef _BT_ACTION_INTERFACE_H +#define _BT_ACTION_INTERFACE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _BT_ACTION_INTERFACE_H -#define _BT_ACTION_INTERFACE_H + + class btIDebugDraw; class btCollisionWorld; diff --git a/thirdparty/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h b/thirdparty/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h index 73607c61f..613b3ef16 100644 --- a/thirdparty/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h +++ b/thirdparty/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h @@ -1,3 +1,5 @@ +#ifndef BT_DISCRETE_DYNAMICS_WORLD_H +#define BT_DISCRETE_DYNAMICS_WORLD_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_DISCRETE_DYNAMICS_WORLD_H -#define BT_DISCRETE_DYNAMICS_WORLD_H + + #include "btDynamicsWorld.h" class btDispatcher; diff --git a/thirdparty/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h b/thirdparty/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h index dccf35d7a..6e39032b3 100644 --- a/thirdparty/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h +++ b/thirdparty/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h @@ -1,3 +1,5 @@ +#ifndef BT_DISCRETE_DYNAMICS_WORLD_MT_H +#define BT_DISCRETE_DYNAMICS_WORLD_MT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_DISCRETE_DYNAMICS_WORLD_MT_H -#define BT_DISCRETE_DYNAMICS_WORLD_MT_H + + #include "btDiscreteDynamicsWorld.h" #include "btSimulationIslandManagerMt.h" diff --git a/thirdparty/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h b/thirdparty/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h index a5a4411ad..8eac974a3 100644 --- a/thirdparty/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h +++ b/thirdparty/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h @@ -1,3 +1,5 @@ +#ifndef BT_DYNAMICS_WORLD_H +#define BT_DYNAMICS_WORLD_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_DYNAMICS_WORLD_H -#define BT_DYNAMICS_WORLD_H + + #include "BulletCollision/CollisionDispatch/btCollisionWorld.h" #include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h" diff --git a/thirdparty/bullet/BulletDynamics/Dynamics/btRigidBody.h b/thirdparty/bullet/BulletDynamics/Dynamics/btRigidBody.h index 00143ef4e..910364c07 100644 --- a/thirdparty/bullet/BulletDynamics/Dynamics/btRigidBody.h +++ b/thirdparty/bullet/BulletDynamics/Dynamics/btRigidBody.h @@ -1,3 +1,5 @@ +#ifndef BT_RIGIDBODY_H +#define BT_RIGIDBODY_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_RIGIDBODY_H -#define BT_RIGIDBODY_H + + #include "LinearMath/btAlignedObjectArray.h" #include "LinearMath/btTransform.h" diff --git a/thirdparty/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h b/thirdparty/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h index 46bd535f6..cd1245c4d 100644 --- a/thirdparty/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h +++ b/thirdparty/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h @@ -1,3 +1,5 @@ +#ifndef BT_SIMPLE_DYNAMICS_WORLD_H +#define BT_SIMPLE_DYNAMICS_WORLD_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SIMPLE_DYNAMICS_WORLD_H -#define BT_SIMPLE_DYNAMICS_WORLD_H + + #include "btDynamicsWorld.h" diff --git a/thirdparty/bullet/BulletDynamics/Dynamics/btSimulationIslandManagerMt.h b/thirdparty/bullet/BulletDynamics/Dynamics/btSimulationIslandManagerMt.h index dcc04cd81..9548b9a0a 100644 --- a/thirdparty/bullet/BulletDynamics/Dynamics/btSimulationIslandManagerMt.h +++ b/thirdparty/bullet/BulletDynamics/Dynamics/btSimulationIslandManagerMt.h @@ -1,3 +1,5 @@ +#ifndef BT_SIMULATION_ISLAND_MANAGER_MT_H +#define BT_SIMULATION_ISLAND_MANAGER_MT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SIMULATION_ISLAND_MANAGER_MT_H -#define BT_SIMULATION_ISLAND_MANAGER_MT_H + + #include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h" diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBody.h b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBody.h index 345970d26..f2efac3ab 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBody.h +++ b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBody.h @@ -1,3 +1,5 @@ +#ifndef BT_MULTIBODY_H +#define BT_MULTIBODY_H /* * PURPOSE: * Class representing an articulated rigid body. Stores the body's @@ -21,8 +23,8 @@ */ -#ifndef BT_MULTIBODY_H -#define BT_MULTIBODY_H + + #include "LinearMath/btScalar.h" #include "LinearMath/btVector3.h" diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyConstraint.h b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyConstraint.h index 1aaa07b69..83b0eba7b 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyConstraint.h +++ b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_MULTIBODY_CONSTRAINT_H +#define BT_MULTIBODY_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2013 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_MULTIBODY_CONSTRAINT_H -#define BT_MULTIBODY_CONSTRAINT_H + + #include "LinearMath/btScalar.h" #include "LinearMath/btAlignedObjectArray.h" diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h index f584360e2..96b2122ab 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h +++ b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h @@ -1,3 +1,5 @@ +#ifndef BT_MULTIBODY_CONSTRAINT_SOLVER_H +#define BT_MULTIBODY_CONSTRAINT_SOLVER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2013 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_MULTIBODY_CONSTRAINT_SOLVER_H -#define BT_MULTIBODY_CONSTRAINT_SOLVER_H + + #include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h" #include "btMultiBodySolverConstraint.h" diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h index d2d76c8b9..9e2f9c764 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h +++ b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h @@ -1,3 +1,5 @@ +#ifndef BT_MULTIBODY_DYNAMICS_WORLD_H +#define BT_MULTIBODY_DYNAMICS_WORLD_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2013 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_MULTIBODY_DYNAMICS_WORLD_H -#define BT_MULTIBODY_DYNAMICS_WORLD_H + + #include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h" #include "BulletDynamics/Featherstone/btMultiBodyInplaceSolverIslandCallback.h" diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h index adb1cb47d..d1ba192c7 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h +++ b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_MULTIBODY_FIXED_CONSTRAINT_H +#define BT_MULTIBODY_FIXED_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2013 Erwin Coumans http://bulletphysics.org @@ -15,8 +17,8 @@ subject to the following restrictions: ///This file was written by Erwin Coumans -#ifndef BT_MULTIBODY_FIXED_CONSTRAINT_H -#define BT_MULTIBODY_FIXED_CONSTRAINT_H + + #include "btMultiBodyConstraint.h" diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyGearConstraint.h b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyGearConstraint.h index 31888fbc6..dd7e915f2 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyGearConstraint.h +++ b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyGearConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_MULTIBODY_GEAR_CONSTRAINT_H +#define BT_MULTIBODY_GEAR_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2013 Erwin Coumans http://bulletphysics.org @@ -15,8 +17,8 @@ subject to the following restrictions: ///This file was written by Erwin Coumans -#ifndef BT_MULTIBODY_GEAR_CONSTRAINT_H -#define BT_MULTIBODY_GEAR_CONSTRAINT_H + + #include "btMultiBodyConstraint.h" diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyInplaceSolverIslandCallback.h b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyInplaceSolverIslandCallback.h index 3169b86e6..519267be2 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyInplaceSolverIslandCallback.h +++ b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyInplaceSolverIslandCallback.h @@ -1,3 +1,5 @@ +#ifndef BT_MULTIBODY_INPLACE_SOLVER_ISLAND_CALLBACK_H +#define BT_MULTIBODY_INPLACE_SOLVER_ISLAND_CALLBACK_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2019 Google Inc. http://bulletphysics.org @@ -11,8 +13,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_MULTIBODY_INPLACE_SOLVER_ISLAND_CALLBACK_H -#define BT_MULTIBODY_INPLACE_SOLVER_ISLAND_CALLBACK_H + + #include "BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h" #include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h" diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyJointFeedback.h b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyJointFeedback.h index d943019e7..83587adf9 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyJointFeedback.h +++ b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyJointFeedback.h @@ -1,3 +1,5 @@ +#ifndef BT_MULTIBODY_JOINT_FEEDBACK_H +#define BT_MULTIBODY_JOINT_FEEDBACK_H /* Copyright (c) 2015 Google Inc. @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_MULTIBODY_JOINT_FEEDBACK_H -#define BT_MULTIBODY_JOINT_FEEDBACK_H + + #include "LinearMath/btSpatialAlgebra.h" diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h index b810692b4..cce003fd2 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h +++ b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_MULTIBODY_JOINT_LIMIT_CONSTRAINT_H +#define BT_MULTIBODY_JOINT_LIMIT_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2013 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_MULTIBODY_JOINT_LIMIT_CONSTRAINT_H -#define BT_MULTIBODY_JOINT_LIMIT_CONSTRAINT_H + + #include "btMultiBodyConstraint.h" struct btSolverInfo; diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyJointMotor.h b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyJointMotor.h index 1aca36352..57e4582aa 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyJointMotor.h +++ b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyJointMotor.h @@ -1,3 +1,5 @@ +#ifndef BT_MULTIBODY_JOINT_MOTOR_H +#define BT_MULTIBODY_JOINT_MOTOR_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2013 Erwin Coumans http://bulletphysics.org @@ -15,8 +17,8 @@ subject to the following restrictions: ///This file was written by Erwin Coumans -#ifndef BT_MULTIBODY_JOINT_MOTOR_H -#define BT_MULTIBODY_JOINT_MOTOR_H + + #include "btMultiBodyConstraint.h" struct btSolverInfo; diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyLink.h b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyLink.h index 5a1429340..d7363b34c 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyLink.h +++ b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyLink.h @@ -1,3 +1,5 @@ +#ifndef BT_MULTIBODY_LINK_H +#define BT_MULTIBODY_LINK_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2013 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_MULTIBODY_LINK_H -#define BT_MULTIBODY_LINK_H + + #include "LinearMath/btQuaternion.h" #include "LinearMath/btVector3.h" diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h index 3dc35a581..f8acf1a0a 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h +++ b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h @@ -1,3 +1,5 @@ +#ifndef BT_FEATHERSTONE_LINK_COLLIDER_H +#define BT_FEATHERSTONE_LINK_COLLIDER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2013 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_FEATHERSTONE_LINK_COLLIDER_H -#define BT_FEATHERSTONE_LINK_COLLIDER_H + + #include "BulletCollision/CollisionDispatch/btCollisionObject.h" diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyMLCPConstraintSolver.h b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyMLCPConstraintSolver.h index 77fdb86bb..93451465b 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyMLCPConstraintSolver.h +++ b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyMLCPConstraintSolver.h @@ -1,3 +1,5 @@ +#ifndef BT_MULTIBODY_MLCP_CONSTRAINT_SOLVER_H +#define BT_MULTIBODY_MLCP_CONSTRAINT_SOLVER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2018 Google Inc. http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_MULTIBODY_MLCP_CONSTRAINT_SOLVER_H -#define BT_MULTIBODY_MLCP_CONSTRAINT_SOLVER_H + + #include "LinearMath/btMatrixX.h" #include "LinearMath/btThreads.h" diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h index ef03a557e..2fee6633b 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h +++ b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h @@ -1,3 +1,5 @@ +#ifndef BT_MULTIBODY_POINT2POINT_H +#define BT_MULTIBODY_POINT2POINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2013 Erwin Coumans http://bulletphysics.org @@ -15,8 +17,8 @@ subject to the following restrictions: ///This file was written by Erwin Coumans -#ifndef BT_MULTIBODY_POINT2POINT_H -#define BT_MULTIBODY_POINT2POINT_H + + #include "btMultiBodyConstraint.h" diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodySliderConstraint.h b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodySliderConstraint.h index b192b6f8f..713f0eb6b 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodySliderConstraint.h +++ b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodySliderConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_MULTIBODY_SLIDER_CONSTRAINT_H +#define BT_MULTIBODY_SLIDER_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2013 Erwin Coumans http://bulletphysics.org @@ -15,8 +17,8 @@ subject to the following restrictions: ///This file was written by Erwin Coumans -#ifndef BT_MULTIBODY_SLIDER_CONSTRAINT_H -#define BT_MULTIBODY_SLIDER_CONSTRAINT_H + + #include "btMultiBodyConstraint.h" diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h index deed3e2a1..c8b259b1f 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h +++ b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_MULTIBODY_SOLVER_CONSTRAINT_H +#define BT_MULTIBODY_SOLVER_CONSTRAINT_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2013 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_MULTIBODY_SOLVER_CONSTRAINT_H -#define BT_MULTIBODY_SOLVER_CONSTRAINT_H + + #include "LinearMath/btVector3.h" #include "LinearMath/btAlignedObjectArray.h" diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.h b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.h index bdeccc2e2..61789ebe0 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.h +++ b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.h @@ -1,3 +1,5 @@ +#ifndef BT_MULTIBODY_SPHERICAL_JOINT_MOTOR_H +#define BT_MULTIBODY_SPHERICAL_JOINT_MOTOR_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2018 Erwin Coumans http://bulletphysics.org @@ -15,8 +17,8 @@ subject to the following restrictions: ///This file was written by Erwin Coumans -#ifndef BT_MULTIBODY_SPHERICAL_JOINT_MOTOR_H -#define BT_MULTIBODY_SPHERICAL_JOINT_MOTOR_H + + #include "btMultiBodyConstraint.h" struct btSolverInfo; diff --git a/thirdparty/bullet/BulletDynamics/MLCPSolvers/btDantzigLCP.h b/thirdparty/bullet/BulletDynamics/MLCPSolvers/btDantzigLCP.h index 8d9b2a13e..c7cc52b3e 100644 --- a/thirdparty/bullet/BulletDynamics/MLCPSolvers/btDantzigLCP.h +++ b/thirdparty/bullet/BulletDynamics/MLCPSolvers/btDantzigLCP.h @@ -1,3 +1,5 @@ +#ifndef _BT_LCP_H_ +#define _BT_LCP_H_ /************************************************************************* * * * Open Dynamics Engine, Copyright (C) 2001,2002 Russell L. Smith. * @@ -41,8 +43,8 @@ to be implemented. the first `nub' variables are assumed to have findex < 0. */ -#ifndef _BT_LCP_H_ -#define _BT_LCP_H_ + + #include #include diff --git a/thirdparty/bullet/BulletDynamics/MLCPSolvers/btDantzigSolver.h b/thirdparty/bullet/BulletDynamics/MLCPSolvers/btDantzigSolver.h index 1f669751c..e119af17e 100644 --- a/thirdparty/bullet/BulletDynamics/MLCPSolvers/btDantzigSolver.h +++ b/thirdparty/bullet/BulletDynamics/MLCPSolvers/btDantzigSolver.h @@ -1,3 +1,5 @@ +#ifndef BT_DANTZIG_SOLVER_H +#define BT_DANTZIG_SOLVER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -14,8 +16,8 @@ subject to the following restrictions: */ ///original version written by Erwin Coumans, October 2013 -#ifndef BT_DANTZIG_SOLVER_H -#define BT_DANTZIG_SOLVER_H + + #include "btMLCPSolverInterface.h" #include "btDantzigLCP.h" diff --git a/thirdparty/bullet/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.h b/thirdparty/bullet/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.h index 3c6bf72a2..f78deaa2c 100644 --- a/thirdparty/bullet/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.h +++ b/thirdparty/bullet/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.h @@ -1,3 +1,5 @@ +#ifndef BT_NUMERICS_LEMKE_ALGORITHM_H_ +#define BT_NUMERICS_LEMKE_ALGORITHM_H_ /* Copyright (C) 2004-2013 MBSim Development Team Code was converted for the Bullet Continuous Collision Detection and Physics Library @@ -19,8 +21,8 @@ subject to the following restrictions: //Math library was replaced from fmatvec to a the file src/LinearMath/btMatrixX.h //STL/std::vector replaced by btAlignedObjectArray -#ifndef BT_NUMERICS_LEMKE_ALGORITHM_H_ -#define BT_NUMERICS_LEMKE_ALGORITHM_H_ + + #include "LinearMath/btMatrixX.h" diff --git a/thirdparty/bullet/BulletDynamics/MLCPSolvers/btLemkeSolver.h b/thirdparty/bullet/BulletDynamics/MLCPSolvers/btLemkeSolver.h index f18c4ea41..a39a35b22 100644 --- a/thirdparty/bullet/BulletDynamics/MLCPSolvers/btLemkeSolver.h +++ b/thirdparty/bullet/BulletDynamics/MLCPSolvers/btLemkeSolver.h @@ -1,3 +1,5 @@ +#ifndef BT_LEMKE_SOLVER_H +#define BT_LEMKE_SOLVER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -14,8 +16,8 @@ subject to the following restrictions: */ ///original version written by Erwin Coumans, October 2013 -#ifndef BT_LEMKE_SOLVER_H -#define BT_LEMKE_SOLVER_H + + #include "btMLCPSolverInterface.h" #include "btLemkeAlgorithm.h" diff --git a/thirdparty/bullet/BulletDynamics/MLCPSolvers/btMLCPSolver.h b/thirdparty/bullet/BulletDynamics/MLCPSolvers/btMLCPSolver.h index 510ae59e5..c38dc7c85 100644 --- a/thirdparty/bullet/BulletDynamics/MLCPSolvers/btMLCPSolver.h +++ b/thirdparty/bullet/BulletDynamics/MLCPSolvers/btMLCPSolver.h @@ -1,3 +1,5 @@ +#ifndef BT_MLCP_SOLVER_H +#define BT_MLCP_SOLVER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -14,8 +16,8 @@ subject to the following restrictions: */ ///original version written by Erwin Coumans, October 2013 -#ifndef BT_MLCP_SOLVER_H -#define BT_MLCP_SOLVER_H + + #include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h" #include "LinearMath/btMatrixX.h" diff --git a/thirdparty/bullet/BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h b/thirdparty/bullet/BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h index 6b0465b88..b24f43b0c 100644 --- a/thirdparty/bullet/BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h +++ b/thirdparty/bullet/BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h @@ -1,3 +1,5 @@ +#ifndef BT_MLCP_SOLVER_INTERFACE_H +#define BT_MLCP_SOLVER_INTERFACE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -14,8 +16,8 @@ subject to the following restrictions: */ ///original version written by Erwin Coumans, October 2013 -#ifndef BT_MLCP_SOLVER_INTERFACE_H -#define BT_MLCP_SOLVER_INTERFACE_H + + #include "LinearMath/btMatrixX.h" diff --git a/thirdparty/bullet/BulletDynamics/MLCPSolvers/btPATHSolver.h b/thirdparty/bullet/BulletDynamics/MLCPSolvers/btPATHSolver.h index 7f8eec3f6..aeadefe47 100644 --- a/thirdparty/bullet/BulletDynamics/MLCPSolvers/btPATHSolver.h +++ b/thirdparty/bullet/BulletDynamics/MLCPSolvers/btPATHSolver.h @@ -1,3 +1,5 @@ +#ifndef BT_PATH_SOLVER_H +#define BT_PATH_SOLVER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -14,8 +16,8 @@ subject to the following restrictions: */ ///original version written by Erwin Coumans, October 2013 -#ifndef BT_PATH_SOLVER_H -#define BT_PATH_SOLVER_H + + //#define BT_USE_PATH #ifdef BT_USE_PATH diff --git a/thirdparty/bullet/BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h b/thirdparty/bullet/BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h index c3f4ec399..a41d52c60 100644 --- a/thirdparty/bullet/BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h +++ b/thirdparty/bullet/BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h @@ -1,3 +1,5 @@ +#ifndef BT_SOLVE_PROJECTED_GAUSS_SEIDEL_H +#define BT_SOLVE_PROJECTED_GAUSS_SEIDEL_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -14,8 +16,8 @@ subject to the following restrictions: */ ///original version written by Erwin Coumans, October 2013 -#ifndef BT_SOLVE_PROJECTED_GAUSS_SEIDEL_H -#define BT_SOLVE_PROJECTED_GAUSS_SEIDEL_H + + #include "btMLCPSolverInterface.h" diff --git a/thirdparty/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h b/thirdparty/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h index b4a92b0a9..e28254233 100644 --- a/thirdparty/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h +++ b/thirdparty/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h @@ -1,3 +1,5 @@ +#ifndef BT_RAYCASTVEHICLE_H +#define BT_RAYCASTVEHICLE_H /* * Copyright (c) 2005 Erwin Coumans https://bulletphysics.org * @@ -8,8 +10,8 @@ * of this software for any purpose. * It is provided "as is" without express or implied warranty. */ -#ifndef BT_RAYCASTVEHICLE_H -#define BT_RAYCASTVEHICLE_H + + #include "BulletDynamics/Dynamics/btRigidBody.h" #include "BulletDynamics/ConstraintSolver/btTypedConstraint.h" diff --git a/thirdparty/bullet/BulletDynamics/Vehicle/btVehicleRaycaster.h b/thirdparty/bullet/BulletDynamics/Vehicle/btVehicleRaycaster.h index 2c44ce546..2d8380cf1 100644 --- a/thirdparty/bullet/BulletDynamics/Vehicle/btVehicleRaycaster.h +++ b/thirdparty/bullet/BulletDynamics/Vehicle/btVehicleRaycaster.h @@ -1,3 +1,5 @@ +#ifndef BT_VEHICLE_RAYCASTER_H +#define BT_VEHICLE_RAYCASTER_H /* * Copyright (c) 2005 Erwin Coumans http://bulletphysics.org * @@ -8,8 +10,8 @@ * of this software for any purpose. * It is provided "as is" without express or implied warranty. */ -#ifndef BT_VEHICLE_RAYCASTER_H -#define BT_VEHICLE_RAYCASTER_H + + #include "LinearMath/btVector3.h" diff --git a/thirdparty/bullet/BulletDynamics/Vehicle/btWheelInfo.h b/thirdparty/bullet/BulletDynamics/Vehicle/btWheelInfo.h index 68f61423d..6bcef4839 100644 --- a/thirdparty/bullet/BulletDynamics/Vehicle/btWheelInfo.h +++ b/thirdparty/bullet/BulletDynamics/Vehicle/btWheelInfo.h @@ -1,3 +1,5 @@ +#ifndef BT_WHEEL_INFO_H +#define BT_WHEEL_INFO_H /* * Copyright (c) 2005 Erwin Coumans https://bulletphysics.org * @@ -8,8 +10,8 @@ * of this software for any purpose. * It is provided "as is" without express or implied warranty. */ -#ifndef BT_WHEEL_INFO_H -#define BT_WHEEL_INFO_H + + #include "LinearMath/btVector3.h" #include "LinearMath/btTransform.h" diff --git a/thirdparty/bullet/BulletSoftBody/DeformableBodyInplaceSolverIslandCallback.h b/thirdparty/bullet/BulletSoftBody/DeformableBodyInplaceSolverIslandCallback.h index 01c7e93a1..7293fbe85 100644 --- a/thirdparty/bullet/BulletSoftBody/DeformableBodyInplaceSolverIslandCallback.h +++ b/thirdparty/bullet/BulletSoftBody/DeformableBodyInplaceSolverIslandCallback.h @@ -1,3 +1,5 @@ +#ifndef DeformableBodyInplaceSolverIslandCallback_h +#define DeformableBodyInplaceSolverIslandCallback_h // // DeformableBodyInplaceSolverIslandCallback.h // BulletSoftBody @@ -5,8 +7,8 @@ // Created by Xuchen Han on 12/16/19. // -#ifndef DeformableBodyInplaceSolverIslandCallback_h -#define DeformableBodyInplaceSolverIslandCallback_h + + struct DeformableBodyInplaceSolverIslandCallback : public MultiBodyInplaceSolverIslandCallback { diff --git a/thirdparty/bullet/BulletSoftBody/btCGProjection.h b/thirdparty/bullet/BulletSoftBody/btCGProjection.h index e05970664..3a4dc4d37 100644 --- a/thirdparty/bullet/BulletSoftBody/btCGProjection.h +++ b/thirdparty/bullet/BulletSoftBody/btCGProjection.h @@ -1,3 +1,5 @@ +#ifndef BT_CG_PROJECTION_H +#define BT_CG_PROJECTION_H /* Written by Xuchen Han @@ -13,8 +15,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CG_PROJECTION_H -#define BT_CG_PROJECTION_H + + #include "btSoftBody.h" #include "BulletDynamics/Featherstone/btMultiBodyLinkCollider.h" diff --git a/thirdparty/bullet/BulletSoftBody/btConjugateGradient.h b/thirdparty/bullet/BulletSoftBody/btConjugateGradient.h index bcd5e6b51..3fb51b1e9 100644 --- a/thirdparty/bullet/BulletSoftBody/btConjugateGradient.h +++ b/thirdparty/bullet/BulletSoftBody/btConjugateGradient.h @@ -1,3 +1,5 @@ +#ifndef BT_CONJUGATE_GRADIENT_H +#define BT_CONJUGATE_GRADIENT_H /* Written by Xuchen Han @@ -13,8 +15,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONJUGATE_GRADIENT_H -#define BT_CONJUGATE_GRADIENT_H + + #include "btKrylovSolver.h" template class btConjugateGradient : public btKrylovSolver diff --git a/thirdparty/bullet/BulletSoftBody/btConjugateResidual.h b/thirdparty/bullet/BulletSoftBody/btConjugateResidual.h index 614612036..ca11629ac 100644 --- a/thirdparty/bullet/BulletSoftBody/btConjugateResidual.h +++ b/thirdparty/bullet/BulletSoftBody/btConjugateResidual.h @@ -1,3 +1,5 @@ +#ifndef BT_CONJUGATE_RESIDUAL_H +#define BT_CONJUGATE_RESIDUAL_H /* Written by Xuchen Han @@ -13,8 +15,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONJUGATE_RESIDUAL_H -#define BT_CONJUGATE_RESIDUAL_H + + #include "btKrylovSolver.h" template diff --git a/thirdparty/bullet/BulletSoftBody/btDefaultSoftBodySolver.h b/thirdparty/bullet/BulletSoftBody/btDefaultSoftBodySolver.h index d54edcae0..f1b7eb1e7 100644 --- a/thirdparty/bullet/BulletSoftBody/btDefaultSoftBodySolver.h +++ b/thirdparty/bullet/BulletSoftBody/btDefaultSoftBodySolver.h @@ -1,3 +1,5 @@ +#ifndef BT_SOFT_BODY_DEFAULT_SOLVER_H +#define BT_SOFT_BODY_DEFAULT_SOLVER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SOFT_BODY_DEFAULT_SOLVER_H -#define BT_SOFT_BODY_DEFAULT_SOLVER_H + + #include "BulletSoftBody/btSoftBodySolvers.h" #include "btSoftBodySolverVertexBuffer.h" diff --git a/thirdparty/bullet/BulletSoftBody/btDeformableBackwardEulerObjective.h b/thirdparty/bullet/BulletSoftBody/btDeformableBackwardEulerObjective.h index eb05b9f01..4fbca8235 100644 --- a/thirdparty/bullet/BulletSoftBody/btDeformableBackwardEulerObjective.h +++ b/thirdparty/bullet/BulletSoftBody/btDeformableBackwardEulerObjective.h @@ -1,3 +1,5 @@ +#ifndef BT_BACKWARD_EULER_OBJECTIVE_H +#define BT_BACKWARD_EULER_OBJECTIVE_H /* Written by Xuchen Han @@ -13,8 +15,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_BACKWARD_EULER_OBJECTIVE_H -#define BT_BACKWARD_EULER_OBJECTIVE_H + + //#include "btConjugateGradient.h" #include "btDeformableLagrangianForce.h" #include "btDeformableMassSpringForce.h" diff --git a/thirdparty/bullet/BulletSoftBody/btDeformableBodySolver.h b/thirdparty/bullet/BulletSoftBody/btDeformableBodySolver.h index ae674d6e8..2b6a689ac 100644 --- a/thirdparty/bullet/BulletSoftBody/btDeformableBodySolver.h +++ b/thirdparty/bullet/BulletSoftBody/btDeformableBodySolver.h @@ -1,3 +1,5 @@ +#ifndef BT_DEFORMABLE_BODY_SOLVERS_H +#define BT_DEFORMABLE_BODY_SOLVERS_H /* Written by Xuchen Han @@ -13,8 +15,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_DEFORMABLE_BODY_SOLVERS_H -#define BT_DEFORMABLE_BODY_SOLVERS_H + + #include "btSoftBodySolvers.h" #include "btDeformableBackwardEulerObjective.h" diff --git a/thirdparty/bullet/BulletSoftBody/btDeformableContactConstraint.h b/thirdparty/bullet/BulletSoftBody/btDeformableContactConstraint.h index ddecb40fc..e5c2562d4 100644 --- a/thirdparty/bullet/BulletSoftBody/btDeformableContactConstraint.h +++ b/thirdparty/bullet/BulletSoftBody/btDeformableContactConstraint.h @@ -1,3 +1,5 @@ +#ifndef BT_DEFORMABLE_CONTACT_CONSTRAINT_H +#define BT_DEFORMABLE_CONTACT_CONSTRAINT_H /* Written by Xuchen Han @@ -13,8 +15,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_DEFORMABLE_CONTACT_CONSTRAINT_H -#define BT_DEFORMABLE_CONTACT_CONSTRAINT_H + + #include "btSoftBody.h" // btDeformableContactConstraint is an abstract class specifying the method that each type of contact constraint needs to implement diff --git a/thirdparty/bullet/BulletSoftBody/btDeformableContactProjection.h b/thirdparty/bullet/BulletSoftBody/btDeformableContactProjection.h index 4964eaf99..9f576dd2a 100644 --- a/thirdparty/bullet/BulletSoftBody/btDeformableContactProjection.h +++ b/thirdparty/bullet/BulletSoftBody/btDeformableContactProjection.h @@ -1,3 +1,5 @@ +#ifndef BT_CONTACT_PROJECTION_H +#define BT_CONTACT_PROJECTION_H /* Written by Xuchen Han @@ -13,8 +15,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONTACT_PROJECTION_H -#define BT_CONTACT_PROJECTION_H + + #include "btCGProjection.h" #include "btSoftBody.h" #include "BulletDynamics/Featherstone/btMultiBodyLinkCollider.h" diff --git a/thirdparty/bullet/BulletSoftBody/btDeformableCorotatedForce.h b/thirdparty/bullet/BulletSoftBody/btDeformableCorotatedForce.h index dfd85523b..9e92da7a5 100644 --- a/thirdparty/bullet/BulletSoftBody/btDeformableCorotatedForce.h +++ b/thirdparty/bullet/BulletSoftBody/btDeformableCorotatedForce.h @@ -1,3 +1,5 @@ +#ifndef BT_COROTATED_H +#define BT_COROTATED_H /* Written by Xuchen Han @@ -13,8 +15,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_COROTATED_H -#define BT_COROTATED_H + + #include "btDeformableLagrangianForce.h" #include "LinearMath/btPolarDecomposition.h" diff --git a/thirdparty/bullet/BulletSoftBody/btDeformableGravityForce.h b/thirdparty/bullet/BulletSoftBody/btDeformableGravityForce.h index d91867f45..3a7c42535 100644 --- a/thirdparty/bullet/BulletSoftBody/btDeformableGravityForce.h +++ b/thirdparty/bullet/BulletSoftBody/btDeformableGravityForce.h @@ -1,3 +1,5 @@ +#ifndef BT_DEFORMABLE_GRAVITY_FORCE_H +#define BT_DEFORMABLE_GRAVITY_FORCE_H /* Written by Xuchen Han @@ -13,8 +15,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_DEFORMABLE_GRAVITY_FORCE_H -#define BT_DEFORMABLE_GRAVITY_FORCE_H + + #include "btDeformableLagrangianForce.h" diff --git a/thirdparty/bullet/BulletSoftBody/btDeformableLagrangianForce.h b/thirdparty/bullet/BulletSoftBody/btDeformableLagrangianForce.h index d58d825d1..2cb201f6b 100644 --- a/thirdparty/bullet/BulletSoftBody/btDeformableLagrangianForce.h +++ b/thirdparty/bullet/BulletSoftBody/btDeformableLagrangianForce.h @@ -1,3 +1,5 @@ +#ifndef BT_DEFORMABLE_LAGRANGIAN_FORCE_H +#define BT_DEFORMABLE_LAGRANGIAN_FORCE_H /* Written by Xuchen Han @@ -13,8 +15,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_DEFORMABLE_LAGRANGIAN_FORCE_H -#define BT_DEFORMABLE_LAGRANGIAN_FORCE_H + + #include "btSoftBody.h" #include diff --git a/thirdparty/bullet/BulletSoftBody/btDeformableLinearElasticityForce.h b/thirdparty/bullet/BulletSoftBody/btDeformableLinearElasticityForce.h index 971192050..e10a105fc 100644 --- a/thirdparty/bullet/BulletSoftBody/btDeformableLinearElasticityForce.h +++ b/thirdparty/bullet/BulletSoftBody/btDeformableLinearElasticityForce.h @@ -1,3 +1,5 @@ +#ifndef BT_LINEAR_ELASTICITY_H +#define BT_LINEAR_ELASTICITY_H /* Written by Xuchen Han @@ -13,8 +15,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_LINEAR_ELASTICITY_H -#define BT_LINEAR_ELASTICITY_H + + #include "btDeformableLagrangianForce.h" #include "LinearMath/btQuickprof.h" diff --git a/thirdparty/bullet/BulletSoftBody/btDeformableMassSpringForce.h b/thirdparty/bullet/BulletSoftBody/btDeformableMassSpringForce.h index 8c97bd1ba..f93c56149 100644 --- a/thirdparty/bullet/BulletSoftBody/btDeformableMassSpringForce.h +++ b/thirdparty/bullet/BulletSoftBody/btDeformableMassSpringForce.h @@ -1,3 +1,5 @@ +#ifndef BT_MASS_SPRING_H +#define BT_MASS_SPRING_H /* Written by Xuchen Han @@ -13,8 +15,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_MASS_SPRING_H -#define BT_MASS_SPRING_H + + #include "btDeformableLagrangianForce.h" diff --git a/thirdparty/bullet/BulletSoftBody/btDeformableMousePickingForce.h b/thirdparty/bullet/BulletSoftBody/btDeformableMousePickingForce.h index 697408355..584bb3758 100644 --- a/thirdparty/bullet/BulletSoftBody/btDeformableMousePickingForce.h +++ b/thirdparty/bullet/BulletSoftBody/btDeformableMousePickingForce.h @@ -1,3 +1,5 @@ +#ifndef BT_MOUSE_PICKING_FORCE_H +#define BT_MOUSE_PICKING_FORCE_H /* Written by Xuchen Han @@ -13,8 +15,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_MOUSE_PICKING_FORCE_H -#define BT_MOUSE_PICKING_FORCE_H + + #include "btDeformableLagrangianForce.h" diff --git a/thirdparty/bullet/BulletSoftBody/btDeformableMultiBodyConstraintSolver.h b/thirdparty/bullet/BulletSoftBody/btDeformableMultiBodyConstraintSolver.h index 94aabce83..415a4ef5b 100644 --- a/thirdparty/bullet/BulletSoftBody/btDeformableMultiBodyConstraintSolver.h +++ b/thirdparty/bullet/BulletSoftBody/btDeformableMultiBodyConstraintSolver.h @@ -1,3 +1,5 @@ +#ifndef BT_DEFORMABLE_MULTIBODY_CONSTRAINT_SOLVER_H +#define BT_DEFORMABLE_MULTIBODY_CONSTRAINT_SOLVER_H /* Written by Xuchen Han @@ -13,8 +15,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_DEFORMABLE_MULTIBODY_CONSTRAINT_SOLVER_H -#define BT_DEFORMABLE_MULTIBODY_CONSTRAINT_SOLVER_H + + #include "btDeformableBodySolver.h" #include "BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h" diff --git a/thirdparty/bullet/BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h b/thirdparty/bullet/BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h index 4b7069aac..d4052fda5 100644 --- a/thirdparty/bullet/BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h +++ b/thirdparty/bullet/BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h @@ -1,3 +1,5 @@ +#ifndef BT_DEFORMABLE_MULTIBODY_DYNAMICS_WORLD_H +#define BT_DEFORMABLE_MULTIBODY_DYNAMICS_WORLD_H /* Written by Xuchen Han @@ -13,8 +15,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_DEFORMABLE_MULTIBODY_DYNAMICS_WORLD_H -#define BT_DEFORMABLE_MULTIBODY_DYNAMICS_WORLD_H + + #include "btSoftMultiBodyDynamicsWorld.h" #include "btDeformableLagrangianForce.h" diff --git a/thirdparty/bullet/BulletSoftBody/btDeformableNeoHookeanForce.h b/thirdparty/bullet/BulletSoftBody/btDeformableNeoHookeanForce.h index 60798c5bc..c45cfc8a1 100644 --- a/thirdparty/bullet/BulletSoftBody/btDeformableNeoHookeanForce.h +++ b/thirdparty/bullet/BulletSoftBody/btDeformableNeoHookeanForce.h @@ -1,3 +1,5 @@ +#ifndef BT_NEOHOOKEAN_H +#define BT_NEOHOOKEAN_H /* Written by Xuchen Han @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_NEOHOOKEAN_H -#define BT_NEOHOOKEAN_H + + #include "btDeformableLagrangianForce.h" #include "LinearMath/btQuickprof.h" diff --git a/thirdparty/bullet/BulletSoftBody/btKrylovSolver.h b/thirdparty/bullet/BulletSoftBody/btKrylovSolver.h index 59126b47a..45ad6107a 100644 --- a/thirdparty/bullet/BulletSoftBody/btKrylovSolver.h +++ b/thirdparty/bullet/BulletSoftBody/btKrylovSolver.h @@ -1,3 +1,5 @@ +#ifndef BT_KRYLOV_SOLVER_H +#define BT_KRYLOV_SOLVER_H /* Written by Xuchen Han @@ -13,8 +15,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_KRYLOV_SOLVER_H -#define BT_KRYLOV_SOLVER_H + + #include #include #include diff --git a/thirdparty/bullet/BulletSoftBody/btPreconditioner.h b/thirdparty/bullet/BulletSoftBody/btPreconditioner.h index 21c1106a4..8921acc64 100644 --- a/thirdparty/bullet/BulletSoftBody/btPreconditioner.h +++ b/thirdparty/bullet/BulletSoftBody/btPreconditioner.h @@ -1,3 +1,5 @@ +#ifndef BT_PRECONDITIONER_H +#define BT_PRECONDITIONER_H /* Written by Xuchen Han @@ -13,8 +15,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_PRECONDITIONER_H -#define BT_PRECONDITIONER_H + + class Preconditioner { diff --git a/thirdparty/bullet/BulletSoftBody/btSoftBody.h b/thirdparty/bullet/BulletSoftBody/btSoftBody.h index cee3ae0f2..5788b5c19 100644 --- a/thirdparty/bullet/BulletSoftBody/btSoftBody.h +++ b/thirdparty/bullet/BulletSoftBody/btSoftBody.h @@ -1,3 +1,5 @@ +#ifndef _BT_SOFT_BODY_H +#define _BT_SOFT_BODY_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -14,8 +16,8 @@ subject to the following restrictions: */ ///btSoftBody implementation by Nathanael Presson -#ifndef _BT_SOFT_BODY_H -#define _BT_SOFT_BODY_H + + #include "LinearMath/btAlignedObjectArray.h" #include "LinearMath/btTransform.h" diff --git a/thirdparty/bullet/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h b/thirdparty/bullet/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h index 0dbceebf3..59500dcf5 100644 --- a/thirdparty/bullet/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h +++ b/thirdparty/bullet/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h @@ -1,3 +1,5 @@ +#ifndef BT_SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H +#define BT_SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H -#define BT_SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H + + #include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" #include "BulletCollision/BroadphaseCollision/btDispatcher.h" diff --git a/thirdparty/bullet/BulletSoftBody/btSoftBodyData.h b/thirdparty/bullet/BulletSoftBody/btSoftBodyData.h index 8469c3ce7..48eead4bc 100644 --- a/thirdparty/bullet/BulletSoftBody/btSoftBodyData.h +++ b/thirdparty/bullet/BulletSoftBody/btSoftBodyData.h @@ -1,3 +1,5 @@ +#ifndef BT_SOFTBODY_FLOAT_DATA +#define BT_SOFTBODY_FLOAT_DATA /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SOFTBODY_FLOAT_DATA -#define BT_SOFTBODY_FLOAT_DATA + + #include "BulletCollision/CollisionDispatch/btCollisionObject.h" #include "BulletDynamics/Dynamics/btRigidBody.h" diff --git a/thirdparty/bullet/BulletSoftBody/btSoftBodyHelpers.h b/thirdparty/bullet/BulletSoftBody/btSoftBodyHelpers.h index b292d90d1..56d95355a 100644 --- a/thirdparty/bullet/BulletSoftBody/btSoftBodyHelpers.h +++ b/thirdparty/bullet/BulletSoftBody/btSoftBodyHelpers.h @@ -1,3 +1,5 @@ +#ifndef BT_SOFT_BODY_HELPERS_H +#define BT_SOFT_BODY_HELPERS_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2008 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SOFT_BODY_HELPERS_H -#define BT_SOFT_BODY_HELPERS_H + + #include "btSoftBody.h" #include diff --git a/thirdparty/bullet/BulletSoftBody/btSoftBodyInternals.h b/thirdparty/bullet/BulletSoftBody/btSoftBodyInternals.h index e52b1c875..cd8e765ef 100644 --- a/thirdparty/bullet/BulletSoftBody/btSoftBodyInternals.h +++ b/thirdparty/bullet/BulletSoftBody/btSoftBodyInternals.h @@ -1,3 +1,5 @@ +#ifndef _BT_SOFT_BODY_INTERNALS_H +#define _BT_SOFT_BODY_INTERNALS_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -14,8 +16,8 @@ subject to the following restrictions: */ ///btSoftBody implementation by Nathanael Presson -#ifndef _BT_SOFT_BODY_INTERNALS_H -#define _BT_SOFT_BODY_INTERNALS_H + + #include "btSoftBody.h" #include "LinearMath/btQuickprof.h" diff --git a/thirdparty/bullet/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h b/thirdparty/bullet/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h index 0feb84f94..80aa5b48a 100644 --- a/thirdparty/bullet/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h +++ b/thirdparty/bullet/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h @@ -1,3 +1,5 @@ +#ifndef BT_SOFTBODY_RIGIDBODY_COLLISION_CONFIGURATION +#define BT_SOFTBODY_RIGIDBODY_COLLISION_CONFIGURATION /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SOFTBODY_RIGIDBODY_COLLISION_CONFIGURATION -#define BT_SOFTBODY_RIGIDBODY_COLLISION_CONFIGURATION + + #include "BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h" diff --git a/thirdparty/bullet/BulletSoftBody/btSoftBodySolverVertexBuffer.h b/thirdparty/bullet/BulletSoftBody/btSoftBodySolverVertexBuffer.h index c41ebf74d..f8dc55445 100644 --- a/thirdparty/bullet/BulletSoftBody/btSoftBodySolverVertexBuffer.h +++ b/thirdparty/bullet/BulletSoftBody/btSoftBodySolverVertexBuffer.h @@ -1,3 +1,5 @@ +#ifndef BT_SOFT_BODY_SOLVER_VERTEX_BUFFER_H +#define BT_SOFT_BODY_SOLVER_VERTEX_BUFFER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SOFT_BODY_SOLVER_VERTEX_BUFFER_H -#define BT_SOFT_BODY_SOLVER_VERTEX_BUFFER_H + + class btVertexBufferDescriptor { diff --git a/thirdparty/bullet/BulletSoftBody/btSoftBodySolvers.h b/thirdparty/bullet/BulletSoftBody/btSoftBodySolvers.h index cdd069849..ffba4d1f6 100644 --- a/thirdparty/bullet/BulletSoftBody/btSoftBodySolvers.h +++ b/thirdparty/bullet/BulletSoftBody/btSoftBodySolvers.h @@ -1,3 +1,5 @@ +#ifndef BT_SOFT_BODY_SOLVERS_H +#define BT_SOFT_BODY_SOLVERS_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SOFT_BODY_SOLVERS_H -#define BT_SOFT_BODY_SOLVERS_H + + #include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h" diff --git a/thirdparty/bullet/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h b/thirdparty/bullet/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h index 40cb1ec53..8c0ba4a1a 100644 --- a/thirdparty/bullet/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h +++ b/thirdparty/bullet/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h @@ -1,3 +1,5 @@ +#ifndef BT_SOFT_MULTIBODY_DYNAMICS_WORLD_H +#define BT_SOFT_MULTIBODY_DYNAMICS_WORLD_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SOFT_MULTIBODY_DYNAMICS_WORLD_H -#define BT_SOFT_MULTIBODY_DYNAMICS_WORLD_H + + #include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h" #include "BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h" diff --git a/thirdparty/bullet/BulletSoftBody/btSoftRigidCollisionAlgorithm.h b/thirdparty/bullet/BulletSoftBody/btSoftRigidCollisionAlgorithm.h index 7b2454590..a7a381df5 100644 --- a/thirdparty/bullet/BulletSoftBody/btSoftRigidCollisionAlgorithm.h +++ b/thirdparty/bullet/BulletSoftBody/btSoftRigidCollisionAlgorithm.h @@ -1,3 +1,5 @@ +#ifndef BT_SOFT_RIGID_COLLISION_ALGORITHM_H +#define BT_SOFT_RIGID_COLLISION_ALGORITHM_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SOFT_RIGID_COLLISION_ALGORITHM_H -#define BT_SOFT_RIGID_COLLISION_ALGORITHM_H + + #include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" diff --git a/thirdparty/bullet/BulletSoftBody/btSoftRigidDynamicsWorld.h b/thirdparty/bullet/BulletSoftBody/btSoftRigidDynamicsWorld.h index 0ecc7a0fa..27f799407 100644 --- a/thirdparty/bullet/BulletSoftBody/btSoftRigidDynamicsWorld.h +++ b/thirdparty/bullet/BulletSoftBody/btSoftRigidDynamicsWorld.h @@ -1,3 +1,5 @@ +#ifndef BT_SOFT_RIGID_DYNAMICS_WORLD_H +#define BT_SOFT_RIGID_DYNAMICS_WORLD_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SOFT_RIGID_DYNAMICS_WORLD_H -#define BT_SOFT_RIGID_DYNAMICS_WORLD_H + + #include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h" #include "btSoftBody.h" diff --git a/thirdparty/bullet/BulletSoftBody/btSoftSoftCollisionAlgorithm.h b/thirdparty/bullet/BulletSoftBody/btSoftSoftCollisionAlgorithm.h index 30923be66..3b5be9f58 100644 --- a/thirdparty/bullet/BulletSoftBody/btSoftSoftCollisionAlgorithm.h +++ b/thirdparty/bullet/BulletSoftBody/btSoftSoftCollisionAlgorithm.h @@ -1,3 +1,5 @@ +#ifndef BT_SOFT_SOFT_COLLISION_ALGORITHM_H +#define BT_SOFT_SOFT_COLLISION_ALGORITHM_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SOFT_SOFT_COLLISION_ALGORITHM_H -#define BT_SOFT_SOFT_COLLISION_ALGORITHM_H + + #include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" diff --git a/thirdparty/bullet/BulletSoftBody/btSparseSDF.h b/thirdparty/bullet/BulletSoftBody/btSparseSDF.h index ae1288d9e..11025d57f 100644 --- a/thirdparty/bullet/BulletSoftBody/btSparseSDF.h +++ b/thirdparty/bullet/BulletSoftBody/btSparseSDF.h @@ -1,3 +1,5 @@ +#ifndef BT_SPARSE_SDF_H +#define BT_SPARSE_SDF_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -14,8 +16,8 @@ subject to the following restrictions: */ ///btSparseSdf implementation by Nathanael Presson -#ifndef BT_SPARSE_SDF_H -#define BT_SPARSE_SDF_H + + #include "BulletCollision/CollisionDispatch/btCollisionObject.h" #include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h" diff --git a/thirdparty/bullet/BulletSoftBody/poly34.h b/thirdparty/bullet/BulletSoftBody/poly34.h index 35a52c5fe..ca423bb75 100644 --- a/thirdparty/bullet/BulletSoftBody/poly34.h +++ b/thirdparty/bullet/BulletSoftBody/poly34.h @@ -1,9 +1,11 @@ +#ifndef POLY_34 +#define POLY_34 // poly34.h : solution of cubic and quartic equation // (c) Khashin S.I. http://math.ivanovo.ac.ru/dalgebra/Khashin/index.html // khash2 (at) gmail.com -#ifndef POLY_34 -#define POLY_34 + + #include "LinearMath/btScalar.h" // x - array of size 2 // return 2: 2 real roots x[0], x[1] diff --git a/thirdparty/bullet/LinearMath/TaskScheduler/btThreadSupportInterface.h b/thirdparty/bullet/LinearMath/TaskScheduler/btThreadSupportInterface.h index 1fe49335a..ef26125b5 100644 --- a/thirdparty/bullet/LinearMath/TaskScheduler/btThreadSupportInterface.h +++ b/thirdparty/bullet/LinearMath/TaskScheduler/btThreadSupportInterface.h @@ -1,3 +1,5 @@ +#ifndef BT_THREAD_SUPPORT_INTERFACE_H +#define BT_THREAD_SUPPORT_INTERFACE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2018 Erwin Coumans http://bulletphysics.com @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_THREAD_SUPPORT_INTERFACE_H -#define BT_THREAD_SUPPORT_INTERFACE_H + + class btCriticalSection { diff --git a/thirdparty/bullet/LinearMath/btAabbUtil2.h b/thirdparty/bullet/LinearMath/btAabbUtil2.h index 67ff479c7..64b6ed6a7 100644 --- a/thirdparty/bullet/LinearMath/btAabbUtil2.h +++ b/thirdparty/bullet/LinearMath/btAabbUtil2.h @@ -1,3 +1,5 @@ +#ifndef BT_AABB_UTIL2 +#define BT_AABB_UTIL2 /* Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans https://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_AABB_UTIL2 -#define BT_AABB_UTIL2 + + #include "btTransform.h" #include "btVector3.h" diff --git a/thirdparty/bullet/LinearMath/btAlignedAllocator.h b/thirdparty/bullet/LinearMath/btAlignedAllocator.h index f6bbcdbbf..fd0dc3df1 100644 --- a/thirdparty/bullet/LinearMath/btAlignedAllocator.h +++ b/thirdparty/bullet/LinearMath/btAlignedAllocator.h @@ -1,3 +1,5 @@ +#ifndef BT_ALIGNED_ALLOCATOR +#define BT_ALIGNED_ALLOCATOR /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_ALIGNED_ALLOCATOR -#define BT_ALIGNED_ALLOCATOR + + ///we probably replace this with our own aligned memory allocator ///so we replace _aligned_malloc and _aligned_free with our own diff --git a/thirdparty/bullet/LinearMath/btAlignedObjectArray.h b/thirdparty/bullet/LinearMath/btAlignedObjectArray.h index ac3e189eb..fbe926422 100644 --- a/thirdparty/bullet/LinearMath/btAlignedObjectArray.h +++ b/thirdparty/bullet/LinearMath/btAlignedObjectArray.h @@ -1,3 +1,5 @@ +#ifndef BT_OBJECT_ARRAY__ +#define BT_OBJECT_ARRAY__ /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_OBJECT_ARRAY__ -#define BT_OBJECT_ARRAY__ + + #include "btScalar.h" // has definitions like SIMD_FORCE_INLINE #include "btAlignedAllocator.h" diff --git a/thirdparty/bullet/LinearMath/btConvexHull.h b/thirdparty/bullet/LinearMath/btConvexHull.h index f890d75ea..6b0144dfe 100644 --- a/thirdparty/bullet/LinearMath/btConvexHull.h +++ b/thirdparty/bullet/LinearMath/btConvexHull.h @@ -1,3 +1,5 @@ +#ifndef BT_CD_HULL_H +#define BT_CD_HULL_H /* Stan Melax Convex Hull Computation @@ -16,8 +18,8 @@ subject to the following restrictions: ///includes modifications/improvements by John Ratcliff, see BringOutYourDead below. -#ifndef BT_CD_HULL_H -#define BT_CD_HULL_H + + #include "btVector3.h" #include "btAlignedObjectArray.h" diff --git a/thirdparty/bullet/LinearMath/btConvexHullComputer.h b/thirdparty/bullet/LinearMath/btConvexHullComputer.h index 18b26eea9..72b9c35bf 100644 --- a/thirdparty/bullet/LinearMath/btConvexHullComputer.h +++ b/thirdparty/bullet/LinearMath/btConvexHullComputer.h @@ -1,3 +1,5 @@ +#ifndef BT_CONVEX_HULL_COMPUTER_H +#define BT_CONVEX_HULL_COMPUTER_H /* Copyright (c) 2011 Ole Kniemeyer, MAXON, www.maxon.net @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONVEX_HULL_COMPUTER_H -#define BT_CONVEX_HULL_COMPUTER_H + + #include "btVector3.h" #include "btAlignedObjectArray.h" diff --git a/thirdparty/bullet/LinearMath/btGeometryUtil.h b/thirdparty/bullet/LinearMath/btGeometryUtil.h index 5ed87022e..244a8c2ad 100644 --- a/thirdparty/bullet/LinearMath/btGeometryUtil.h +++ b/thirdparty/bullet/LinearMath/btGeometryUtil.h @@ -1,3 +1,5 @@ +#ifndef BT_GEOMETRY_UTIL_H +#define BT_GEOMETRY_UTIL_H /* Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans https://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_GEOMETRY_UTIL_H -#define BT_GEOMETRY_UTIL_H + + #include "btVector3.h" #include "btAlignedObjectArray.h" diff --git a/thirdparty/bullet/LinearMath/btGrahamScan2dConvexHull.h b/thirdparty/bullet/LinearMath/btGrahamScan2dConvexHull.h index 0fcb28597..2783a8936 100644 --- a/thirdparty/bullet/LinearMath/btGrahamScan2dConvexHull.h +++ b/thirdparty/bullet/LinearMath/btGrahamScan2dConvexHull.h @@ -1,3 +1,5 @@ +#ifndef GRAHAM_SCAN_2D_CONVEX_HULL_H +#define GRAHAM_SCAN_2D_CONVEX_HULL_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2011 Advanced Micro Devices, Inc. http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef GRAHAM_SCAN_2D_CONVEX_HULL_H -#define GRAHAM_SCAN_2D_CONVEX_HULL_H + + #include "btVector3.h" #include "btAlignedObjectArray.h" diff --git a/thirdparty/bullet/LinearMath/btHashMap.h b/thirdparty/bullet/LinearMath/btHashMap.h index 1fca0fb73..af6ca7ebd 100644 --- a/thirdparty/bullet/LinearMath/btHashMap.h +++ b/thirdparty/bullet/LinearMath/btHashMap.h @@ -1,3 +1,5 @@ +#ifndef BT_HASH_MAP_H +#define BT_HASH_MAP_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_HASH_MAP_H -#define BT_HASH_MAP_H + + #include #include "btAlignedObjectArray.h" diff --git a/thirdparty/bullet/LinearMath/btIDebugDraw.h b/thirdparty/bullet/LinearMath/btIDebugDraw.h index df4db2ff5..808ce5211 100644 --- a/thirdparty/bullet/LinearMath/btIDebugDraw.h +++ b/thirdparty/bullet/LinearMath/btIDebugDraw.h @@ -1,3 +1,5 @@ +#ifndef BT_IDEBUG_DRAW__H +#define BT_IDEBUG_DRAW__H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_IDEBUG_DRAW__H -#define BT_IDEBUG_DRAW__H + + #include "btVector3.h" #include "btTransform.h" diff --git a/thirdparty/bullet/LinearMath/btImplicitQRSVD.h b/thirdparty/bullet/LinearMath/btImplicitQRSVD.h index aaedc964f..40f620e84 100644 --- a/thirdparty/bullet/LinearMath/btImplicitQRSVD.h +++ b/thirdparty/bullet/LinearMath/btImplicitQRSVD.h @@ -1,3 +1,5 @@ +#ifndef btImplicitQRSVD_h +#define btImplicitQRSVD_h /** Bullet Continuous Collision Detection and Physics Library Copyright (c) 2019 Google Inc. http://bulletphysics.org @@ -39,8 +41,8 @@ SOFTWARE. **/ -#ifndef btImplicitQRSVD_h -#define btImplicitQRSVD_h + + #include #include "btMatrix3x3.h" class btMatrix2x2 diff --git a/thirdparty/bullet/LinearMath/btList.h b/thirdparty/bullet/LinearMath/btList.h index 9072abcd0..0e10f7ef2 100644 --- a/thirdparty/bullet/LinearMath/btList.h +++ b/thirdparty/bullet/LinearMath/btList.h @@ -1,3 +1,5 @@ +#ifndef BT_GEN_LIST_H +#define BT_GEN_LIST_H /* Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans https://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_GEN_LIST_H -#define BT_GEN_LIST_H + + class btGEN_Link { diff --git a/thirdparty/bullet/LinearMath/btMatrix3x3.h b/thirdparty/bullet/LinearMath/btMatrix3x3.h index 4391a52cd..678d83067 100644 --- a/thirdparty/bullet/LinearMath/btMatrix3x3.h +++ b/thirdparty/bullet/LinearMath/btMatrix3x3.h @@ -1,3 +1,5 @@ +#ifndef BT_MATRIX3x3_H +#define BT_MATRIX3x3_H /* Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans https://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_MATRIX3x3_H -#define BT_MATRIX3x3_H + + #include "btVector3.h" #include "btQuaternion.h" diff --git a/thirdparty/bullet/LinearMath/btMatrixX.h b/thirdparty/bullet/LinearMath/btMatrixX.h index bb0f0dd25..ff73e4d25 100644 --- a/thirdparty/bullet/LinearMath/btMatrixX.h +++ b/thirdparty/bullet/LinearMath/btMatrixX.h @@ -1,3 +1,5 @@ +#ifndef BT_MATRIX_X_H +#define BT_MATRIX_X_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org @@ -14,8 +16,8 @@ subject to the following restrictions: */ ///original version written by Erwin Coumans, October 2013 -#ifndef BT_MATRIX_X_H -#define BT_MATRIX_X_H + + #include "LinearMath/btQuickprof.h" #include "LinearMath/btAlignedObjectArray.h" diff --git a/thirdparty/bullet/LinearMath/btMinMax.h b/thirdparty/bullet/LinearMath/btMinMax.h index cdc54f3fb..acc2a0a5f 100644 --- a/thirdparty/bullet/LinearMath/btMinMax.h +++ b/thirdparty/bullet/LinearMath/btMinMax.h @@ -1,3 +1,5 @@ +#ifndef BT_GEN_MINMAX_H +#define BT_GEN_MINMAX_H /* Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans https://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_GEN_MINMAX_H -#define BT_GEN_MINMAX_H + + #include "btScalar.h" diff --git a/thirdparty/bullet/LinearMath/btModifiedGramSchmidt.h b/thirdparty/bullet/LinearMath/btModifiedGramSchmidt.h index 33bab8d65..5f8e3b076 100644 --- a/thirdparty/bullet/LinearMath/btModifiedGramSchmidt.h +++ b/thirdparty/bullet/LinearMath/btModifiedGramSchmidt.h @@ -1,3 +1,5 @@ +#ifndef btModifiedGramSchmidt_h +#define btModifiedGramSchmidt_h // // btModifiedGramSchmidt.h // LinearMath @@ -5,8 +7,8 @@ // Created by Xuchen Han on 4/4/20. // -#ifndef btModifiedGramSchmidt_h -#define btModifiedGramSchmidt_h + + #include "btReducedVector.h" #include "btAlignedObjectArray.h" diff --git a/thirdparty/bullet/LinearMath/btMotionState.h b/thirdparty/bullet/LinearMath/btMotionState.h index 87aa60299..bc228056e 100644 --- a/thirdparty/bullet/LinearMath/btMotionState.h +++ b/thirdparty/bullet/LinearMath/btMotionState.h @@ -1,3 +1,5 @@ +#ifndef BT_MOTIONSTATE_H +#define BT_MOTIONSTATE_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_MOTIONSTATE_H -#define BT_MOTIONSTATE_H + + #include "btTransform.h" diff --git a/thirdparty/bullet/LinearMath/btPoolAllocator.h b/thirdparty/bullet/LinearMath/btPoolAllocator.h index 816cd627a..e71ccfd40 100644 --- a/thirdparty/bullet/LinearMath/btPoolAllocator.h +++ b/thirdparty/bullet/LinearMath/btPoolAllocator.h @@ -1,3 +1,5 @@ +#ifndef _BT_POOL_ALLOCATOR_H +#define _BT_POOL_ALLOCATOR_H /* Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans https://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _BT_POOL_ALLOCATOR_H -#define _BT_POOL_ALLOCATOR_H + + #include "btScalar.h" #include "btAlignedAllocator.h" diff --git a/thirdparty/bullet/LinearMath/btQuadWord.h b/thirdparty/bullet/LinearMath/btQuadWord.h index 851596b17..d42be795c 100644 --- a/thirdparty/bullet/LinearMath/btQuadWord.h +++ b/thirdparty/bullet/LinearMath/btQuadWord.h @@ -1,3 +1,5 @@ +#ifndef BT_SIMD_QUADWORD_H +#define BT_SIMD_QUADWORD_H /* Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans https://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SIMD_QUADWORD_H -#define BT_SIMD_QUADWORD_H + + #include "btScalar.h" #include "btMinMax.h" diff --git a/thirdparty/bullet/LinearMath/btQuaternion.h b/thirdparty/bullet/LinearMath/btQuaternion.h index 40d6e145c..a133960b2 100644 --- a/thirdparty/bullet/LinearMath/btQuaternion.h +++ b/thirdparty/bullet/LinearMath/btQuaternion.h @@ -1,3 +1,5 @@ +#ifndef BT_SIMD__QUATERNION_H_ +#define BT_SIMD__QUATERNION_H_ /* Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans https://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SIMD__QUATERNION_H_ -#define BT_SIMD__QUATERNION_H_ + + #include "btVector3.h" #include "btQuadWord.h" diff --git a/thirdparty/bullet/LinearMath/btQuickprof.h b/thirdparty/bullet/LinearMath/btQuickprof.h index 990d401d5..f2b4bb268 100644 --- a/thirdparty/bullet/LinearMath/btQuickprof.h +++ b/thirdparty/bullet/LinearMath/btQuickprof.h @@ -1,3 +1,5 @@ +#ifndef BT_QUICK_PROF_H +#define BT_QUICK_PROF_H /*************************************************************************************************** ** @@ -10,8 +12,8 @@ // Credits: The Clock class was inspired by the Timer classes in // Ogre (www.ogre3d.org). -#ifndef BT_QUICK_PROF_H -#define BT_QUICK_PROF_H + + #include "btScalar.h" #define USE_BT_CLOCK 1 diff --git a/thirdparty/bullet/LinearMath/btRandom.h b/thirdparty/bullet/LinearMath/btRandom.h index 775313004..3dac67ce4 100644 --- a/thirdparty/bullet/LinearMath/btRandom.h +++ b/thirdparty/bullet/LinearMath/btRandom.h @@ -1,3 +1,5 @@ +#ifndef BT_GEN_RANDOM_H +#define BT_GEN_RANDOM_H /* Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans https://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_GEN_RANDOM_H -#define BT_GEN_RANDOM_H + + #ifdef MT19937 diff --git a/thirdparty/bullet/LinearMath/btReducedVector.h b/thirdparty/bullet/LinearMath/btReducedVector.h index 313a4271f..195087b3b 100644 --- a/thirdparty/bullet/LinearMath/btReducedVector.h +++ b/thirdparty/bullet/LinearMath/btReducedVector.h @@ -1,11 +1,13 @@ +#ifndef btReducedVectors_h +#define btReducedVectors_h // // btReducedVectors.h // BulletLinearMath // // Created by Xuchen Han on 4/4/20. // -#ifndef btReducedVectors_h -#define btReducedVectors_h + + #include "btVector3.h" #include "btMatrix3x3.h" #include "btAlignedObjectArray.h" diff --git a/thirdparty/bullet/LinearMath/btScalar.h b/thirdparty/bullet/LinearMath/btScalar.h index 28c03b286..576a6af98 100644 --- a/thirdparty/bullet/LinearMath/btScalar.h +++ b/thirdparty/bullet/LinearMath/btScalar.h @@ -1,3 +1,5 @@ +#ifndef BT_SCALAR_H +#define BT_SCALAR_H /* Copyright (c) 2003-2009 Erwin Coumans http://bullet.googlecode.com @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SCALAR_H -#define BT_SCALAR_H + + #ifdef BT_MANAGED_CODE //Aligned data types not supported in managed code diff --git a/thirdparty/bullet/LinearMath/btSerializer.h b/thirdparty/bullet/LinearMath/btSerializer.h index 22bcac1be..191f76b64 100644 --- a/thirdparty/bullet/LinearMath/btSerializer.h +++ b/thirdparty/bullet/LinearMath/btSerializer.h @@ -1,3 +1,5 @@ +#ifndef BT_SERIALIZER_H +#define BT_SERIALIZER_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SERIALIZER_H -#define BT_SERIALIZER_H + + #include "btScalar.h" // has definitions like SIMD_FORCE_INLINE #include "btHashMap.h" diff --git a/thirdparty/bullet/LinearMath/btSpatialAlgebra.h b/thirdparty/bullet/LinearMath/btSpatialAlgebra.h index 6ad67a108..192da5275 100644 --- a/thirdparty/bullet/LinearMath/btSpatialAlgebra.h +++ b/thirdparty/bullet/LinearMath/btSpatialAlgebra.h @@ -1,3 +1,5 @@ +#ifndef BT_SPATIAL_ALGEBRA_H +#define BT_SPATIAL_ALGEBRA_H /* Copyright (c) 2003-2015 Erwin Coumans, Jakub Stepien @@ -15,8 +17,8 @@ subject to the following restrictions: ///These spatial algebra classes are used for btMultiBody, ///see BulletDynamics/Featherstone -#ifndef BT_SPATIAL_ALGEBRA_H -#define BT_SPATIAL_ALGEBRA_H + + #include "btMatrix3x3.h" diff --git a/thirdparty/bullet/LinearMath/btStackAlloc.h b/thirdparty/bullet/LinearMath/btStackAlloc.h index 761d6a429..1774b63b8 100644 --- a/thirdparty/bullet/LinearMath/btStackAlloc.h +++ b/thirdparty/bullet/LinearMath/btStackAlloc.h @@ -1,3 +1,5 @@ +#ifndef BT_STACK_ALLOC +#define BT_STACK_ALLOC /* Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans https://bulletphysics.org @@ -17,8 +19,8 @@ StackAlloc extracted from GJK-EPA collision solver by Nathanael Presson Nov.2006 */ -#ifndef BT_STACK_ALLOC -#define BT_STACK_ALLOC + + #include "btScalar.h" //for btAssert #include "btAlignedAllocator.h" diff --git a/thirdparty/bullet/LinearMath/btThreads.h b/thirdparty/bullet/LinearMath/btThreads.h index b2227e172..1417a16c8 100644 --- a/thirdparty/bullet/LinearMath/btThreads.h +++ b/thirdparty/bullet/LinearMath/btThreads.h @@ -1,3 +1,5 @@ +#ifndef BT_THREADS_H +#define BT_THREADS_H /* Copyright (c) 2003-2014 Erwin Coumans http://bullet.googlecode.com @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_THREADS_H -#define BT_THREADS_H + + #include "btScalar.h" // has definitions like SIMD_FORCE_INLINE diff --git a/thirdparty/bullet/LinearMath/btTransform.h b/thirdparty/bullet/LinearMath/btTransform.h index 310b39766..042250e9f 100644 --- a/thirdparty/bullet/LinearMath/btTransform.h +++ b/thirdparty/bullet/LinearMath/btTransform.h @@ -1,3 +1,5 @@ +#ifndef BT_TRANSFORM_H +#define BT_TRANSFORM_H /* Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans https://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_TRANSFORM_H -#define BT_TRANSFORM_H + + #include "btMatrix3x3.h" diff --git a/thirdparty/bullet/LinearMath/btTransformUtil.h b/thirdparty/bullet/LinearMath/btTransformUtil.h index a5aab208f..81bd26e7d 100644 --- a/thirdparty/bullet/LinearMath/btTransformUtil.h +++ b/thirdparty/bullet/LinearMath/btTransformUtil.h @@ -1,3 +1,5 @@ +#ifndef BT_TRANSFORM_UTIL_H +#define BT_TRANSFORM_UTIL_H /* Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans https://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_TRANSFORM_UTIL_H -#define BT_TRANSFORM_UTIL_H + + #include "btTransform.h" #define ANGULAR_MOTION_THRESHOLD btScalar(0.5) * SIMD_HALF_PI diff --git a/thirdparty/bullet/LinearMath/btVector3.h b/thirdparty/bullet/LinearMath/btVector3.h index 9da162772..0d53863db 100644 --- a/thirdparty/bullet/LinearMath/btVector3.h +++ b/thirdparty/bullet/LinearMath/btVector3.h @@ -1,3 +1,5 @@ +#ifndef BT_VECTOR3_H +#define BT_VECTOR3_H /* Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans https://bulletphysics.org @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_VECTOR3_H -#define BT_VECTOR3_H + + //#include #include "btScalar.h" diff --git a/thirdparty/bullet/btBulletCollisionCommon.h b/thirdparty/bullet/btBulletCollisionCommon.h index 2de34ad3b..254e476f5 100644 --- a/thirdparty/bullet/btBulletCollisionCommon.h +++ b/thirdparty/bullet/btBulletCollisionCommon.h @@ -1,3 +1,5 @@ +#ifndef BULLET_COLLISION_COMMON_H +#define BULLET_COLLISION_COMMON_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BULLET_COLLISION_COMMON_H -#define BULLET_COLLISION_COMMON_H + + ///Common headerfile includes for Bullet Collision Detection diff --git a/thirdparty/bullet/btBulletDynamicsCommon.h b/thirdparty/bullet/btBulletDynamicsCommon.h index fef4380f6..8c5d754c3 100644 --- a/thirdparty/bullet/btBulletDynamicsCommon.h +++ b/thirdparty/bullet/btBulletDynamicsCommon.h @@ -1,3 +1,5 @@ +#ifndef BULLET_DYNAMICS_COMMON_H +#define BULLET_DYNAMICS_COMMON_H /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BULLET_DYNAMICS_COMMON_H -#define BULLET_DYNAMICS_COMMON_H + + ///Common headerfile includes for Bullet Dynamics, including Collision Detection #include "btBulletCollisionCommon.h"