[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16348] branches/sim_physics: svn merge -r 16334:16347 https://svn.blender.org/svnroot/bf-blender/trunk/ blender + also added missing files from bullet-2. 71alpha0 archiv + fixed compile errors
Daniel Genrich
daniel.genrich at gmx.net
Wed Sep 3 12:55:49 CEST 2008
Revision: 16348
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16348
Author: genscher
Date: 2008-09-03 12:55:46 +0200 (Wed, 03 Sep 2008)
Log Message:
-----------
svn merge -r 16334:16347 https://svn.blender.org/svnroot/bf-blender/trunk/blender + also added missing files from bullet-2.71alpha0 archiv + fixed compile errors
Modified Paths:
--------------
branches/sim_physics/extern/bullet2/src/Bullet-C-Api.h
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Jamfile
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/Jamfile
branches/sim_physics/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
branches/sim_physics/extern/bullet2/src/Jamfile
branches/sim_physics/extern/bullet2/src/LinearMath/Jamfile
branches/sim_physics/extern/bullet2/src/LinearMath/btAabbUtil2.h
branches/sim_physics/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
branches/sim_physics/extern/bullet2/src/LinearMath/btAlignedAllocator.h
branches/sim_physics/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
branches/sim_physics/extern/bullet2/src/LinearMath/btDefaultMotionState.h
branches/sim_physics/extern/bullet2/src/LinearMath/btGeometryUtil.cpp
branches/sim_physics/extern/bullet2/src/LinearMath/btGeometryUtil.h
branches/sim_physics/extern/bullet2/src/LinearMath/btIDebugDraw.h
branches/sim_physics/extern/bullet2/src/LinearMath/btMatrix3x3.h
branches/sim_physics/extern/bullet2/src/LinearMath/btMinMax.h
branches/sim_physics/extern/bullet2/src/LinearMath/btMotionState.h
branches/sim_physics/extern/bullet2/src/LinearMath/btQuadWord.h
branches/sim_physics/extern/bullet2/src/LinearMath/btQuaternion.h
branches/sim_physics/extern/bullet2/src/LinearMath/btQuickprof.cpp
branches/sim_physics/extern/bullet2/src/LinearMath/btQuickprof.h
branches/sim_physics/extern/bullet2/src/LinearMath/btScalar.h
branches/sim_physics/extern/bullet2/src/LinearMath/btStackAlloc.h
branches/sim_physics/extern/bullet2/src/LinearMath/btTransform.h
branches/sim_physics/extern/bullet2/src/LinearMath/btTransformUtil.h
branches/sim_physics/extern/bullet2/src/LinearMath/btVector3.h
branches/sim_physics/extern/bullet2/src/SConscript
branches/sim_physics/extern/bullet2/src/btBulletCollisionCommon.h
branches/sim_physics/extern/bullet2/src/btBulletDynamicsCommon.h
branches/sim_physics/intern/opennl/superlu/BLO_sys_types.h
branches/sim_physics/release/scripts/mesh_cleanup.py
branches/sim_physics/source/blender/blenkernel/intern/particle_system.c
branches/sim_physics/source/blender/blenloader/BLO_sys_types.h
branches/sim_physics/source/blender/makesdna/DNA_meshdata_types.h
branches/sim_physics/source/blender/python/api2_2x/Text.c
branches/sim_physics/source/blender/src/drawtext.c
branches/sim_physics/source/blender/src/editmesh.c
branches/sim_physics/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/sim_physics/source/gameengine/Expressions/PyObjectPlus.cpp
branches/sim_physics/source/gameengine/Expressions/Value.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_GameObject.cpp
branches/sim_physics/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/sim_physics/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/sim_physics/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/sim_physics/source/gameengine/PyDoc/KX_GameObject.py
Added Paths:
-----------
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeContactJoint.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeContactJoint.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeJoint.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeJoint.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeMacros.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeQuickstepConstraintSolver.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeQuickstepConstraintSolver.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeSolverBody.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeTypedJoint.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeTypedJoint.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSorLcp.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSorLcp.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/
branches/sim_physics/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
branches/sim_physics/extern/bullet2/src/BulletSoftBody/Jamfile
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBody.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
branches/sim_physics/extern/bullet2/src/LinearMath/btConvexHull.h
branches/sim_physics/extern/bullet2/src/LinearMath/btPoolAllocator.h
Removed Paths:
-------------
branches/sim_physics/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
branches/sim_physics/extern/bullet2/src/BulletSoftBody/Jamfile
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBody.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
Modified: branches/sim_physics/extern/bullet2/src/Bullet-C-Api.h
===================================================================
--- branches/sim_physics/extern/bullet2/src/Bullet-C-Api.h 2008-09-03 06:43:07 UTC (rev 16347)
+++ branches/sim_physics/extern/bullet2/src/Bullet-C-Api.h 2008-09-03 10:55:46 UTC (rev 16348)
@@ -1,37 +1,175 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/
-
-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.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-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.
-*/
-
-/*
- Draft high-level generic physics C-API. For low-level access, use the physics SDK native API's.
- Work in progress, functionality will be added on demand.
-
- If possible, use the richer Bullet C++ API, by including "btBulletDynamicsCommon.h"
-*/
-
-#ifndef BULLET_C_API_H
-#define BULLET_C_API_H
-
-#ifdef __cplusplus
-extern "C" {
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/
+
+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.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+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.
+*/
+
+/*
+ Draft high-level generic physics C-API. For low-level access, use the physics SDK native API's.
+ Work in progress, functionality will be added on demand.
+
+ If possible, use the richer Bullet C++ API, by including "btBulletDynamicsCommon.h"
+*/
+
+#ifndef BULLET_C_API_H
+#define BULLET_C_API_H
+
+#define PL_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name
+
+#ifdef BT_USE_DOUBLE_PRECISION
+typedef double plReal;
+#else
+typedef float plReal;
+#endif
+
+typedef plReal plVector3[3];
+typedef plReal plQuaternion[4];
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Particular physics SDK */
+ PL_DECLARE_HANDLE(plPhysicsSdkHandle);
+
+/* Dynamics world, belonging to some physics SDK */
+ PL_DECLARE_HANDLE(plDynamicsWorldHandle);
+
+/* Rigid Body that can be part of a Dynamics World */
+ PL_DECLARE_HANDLE(plRigidBodyHandle);
+
+/* Collision Shape/Geometry, property of a Rigid Body */
+ PL_DECLARE_HANDLE(plCollisionShapeHandle);
+
+/* Constraint for Rigid Bodies */
+ PL_DECLARE_HANDLE(plConstraintHandle);
+
+/* Triangle Mesh interface */
+ PL_DECLARE_HANDLE(plMeshInterfaceHandle);
+
+/* Broadphase Scene/Proxy Handles */
+ PL_DECLARE_HANDLE(plCollisionBroadphaseHandle);
+ PL_DECLARE_HANDLE(plBroadphaseProxyHandle);
+ PL_DECLARE_HANDLE(plCollisionWorldHandle);
+
+/*
+ Create and Delete a Physics SDK
+*/
+
+ 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 */
+
+ typedef void(*btBroadphaseCallback)(void* clientData, void* object1,void* object2);
+
+ extern plCollisionBroadphaseHandle plCreateSapBroadphase(btBroadphaseCallback beginCallback,btBroadphaseCallback endCallback);
+
+ extern void plDestroyBroadphase(plCollisionBroadphaseHandle bp);
+
+ extern plBroadphaseProxyHandle plCreateProxy(plCollisionBroadphaseHandle bp, void* clientData, plReal minX,plReal minY,plReal minZ, plReal maxX,plReal maxY, plReal maxZ);
+
+ extern void plDestroyProxy(plCollisionBroadphaseHandle bp, plBroadphaseProxyHandle proxyHandle);
+
+ extern void plSetBoundingBox(plBroadphaseProxyHandle proxyHandle, plReal minX,plReal minY,plReal minZ, plReal maxX,plReal maxY, plReal maxZ);
+
+/* todo: add pair cache support with queries like add/remove/find pair */
+
+ extern plCollisionWorldHandle plCreateCollisionWorld(plPhysicsSdkHandle physicsSdk);
+
+/* todo: add/remove objects */
+
+
+/* Dynamics World */
+
+ extern plDynamicsWorldHandle plCreateDynamicsWorld(plPhysicsSdkHandle physicsSdk);
+
+ extern void plDeleteDynamicsWorld(plDynamicsWorldHandle world);
+
+ extern void plStepSimulation(plDynamicsWorldHandle, plReal timeStep);
+
+ extern void plAddRigidBody(plDynamicsWorldHandle world, plRigidBodyHandle object);
+
+ extern void plRemoveRigidBody(plDynamicsWorldHandle world, plRigidBodyHandle object);
+
+
+/* Rigid Body */
+
+ extern plRigidBodyHandle plCreateRigidBody( void* user_data, float mass, plCollisionShapeHandle cshape );
+
+ extern void plDeleteRigidBody(plRigidBodyHandle body);
+
+
+/* Collision Shape definition */
+
+ extern plCollisionShapeHandle plNewSphereShape(plReal radius);
+ extern plCollisionShapeHandle plNewBoxShape(plReal x, plReal y, plReal z);
+ extern plCollisionShapeHandle plNewCapsuleShape(plReal radius, plReal height);
+ extern plCollisionShapeHandle plNewConeShape(plReal radius, plReal height);
+ extern plCollisionShapeHandle plNewCylinderShape(plReal radius, plReal height);
+ extern plCollisionShapeHandle plNewCompoundShape();
+ extern void plAddChildShape(plCollisionShapeHandle compoundShape,plCollisionShapeHandle childShape, plVector3 childPos,plQuaternion childOrn);
+
+ extern void plDeleteShape(plCollisionShapeHandle shape);
+
+ /* Convex Meshes */
+ extern plCollisionShapeHandle plNewConvexHullShape();
+ extern void plAddVertex(plCollisionShapeHandle convexHull, plReal x,plReal y,plReal z);
+/* Concave static triangle meshes */
+ extern plMeshInterfaceHandle plNewMeshInterface();
+ extern void plAddTriangle(plMeshInterfaceHandle meshHandle, plVector3 v0,plVector3 v1,plVector3 v2);
+ extern plCollisionShapeHandle plNewStaticTriangleMeshShape(plMeshInterfaceHandle);
+
+ extern void plSetScaling(plCollisionShapeHandle shape, plVector3 scaling);
+
+/* SOLID has Response Callback/Table/Management */
+/* PhysX has Triggers, User Callbacks and filtering */
+/* ODE has the typedef void dNearCallback (void *data, dGeomID o1, dGeomID o2); */
+
+/* typedef void plUpdatedPositionCallback(void* userData, plRigidBodyHandle rbHandle, plVector3 pos); */
+/* typedef void plUpdatedOrientationCallback(void* userData, plRigidBodyHandle rbHandle, plQuaternion orientation); */
+
+ /* get world transform */
+ extern void plGetOpenGLMatrix(plRigidBodyHandle object, plReal* matrix);
+ extern void plGetPosition(plRigidBodyHandle object,plVector3 position);
+ extern void plGetOrientation(plRigidBodyHandle object,plQuaternion orientation);
+
+ /* set world transform (position/orientation) */
+ 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);
+
+ typedef struct plRayCastResult {
+ plRigidBodyHandle m_body;
+ plCollisionShapeHandle m_shape;
+ plVector3 m_positionWorld;
+ plVector3 m_normalWorld;
+ } plRayCastResult;
+
+ extern int plRayCast(plDynamicsWorldHandle world, const plVector3 rayStart, const plVector3 rayEnd, plRayCastResult res);
+
+ /* Sweep API */
+
+ /* extern plRigidBodyHandle plObjectCast(plDynamicsWorldHandle world, const plVector3 rayStart, const plVector3 rayEnd, plVector3 hitpoint, plVector3 normal); */
+
+ /* Continuous Collision Detection API */
+
+ // needed for source/blender/blenkernel/intern/collision.c
+ double plNearestPoints(float p1[3], float p2[3], float p3[3], float q1[3], float q2[3], float q3[3], float *pa, float *pb, float normal[3]);
+
+#ifdef __cplusplus
+}
#endif
-
-double plNearestPoints(float p1[3], float p2[3], float p3[3], float q1[3], float q2[3], float q3[3], float *pa, float *pb, float normal[3]);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif //BULLET_C_API_H
-
+
+
+#endif //BULLET_C_API_H
+
Modified: branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
===================================================================
--- branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp 2008-09-03 06:43:07 UTC (rev 16347)
+++ branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp 2008-09-03 10:55:46 UTC (rev 16348)
@@ -21,640 +21,18 @@
#include <assert.h>
-#ifdef DEBUG_BROADPHASE
-#include <stdio.h>
-void btAxisSweep3::debugPrintAxis(int axis, bool checkCardinality)
+btAxisSweep3::btAxisSweep3(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, unsigned short int maxHandles, btOverlappingPairCache* pairCache)
+:btAxisSweep3Internal<unsigned short int>(worldAabbMin,worldAabbMax,0xfffe,0xffff,maxHandles,pairCache)
{
- int numEdges = m_pHandles[0].m_maxEdges[axis];
- printf("SAP Axis %d, numEdges=%d\n",axis,numEdges);
+ // 1 handle is reserved as sentinel
+ btAssert(maxHandles > 1 && maxHandles < 32767);
- int i;
- for (i=0;i<numEdges+1;i++)
- {
- Edge* pEdge = m_pEdges[axis] + i;
- Handle* pHandlePrev = getHandle(pEdge->m_handle);
- int handleIndex = pEdge->IsMax()? pHandlePrev->m_maxEdges[axis] : pHandlePrev->m_minEdges[axis];
- char beginOrEnd;
- beginOrEnd=pEdge->IsMax()?'E':'B';
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list