[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11058] branches/particles: Merge from trunk: revisions 10953-11056
Janne Karhu
janne.karhu at utu.fi
Tue Jun 26 03:18:10 CEST 2007
Revision: 11058
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11058
Author: jhk
Date: 2007-06-26 03:17:56 +0200 (Tue, 26 Jun 2007)
Log Message:
-----------
Merge from trunk: revisions 10953-11056
Modified Paths:
--------------
branches/particles/CMakeLists.txt
branches/particles/config/darwin-config.py
branches/particles/config/linux2-config.py
branches/particles/config/linuxcross-config.py
branches/particles/config/openbsd3-config.py
branches/particles/config/sunos5-config.py
branches/particles/config/win32-mingw-config.py
branches/particles/config/win32-vc-config.py
branches/particles/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
branches/particles/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
branches/particles/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
branches/particles/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
branches/particles/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
branches/particles/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
branches/particles/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
branches/particles/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
branches/particles/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
branches/particles/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
branches/particles/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionMargin.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
branches/particles/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
branches/particles/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
branches/particles/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
branches/particles/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
branches/particles/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
branches/particles/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
branches/particles/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
branches/particles/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
branches/particles/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
branches/particles/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
branches/particles/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
branches/particles/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
branches/particles/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
branches/particles/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
branches/particles/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp
branches/particles/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
branches/particles/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
branches/particles/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
branches/particles/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
branches/particles/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
branches/particles/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
branches/particles/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
branches/particles/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
branches/particles/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
branches/particles/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
branches/particles/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
branches/particles/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
branches/particles/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
branches/particles/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.cpp
branches/particles/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
branches/particles/extern/bullet2/src/Jamfile
branches/particles/extern/bullet2/src/LinearMath/btAabbUtil2.h
branches/particles/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
branches/particles/extern/bullet2/src/LinearMath/btAlignedAllocator.h
branches/particles/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
branches/particles/extern/bullet2/src/LinearMath/btDefaultMotionState.h
branches/particles/extern/bullet2/src/LinearMath/btGeometryUtil.cpp
branches/particles/extern/bullet2/src/LinearMath/btGeometryUtil.h
branches/particles/extern/bullet2/src/LinearMath/btIDebugDraw.h
branches/particles/extern/bullet2/src/LinearMath/btMatrix3x3.h
branches/particles/extern/bullet2/src/LinearMath/btMotionState.h
branches/particles/extern/bullet2/src/LinearMath/btPoint3.h
branches/particles/extern/bullet2/src/LinearMath/btQuadWord.h
branches/particles/extern/bullet2/src/LinearMath/btQuaternion.h
branches/particles/extern/bullet2/src/LinearMath/btQuickprof.cpp
branches/particles/extern/bullet2/src/LinearMath/btQuickprof.h
branches/particles/extern/bullet2/src/LinearMath/btScalar.h
branches/particles/extern/bullet2/src/LinearMath/btSimdMinMax.h
branches/particles/extern/bullet2/src/LinearMath/btTransform.h
branches/particles/extern/bullet2/src/LinearMath/btTransformUtil.h
branches/particles/extern/bullet2/src/LinearMath/btVector3.h
branches/particles/extern/bullet2/src/btBulletCollisionCommon.h
branches/particles/extern/verse/Makefile
branches/particles/intern/boolop/intern/BOP_Face2Face.cpp
branches/particles/projectfiles_vc7/blender/src/BL_src.vcproj
branches/particles/release/scripts/vrml97_export.py
branches/particles/source/Makefile
branches/particles/source/blender/SConscript
branches/particles/source/blender/blenkernel/SConscript
branches/particles/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/particles/source/blender/blenkernel/intern/Makefile
branches/particles/source/blender/blenkernel/intern/constraint.c
branches/particles/source/blender/blenkernel/intern/depsgraph.c
branches/particles/source/blender/blenkernel/intern/idprop.c
branches/particles/source/blender/blenkernel/intern/image.c
branches/particles/source/blender/blenkernel/intern/ipo.c
branches/particles/source/blender/blenkernel/intern/modifier.c
branches/particles/source/blender/blenloader/intern/readfile.c
branches/particles/source/blender/blenloader/intern/writefile.c
branches/particles/source/blender/imbuf/IMB_imbuf_types.h
branches/particles/source/blender/imbuf/SConscript
branches/particles/source/blender/imbuf/intern/Makefile
branches/particles/source/blender/imbuf/intern/readimage.c
branches/particles/source/blender/imbuf/intern/util.c
branches/particles/source/blender/imbuf/intern/writeimage.c
branches/particles/source/blender/include/BDR_drawaction.h
branches/particles/source/blender/include/BDR_sculptmode.h
branches/particles/source/blender/include/BIF_editconstraint.h
branches/particles/source/blender/include/BIF_editseq.h
branches/particles/source/blender/include/transform.h
branches/particles/source/blender/makesdna/DNA_constraint_types.h
branches/particles/source/blender/makesdna/DNA_ipo_types.h
branches/particles/source/blender/makesdna/DNA_scene_types.h
branches/particles/source/blender/python/BPY_extern.h
branches/particles/source/blender/python/BPY_interface.c
branches/particles/source/blender/python/api2_2x/Constraint.c
branches/particles/source/blender/python/api2_2x/Draw.c
branches/particles/source/blender/python/api2_2x/Material.c
branches/particles/source/blender/python/api2_2x/Object.c
branches/particles/source/blender/python/api2_2x/Texture.c
branches/particles/source/blender/python/api2_2x/doc/Constraint.py
branches/particles/source/blender/src/Makefile
branches/particles/source/blender/src/SConscript
branches/particles/source/blender/src/buttons_object.c
branches/particles/source/blender/src/buttons_scene.c
branches/particles/source/blender/src/drawaction.c
branches/particles/source/blender/src/drawnla.c
branches/particles/source/blender/src/drawobject.c
branches/particles/source/blender/src/drawview.c
branches/particles/source/blender/src/edit.c
branches/particles/source/blender/src/editaction.c
branches/particles/source/blender/src/editconstraint.c
branches/particles/source/blender/src/editnla.c
branches/particles/source/blender/src/editobject.c
branches/particles/source/blender/src/editseq.c
branches/particles/source/blender/src/editsima.c
branches/particles/source/blender/src/filesel.c
branches/particles/source/blender/src/header_ipo.c
branches/particles/source/blender/src/header_seq.c
branches/particles/source/blender/src/header_text.c
branches/particles/source/blender/src/header_view3d.c
branches/particles/source/blender/src/sculptmode.c
branches/particles/source/blender/src/space.c
branches/particles/source/blender/src/toolbox.c
branches/particles/source/blender/src/transform_conversions.c
branches/particles/source/blender/src/writeimage.c
branches/particles/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/particles/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/particles/source/gameengine/Ketsji/KX_GameObject.h
branches/particles/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/particles/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/particles/source/gameengine/SceneGraph/SG_Node.h
branches/particles/source/nan_definitions.mk
branches/particles/tools/btools.py
Added Paths:
-----------
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
branches/particles/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
branches/particles/source/blender/imbuf/intern/dds/
Modified: branches/particles/CMakeLists.txt
===================================================================
--- branches/particles/CMakeLists.txt 2007-06-26 01:04:03 UTC (rev 11057)
+++ branches/particles/CMakeLists.txt 2007-06-26 01:17:56 UTC (rev 11058)
@@ -144,6 +144,7 @@
/opt/local/include/freetype2
/opt/csw/include/freetype2
/opt/include/freetype2
+ NO_DEFAULT_PATH
)
SET(FREETYPE_LIB freetype)
Modified: branches/particles/config/darwin-config.py
===================================================================
--- branches/particles/config/darwin-config.py 2007-06-26 01:04:03 UTC (rev 11057)
+++ branches/particles/config/darwin-config.py 2007-06-26 01:17:56 UTC (rev 11058)
@@ -52,6 +52,7 @@
BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread'
+WITH_BF_DDS = 'true'
WITH_BF_JPEG = 'true'
BF_JPEG = LIBDIR + '/jpeg'
Modified: branches/particles/config/linux2-config.py
===================================================================
--- branches/particles/config/linux2-config.py 2007-06-26 01:04:03 UTC (rev 11057)
+++ branches/particles/config/linux2-config.py 2007-06-26 01:17:56 UTC (rev 11058)
@@ -32,6 +32,8 @@
BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+WITH_BF_DDS = 'true'
+
WITH_BF_JPEG = 'true'
BF_JPEG = '/usr'
BF_JPEG_INC = '${BF_JPEG}/include'
Modified: branches/particles/config/linuxcross-config.py
===================================================================
--- branches/particles/config/linuxcross-config.py 2007-06-26 01:04:03 UTC (rev 11057)
+++ branches/particles/config/linuxcross-config.py 2007-06-26 01:17:56 UTC (rev 11058)
@@ -39,6 +39,8 @@
BF_OPENEXR_LIB = ' Half IlmImf Iex '
BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+WITH_BF_DDS = 'true'
+
WITH_BF_JPEG = 'true'
BF_JPEG = LIBDIR + '/jpeg'
BF_JPEG_INC = '${BF_JPEG}/include'
Modified: branches/particles/config/openbsd3-config.py
===================================================================
--- branches/particles/config/openbsd3-config.py 2007-06-26 01:04:03 UTC (rev 11057)
+++ branches/particles/config/openbsd3-config.py 2007-06-26 01:17:56 UTC (rev 11058)
@@ -28,6 +28,8 @@
BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+WITH_BF_DDS = 'true'
+
WITH_BF_JPEG = 'true'
BF_JPEG = '/usr/local'
BF_JPEG_INC = '${BF_JPEG}/include'
Modified: branches/particles/config/sunos5-config.py
===================================================================
--- branches/particles/config/sunos5-config.py 2007-06-26 01:04:03 UTC (rev 11057)
+++ branches/particles/config/sunos5-config.py 2007-06-26 01:17:56 UTC (rev 11058)
@@ -29,6 +29,8 @@
BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+WITH_BF_DDS = 'true'
+
WITH_BF_JPEG = 'true'
BF_JPEG = '/usr/local'
BF_JPEG_INC = '${BF_JPEG}/include'
Modified: branches/particles/config/win32-mingw-config.py
===================================================================
--- branches/particles/config/win32-mingw-config.py 2007-06-26 01:04:03 UTC (rev 11057)
+++ branches/particles/config/win32-mingw-config.py 2007-06-26 01:17:56 UTC (rev 11058)
@@ -42,6 +42,8 @@
BF_OPENEXR_LIB = ' Half IlmImf Iex '
BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+WITH_BF_DDS = 'true'
+
WITH_BF_JPEG = 'true'
BF_JPEG = LIBDIR + '/jpeg'
BF_JPEG_INC = '${BF_JPEG}/include'
Modified: branches/particles/config/win32-vc-config.py
===================================================================
--- branches/particles/config/win32-vc-config.py 2007-06-26 01:04:03 UTC (rev 11057)
+++ branches/particles/config/win32-vc-config.py 2007-06-26 01:17:56 UTC (rev 11058)
@@ -50,6 +50,8 @@
BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread '
BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib_msvc'
+WITH_BF_DDS = 'true'
+
WITH_BF_JPEG = 'true'
BF_JPEG = LIBDIR + '/jpeg'
BF_JPEG_INC = '${BF_JPEG}/include'
Modified: branches/particles/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
===================================================================
--- branches/particles/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj 2007-06-26 01:04:03 UTC (rev 11057)
+++ branches/particles/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj 2007-06-26 01:17:56 UTC (rev 11058)
@@ -681,6 +681,12 @@
RelativePath="..\..\src\BulletCollision\CollisionShapes\btBvhTriangleMeshShape.h">
</File>
<File
+ RelativePath="..\..\src\BulletCollision\CollisionShapes\btCapsuleShape.cpp">
+ </File>
+ <File
+ RelativePath="..\..\src\BulletCollision\CollisionShapes\btCapsuleShape.h">
+ </File>
+ <File
RelativePath="..\..\src\BulletCollision\CollisionShapes\btCollisionMargin.h">
</File>
<File
Modified: branches/particles/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
===================================================================
--- branches/particles/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp 2007-06-26 01:04:03 UTC (rev 11057)
+++ branches/particles/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp 2007-06-26 01:17:56 UTC (rev 11058)
@@ -21,9 +21,34 @@
#include <assert.h>
+#ifdef DEBUG_BROADPHASE
+#include <stdio.h>
+void btAxisSweep3::debugPrintAxis(int axis, bool checkCardinality)
+{
+ 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
+
+
btBroadphaseProxy* btAxisSweep3::createProxy( const btVector3& min, const btVector3& max,int shapeType,void* userPtr,short int collisionFilterGroup,short int collisionFilterMask)
{
- unsigned short handleId = addHandle(min,max, userPtr,collisionFilterGroup,collisionFilterMask);
+ (void)shapeType;
+ BP_FP_INT_TYPE handleId = addHandle(min,max, userPtr,collisionFilterGroup,collisionFilterMask);
Handle* handle = getHandle(handleId);
@@ -40,6 +65,7 @@
{
Handle* handle = static_cast<Handle*>(proxy);
updateHandle(handle->m_handleId,aabbMin,aabbMax);
+
}
@@ -50,10 +76,11 @@
btAxisSweep3::btAxisSweep3(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, int maxHandles)
:btOverlappingPairCache()
{
+ m_invalidPair = 0;
//assert(bounds.HasVolume());
// 1 handle is reserved as sentinel
- assert(maxHandles > 1 && maxHandles < 32767);
+ btAssert(maxHandles > 1 && maxHandles < BP_MAX_HANDLES);
// init bounds
m_worldAabbMin = worldAabbMin;
@@ -61,8 +88,10 @@
btVector3 aabbSize = m_worldAabbMax - m_worldAabbMin;
- m_quantize = btVector3(65535.0f,65535.0f,65535.0f) / aabbSize;
+ BP_FP_INT_TYPE maxInt = BP_HANDLE_SENTINEL;
+ m_quantize = btVector3(btScalar(maxInt),btScalar(maxInt),btScalar(maxInt)) / aabbSize;
+
// allocate handles buffer and put all handles on free list
m_pHandles = new Handle[maxHandles];
m_maxHandles = maxHandles;
@@ -71,7 +100,7 @@
// handle 0 is reserved as the null index, and is also used as the sentinel
m_firstFreeHandle = 1;
{
- for (int i = m_firstFreeHandle; i < maxHandles; i++)
+ for (BP_FP_INT_TYPE i = m_firstFreeHandle; i < maxHandles; i++)
m_pHandles[i].SetNextFree(i + 1);
m_pHandles[maxHandles - 1].SetNextFree(0);
}
@@ -94,9 +123,14 @@
m_pEdges[axis][0].m_pos = 0;
m_pEdges[axis][0].m_handle = 0;
- m_pEdges[axis][1].m_pos = 0xffff;
+ m_pEdges[axis][1].m_pos = BP_HANDLE_SENTINEL;
m_pEdges[axis][1].m_handle = 0;
+#ifdef DEBUG_BROADPHASE
+ debugPrintAxis(axis);
+#endif //DEBUG_BROADPHASE
+
}
+
}
btAxisSweep3::~btAxisSweep3()
@@ -107,43 +141,36 @@
delete[] m_pHandles;
}
-void btAxisSweep3::quantize(unsigned short* out, const btPoint3& point, int isMax) const
+void btAxisSweep3::quantize(BP_FP_INT_TYPE* out, const btPoint3& point, int isMax) const
{
btPoint3 clampedPoint(point);
- /*
- if (isMax)
- clampedPoint += btVector3(10,10,10);
- else
- {
- clampedPoint -= btVector3(10,10,10);
- }
- */
+
clampedPoint.setMax(m_worldAabbMin);
clampedPoint.setMin(m_worldAabbMax);
btVector3 v = (clampedPoint - m_worldAabbMin) * m_quantize;
- out[0] = (unsigned short)(((int)v.getX() & 0xfffc) | isMax);
- out[1] = (unsigned short)(((int)v.getY() & 0xfffc) | isMax);
- out[2] = (unsigned short)(((int)v.getZ() & 0xfffc) | isMax);
+ out[0] = (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v.getX() & BP_HANDLE_MASK) | isMax);
+ out[1] = (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v.getY() & BP_HANDLE_MASK) | isMax);
+ out[2] = (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v.getZ() & BP_HANDLE_MASK) | isMax);
}
-unsigned short btAxisSweep3::allocHandle()
+BP_FP_INT_TYPE btAxisSweep3::allocHandle()
{
assert(m_firstFreeHandle);
- unsigned short handle = m_firstFreeHandle;
+ BP_FP_INT_TYPE handle = m_firstFreeHandle;
m_firstFreeHandle = getHandle(handle)->GetNextFree();
m_numHandles++;
return handle;
}
-void btAxisSweep3::freeHandle(unsigned short handle)
+void btAxisSweep3::freeHandle(BP_FP_INT_TYPE handle)
{
assert(handle > 0 && handle < m_maxHandles);
@@ -155,15 +182,15 @@
-unsigned short btAxisSweep3::addHandle(const btPoint3& aabbMin,const btPoint3& aabbMax, void* pOwner,short int collisionFilterGroup,short int collisionFilterMask)
+BP_FP_INT_TYPE btAxisSweep3::addHandle(const btPoint3& aabbMin,const btPoint3& aabbMax, void* pOwner,short int collisionFilterGroup,short int collisionFilterMask)
{
// quantize the bounds
- unsigned short min[3], max[3];
+ BP_FP_INT_TYPE min[3], max[3];
quantize(min, aabbMin, 0);
quantize(max, aabbMax, 1);
// allocate a handle
- unsigned short handle = allocHandle();
+ BP_FP_INT_TYPE handle = allocHandle();
assert(handle!= 0xcdcd);
Handle* pHandle = getHandle(handle);
@@ -175,11 +202,13 @@
pHandle->m_collisionFilterMask = collisionFilterMask;
// compute current limit of edge arrays
- int limit = m_numHandles * 2;
+ BP_FP_INT_TYPE limit = m_numHandles * 2;
+
// insert new edges just inside the max boundary edge
- for (int axis = 0; axis < 3; axis++)
+ for (BP_FP_INT_TYPE axis = 0; axis < 3; axis++)
{
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list