[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29506] trunk/blender/extern/bullet2: == SoC Bullet - Bullet Upgrade to 2.76 ==
Joshua Leung
aligorith at gmail.com
Thu Jun 17 04:42:44 CEST 2010
Revision: 29506
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29506
Author: aligorith
Date: 2010-06-17 04:42:43 +0200 (Thu, 17 Jun 2010)
Log Message:
-----------
== SoC Bullet - Bullet Upgrade to 2.76 ==
Updated Blender's Bullet to 2.76 in this branch only.
This update was done by:
1) deleting the contents of the existing extern/bullet2/src directory (leaving the .svn folder in place),
2) copy/pasting the contents of the bullet/src directory (from unzipped Bullet archive) into this newly cleared folder.
Hopefully there aren't any patches that are still needed from the Bullet we had in source.
---
Note: I didn't use Moguri's patch, since that was giving me compile errors with headers not being able to be found.
Modified Paths:
--------------
branches/soc-2010-aligorith-2/extern/bullet2/readme.txt
trunk/blender/extern/bullet2/CMakeLists.txt
trunk/blender/extern/bullet2/Makefile
Added Paths:
-----------
trunk/blender/extern/bullet2/Bullet-C-Api.h
trunk/blender/extern/bullet2/BulletCollision/
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btAxisSweep3.h
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btDbvt.cpp
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btDbvt.h
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btDispatcher.cpp
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btDispatcher.h
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
trunk/blender/extern/bullet2/BulletCollision/CMakeLists.txt
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btCollisionObject.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btCollisionObject.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btCollisionWorld.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btGhostObject.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btGhostObject.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btManifoldResult.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btManifoldResult.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btUnionFind.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionDispatch/btUnionFind.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btBox2dShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btBox2dShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btBoxShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btBoxShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btCapsuleShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btCapsuleShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btCollisionMargin.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btCollisionShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btCollisionShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btCompoundShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btCompoundShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btConcaveShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btConcaveShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btConeShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btConeShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btConvex2dShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btConvex2dShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btConvexHullShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btConvexHullShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btConvexInternalShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btConvexPointCloudShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btConvexShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btConvexShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btCylinderShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btCylinderShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btEmptyShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btEmptyShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btMaterial.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btMultiSphereShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btOptimizedBvh.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btShapeHull.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btShapeHull.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btSphereShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btSphereShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btStaticPlaneShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btStridingMeshInterface.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btTetrahedronShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btTetrahedronShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btTriangleBuffer.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btTriangleBuffer.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btTriangleCallback.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btTriangleCallback.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btTriangleInfoMap.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btTriangleMesh.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btTriangleMesh.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btTriangleMeshShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btTriangleShape.h
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
trunk/blender/extern/bullet2/BulletCollision/CollisionShapes/btUniformScalingShape.h
trunk/blender/extern/bullet2/BulletCollision/Doxyfile
trunk/blender/extern/bullet2/BulletCollision/Gimpact/
trunk/blender/extern/bullet2/BulletCollision/Gimpact/btBoxCollision.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/btClipPolygon.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/btContactProcessing.cpp
trunk/blender/extern/bullet2/BulletCollision/Gimpact/btContactProcessing.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/btGImpactBvh.cpp
trunk/blender/extern/bullet2/BulletCollision/Gimpact/btGImpactBvh.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/btGImpactMassUtil.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
trunk/blender/extern/bullet2/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/btGImpactShape.cpp
trunk/blender/extern/bullet2/BulletCollision/Gimpact/btGImpactShape.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
trunk/blender/extern/bullet2/BulletCollision/Gimpact/btGenericPoolAllocator.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/btGeometryOperations.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/btQuantization.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/btTriangleShapeEx.cpp
trunk/blender/extern/bullet2/BulletCollision/Gimpact/btTriangleShapeEx.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/gim_array.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/gim_basic_geometry_operations.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/gim_bitset.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/gim_box_collision.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/gim_box_set.cpp
trunk/blender/extern/bullet2/BulletCollision/Gimpact/gim_box_set.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/gim_clip_polygon.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/gim_contact.cpp
trunk/blender/extern/bullet2/BulletCollision/Gimpact/gim_contact.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/gim_geom_types.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/gim_geometry.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/gim_hash_table.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/gim_linear_math.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/gim_math.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/gim_memory.cpp
trunk/blender/extern/bullet2/BulletCollision/Gimpact/gim_memory.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/gim_radixsort.h
trunk/blender/extern/bullet2/BulletCollision/Gimpact/gim_tri_collision.cpp
trunk/blender/extern/bullet2/BulletCollision/Gimpact/gim_tri_collision.h
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btConvexCast.h
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btPointCollector.h
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
trunk/blender/extern/bullet2/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
trunk/blender/extern/bullet2/BulletDynamics/
trunk/blender/extern/bullet2/BulletDynamics/CMakeLists.txt
trunk/blender/extern/bullet2/BulletDynamics/Character/
trunk/blender/extern/bullet2/BulletDynamics/Character/btCharacterControllerInterface.h
trunk/blender/extern/bullet2/BulletDynamics/Character/btKinematicCharacterController.cpp
trunk/blender/extern/bullet2/BulletDynamics/Character/btKinematicCharacterController.h
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btConstraintSolver.h
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btContactConstraint.h
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btHingeConstraint.h
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btJacobianEntry.h
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btSliderConstraint.h
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btSolverBody.h
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btSolverConstraint.h
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btTypedConstraint.h
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
trunk/blender/extern/bullet2/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
trunk/blender/extern/bullet2/BulletDynamics/Dynamics/
trunk/blender/extern/bullet2/BulletDynamics/Dynamics/Bullet-C-API.cpp
trunk/blender/extern/bullet2/BulletDynamics/Dynamics/btActionInterface.h
trunk/blender/extern/bullet2/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
trunk/blender/extern/bullet2/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
trunk/blender/extern/bullet2/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
trunk/blender/extern/bullet2/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
trunk/blender/extern/bullet2/BulletDynamics/Dynamics/btDynamicsWorld.h
trunk/blender/extern/bullet2/BulletDynamics/Dynamics/btRigidBody.cpp
trunk/blender/extern/bullet2/BulletDynamics/Dynamics/btRigidBody.h
trunk/blender/extern/bullet2/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
trunk/blender/extern/bullet2/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
trunk/blender/extern/bullet2/BulletDynamics/Vehicle/
trunk/blender/extern/bullet2/BulletDynamics/Vehicle/btRaycastVehicle.cpp
trunk/blender/extern/bullet2/BulletDynamics/Vehicle/btRaycastVehicle.h
trunk/blender/extern/bullet2/BulletDynamics/Vehicle/btVehicleRaycaster.h
trunk/blender/extern/bullet2/BulletDynamics/Vehicle/btWheelInfo.cpp
trunk/blender/extern/bullet2/BulletDynamics/Vehicle/btWheelInfo.h
trunk/blender/extern/bullet2/BulletMultiThreaded/
trunk/blender/extern/bullet2/BulletMultiThreaded/CMakeLists.txt
trunk/blender/extern/bullet2/BulletMultiThreaded/Makefile.original
trunk/blender/extern/bullet2/BulletMultiThreaded/MiniCL.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/MiniCLTask/
trunk/blender/extern/bullet2/BulletMultiThreaded/MiniCLTask/MiniCLTask.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/MiniCLTask/MiniCLTask.h
trunk/blender/extern/bullet2/BulletMultiThreaded/MiniCLTaskScheduler.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/MiniCLTaskScheduler.h
trunk/blender/extern/bullet2/BulletMultiThreaded/PlatformDefinitions.h
trunk/blender/extern/bullet2/BulletMultiThreaded/PosixThreadSupport.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/PosixThreadSupport.h
trunk/blender/extern/bullet2/BulletMultiThreaded/PpuAddressSpace.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SequentialThreadSupport.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/SequentialThreadSupport.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuCollisionObjectWrapper.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuCollisionObjectWrapper.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuCollisionTaskProcess.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuCollisionTaskProcess.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuDoubleBuffer.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuFakeDma.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuFakeDma.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuGatheringCollisionDispatcher.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuGatheringCollisionDispatcher.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuLibspe2Support.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuLibspe2Support.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuLocalSupport.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/readme.txt
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuSampleTask/
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuSampleTask/SpuSampleTask.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuSampleTask/SpuSampleTask.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuSampleTask/readme.txt
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuSampleTaskProcess.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuSampleTaskProcess.h
trunk/blender/extern/bullet2/BulletMultiThreaded/SpuSync.h
trunk/blender/extern/bullet2/BulletMultiThreaded/Win32ThreadSupport.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/Win32ThreadSupport.h
trunk/blender/extern/bullet2/BulletMultiThreaded/btGpu3DGridBroadphase.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/btGpu3DGridBroadphase.h
trunk/blender/extern/bullet2/BulletMultiThreaded/btGpu3DGridBroadphaseSharedCode.h
trunk/blender/extern/bullet2/BulletMultiThreaded/btGpu3DGridBroadphaseSharedDefs.h
trunk/blender/extern/bullet2/BulletMultiThreaded/btGpu3DGridBroadphaseSharedTypes.h
trunk/blender/extern/bullet2/BulletMultiThreaded/btGpuDefines.h
trunk/blender/extern/bullet2/BulletMultiThreaded/btGpuUtilsSharedCode.h
trunk/blender/extern/bullet2/BulletMultiThreaded/btGpuUtilsSharedDefs.h
trunk/blender/extern/bullet2/BulletMultiThreaded/btParallelConstraintSolver.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/btParallelConstraintSolver.h
trunk/blender/extern/bullet2/BulletMultiThreaded/btThreadSupportInterface.cpp
trunk/blender/extern/bullet2/BulletMultiThreaded/btThreadSupportInterface.h
trunk/blender/extern/bullet2/BulletMultiThreaded/out/
trunk/blender/extern/bullet2/BulletMultiThreaded/vectormath/
trunk/blender/extern/bullet2/BulletMultiThreaded/vectormath/scalar/
trunk/blender/extern/bullet2/BulletMultiThreaded/vectormath/scalar/cpp/
trunk/blender/extern/bullet2/BulletMultiThreaded/vectormath/scalar/cpp/boolInVec.h
trunk/blender/extern/bullet2/BulletMultiThreaded/vectormath/scalar/cpp/floatInVec.h
trunk/blender/extern/bullet2/BulletMultiThreaded/vectormath/scalar/cpp/mat_aos.h
trunk/blender/extern/bullet2/BulletMultiThreaded/vectormath/scalar/cpp/quat_aos.h
trunk/blender/extern/bullet2/BulletMultiThreaded/vectormath/scalar/cpp/vec_aos.h
trunk/blender/extern/bullet2/BulletMultiThreaded/vectormath/scalar/cpp/vectormath_aos.h
trunk/blender/extern/bullet2/BulletMultiThreaded/vectormath2bullet.h
trunk/blender/extern/bullet2/BulletSoftBody/
trunk/blender/extern/bullet2/BulletSoftBody/CMakeLists.txt
trunk/blender/extern/bullet2/BulletSoftBody/btSoftBody.cpp
trunk/blender/extern/bullet2/BulletSoftBody/btSoftBody.h
trunk/blender/extern/bullet2/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
trunk/blender/extern/bullet2/BulletSoftBody/btSoftBodyHelpers.cpp
trunk/blender/extern/bullet2/BulletSoftBody/btSoftBodyHelpers.h
trunk/blender/extern/bullet2/BulletSoftBody/btSoftBodyInternals.h
trunk/blender/extern/bullet2/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
trunk/blender/extern/bullet2/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
trunk/blender/extern/bullet2/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
trunk/blender/extern/bullet2/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
trunk/blender/extern/bullet2/BulletSoftBody/btSoftRigidDynamicsWorld.h
trunk/blender/extern/bullet2/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
trunk/blender/extern/bullet2/BulletSoftBody/btSparseSDF.h
trunk/blender/extern/bullet2/Jamfile
trunk/blender/extern/bullet2/LinearMath/
trunk/blender/extern/bullet2/LinearMath/CMakeLists.txt
trunk/blender/extern/bullet2/LinearMath/btAabbUtil2.h
trunk/blender/extern/bullet2/LinearMath/btAlignedAllocator.cpp
trunk/blender/extern/bullet2/LinearMath/btAlignedAllocator.h
trunk/blender/extern/bullet2/LinearMath/btAlignedObjectArray.h
trunk/blender/extern/bullet2/LinearMath/btConvexHull.cpp
trunk/blender/extern/bullet2/LinearMath/btConvexHull.h
trunk/blender/extern/bullet2/LinearMath/btDefaultMotionState.h
trunk/blender/extern/bullet2/LinearMath/btGeometryUtil.cpp
trunk/blender/extern/bullet2/LinearMath/btGeometryUtil.h
trunk/blender/extern/bullet2/LinearMath/btHashMap.h
trunk/blender/extern/bullet2/LinearMath/btIDebugDraw.h
trunk/blender/extern/bullet2/LinearMath/btList.h
trunk/blender/extern/bullet2/LinearMath/btMatrix3x3.h
trunk/blender/extern/bullet2/LinearMath/btMinMax.h
trunk/blender/extern/bullet2/LinearMath/btMotionState.h
trunk/blender/extern/bullet2/LinearMath/btPoolAllocator.h
trunk/blender/extern/bullet2/LinearMath/btQuadWord.h
trunk/blender/extern/bullet2/LinearMath/btQuaternion.h
trunk/blender/extern/bullet2/LinearMath/btQuickprof.cpp
trunk/blender/extern/bullet2/LinearMath/btQuickprof.h
trunk/blender/extern/bullet2/LinearMath/btRandom.h
trunk/blender/extern/bullet2/LinearMath/btScalar.h
trunk/blender/extern/bullet2/LinearMath/btSerializer.cpp
trunk/blender/extern/bullet2/LinearMath/btSerializer.h
trunk/blender/extern/bullet2/LinearMath/btStackAlloc.h
trunk/blender/extern/bullet2/LinearMath/btTransform.h
trunk/blender/extern/bullet2/LinearMath/btTransformUtil.h
trunk/blender/extern/bullet2/LinearMath/btVector3.h
trunk/blender/extern/bullet2/MiniCL/
trunk/blender/extern/bullet2/MiniCL/cl.h
trunk/blender/extern/bullet2/MiniCL/cl_MiniCL_Defs.h
trunk/blender/extern/bullet2/MiniCL/cl_gl.h
trunk/blender/extern/bullet2/MiniCL/cl_platform.h
trunk/blender/extern/bullet2/SConscript
trunk/blender/extern/bullet2/btBulletCollisionCommon.h
trunk/blender/extern/bullet2/btBulletDynamicsCommon.h
Modified: branches/soc-2010-aligorith-2/extern/bullet2/readme.txt
===================================================================
--- branches/soc-2010-aligorith-2/extern/bullet2/readme.txt 2010-06-17 02:38:49 UTC (rev 29505)
+++ branches/soc-2010-aligorith-2/extern/bullet2/readme.txt 2010-06-17 02:42:43 UTC (rev 29506)
@@ -1,16 +1,13 @@
-***
-Apply bullet_compound_raycast.patch if not already applied in Bullet source
-This patch is needed to return correct raycast results on compound shape.
-/ben
+June 17, 2010
+Upgraded Bullet srcs to 2.76 release.
+This was simply a case of deleting the existing extern/bullet2/src directory and replacing it with the bullet/src directory (from unzipped Bullet archive).
-*** These files in extern/bullet2 are NOT part of the Blender build yet ***
+Hopefully there aren't any patches that are still needed from the old version....
-This is the new refactored version of Bullet physics library version 2.x
+Aligorith
-Soon this will replace the old Bullet version in extern/bullet.
-First the integration in Blender Game Engine needs to be updated.
-Once that is done all build systems can be updated to use/build extern/bullet2 files.
+/* ***************************** */
Questions? mail blender at erwincoumans.com, or check the bf-blender mailing list.
Thanks,
Added: trunk/blender/extern/bullet2/Bullet-C-Api.h
===================================================================
--- trunk/blender/extern/bullet2/Bullet-C-Api.h (rev 0)
+++ trunk/blender/extern/bullet2/Bullet-C-Api.h 2010-06-17 02:42:43 UTC (rev 29506)
@@ -0,0 +1,176 @@
+/*
+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 (C-API) */
+ PL_DECLARE_HANDLE(plPhysicsSdkHandle);
+
+/** Dynamics world, belonging to some physics SDK (C-API)*/
+ PL_DECLARE_HANDLE(plDynamicsWorldHandle);
+
+/** Rigid Body that can be part of a Dynamics World (C-API)*/
+ PL_DECLARE_HANDLE(plRigidBodyHandle);
+
+/** Collision Shape/Geometry, property of a Rigid Body (C-API)*/
+ PL_DECLARE_HANDLE(plCollisionShapeHandle);
+
+/** Constraint for Rigid Bodies (C-API)*/
+ PL_DECLARE_HANDLE(plConstraintHandle);
+
+/** Triangle Mesh interface (C-API)*/
+ PL_DECLARE_HANDLE(plMeshInterfaceHandle);
+
+/** Broadphase Scene/Proxy Handles (C-API)*/
+ 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);
+ extern void plSetOpenGLMatrix(plRigidBodyHandle object, plReal* matrix);
+
+ 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
+
+
+#endif //BULLET_C_API_H
+
Added: trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
===================================================================
--- trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp (rev 0)
+++ trunk/blender/extern/bullet2/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp 2010-06-17 02:42:43 UTC (rev 29506)
@@ -0,0 +1,37 @@
+
+//Bullet Continuous Collision Detection and Physics Library
+//Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/
+
+
+//
+// btAxisSweep3
+//
+// Copyright (c) 2006 Simon Hobbs
+//
+// 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.
+//
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list