[Bf-blender-cvs] CVS commit: blender/extern/bullet/Bullet/CollisionDispatch CollisionWorld.cpp CollisionWorld.h ConvexConcaveCollisionAlgorithm.cpp blender/extern/bullet/Bullet/NarrowPhaseCollision RaycastCallback.cpp RaycastCallback.h blender/extern/bullet/Demos/CcdPhysicsDemo CcdPhysicsDemo.cpp blender/extern/bullet/Demos/OpenGL BMF_Api.cpp BMF_Api.h ...

[Erwin Coumans]

erwin (Erwin Coumans) 2006/05/11 19:58:23 CEST

  Modified files:
    blender/extern/bullet/Bullet/CollisionDispatch 
                                                   CollisionWorld.cpp 
                                                   CollisionWorld.h 
                                                   ConvexConcaveCollisionAlgorithm.cpp 
    blender/extern/bullet/Bullet/NarrowPhaseCollision 
                                                      RaycastCallback.cpp 
                                                      RaycastCallback.h 
    blender/extern/bullet/Demos/CcdPhysicsDemo CcdPhysicsDemo.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 
                                                             CcdPhysicsController.cpp 
                                                             CcdPhysicsEnvironment.cpp 
    blender/source/blender/src usiblender.c 
    blender/source/gameengine/Converter BL_ArmatureObject.h 
                                        KX_BlenderSceneConverter.cpp 
    blender/source/gameengine/GameLogic SCA_IObject.h 
    blender/source/gameengine/Ketsji KX_Scene.cpp 
    blender/source/gameengine/Physics/Bullet 
                                             CcdPhysicsEnvironment.cpp 
  
  Log:
  - Charlie provided a work-around for some armature related crashes
  - fixed some Bullet raycasting (hitfraction was not properly updated for static meshes)
  - removed some cvs tags in Bullet's BMF _Font files (they keep on conflicting when duplicated in different repositories)
  - set default linearsleepingtreshold explicitly
  
  Revision  Changes    Path
  1.6       +6 -5      blender/extern/bullet/Bullet/CollisionDispatch/CollisionWorld.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/CollisionDispatch/CollisionWorld.cpp.diff?r1=1.5&r2=1.6&cvsroot=bf-blender>
  1.5       +3 -0      blender/extern/bullet/Bullet/CollisionDispatch/CollisionWorld.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/CollisionDispatch/CollisionWorld.h.diff?r1=1.4&r2=1.5&cvsroot=bf-blender>
  1.6       +3 -1      blender/extern/bullet/Bullet/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp.diff?r1=1.5&r2=1.6&cvsroot=bf-blender>
  1.8       +2 -2      blender/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.cpp.diff?r1=1.7&r2=1.8&cvsroot=bf-blender>
  1.7       +1 -1      blender/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.h.diff?r1=1.6&r2=1.7&cvsroot=bf-blender>
  1.16      +3 -1      blender/extern/bullet/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp.diff?r1=1.15&r2=1.16&cvsroot=bf-blender>
  1.10      +0 -2      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.9&r2=1.10&cvsroot=bf-blender>
  1.9       +0 -2      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.8&r2=1.9&cvsroot=bf-blender>
  1.10      +0 -2      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.9&r2=1.10&cvsroot=bf-blender>
  1.9       +0 -2      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.8&r2=1.9&cvsroot=bf-blender>
  1.9       +0 -2      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.8&r2=1.9&cvsroot=bf-blender>
  1.9       +0 -2      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.8&r2=1.9&cvsroot=bf-blender>
  1.9       +1 -3      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.8&r2=1.9&cvsroot=bf-blender>
  1.10      +0 -1      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.9&r2=1.10&cvsroot=bf-blender>
  1.8       +8 -1      blender/extern/bullet/Demos/OpenGL/GlutStuff.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Demos/OpenGL/GlutStuff.cpp.diff?r1=1.7&r2=1.8&cvsroot=bf-blender>
  1.19      +1 -1      blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp.diff?r1=1.18&r2=1.19&cvsroot=bf-blender>
  1.27      +3 -1      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.26&r2=1.27&cvsroot=bf-blender>
  1.107     +2 -1      blender/source/blender/src/usiblender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/usiblender.c.diff?r1=1.106&r2=1.107&cvsroot=bf-blender>
  1.8       +2 -1      blender/source/gameengine/Converter/BL_ArmatureObject.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Converter/BL_ArmatureObject.h.diff?r1=1.7&r2=1.8&cvsroot=bf-blender>
  1.31      +4 -1      blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp.diff?r1=1.30&r2=1.31&cvsroot=bf-blender>
  1.9       +7 -1      blender/source/gameengine/GameLogic/SCA_IObject.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/GameLogic/SCA_IObject.h.diff?r1=1.8&r2=1.9&cvsroot=bf-blender>
  1.24      +78 -29    blender/source/gameengine/Ketsji/KX_Scene.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/KX_Scene.cpp.diff?r1=1.23&r2=1.24&cvsroot=bf-blender>
  1.37      +3 -1      blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp.diff?r1=1.36&r2=1.37&cvsroot=bf-blender>