[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29507] branches/soc-2010-aligorith-2/ extern/bullet2/src: == SoC Bullet - Bullet Upgrade to 2.76 ==
Joshua Leung
aligorith at gmail.com
Thu Jun 17 05:20:18 CEST 2010
Revision: 29507
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29507
Author: aligorith
Date: 2010-06-17 05:20:17 +0200 (Thu, 17 Jun 2010)
Log Message:
-----------
== SoC Bullet - Bullet Upgrade to 2.76 ==
Crossing fingers that this time it goes into my branch, not trunk...
Modified Paths:
--------------
branches/soc-2010-aligorith-2/extern/bullet2/src/Bullet-C-Api.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CMakeLists.txt
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btGhostObject.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionMargin.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/CMakeLists.txt
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/Dynamics/btActionInterface.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletSoftBody/btSoftBody.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/CMakeLists.txt
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/btConvexHull.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/btConvexHull.h
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/btDefaultMotionState.h
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/btHashMap.h
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/btIDebugDraw.h
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/btMatrix3x3.h
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/btQuaternion.h
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/btQuickprof.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/btQuickprof.h
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/btScalar.h
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/btTransform.h
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/btTransformUtil.h
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/btVector3.h
branches/soc-2010-aligorith-2/extern/bullet2/src/btBulletCollisionCommon.h
branches/soc-2010-aligorith-2/extern/bullet2/src/btBulletDynamicsCommon.h
Added Paths:
-----------
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btConvex2dShape.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btConvex2dShape.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/ibmsdk/
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/ibmsdk/Makefile
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/Character/
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/Character/btCharacterControllerInterface.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ibmsdk/
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletDynamics/ibmsdk/Makefile
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/CMakeLists.txt
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/Makefile.original
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/MiniCL.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/MiniCLTask/
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/MiniCLTask/MiniCLTask.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/MiniCLTask/MiniCLTask.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/MiniCLTaskScheduler.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/MiniCLTaskScheduler.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/PlatformDefinitions.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/PosixThreadSupport.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/PosixThreadSupport.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/PpuAddressSpace.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SequentialThreadSupport.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SequentialThreadSupport.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuCollisionObjectWrapper.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuCollisionObjectWrapper.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuCollisionTaskProcess.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuCollisionTaskProcess.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuDoubleBuffer.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuFakeDma.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuFakeDma.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuGatheringCollisionDispatcher.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuGatheringCollisionDispatcher.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuLibspe2Support.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuLibspe2Support.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuLocalSupport.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/readme.txt
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuSampleTask/
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuSampleTask/SpuSampleTask.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuSampleTask/SpuSampleTask.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuSampleTask/readme.txt
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuSampleTaskProcess.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuSampleTaskProcess.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/SpuSync.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/Win32ThreadSupport.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/Win32ThreadSupport.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/btGpu3DGridBroadphase.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/btGpu3DGridBroadphase.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/btGpu3DGridBroadphaseSharedCode.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/btGpu3DGridBroadphaseSharedDefs.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/btGpu3DGridBroadphaseSharedTypes.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/btGpuDefines.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/btGpuUtilsSharedCode.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/btGpuUtilsSharedDefs.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/btParallelConstraintSolver.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/btParallelConstraintSolver.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/btThreadSupportInterface.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/btThreadSupportInterface.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/out/
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/vectormath/
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/vectormath/scalar/
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/vectormath/scalar/cpp/
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/vectormath/scalar/cpp/boolInVec.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/vectormath/scalar/cpp/floatInVec.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/vectormath/scalar/cpp/mat_aos.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/vectormath/scalar/cpp/quat_aos.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/vectormath/scalar/cpp/vec_aos.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/vectormath/scalar/cpp/vectormath_aos.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletMultiThreaded/vectormath2bullet.h
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/btSerializer.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/btSerializer.h
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/ibmsdk/
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/ibmsdk/Makefile
branches/soc-2010-aligorith-2/extern/bullet2/src/MiniCL/
branches/soc-2010-aligorith-2/extern/bullet2/src/MiniCL/cl.h
branches/soc-2010-aligorith-2/extern/bullet2/src/MiniCL/cl_MiniCL_Defs.h
branches/soc-2010-aligorith-2/extern/bullet2/src/MiniCL/cl_gl.h
branches/soc-2010-aligorith-2/extern/bullet2/src/MiniCL/cl_platform.h
branches/soc-2010-aligorith-2/extern/bullet2/src/ibmsdk/
branches/soc-2010-aligorith-2/extern/bullet2/src/ibmsdk/Makefile
Removed Paths:
-------------
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h
branches/soc-2010-aligorith-2/extern/bullet2/src/BulletSoftBody/Jamfile
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/Jamfile
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/btPoint3.h
branches/soc-2010-aligorith-2/extern/bullet2/src/LinearMath/btSimdMinMax.h
Modified: branches/soc-2010-aligorith-2/extern/bullet2/src/Bullet-C-Api.h
===================================================================
--- branches/soc-2010-aligorith-2/extern/bullet2/src/Bullet-C-Api.h 2010-06-17 02:42:43 UTC (rev 29506)
+++ branches/soc-2010-aligorith-2/extern/bullet2/src/Bullet-C-Api.h 2010-06-17 03:20:17 UTC (rev 29507)
@@ -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: branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
===================================================================
--- branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h 2010-06-17 02:42:43 UTC (rev 29506)
+++ branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h 2010-06-17 03:20:17 UTC (rev 29507)
@@ -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: branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
===================================================================
--- branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h 2010-06-17 02:42:43 UTC (rev 29506)
+++ branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h 2010-06-17 03:20:17 UTC (rev 29507)
@@ -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: branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
===================================================================
--- branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h 2010-06-17 02:42:43 UTC (rev 29506)
+++ branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h 2010-06-17 03:20:17 UTC (rev 29507)
@@ -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,
@@ -139,6 +141,11 @@
return (proxyType < CONCAVE_SHAPES_START_HERE);
}
+ static SIMD_FORCE_INLINE bool isNonMoving(int proxyType)
+ {
+ return (isConcave(proxyType) && !(proxyType==GIMPACT_SHAPE_PROXYTYPE));
+ }
+
static SIMD_FORCE_INLINE bool isConcave(int proxyType)
{
return ((proxyType > CONCAVE_SHAPES_START_HERE) &&
@@ -148,14 +155,22 @@
{
return (proxyType == COMPOUND_SHAPE_PROXYTYPE);
}
+
+ static SIMD_FORCE_INLINE bool isSoftBody(int proxyType)
+ {
+ return (proxyType == SOFTBODY_SHAPE_PROXYTYPE);
+ }
+
static SIMD_FORCE_INLINE bool isInfinite(int proxyType)
{
return (proxyType == STATIC_PLANE_PROXYTYPE);
}
- static SIMD_FORCE_INLINE bool isSoftBody(int proxyType)
+
+ static SIMD_FORCE_INLINE bool isConvex2d(int proxyType)
{
- return (proxyType == SOFTBODY_SHAPE_PROXYTYPE);
+ return (proxyType == BOX_2D_SHAPE_PROXYTYPE) || (proxyType == CONVEX_2D_SHAPE_PROXYTYPE);
}
+
}
;
Modified: branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
===================================================================
--- branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp 2010-06-17 02:42:43 UTC (rev 29506)
+++ branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp 2010-06-17 03:20:17 UTC (rev 29507)
@@ -238,7 +238,7 @@
right.resize(0);
for(int i=0,ni=leaves.size();i<ni;++i)
{
- if(dot(axis,leaves[i]->volume.Center()-org)<0)
+ if(btDot(axis,leaves[i]->volume.Center()-org)<0)
left.push_back(leaves[i]);
else
right.push_back(leaves[i]);
@@ -319,7 +319,7 @@
const btVector3 x=leaves[i]->volume.Center()-org;
for(int j=0;j<3;++j)
{
- ++splitcount[j][dot(x,axis[j])>0?1:0];
+ ++splitcount[j][btDot(x,axis[j])>0?1:0];
}
}
for( i=0;i<3;++i)
Modified: branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
===================================================================
--- branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h 2010-06-17 02:42:43 UTC (rev 29506)
+++ branches/soc-2010-aligorith-2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h 2010-06-17 03:20:17 UTC (rev 29507)
@@ -32,7 +32,7 @@
#define DBVT_IMPL_SSE 1 // SSE
// Template implementation of ICollide
-#ifdef WIN32
+#ifdef _WIN32
#if (defined (_MSC_VER) && _MSC_VER >= 1400)
#define DBVT_USE_TEMPLATE 1
#else
@@ -57,7 +57,7 @@
// Specific methods implementation
//SSE gives errors on a MSVC 7.1
-#ifdef BT_USE_SSE
+#if defined (BT_USE_SSE) && defined (_WIN32)
#define DBVT_SELECT_IMPL DBVT_IMPL_SSE
#define DBVT_MERGE_IMPL DBVT_IMPL_SSE
#define DBVT_INT0_IMPL DBVT_IMPL_SSE
@@ -92,7 +92,7 @@
#endif
#if DBVT_USE_MEMMOVE
-#ifndef __CELLOS_LV2__
+#if !defined( __CELLOS_LV2__) && !defined(__MWERKS__)
#include <memory.h>
#endif
#include <string.h>
@@ -484,8 +484,8 @@
case (1+2+4): px=btVector3(mx.x(),mx.y(),mx.z());
pi=btVector3(mi.x(),mi.y(),mi.z());break;
}
- if((dot(n,px)+o)<0) return(-1);
- if((dot(n,pi)+o)>=0) return(+1);
+ if((btDot(n,px)+o)<0) return(-1);
+ if((btDot(n,pi)+o)>=0) return(+1);
return(0);
}
@@ -496,7 +496,7 @@
const btVector3 p( b[(signs>>0)&1]->x(),
b[(signs>>1)&1]->y(),
b[(signs>>2)&1]->z());
- return(dot(p,v));
+ return(btDot(p,v));
}
//
@@ -947,6 +947,7 @@
const btVector3& aabbMax,
DBVT_IPOLICY) const
{
+ (void) rayTo;
DBVT_CHECKTYPE
if(root)
{
@@ -961,8 +962,8 @@
do
{
const btDbvtNode* node=stack[--depth];
- bounds[0] = node->volume.Mins()+aabbMin;
- bounds[1] = node->volume.Maxs()+aabbMax;
+ bounds[0] = node->volume.Mins()-aabbMax;
+ bounds[1] = node->volume.Maxs()-aabbMin;
btScalar tmin=1.f,lambda_min=0.f;
unsigned int result1=false;
result1 = btRayAabb2(rayFrom,rayDirectionInverse,signs,bounds,tmin,lambda_min,lambda_max);
@@ -1000,11 +1001,11 @@
btVector3 rayDir = (rayTo-rayFrom);
rayDir.normalize ();
- ///what about division by zero? --> just set rayDirection[i] to INF/1e30
+ ///what about division by zero? --> just set rayDirection[i] to INF/BT_LARGE_FLOAT
btVector3 rayDirectionInverse;
- rayDirectionInverse[0] = rayDir[0] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDir[0];
- rayDirectionInverse[1] = rayDir[1] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDir[1];
- rayDirectionInverse[2] = rayDir[2] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDir[2];
+ rayDirectionInverse[0] = rayDir[0] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDir[0];
+ rayDirectionInverse[1] = rayDir[1] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDir[1];
+ rayDirectionInverse[2] = rayDir[2] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDir[2];
unsigned int signs[3] = { rayDirectionInverse[0] < 0.0, rayDirectionInverse[1] < 0.0, rayDirectionInverse[2] < 0.0};
btScalar lambda_max = rayDir.dot(rayTo-rayFrom);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list