[Bf-blender-cvs] CVS commit: blender/extern/bullet/BulletDynamics/ConstraintSolver SimpleConstraintSolver.cpp blender/extern/bullet/Bullet/BroadphaseCollision AxisSweep3.cpp Dispatcher.h blender/extern/bullet/Bullet/CollisionDispatch ConvexConvexAlgorithm.cpp blender/extern/bullet/Bullet/CollisionShapes BoxShape.h ConeShape.cpp ConeShape.h ConvexHullShape.cpp ConvexHullShape.h ...

Thu Apr 13 07:11:34 CEST 2006

erwin (Erwin Coumans) 2006/04/13 07:11:34 CEST

  Modified files:
    blender/extern/bullet/BulletDynamics/ConstraintSolver 
                                                          SimpleConstraintSolver.cpp 
    blender/extern/bullet/Bullet/BroadphaseCollision 
                                                     AxisSweep3.cpp 
                                                     Dispatcher.h 
    blender/extern/bullet/Bullet/CollisionDispatch 
                                                   ConvexConvexAlgorithm.cpp 
    blender/extern/bullet/Bullet/CollisionShapes BoxShape.h 
                                                 ConeShape.cpp 
                                                 ConeShape.h 
                                                 ConvexHullShape.cpp 
                                                 ConvexHullShape.h 
                                                 ConvexShape.h 
                                                 MinkowskiSumShape.cpp 
                                                 MinkowskiSumShape.h 
                                                 MultiSphereShape.cpp 
                                                 MultiSphereShape.h 
                                                 PolyhedralConvexShape.cpp 
                                                 PolyhedralConvexShape.h 
                                                 SphereShape.cpp 
                                                 SphereShape.h 
                                                 TriangleShape.h 
    blender/extern/bullet/Bullet Doxyfile 
    blender/extern/bullet/Bullet/NarrowPhaseCollision 
                                                      MinkowskiPenetrationDepthSolver.cpp 
    blender/extern/bullet/Demos/CcdPhysicsDemo CcdPhysicsDemo.cpp 
    blender/extern/bullet/Demos/CollisionInterfaceDemo 
                                                       CollisionInterfaceDemo.cpp 
    blender/extern/bullet/Demos/OpenGL BMF_Api.cpp BMF_Api.h 
                                       BMF_BitmapFont.cpp 
                                       BMF_BitmapFont.h 
                                       BMF_FontData.h BMF_Fonts.h 
                                       BMF_Settings.h 
                                       BMF_font_helv10.cpp 
                                       GlutStuff.cpp 
    blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics 
                                                             CcdPhysicsEnvironment.cpp 
                                                             CcdPhysicsEnvironment.h 
    blender/extern/bullet/LinearMath IDebugDraw.h SimdVector3.h 
    blender/source/gameengine/Converter 
                                        BL_BlenderDataConversion.cpp 
    blender/source/gameengine/Ketsji BL_Shader.cpp 
                                     KX_ConvertPhysicsObjects.cpp 
    blender/source/gameengine/Physics/Bullet 
                                             CcdPhysicsEnvironment.cpp 
                                             CcdPhysicsEnvironment.h 
    blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
                                                              RAS_ListRasterizer.cpp 

  Log:
  a lot of work in a few small changes to improve penetration depth. and some fixes in shaders from Charlie.

  Revision  Changes    Path
  1.10      +17 -4     blender/extern/bullet/BulletDynamics/ConstraintSolver/SimpleConstraintSolver.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/BulletDynamics/ConstraintSolver/SimpleConstraintSolver.cpp.diff?r1=1.9&r2=1.10&cvsroot=bf-blender>
  1.3       +7 -4      blender/extern/bullet/Bullet/BroadphaseCollision/AxisSweep3.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/BroadphaseCollision/AxisSweep3.cpp.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.4       +3 -1      blender/extern/bullet/Bullet/BroadphaseCollision/Dispatcher.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/BroadphaseCollision/Dispatcher.h.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
  1.5       +133 -6    blender/extern/bullet/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp.diff?r1=1.4&r2=1.5&cvsroot=bf-blender>
  1.8       +18 -2     blender/extern/bullet/Bullet/CollisionShapes/BoxShape.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/CollisionShapes/BoxShape.h.diff?r1=1.7&r2=1.8&cvsroot=bf-blender>
  1.4       +10 -0     blender/extern/bullet/Bullet/CollisionShapes/ConeShape.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/CollisionShapes/ConeShape.cpp.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
  1.5       +1 -0      blender/extern/bullet/Bullet/CollisionShapes/ConeShape.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/CollisionShapes/ConeShape.h.diff?r1=1.4&r2=1.5&cvsroot=bf-blender>
  1.6       +33 -0     blender/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.cpp.diff?r1=1.5&r2=1.6&cvsroot=bf-blender>
  1.6       +2 -1      blender/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.h.diff?r1=1.5&r2=1.6&cvsroot=bf-blender>
  1.6       +3 -0      blender/extern/bullet/Bullet/CollisionShapes/ConvexShape.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/CollisionShapes/ConvexShape.h.diff?r1=1.5&r2=1.6&cvsroot=bf-blender>
  1.4       +12 -0     blender/extern/bullet/Bullet/CollisionShapes/MinkowskiSumShape.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/CollisionShapes/MinkowskiSumShape.cpp.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
  1.4       +3 -0      blender/extern/bullet/Bullet/CollisionShapes/MinkowskiSumShape.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/CollisionShapes/MinkowskiSumShape.h.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
  1.5       +28 -0     blender/extern/bullet/Bullet/CollisionShapes/MultiSphereShape.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/CollisionShapes/MultiSphereShape.cpp.diff?r1=1.4&r2=1.5&cvsroot=bf-blender>
  1.4       +2 -0      blender/extern/bullet/Bullet/CollisionShapes/MultiSphereShape.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/CollisionShapes/MultiSphereShape.h.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
  1.5       +32 -1     blender/extern/bullet/Bullet/CollisionShapes/PolyhedralConvexShape.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/CollisionShapes/PolyhedralConvexShape.cpp.diff?r1=1.4&r2=1.5&cvsroot=bf-blender>
  1.5       +6 -2      blender/extern/bullet/Bullet/CollisionShapes/PolyhedralConvexShape.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/CollisionShapes/PolyhedralConvexShape.h.diff?r1=1.4&r2=1.5&cvsroot=bf-blender>
  1.8       +9 -0      blender/extern/bullet/Bullet/CollisionShapes/SphereShape.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/CollisionShapes/SphereShape.cpp.diff?r1=1.7&r2=1.8&cvsroot=bf-blender>
  1.6       +2 -0      blender/extern/bullet/Bullet/CollisionShapes/SphereShape.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/CollisionShapes/SphereShape.h.diff?r1=1.5&r2=1.6&cvsroot=bf-blender>
  1.5       +12 -0     blender/extern/bullet/Bullet/CollisionShapes/TriangleShape.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/CollisionShapes/TriangleShape.h.diff?r1=1.4&r2=1.5&cvsroot=bf-blender>
  1.2       +1 -1      blender/extern/bullet/Bullet/Doxyfile
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/Doxyfile.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.8       +48 -9     blender/extern/bullet/Bullet/NarrowPhaseCollision/MinkowskiPenetrationDepthSolver.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/NarrowPhaseCollision/MinkowskiPenetrationDepthSolver.cpp.diff?r1=1.7&r2=1.8&cvsroot=bf-blender>
  1.13      +123 -7    blender/extern/bullet/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp.diff?r1=1.12&r2=1.13&cvsroot=bf-blender>
  1.3       +13 -6     blender/extern/bullet/Demos/CollisionInterfaceDemo/CollisionInterfaceDemo.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Demos/CollisionInterfaceDemo/CollisionInterfaceDemo.cpp.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.7       +0 -0      blender/extern/bullet/Demos/OpenGL/BMF_Api.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Demos/OpenGL/BMF_Api.cpp.diff?r1=1.6&r2=1.7&cvsroot=bf-blender>
  1.6       +0 -0      blender/extern/bullet/Demos/OpenGL/BMF_Api.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Demos/OpenGL/BMF_Api.h.diff?r1=1.5&r2=1.6&cvsroot=bf-blender>
  1.7       +0 -0      blender/extern/bullet/Demos/OpenGL/BMF_BitmapFont.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Demos/OpenGL/BMF_BitmapFont.cpp.diff?r1=1.6&r2=1.7&cvsroot=bf-blender>
  1.6       +0 -0      blender/extern/bullet/Demos/OpenGL/BMF_BitmapFont.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Demos/OpenGL/BMF_BitmapFont.h.diff?r1=1.5&r2=1.6&cvsroot=bf-blender>
  1.6       +0 -0      blender/extern/bullet/Demos/OpenGL/BMF_FontData.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Demos/OpenGL/BMF_FontData.h.diff?r1=1.5&r2=1.6&cvsroot=bf-blender>
  1.6       +0 -0      blender/extern/bullet/Demos/OpenGL/BMF_Fonts.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Demos/OpenGL/BMF_Fonts.h.diff?r1=1.5&r2=1.6&cvsroot=bf-blender>
  1.6       +0 -0      blender/extern/bullet/Demos/OpenGL/BMF_Settings.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Demos/OpenGL/BMF_Settings.h.diff?r1=1.5&r2=1.6&cvsroot=bf-blender>
  1.7       +0 -0      blender/extern/bullet/Demos/OpenGL/BMF_font_helv10.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Demos/OpenGL/BMF_font_helv10.cpp.diff?r1=1.6&r2=1.7&cvsroot=bf-blender>
  1.6       +21 -0     blender/extern/bullet/Demos/OpenGL/GlutStuff.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Demos/OpenGL/GlutStuff.cpp.diff?r1=1.5&r2=1.6&cvsroot=bf-blender>
  1.17      +63 -5     blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp.diff?r1=1.16&r2=1.17&cvsroot=bf-blender>
  1.11      +13 -1     blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.h.diff?r1=1.10&r2=1.11&cvsroot=bf-blender>
  1.7       +3 -0      blender/extern/bullet/LinearMath/IDebugDraw.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/LinearMath/IDebugDraw.h.diff?r1=1.6&r2=1.7&cvsroot=bf-blender>
  1.5       +1 -1      blender/extern/bullet/LinearMath/SimdVector3.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/LinearMath/SimdVector3.h.diff?r1=1.4&r2=1.5&cvsroot=bf-blender>
  1.40      +37 -12    blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp.diff?r1=1.39&r2=1.40&cvsroot=bf-blender>
  1.16      +3 -0      blender/source/gameengine/Ketsji/BL_Shader.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/BL_Shader.cpp.diff?r1=1.15&r2=1.16&cvsroot=bf-blender>
  1.35      +38 -1     blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp.diff?r1=1.34&r2=1.35&cvsroot=bf-blender>
  1.27      +86 -9     blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp.diff?r1=1.26&r2=1.27&cvsroot=bf-blender>
  1.13      +13 -1     blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h.diff?r1=1.12&r2=1.13&cvsroot=bf-blender>
  1.4       +1 -1      blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>