Revision: 35500
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35500
Author: erwin
Date: 2011-03-12 20:34:17 +0000 (Sat, 12 Mar 2011)
Log Message:
-----------
update Bullet physics sdk to latest trunk/version 2.78
add PhysicsConstraints.exportBulletFile(char* fileName) python command
I'll be checking the bf-committers mailing list, in case this commit broke stuff
scons needs to be updated, I'll do that in a second.
Modified Paths:
--------------
trunk/blender/extern/bullet2/CMakeLists.txt
trunk/blender/extern/bullet2/src/Bullet-C-Api.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btGhostObject.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionMargin.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btClipPolygon.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.cpp
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactMassUtil.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGeometryOperations.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btQuantization.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.cpp
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_array.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_bitset.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_box_collision.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_clip_polygon.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_geom_types.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_geometry.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_hash_table.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_linear_math.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_math.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_radixsort.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.cpp
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btActionInterface.h
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
trunk/blender/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
trunk/blender/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBody.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
trunk/blender/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
trunk/blender/extern/bullet2/src/LinearMath/btConvexHull.cpp
trunk/blender/extern/bullet2/src/LinearMath/btConvexHull.h
trunk/blender/extern/bullet2/src/LinearMath/btDefaultMotionState.h
trunk/blender/extern/bullet2/src/LinearMath/btHashMap.h
trunk/blender/extern/bullet2/src/LinearMath/btIDebugDraw.h
trunk/blender/extern/bullet2/src/LinearMath/btMatrix3x3.h
trunk/blender/extern/bullet2/src/LinearMath/btMinMax.h
trunk/blender/extern/bullet2/src/LinearMath/btPoolAllocator.h
trunk/blender/extern/bullet2/src/LinearMath/btQuaternion.h
trunk/blender/extern/bullet2/src/LinearMath/btQuickprof.cpp
trunk/blender/extern/bullet2/src/LinearMath/btQuickprof.h
trunk/blender/extern/bullet2/src/LinearMath/btScalar.h
trunk/blender/extern/bullet2/src/LinearMath/btTransform.h
trunk/blender/extern/bullet2/src/LinearMath/btTransformUtil.h
trunk/blender/extern/bullet2/src/LinearMath/btVector3.h
trunk/blender/extern/bullet2/src/btBulletCollisionCommon.h
trunk/blender/extern/bullet2/src/btBulletDynamicsCommon.h
trunk/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
trunk/blender/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
Added Paths:
-----------
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvex2dShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvex2dShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h
trunk/blender/extern/bullet2/src/BulletDynamics/Character/
trunk/blender/extern/bullet2/src/BulletDynamics/Character/btCharacterControllerInterface.h
trunk/blender/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyData.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodySolverVertexBuffer.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodySolvers.h
trunk/blender/extern/bullet2/src/LinearMath/btSerializer.cpp
trunk/blender/extern/bullet2/src/LinearMath/btSerializer.h
Removed Paths:
-------------
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h
Modified: trunk/blender/extern/bullet2/CMakeLists.txt
===================================================================
--- trunk/blender/extern/bullet2/CMakeLists.txt 2011-03-12 16:06:37 UTC (rev
35499)
+++ trunk/blender/extern/bullet2/CMakeLists.txt 2011-03-12 20:34:17 UTC (rev
35500)
@@ -107,7 +107,6 @@
src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
src/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp
src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp
- src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp
src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
@@ -119,6 +118,7 @@
src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
+ src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
@@ -132,6 +132,7 @@
src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
src/BulletDynamics/Vehicle/btWheelInfo.cpp
+ src/BulletSoftBody/btDefaultSoftBodySolver.cpp
src/BulletSoftBody/btSoftBody.cpp
src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
src/BulletSoftBody/btSoftBodyHelpers.cpp
@@ -143,6 +144,8 @@
src/LinearMath/btConvexHull.cpp
src/LinearMath/btGeometryUtil.cpp
src/LinearMath/btQuickprof.cpp
+ src/LinearMath/btSerializer.cpp
+
src/Bullet-C-Api.h
src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
@@ -247,8 +250,7 @@
src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
- src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h
- src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
+? src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
@@ -264,6 +266,7 @@
src/BulletDynamics/ConstraintSolver/btContactConstraint.h
src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
+ src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
@@ -282,6 +285,7 @@
src/BulletDynamics/Vehicle/btRaycastVehicle.h
src/BulletDynamics/Vehicle/btVehicleRaycaster.h
src/BulletDynamics/Vehicle/btWheelInfo.h
+ src/BulletSoftBody/btDefaultSoftBodySolver.h
src/BulletSoftBody/btSoftBody.h
src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
src/BulletSoftBody/btSoftBodyHelpers.h
@@ -310,11 +314,13 @@
src/LinearMath/btQuickprof.h
src/LinearMath/btRandom.h
src/LinearMath/btScalar.h
+ src/LinearMath/btSerializer.h
src/LinearMath/btSimdMinMax.h
src/LinearMath/btStackAlloc.h
src/LinearMath/btTransform.h
src/LinearMath/btTransformUtil.h
src/LinearMath/btVector3.h
+
src/btBulletCollisionCommon.h
src/btBulletDynamicsCommon.h
)
Modified: trunk/blender/extern/bullet2/src/Bullet-C-Api.h
===================================================================
--- trunk/blender/extern/bullet2/src/Bullet-C-Api.h 2011-03-12 16:06:37 UTC
(rev 35499)
+++ trunk/blender/extern/bullet2/src/Bullet-C-Api.h 2011-03-12 20:34:17 UTC
(rev 35500)
@@ -65,7 +65,7 @@
Create and Delete a Physics SDK
*/
- extern plPhysicsSdkHandle plNewBulletSdk(void); //this could be
also another sdk, like ODE, PhysX etc.
+ extern plPhysicsSdkHandle plNewBulletSdk(); //this could be also
another sdk, like ODE, PhysX etc.
extern void plDeletePhysicsSdk(plPhysicsSdkHandle
physicsSdk);
/** Collision World, not strictly necessary, you can also just create a
Dynamics World with Rigid Bodies which internally manages the Collision World
with Collision Objects */
@@ -116,16 +116,16 @@
extern plCollisionShapeHandle plNewCapsuleShape(plReal radius, plReal
height);
extern plCollisionShapeHandle plNewConeShape(plReal radius, plReal
height);
extern plCollisionShapeHandle plNewCylinderShape(plReal radius, plReal
height);
- extern plCollisionShapeHandle plNewCompoundShape(void);
+ extern plCollisionShapeHandle plNewCompoundShape();
extern void plAddChildShape(plCollisionShapeHandle
compoundShape,plCollisionShapeHandle childShape, plVector3
childPos,plQuaternion childOrn);
extern void plDeleteShape(plCollisionShapeHandle shape);
/* Convex Meshes */
- extern plCollisionShapeHandle plNewConvexHullShape(void);
+ extern plCollisionShapeHandle plNewConvexHullShape();
extern void plAddVertex(plCollisionShapeHandle convexHull,
plReal x,plReal y,plReal z);
/* Concave static triangle meshes */
- extern plMeshInterfaceHandle plNewMeshInterface(void);
+ extern plMeshInterfaceHandle plNewMeshInterface();
extern void plAddTriangle(plMeshInterfaceHandle meshHandle,
plVector3 v0,plVector3 v1,plVector3 v2);
extern plCollisionShapeHandle
plNewStaticTriangleMeshShape(plMeshInterfaceHandle);
@@ -147,6 +147,7 @@
extern void plSetPosition(plRigidBodyHandle object, const plVector3
position);
extern void plSetOrientation(plRigidBodyHandle object, const
plQuaternion orientation);
extern void plSetEuler(plReal yaw,plReal pitch,plReal roll,
plQuaternion orient);
+ extern void plSetOpenGLMatrix(plRigidBodyHandle object, plReal*
matrix);
typedef struct plRayCastResult {
plRigidBodyHandle m_body;
Modified:
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
===================================================================
---
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
2011-03-12 16:06:37 UTC (rev 35499)
+++
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
2011-03-12 20:34:17 UTC (rev 35500)
@@ -150,6 +150,8 @@
virtual void getAabb(btBroadphaseProxy* proxy,btVector3& aabbMin,
btVector3& aabbMax ) const;
virtual void rayTest(const btVector3& rayFrom,const btVector3&
rayTo, btBroadphaseRayCallback& rayCallback, const btVector3&
aabbMin=btVector3(0,0,0), const btVector3& aabbMax = btVector3(0,0,0));
+ virtual void aabbTest(const btVector3& aabbMin, const btVector3&
aabbMax, btBroadphaseAabbCallback& callback);
+
void quantize(BP_FP_INT_TYPE* out, const btVector3& point, int isMax)
const;
///unQuantize should be conservative: aabbMin/aabbMax should be larger
then 'getAabb' result
@@ -285,8 +287,33 @@
}
}
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::aabbTest(const btVector3&
aabbMin, const btVector3& aabbMax, btBroadphaseAabbCallback& callback)
+{
+ if (m_raycastAccelerator)
+ {
+ m_raycastAccelerator->aabbTest(aabbMin,aabbMax,callback);
+ } else
+ {
+ //choose axis?
+ BP_FP_INT_TYPE axis = 0;
+ //for each proxy
+ for (BP_FP_INT_TYPE i=1;i<m_numHandles*2+1;i++)
+ {
+ if (m_pEdges[axis][i].IsMax())
+ {
+ Handle* handle =
getHandle(m_pEdges[axis][i].m_handle);
+ if
(TestAabbAgainstAabb2(aabbMin,aabbMax,handle->m_aabbMin,handle->m_aabbMax))
+ {
+ callback.process(handle);
+ }
+ }
+ }
+ }
+}
+
template <typename BP_FP_INT_TYPE>
void btAxisSweep3Internal<BP_FP_INT_TYPE>::getAabb(btBroadphaseProxy*
proxy,btVector3& aabbMin, btVector3& aabbMax ) const
{
Modified:
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
===================================================================
---
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
2011-03-12 16:06:37 UTC (rev 35499)
+++
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
2011-03-12 20:34:17 UTC (rev 35500)
@@ -26,15 +26,21 @@
-struct btBroadphaseRayCallback
+struct btBroadphaseAabbCallback
{
+ virtual ~btBroadphaseAabbCallback() {}
+ virtual bool process(const btBroadphaseProxy* proxy) = 0;
+};
+
+
+struct btBroadphaseRayCallback : public btBroadphaseAabbCallback
+{
///added some cached data to accelerate ray-AABB tests
btVector3 m_rayDirectionInverse;
unsigned int m_signs[3];
btScalar m_lambda_max;
virtual ~btBroadphaseRayCallback() {}
- virtual bool process(const btBroadphaseProxy* proxy) = 0;
};
#include "LinearMath/btVector3.h"
@@ -54,6 +60,8 @@
virtual void rayTest(const btVector3& rayFrom,const btVector3&
rayTo, btBroadphaseRayCallback& rayCallback, const btVector3&
aabbMin=btVector3(0,0,0), const btVector3& aabbMax = btVector3(0,0,0)) = 0;
+ virtual void aabbTest(const btVector3& aabbMin, const btVector3&
aabbMax, btBroadphaseAabbCallback& callback) = 0;
+
///calculateOverlappingPairs is optional: incremental algorithms (sweep
and prune) might do it during the set aabb
virtual void calculateOverlappingPairs(btDispatcher* dispatcher)=0;
@@ -65,7 +73,7 @@
virtual void getBroadphaseAabb(btVector3& aabbMin,btVector3& aabbMax)
const =0;
///reset broadphase internal structures, to ensure
determinism/reproducability
- virtual void resetPool(btDispatcher* dispatcher) {};
+ virtual void resetPool(btDispatcher* dispatcher) { (void) dispatcher; };
virtual void printStats() = 0;
Modified:
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
===================================================================
---
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
2011-03-12 16:06:37 UTC (rev 35499)
+++
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
2011-03-12 20:34:17 UTC (rev 35500)
@@ -46,6 +46,8 @@
UNIFORM_SCALING_SHAPE_PROXYTYPE,
MINKOWSKI_SUM_SHAPE_PROXYTYPE,
MINKOWSKI_DIFFERENCE_SHAPE_PROXYTYPE,
+ BOX_2D_SHAPE_PROXYTYPE,
+ CONVEX_2D_SHAPE_PROXYTYPE,
CUSTOM_CONVEX_SHAPE_TYPE,
//concave shapes
CONCAVE_SHAPES_START_HERE,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
