I'll break this commit into two sections in the moto files

[blender-staging.git] / source / gameengine / Converter / KX_BlenderSceneConverter.cpp

diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index 4f5804da9b629497124c99f379ddb3e959481569..283710a5d5b434db7542849583aa56ada31ebcad 100644 (file)
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -29,17 +29,13 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef WIN32
        #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
 #endif
 
-
 #include "KX_Scene.h"
 #include "KX_GameObject.h"
+#include "KX_BlenderSceneConverter.h"
 #include "KX_IpoConvert.h"
 #include "RAS_MeshObject.h"
 #include "KX_PhysicsEngineEnums.h"
@@ -117,6 +113,10 @@ KX_BlenderSceneConverter::~KX_BlenderSceneConverter()
                delete (*itm);
                itm++;
        }
+       
+#ifdef USE_SUMO_SOLID
+       KX_ClearSumoSharedShapes();
+#endif
 }
 
 
@@ -170,92 +170,88 @@ void KX_BlenderSceneConverter::ConvertScene(const STR_String& scenename,
                                                                                        class RAS_IRenderTools* rendertools,
                                                                                        class RAS_ICanvas* canvas)
 {
-//find out which physics engine
-  Scene *blenderscene = GetSceneForName2(m_maggie, scenename);
+       //find out which physics engine
+       Scene *blenderscene = GetSceneForName2(m_maggie, scenename);
 
-  e_PhysicsEngine physics_engine = UseSumo;
+       e_PhysicsEngine physics_engine = UseSumo;
 
-  /* FIXME: Force physics engine = sumo.
-     This isn't really a problem - no other physics engines are available. 
-  if (blenderscene)
+       if (blenderscene)
        {
-         int i=0;
-               
-         if (blenderscene->world)
+       
+               if (blenderscene->world)
                {
-                 switch (blenderscene->world->physicsEngine)
+                       switch (blenderscene->world->physicsEngine)
                        {
                                 
-                       case 4:
-                         {
-                               physics_engine = UseODE;
-                               break;
-                         }
-                       case 3:
-                         {
-                               physics_engine = UseDynamo;
-                               break;
-                         }
-                       case 2:
-                         {
-                               physics_engine = UseSumo;
-                               break;
-                         };
-                       case 0:
-                         {
-                               physics_engine = UseNone;
-                         }
+                               case WOPHY_ODE:
+                               {
+                                       physics_engine = UseODE;
+                                       break;
+                               }
+                               case WOPHY_DYNAMO:
+                               {
+                                       physics_engine = UseDynamo;
+                                       break;
+                               }
+                               case WOPHY_SUMO:
+                               {
+                                       physics_engine = UseSumo;
+                                       break;
+                               }
+                               case WOPHY_NONE:
+                               {
+                                       physics_engine = UseNone;
+                               }
                        }
                  
                }
        }
-*/
-  switch (physics_engine)
-       {
 
+       switch (physics_engine)
+       {
+       
 #ifdef USE_SUMO_SOLID
-       case UseSumo:
-               destinationscene ->SetPhysicsEnvironment(new SumoPhysicsEnvironment());
-               break;
+               case UseSumo:
+                       destinationscene ->SetPhysicsEnvironment(new SumoPhysicsEnvironment());
+                       break;
 #endif
 #ifdef USE_ODE
-       case UseODE:
-               destinationscene ->SetPhysicsEnvironment(new ODEPhysicsEnvironment());
-               break;
-#endif //USE_ODE
 
-       case UseDynamo:
-         {
-         }
-
-       case UseNone:
-         {
-         }
-       default:
-               physics_engine = UseNone;
-               destinationscene ->SetPhysicsEnvironment(new DummyPhysicsEnvironment());
-               break;
+               case UseODE:
+                       destinationscene ->SetPhysicsEnvironment(new ODEPhysicsEnvironment());
+                       break;
+#endif //USE_ODE
+       
+               case UseDynamo:
+               {
+               }
+               
+               default:
+               case UseNone:
+                       physics_engine = UseNone;
+                       destinationscene ->SetPhysicsEnvironment(new DummyPhysicsEnvironment());
+                       break;
        }
 
-  BL_ConvertBlenderObjects(m_maggie,
-                                                  scenename,
-                                                  destinationscene,
-                                                  m_ketsjiEngine,
-                                                  physics_engine,
-                                                  dictobj,
-                                                  keyinputdev,
-                                                  rendertools,
-                                                  canvas,
-                                                  this,
-                                                  m_alwaysUseExpandFraming
-                                                  );
-
-  m_map_blender_to_gameactuator.clear();
-  m_map_blender_to_gamecontroller.clear();
-
-  m_map_blender_to_gameobject.clear();
-  m_map_mesh_to_gamemesh.clear();
-  m_map_gameobject_to_blender.clear();
+       BL_ConvertBlenderObjects(m_maggie,
+               scenename,
+               destinationscene,
+               m_ketsjiEngine,
+               physics_engine,
+               dictobj,
+               keyinputdev,
+               rendertools,
+               canvas,
+               this,
+               m_alwaysUseExpandFraming
+               );
+
+       m_map_blender_to_gameactuator.clear();
+       m_map_blender_to_gamecontroller.clear();
+       
+       m_map_blender_to_gameobject.clear();
+       m_map_mesh_to_gamemesh.clear();
+       m_map_gameobject_to_blender.clear();
 }