From 8f1500da005e4f84fd593492822c6d99e768c354 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 18 Apr 2010 10:28:37 +0000 Subject: remove config.h references, was added for automake build system rev around 124-126 but isnt used by any build systems now. --- source/gameengine/Converter/BL_BlenderDataConversion.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source/gameengine/Converter/BL_BlenderDataConversion.cpp') diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index d8484559d91..4a2aa3695fa 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -28,10 +28,6 @@ * Convert blender data to ketsji */ -#ifdef HAVE_CONFIG_H -#include -#endif - #ifdef WIN32 #pragma warning (disable : 4786) #endif -- cgit v1.2.3 From 5416f51b7a0c4e1ca23592385fbd025355cedc0e Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Tue, 25 May 2010 08:42:11 +0000 Subject: BGE Fix for: [#22142] Armature deformation does not work in Game Engine. + parent type to modifiers doversion(). Patch by Xavier Thomas (xat) This fix the problem of not being able to play animations created with Blender 2.5 in BGE. Patch reviewed by Benoit Added also other parent to modifier conversions as requested by Joshua (aligorith). I didn't bump subversion here, but the patch should work still. If not I'm increasing subversion sooner anyways (tomorrow or by the middle of the week I hope). I was waiting to commit this one together with the Logic Editor datablock patch (converting material_name DNA properties to struct Material *). However my patch is getting too big and it's better if it's alone (easier to analyze later, eventual fixes, ...) Mitchell, this commit adds a function that can help hardware skinning - HasArmatureDeformer() --- source/gameengine/Converter/BL_BlenderDataConversion.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/gameengine/Converter/BL_BlenderDataConversion.cpp') diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index 4a2aa3695fa..2f0f70ed9fe 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -1729,7 +1729,7 @@ static KX_GameObject *gameobject_from_blenderobject( // only support relative shape key bool bHasShapeKey = mesh->key != NULL && mesh->key->type==KEY_RELATIVE; bool bHasDvert = mesh->dvert != NULL && ob->defbase.first; - bool bHasArmature = (ob->parent && ob->parent->type == OB_ARMATURE && ob->partype==PARSKEL && bHasDvert); + bool bHasArmature = (BL_ModifierDeformer::HasArmatureDeformer(ob) && ob->parent && ob->parent->type == OB_ARMATURE && bHasDvert); bool bHasModifier = BL_ModifierDeformer::HasCompatibleDeformer(ob); bool bHasSoftBody = (!ob->parent && (ob->gameflag & OB_SOFT_BODY)); @@ -2357,8 +2357,8 @@ void BL_ConvertBlenderObjects(struct Main* maggie, if (me->dvert){ BL_DeformableGameObject *obj = (BL_DeformableGameObject*)converter->FindGameObject(blenderobj); - - if (obj && blenderobj->parent && blenderobj->parent->type==OB_ARMATURE && blenderobj->partype==PARSKEL){ + + if (obj && BL_ModifierDeformer::HasArmatureDeformer(blenderobj) && blenderobj->parent && blenderobj->parent->type==OB_ARMATURE){ KX_GameObject *par = converter->FindGameObject(blenderobj->parent); if (par && obj->GetDeformer()) ((BL_SkinDeformer*)obj->GetDeformer())->SetArmature((BL_ArmatureObject*) par); -- cgit v1.2.3 From 9d3157eed000e7c543d04f5ad3efc5990675903b Mon Sep 17 00:00:00 2001 From: Mitchell Stokes Date: Sat, 29 May 2010 21:22:24 +0000 Subject: Reversing the last merge because I botched it. --- source/gameengine/Converter/BL_BlenderDataConversion.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'source/gameengine/Converter/BL_BlenderDataConversion.cpp') diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index 2f0f70ed9fe..efd93eb3102 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -1570,6 +1570,13 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj, objprop.m_boundobject.c.m_height = 2.f*bb.m_extends[2]; break; } + case OB_BOUND_CAPSULE: + { + objprop.m_boundclass = KX_BOUNDCAPSULE; + objprop.m_boundobject.c.m_radius = MT_max(bb.m_extends[0], bb.m_extends[1]); + objprop.m_boundobject.c.m_height = bb.m_extends[2]; + break; + } } } @@ -2691,4 +2698,4 @@ void BL_ConvertBlenderObjects(struct Main* maggie, MT_Scalar distance = (activecam)? activecam->GetCameraFar() - activecam->GetCameraNear(): 100.0f; RAS_BucketManager *bucketmanager = kxscene->GetBucketManager(); bucketmanager->OptimizeBuckets(distance); -} +} \ No newline at end of file -- cgit v1.2.3 From c6bec43330be0874b4116d259bbaf9fb90ed0556 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Sat, 29 May 2010 21:31:57 +0000 Subject: reverting previous commit from Mitchell. His commit went to the trunk instead of the branch :) svn merge -r 29067:29066 https://svn.blender.org/svnroot/bf-blender/trunk/blender --- source/gameengine/Converter/BL_BlenderDataConversion.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'source/gameengine/Converter/BL_BlenderDataConversion.cpp') diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index efd93eb3102..2f0f70ed9fe 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -1570,13 +1570,6 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj, objprop.m_boundobject.c.m_height = 2.f*bb.m_extends[2]; break; } - case OB_BOUND_CAPSULE: - { - objprop.m_boundclass = KX_BOUNDCAPSULE; - objprop.m_boundobject.c.m_radius = MT_max(bb.m_extends[0], bb.m_extends[1]); - objprop.m_boundobject.c.m_height = bb.m_extends[2]; - break; - } } } @@ -2698,4 +2691,4 @@ void BL_ConvertBlenderObjects(struct Main* maggie, MT_Scalar distance = (activecam)? activecam->GetCameraFar() - activecam->GetCameraNear(): 100.0f; RAS_BucketManager *bucketmanager = kxscene->GetBucketManager(); bucketmanager->OptimizeBuckets(distance); -} \ No newline at end of file +} -- cgit v1.2.3 From 3eebaceaa633c62b8ff8c17333541ab9ad92ba81 Mon Sep 17 00:00:00 2001 From: "Guillermo S. Romero" Date: Fri, 9 Jul 2010 23:14:07 +0000 Subject: Fix spelling. --- source/gameengine/Converter/BL_BlenderDataConversion.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/gameengine/Converter/BL_BlenderDataConversion.cpp') diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index 2f0f70ed9fe..fa32cfdb866 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -1548,7 +1548,7 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj, objprop.m_boundclass = KX_BOUNDMESH; break; } - // Object is not a mesh... can't use polyheder. + // Object is not a mesh... can't use polyhedron. // Fall through and become a sphere. case OB_BOUND_SPHERE: { -- cgit v1.2.3