Revision: 16883
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16883
Author: sirdude
Date: 2008-10-02 18:52:39 +0200 (Thu, 02 Oct 2008)
Log Message:
-----------
Maybe not needed, I was running into some problems though
and noticed dos line endings in a bunch of files so ran
dos2unix on everything in bullet2.
Erwin, I noticed there are a few files that do not have
license info in them, couple of quick examples are: btDefaultMotionState.h
btHashMap.h btQuickprof.cpp
could you take a look at add where needed? If you want I can give a list
of files I think should get it added and or just add the standard one
say the one in src/btBulletCollisionCommon.h
Kent
Modified Paths:
--------------
trunk/blender/extern/bullet2/src/Bullet-C-Api.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/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/btScaledBvhTriangleMeshShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/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/Gimpact/btBoxCollision.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btClipPolygon.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.cpp
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactMassUtil.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGeometryOperations.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btQuantization.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.cpp
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_array.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_bitset.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_box_collision.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.cpp
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_clip_polygon.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.cpp
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_geom_types.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_geometry.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_hash_table.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_linear_math.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_math.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.cpp
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_radixsort.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.cpp
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/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/Bullet-C-API.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBody.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
trunk/blender/extern/bullet2/src/LinearMath/btConvexHull.cpp
trunk/blender/extern/bullet2/src/LinearMath/btConvexHull.h
trunk/blender/extern/bullet2/src/LinearMath/btHashMap.h
trunk/blender/extern/bullet2/src/LinearMath/btPoolAllocator.h
trunk/blender/extern/bullet2/src/LinearMath/btScalar.h
Modified: trunk/blender/extern/bullet2/src/Bullet-C-Api.h
===================================================================
--- trunk/blender/extern/bullet2/src/Bullet-C-Api.h 2008-10-02 12:29:45 UTC
(rev 16882)
+++ trunk/blender/extern/bullet2/src/Bullet-C-Api.h 2008-10-02 16:52:39 UTC
(rev 16883)
@@ -1,175 +1,175 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the
use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim
that you wrote the original software. If you use this software in a product, an
acknowledgment in the product documentation would be appreciated but is not
required.
-2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-/*
- Draft high-level generic physics C-API. For low-level access, use the
physics SDK native API's.
- Work in progress, functionality will be added on demand.
-
- If possible, use the richer Bullet C++ API, by including
"btBulletDynamicsCommon.h"
-*/
-
-#ifndef BULLET_C_API_H
-#define BULLET_C_API_H
-
-#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); */
-
+/*
+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);
+
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
