Revision: 16349
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16349
Author: genscher
Date: 2008-09-03 13:11:11 +0200 (Wed, 03 Sep 2008)
Log Message:
-----------
Revert rev16344 on trunk, bullet work is done in sim_physics branch as
discussed on sunday meeting
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16344
Modified Paths:
--------------
trunk/blender/extern/bullet2/src/Bullet-C-Api.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
trunk/blender/extern/bullet2/src/BulletCollision/Jamfile
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
trunk/blender/extern/bullet2/src/BulletDynamics/Jamfile
trunk/blender/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
trunk/blender/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
trunk/blender/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
trunk/blender/extern/bullet2/src/Jamfile
trunk/blender/extern/bullet2/src/LinearMath/Jamfile
trunk/blender/extern/bullet2/src/LinearMath/btAabbUtil2.h
trunk/blender/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
trunk/blender/extern/bullet2/src/LinearMath/btAlignedAllocator.h
trunk/blender/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
trunk/blender/extern/bullet2/src/LinearMath/btDefaultMotionState.h
trunk/blender/extern/bullet2/src/LinearMath/btGeometryUtil.cpp
trunk/blender/extern/bullet2/src/LinearMath/btGeometryUtil.h
trunk/blender/extern/bullet2/src/LinearMath/btIDebugDraw.h
trunk/blender/extern/bullet2/src/LinearMath/btMatrix3x3.h
trunk/blender/extern/bullet2/src/LinearMath/btMinMax.h
trunk/blender/extern/bullet2/src/LinearMath/btMotionState.h
trunk/blender/extern/bullet2/src/LinearMath/btQuadWord.h
trunk/blender/extern/bullet2/src/LinearMath/btQuaternion.h
trunk/blender/extern/bullet2/src/LinearMath/btQuickprof.cpp
trunk/blender/extern/bullet2/src/LinearMath/btQuickprof.h
trunk/blender/extern/bullet2/src/LinearMath/btScalar.h
trunk/blender/extern/bullet2/src/LinearMath/btStackAlloc.h
trunk/blender/extern/bullet2/src/LinearMath/btTransform.h
trunk/blender/extern/bullet2/src/LinearMath/btTransformUtil.h
trunk/blender/extern/bullet2/src/LinearMath/btVector3.h
trunk/blender/extern/bullet2/src/btBulletCollisionCommon.h
trunk/blender/extern/bullet2/src/btBulletDynamicsCommon.h
trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
Removed Paths:
-------------
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
trunk/blender/extern/bullet2/src/BulletSoftBody/
Modified: trunk/blender/extern/bullet2/src/Bullet-C-Api.h
===================================================================
--- trunk/blender/extern/bullet2/src/Bullet-C-Api.h 2008-09-03 10:55:46 UTC
(rev 16348)
+++ trunk/blender/extern/bullet2/src/Bullet-C-Api.h 2008-09-03 11:11:11 UTC
(rev 16349)
@@ -1,171 +1,37 @@
-/*
-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 */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif //BULLET_C_API_H
-
+/*
+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" {
+#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
+
Modified:
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
===================================================================
---
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
2008-09-03 10:55:46 UTC (rev 16348)
+++
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
2008-09-03 11:11:11 UTC (rev 16349)
@@ -21,18 +21,640 @@
#include <assert.h>
-btAxisSweep3::btAxisSweep3(const btPoint3& worldAabbMin,const btPoint3&
worldAabbMax, unsigned short int maxHandles, btOverlappingPairCache* pairCache)
-:btAxisSweep3Internal<unsigned short
int>(worldAabbMin,worldAabbMax,0xfffe,0xffff,maxHandles,pairCache)
+#ifdef DEBUG_BROADPHASE
+#include <stdio.h>
+void btAxisSweep3::debugPrintAxis(int axis, bool checkCardinality)
{
- // 1 handle is reserved as sentinel
- btAssert(maxHandles > 1 && maxHandles < 32767);
+ int numEdges = m_pHandles[0].m_maxEdges[axis];
+ printf("SAP Axis %d, numEdges=%d\n",axis,numEdges);
+ 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';
+ printf("
[%c,h=%d,p=%x,i=%d]\n",beginOrEnd,pEdge->m_handle,pEdge->m_pos,handleIndex);
+ }
+
+ if (checkCardinality)
+ assert(numEdges == m_numHandles*2+1);
}
+#endif //DEBUG_BROADPHASE
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
