Revision: 16669
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16669
Author: genscher
Date: 2008-09-22 12:04:45 +0200 (Mon, 22 Sep 2008)
Log Message:
-----------
svn merge -r 16592:16667
https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/sim_physics/SConstruct
branches/sim_physics/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBody.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
branches/sim_physics/intern/SoundSystem/SConscript
branches/sim_physics/intern/SoundSystem/sdl/SND_SDLCDDevice.cpp
branches/sim_physics/intern/elbeem/CMakeLists.txt
branches/sim_physics/intern/elbeem/SConscript
branches/sim_physics/intern/elbeem/extern/elbeem.h
branches/sim_physics/intern/elbeem/intern/elbeem.cpp
branches/sim_physics/intern/elbeem/intern/isosurface.cpp
branches/sim_physics/intern/elbeem/intern/ntl_geometryclass.h
branches/sim_physics/intern/elbeem/intern/ntl_geometryobject.cpp
branches/sim_physics/intern/elbeem/intern/ntl_geometryobject.h
branches/sim_physics/intern/elbeem/intern/ntl_ray.cpp
branches/sim_physics/intern/elbeem/intern/ntl_ray.h
branches/sim_physics/intern/elbeem/intern/ntl_world.cpp
branches/sim_physics/intern/elbeem/intern/simulation_object.cpp
branches/sim_physics/intern/elbeem/intern/solver_adap.cpp
branches/sim_physics/intern/elbeem/intern/solver_class.h
branches/sim_physics/intern/elbeem/intern/solver_init.cpp
branches/sim_physics/intern/elbeem/intern/solver_main.cpp
branches/sim_physics/intern/elbeem/intern/solver_relax.h
branches/sim_physics/intern/elbeem/make/msvc_7_0/elbeem.vcproj
branches/sim_physics/po/fr.po
branches/sim_physics/po/kr.po
branches/sim_physics/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/sim_physics/release/datafiles/preview.blend
branches/sim_physics/release/plugins/sequence/dnr.c
branches/sim_physics/release/scripts/animation_bake_constraints.py
branches/sim_physics/release/scripts/bpymodules/colladaImEx/collada.py
branches/sim_physics/release/scripts/bpymodules/colladaImEx/translator.py
branches/sim_physics/release/scripts/console.py
branches/sim_physics/source/blender/blenkernel/BKE_DerivedMesh.h
branches/sim_physics/source/blender/blenkernel/BKE_bad_level_calls.h
branches/sim_physics/source/blender/blenkernel/BKE_blender.h
branches/sim_physics/source/blender/blenkernel/BKE_property.h
branches/sim_physics/source/blender/blenkernel/BKE_utildefines.h
branches/sim_physics/source/blender/blenkernel/SConscript
branches/sim_physics/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/sim_physics/source/blender/blenkernel/intern/DerivedMesh.c
branches/sim_physics/source/blender/blenkernel/intern/action.c
branches/sim_physics/source/blender/blenkernel/intern/brush.c
branches/sim_physics/source/blender/blenkernel/intern/cdderivedmesh.c
branches/sim_physics/source/blender/blenkernel/intern/colortools.c
branches/sim_physics/source/blender/blenkernel/intern/constraint.c
branches/sim_physics/source/blender/blenkernel/intern/curve.c
branches/sim_physics/source/blender/blenkernel/intern/depsgraph.c
branches/sim_physics/source/blender/blenkernel/intern/displist.c
branches/sim_physics/source/blender/blenkernel/intern/ipo.c
branches/sim_physics/source/blender/blenkernel/intern/modifier.c
branches/sim_physics/source/blender/blenkernel/intern/object.c
branches/sim_physics/source/blender/blenkernel/intern/particle_system.c
branches/sim_physics/source/blender/blenkernel/intern/property.c
branches/sim_physics/source/blender/blenkernel/intern/scene.c
branches/sim_physics/source/blender/blenlib/BLI_arithb.h
branches/sim_physics/source/blender/blenlib/BLI_blenlib.h
branches/sim_physics/source/blender/blenlib/intern/arithb.c
branches/sim_physics/source/blender/blenlib/intern/dynlib.c
branches/sim_physics/source/blender/blenlib/intern/edgehash.c
branches/sim_physics/source/blender/blenlib/intern/freetypefont.c
branches/sim_physics/source/blender/blenlib/intern/util.c
branches/sim_physics/source/blender/blenloader/intern/readfile.c
branches/sim_physics/source/blender/blenloader/intern/writefile.c
branches/sim_physics/source/blender/gpu/GPU_extensions.h
branches/sim_physics/source/blender/gpu/intern/gpu_codegen.c
branches/sim_physics/source/blender/gpu/intern/gpu_extensions.c
branches/sim_physics/source/blender/imbuf/intern/divers.c
branches/sim_physics/source/blender/imbuf/intern/rectop.c
branches/sim_physics/source/blender/include/BIF_editseq.h
branches/sim_physics/source/blender/include/BIF_outliner.h
branches/sim_physics/source/blender/include/blendef.h
branches/sim_physics/source/blender/include/butspace.h
branches/sim_physics/source/blender/makesdna/DNA_curve_types.h
branches/sim_physics/source/blender/makesdna/DNA_ipo_types.h
branches/sim_physics/source/blender/makesdna/DNA_lamp_types.h
branches/sim_physics/source/blender/makesdna/DNA_material_types.h
branches/sim_physics/source/blender/makesdna/DNA_modifier_types.h
branches/sim_physics/source/blender/makesdna/DNA_object_fluidsim.h
branches/sim_physics/source/blender/makesdna/DNA_scene_types.h
branches/sim_physics/source/blender/makesdna/DNA_space_types.h
branches/sim_physics/source/blender/makesdna/DNA_userdef_types.h
branches/sim_physics/source/blender/python/BPY_extern.h
branches/sim_physics/source/blender/python/BPY_interface.c
branches/sim_physics/source/blender/python/api2_2x/Camera.c
branches/sim_physics/source/blender/python/api2_2x/Ipocurve.h
branches/sim_physics/source/blender/python/api2_2x/Lamp.c
branches/sim_physics/source/blender/python/api2_2x/Material.c
branches/sim_physics/source/blender/python/api2_2x/Object.c
branches/sim_physics/source/blender/python/api2_2x/Pose.c
branches/sim_physics/source/blender/python/api2_2x/Scene.c
branches/sim_physics/source/blender/python/api2_2x/Text.c
branches/sim_physics/source/blender/python/api2_2x/World.c
branches/sim_physics/source/blender/python/api2_2x/doc/API_intro.py
branches/sim_physics/source/blender/python/api2_2x/doc/API_related.py
branches/sim_physics/source/blender/python/api2_2x/doc/Blender.py
branches/sim_physics/source/blender/python/api2_2x/doc/Object.py
branches/sim_physics/source/blender/python/api2_2x/sceneRender.c
branches/sim_physics/source/blender/render/extern/include/RE_pipeline.h
branches/sim_physics/source/blender/render/intern/include/render_types.h
branches/sim_physics/source/blender/render/intern/include/sunsky.h
branches/sim_physics/source/blender/render/intern/include/texture.h
branches/sim_physics/source/blender/render/intern/source/convertblender.c
branches/sim_physics/source/blender/render/intern/source/pipeline.c
branches/sim_physics/source/blender/render/intern/source/pixelshading.c
branches/sim_physics/source/blender/render/intern/source/rendercore.c
branches/sim_physics/source/blender/render/intern/source/shadeoutput.c
branches/sim_physics/source/blender/render/intern/source/sunsky.c
branches/sim_physics/source/blender/render/intern/source/texture.c
branches/sim_physics/source/blender/src/SConscript
branches/sim_physics/source/blender/src/buttons_editing.c
branches/sim_physics/source/blender/src/buttons_logic.c
branches/sim_physics/source/blender/src/buttons_object.c
branches/sim_physics/source/blender/src/buttons_scene.c
branches/sim_physics/source/blender/src/buttons_shading.c
branches/sim_physics/source/blender/src/drawaction.c
branches/sim_physics/source/blender/src/drawipo.c
branches/sim_physics/source/blender/src/drawmesh.c
branches/sim_physics/source/blender/src/drawobject.c
branches/sim_physics/source/blender/src/drawtext.c
branches/sim_physics/source/blender/src/drawview.c
branches/sim_physics/source/blender/src/editaction.c
branches/sim_physics/source/blender/src/editcurve.c
branches/sim_physics/source/blender/src/editipo.c
branches/sim_physics/source/blender/src/editipo_lib.c
branches/sim_physics/source/blender/src/editipo_mods.c
branches/sim_physics/source/blender/src/editmesh.c
branches/sim_physics/source/blender/src/editmesh_loop.c
branches/sim_physics/source/blender/src/editobject.c
branches/sim_physics/source/blender/src/editseq.c
branches/sim_physics/source/blender/src/fluidsim.c
branches/sim_physics/source/blender/src/glutil.c
branches/sim_physics/source/blender/src/gpencil.c
branches/sim_physics/source/blender/src/header_buttonswin.c
branches/sim_physics/source/blender/src/header_ipo.c
branches/sim_physics/source/blender/src/header_oops.c
branches/sim_physics/source/blender/src/header_view3d.c
branches/sim_physics/source/blender/src/outliner.c
branches/sim_physics/source/blender/src/preview.blend.c
branches/sim_physics/source/blender/src/previewrender.c
branches/sim_physics/source/blender/src/renderwin.c
branches/sim_physics/source/blender/src/retopo.c
branches/sim_physics/source/blender/src/seqaudio.c
branches/sim_physics/source/blender/src/seqscopes.c
branches/sim_physics/source/blender/src/space.c
branches/sim_physics/source/blender/src/toolbox.c
branches/sim_physics/source/blender/src/transform.c
branches/sim_physics/source/blender/src/transform_conversions.c
branches/sim_physics/source/blender/src/usiblender.c
branches/sim_physics/source/blender/src/writeimage.c
branches/sim_physics/source/blender/yafray/intern/export_File.cpp
branches/sim_physics/source/blender/yafray/intern/export_Plugin.cpp
branches/sim_physics/source/creator/creator.c
branches/sim_physics/source/gameengine/Converter/BL_ActionActuator.cpp
branches/sim_physics/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/sim_physics/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/sim_physics/source/gameengine/Expressions/PyObjectPlus.h
branches/sim_physics/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/sim_physics/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
branches/sim_physics/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
branches/sim_physics/source/gameengine/GameLogic/Joystick/SCA_JoystickPrivate.h
branches/sim_physics/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_DelaySensor.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_JoystickManager.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_PythonController.h
branches/sim_physics/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_RandomSensor.cpp
branches/sim_physics/source/gameengine/GameLogic/SConscript
branches/sim_physics/source/gameengine/GamePlayer/common/GPC_RawImage.cpp
branches/sim_physics/source/gameengine/GamePlayer/common/GPC_RawImage.h
branches/sim_physics/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/sim_physics/source/gameengine/Ketsji/BL_Shader.cpp
branches/sim_physics/source/gameengine/Ketsji/BL_Shader.h
branches/sim_physics/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/sim_physics/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/sim_physics/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_GameActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_GameObject.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_Scene.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_StateActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
branches/sim_physics/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
branches/sim_physics/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/sim_physics/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/sim_physics/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/sim_physics/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/sim_physics/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/sim_physics/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
branches/sim_physics/tools/Blender.py
branches/sim_physics/tools/btools.py
Added Paths:
-----------
branches/sim_physics/intern/elbeem/intern/controlparticles.cpp
branches/sim_physics/intern/elbeem/intern/controlparticles.h
branches/sim_physics/intern/elbeem/intern/elbeem_control.cpp
branches/sim_physics/intern/elbeem/intern/elbeem_control.h
branches/sim_physics/intern/elbeem/intern/mvmcoords.cpp
branches/sim_physics/intern/elbeem/intern/mvmcoords.h
branches/sim_physics/intern/elbeem/intern/solver_control.cpp
branches/sim_physics/intern/elbeem/intern/solver_control.h
branches/sim_physics/source/blender/blenkernel/BKE_fluidsim.h
branches/sim_physics/source/blender/blenkernel/intern/fluidsim.c
Removed Paths:
-------------
branches/sim_physics/intern/elbeem/intern/elbeem.h
Modified: branches/sim_physics/SConstruct
===================================================================
--- branches/sim_physics/SConstruct 2008-09-22 10:00:31 UTC (rev 16668)
+++ branches/sim_physics/SConstruct 2008-09-22 10:04:45 UTC (rev 16669)
@@ -267,7 +267,19 @@
env['WITH_BF_YAFRAY'] = False
env['WITH_BF_REDCODE'] = False
env['WITH_BF_FTGL'] = False
+ env['WITH_BF_DDS'] = False
+ env['WITH_BF_ZLIB'] = False
+ env['WITH_BF_SDL'] = False
+ env['WITH_BF_JPEG'] = False
+ env['WITH_BF_PNG'] = False
+ env['WITH_BF_ODE'] = False
+ env['WITH_BF_BULLET'] = False
+ env['WITH_BF_BINRELOC'] = False
+ env['BF_BUILDINFO'] = False
+ env['BF_NO_ELBEEM'] = True
+
+
# lastly we check for root_build_dir ( we should not do before, otherwise we
might do wrong builddir
#B.root_build_dir = B.arguments.get('BF_BUILDDIR',
'..'+os.sep+'build'+os.sep+platform+os.sep)
B.root_build_dir = env['BF_BUILDDIR']
@@ -410,6 +422,26 @@
source=[dp+os.sep+f for f in df]
scriptinstall.append(env.Install(dir=dir,source=source))
+#-- icons
+if env['OURPLATFORM']=='linux2':
+ iconlist = []
+ icontargetlist = []
+
+ for tp, tn, tf in os.walk('release/freedesktop/icons'):
+ if 'CVS' in tn:
+ tn.remove('CVS')
+ if '.svn' in tn:
+ tn.remove('.svn')
+ for f in tf:
+ print ">>>", env['BF_INSTALLDIR'], tp, f
+ iconlist.append(tp+os.sep+f)
+
icontargetlist.append(env['BF_INSTALLDIR']+tp[19:]+os.sep+f)
+
+ iconinstall = []
+ for targetdir,srcfile in zip(icontargetlist, iconlist):
+ td, tf = os.path.split(targetdir)
+ iconinstall.append(env.Install(dir=td, source=srcfile))
+
#-- plugins
pluglist = []
plugtargetlist = []
@@ -458,6 +490,8 @@
if env['OURPLATFORM']=='darwin':
allinstall = [blenderinstall, plugininstall, textinstall]
+elif env['OURPLATFORM']=='linux2':
+ allinstall = [blenderinstall, dotblenderinstall, scriptinstall,
plugininstall, textinstall, iconinstall]
else:
allinstall = [blenderinstall, dotblenderinstall, scriptinstall,
plugininstall, textinstall]
Modified: branches/sim_physics/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified:
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
===================================================================
---
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
2008-09-22 10:00:31 UTC (rev 16668)
+++
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
2008-09-22 10:04:45 UTC (rev 16669)
@@ -164,7 +164,7 @@
void* userPtr,
short int collisionFilterGroup,
short int collisionFilterMask,
-
btDispatcher* dispatcher,
+
btDispatcher* /*dispatcher*/,
void* /*multiSapProxy*/)
{
btDbvtProxy* proxy=new(btAlignedAlloc(sizeof(btDbvtProxy),16))
btDbvtProxy( userPtr,
@@ -180,6 +180,7 @@
btDbvtTreeCollider collider(this);
collider.proxy=proxy;
btDbvt::collideTV(m_sets[0].m_root,proxy->aabb,collider);
+ btDbvt::collideTV(m_sets[1].m_root,proxy->aabb,collider);
}
return(proxy);
}
Modified:
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
===================================================================
---
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
2008-09-22 10:00:31 UTC (rev 16668)
+++
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
2008-09-22 10:04:45 UTC (rev 16669)
@@ -86,7 +86,6 @@
bool m_releasepaircache;
// Release pair cache on delete
bool m_deferedcollide;
// Defere dynamic/static collision to collide call
bool m_needcleanup;
// Need to run cleanup?
-bool m_initialize;
// Initialization
#if DBVT_BP_PROFILE
btClock m_clock;
struct {
Modified:
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
===================================================================
---
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
2008-09-22 10:00:31 UTC (rev 16668)
+++
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
2008-09-22 10:04:45 UTC (rev 16669)
@@ -143,7 +143,7 @@
virtual ~btCollisionObject();
- void setCollisionShape(btCollisionShape* collisionShape)
+ virtual void setCollisionShape(btCollisionShape* collisionShape)
{
m_collisionShape = collisionShape;
m_rootCollisionShape = collisionShape;
Modified:
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
===================================================================
---
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
2008-09-22 10:00:31 UTC (rev 16668)
+++
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
2008-09-22 10:04:45 UTC (rev 16669)
@@ -56,11 +56,16 @@
btScalar radius0 = sphere0->getRadius();
btScalar radius1 = sphere1->getRadius();
- //m_manifoldPtr->clearManifold(); //don't do this, it disables
warmstarting
+#ifdef CLEAR_MANIFOLD
+ m_manifoldPtr->clearManifold(); //don't do this, it disables
warmstarting
+#endif
///iff distance positive, don't generate a new contact
if ( len > (radius0+radius1))
{
+#ifndef CLEAR_MANIFOLD
+ resultOut->refreshContactPoints();
+#endif //CLEAR_MANIFOLD
return;
}
///distance (negative means penetration)
@@ -82,7 +87,9 @@
resultOut->addContactPoint(normalOnSurfaceB,pos1,dist);
- //no resultOut->refreshContactPoints(); needed, because of
clearManifold (all points are new)
+#ifndef CLEAR_MANIFOLD
+ resultOut->refreshContactPoints();
+#endif //CLEAR_MANIFOLD
}
Modified:
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
===================================================================
---
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
2008-09-22 10:00:31 UTC (rev 16668)
+++
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
2008-09-22 10:04:45 UTC (rev 16669)
@@ -36,6 +36,13 @@
}
+
+void btConvexHullShape::setLocalScaling(const btVector3& scaling)
+{
+ m_localScaling = scaling;
+ recalcLocalAabb();
+}
+
void btConvexHullShape::addPoint(const btPoint3& point)
{
m_points.push_back(point);
Modified:
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
===================================================================
---
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
2008-09-22 10:00:31 UTC (rev 16668)
+++
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
2008-09-22 10:04:45 UTC (rev 16669)
@@ -71,8 +71,9 @@
virtual void getPlane(btVector3& planeNormal,btPoint3& planeSupport,int
i ) const;
virtual bool isInside(const btPoint3& pt,btScalar tolerance) const;
+ ///in case we receive negative scaling
+ virtual void setLocalScaling(const btVector3& scaling);
-
};
Modified:
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
===================================================================
---
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
2008-09-22 10:00:31 UTC (rev 16668)
+++
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
2008-09-22 10:04:45 UTC (rev 16669)
@@ -26,7 +26,7 @@
void btConvexInternalShape::setLocalScaling(const btVector3& scaling)
{
- m_localScaling = scaling;
+ m_localScaling = scaling.absolute();
}
Modified:
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
===================================================================
---
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
2008-09-22 10:00:31 UTC (rev 16668)
+++
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
2008-09-22 10:04:45 UTC (rev 16669)
@@ -56,8 +56,18 @@
btScaledTriangleCallback scaledCallback(callback,m_localScaling);
btVector3
invLocalScaling(1.f/m_localScaling.getX(),1.f/m_localScaling.getY(),1.f/m_localScaling.getZ());
- btVector3 scaledAabbMin = aabbMin * invLocalScaling;
- btVector3 scaledAabbMax = aabbMax * invLocalScaling;
+ btVector3 scaledAabbMin,scaledAabbMax;
+
+ ///support negative scaling
+ scaledAabbMin[0] = m_localScaling.getX() >= 0. ? aabbMin[0] *
invLocalScaling[0] : aabbMax[0] * invLocalScaling[0];
+ scaledAabbMin[1] = m_localScaling.getY() >= 0. ? aabbMin[1] *
invLocalScaling[1] : aabbMax[1] * invLocalScaling[1];
+ scaledAabbMin[2] = m_localScaling.getZ() >= 0. ? aabbMin[2] *
invLocalScaling[2] : aabbMax[2] * invLocalScaling[2];
+
+ scaledAabbMax[0] = m_localScaling.getX() <= 0. ? aabbMin[0] *
invLocalScaling[0] : aabbMax[0] * invLocalScaling[0];
+ scaledAabbMax[1] = m_localScaling.getY() <= 0. ? aabbMin[1] *
invLocalScaling[1] : aabbMax[1] * invLocalScaling[1];
+ scaledAabbMax[2] = m_localScaling.getZ() <= 0. ? aabbMin[2] *
invLocalScaling[2] : aabbMax[2] * invLocalScaling[2];
+
+
m_bvhTriMeshShape->processAllTriangles(&scaledCallback,scaledAabbMin,scaledAabbMax);
}
@@ -66,9 +76,17 @@
{
btVector3 localAabbMin = m_bvhTriMeshShape->getLocalAabbMin();
btVector3 localAabbMax = m_bvhTriMeshShape->getLocalAabbMax();
- localAabbMin *= m_localScaling;
- localAabbMax *= m_localScaling;
+ btVector3 tmpLocalAabbMin = localAabbMin * m_localScaling;
+ btVector3 tmpLocalAabbMax = localAabbMax * m_localScaling;
+
+ localAabbMin[0] = (m_localScaling.getX() >= 0.) ? tmpLocalAabbMin[0] :
tmpLocalAabbMax[0];
+ localAabbMin[1] = (m_localScaling.getY() >= 0.) ? tmpLocalAabbMin[1] :
tmpLocalAabbMax[1];
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
