sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

BGE Physics: Better follow the old (pre-cleanup) logic for determining bounds types.

Browse Source 
This prevents older files from breaking.
This commit is contained in:
Mitchell Stokes 2014-05-14 22:36:28 -07:00
parent 48fcadc88d
commit 183b417cce
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
View File

@ -3056,26 +3056,25 @@ void CcdPhysicsEnvironment::ConvertObject(KX_GameObject *gameobj, RAS_MeshObject
btCollisionShape* bm = 0;
char bounds;
if (blenderobject->gameflag & OB_BOUNDS)
{
bounds = blenderobject->collision_boundtype;
}
else
char bounds = isbulletdyna ? OB_BOUND_SPHERE : OB_BOUND_TRIANGLE_MESH;
if (!(blenderobject->gameflag & OB_BOUNDS))
{
if (blenderobject->gameflag & OB_SOFT_BODY)
bounds = OB_BOUND_TRIANGLE_MESH;
else if (blenderobject->gameflag & OB_CHARACTER)
bounds = OB_BOUND_SPHERE;
else if (isbulletdyna)
bounds = OB_BOUND_SPHERE;
else
bounds = OB_BOUND_TRIANGLE_MESH;
}
// Can't use triangle mesh or convex hull on a non-mesh object, fall-back to sphere
if (ELEM(bounds, OB_BOUND_TRIANGLE_MESH, OB_BOUND_CONVEX_HULL) && blenderobject->type != OB_MESH)
bounds = OB_BOUND_SPHERE;
else
{
if (ELEM(blenderobject->collision_boundtype, OB_BOUND_CONVEX_HULL, OB_BOUND_TRIANGLE_MESH)
&& blenderobject->type != OB_MESH)
{
// Can't use triangle mesh or convex hull on a non-mesh object, fall-back to sphere
bounds = OB_BOUND_SPHERE;
}
else
bounds = blenderobject->collision_boundtype;
}
// Get bounds information
float bounds_center[3], bounds_extends[3];