First checkin of core ODE functionality. See OdePhysicsController.cpp for a todo list.

7 files changed, 25 insertions, 17 deletions

diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 68d45044fff..2343c372f1b 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -139,6 +139,7 @@
 
 #include "SG_Node.h"
 
+// defines USE_ODE to choose physics engine
 #include "KX_ConvertPhysicsObject.h"
 
 
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index fdba851b7a3..a043291c5d5 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -43,12 +43,13 @@
 
 #include "DummyPhysicsEnvironment.h"
 
+//to decide to use sumo/ode or dummy physics - defines USE_ODE
+#include "KX_ConvertPhysicsObject.h"
+
 #ifdef USE_ODE
 #include "OdePhysicsEnvironment.h"
 #endif //USE_ODE
 
-//to decide to use sumo/ode or dummy physics
-#include "KX_ConvertPhysicsObject.h"
 #ifdef USE_SUMO_SOLID
 #include "SumoPhysicsEnvironment.h"
 #endif
@@ -181,24 +182,29 @@ void KX_BlenderSceneConverter::ConvertScene(const STR_String& scenename,
 			switch (blenderscene->world->pad1)
 			{
 				
-			case 4:
+			case 1:
 				{
-					physics_engine = UseODE;
+					physics_engine = UseNone;
+					break;
+				};
+			case 2:
+				{
+					physics_engine = UseSumo;
 					break;
 				}
-			case 5:
+			case 3:
 				{
-					physics_engine = UseDynamo;
+					physics_engine = UseODE;
 					break;
 				}
-			case 7:
+			case 4:
 				{
-					physics_engine = UseNone;
+					physics_engine = UseDynamo;
 					break;
-				};
+				}
 			default:
 				{
-					physics_engine = UseSumo;
+					physics_engine = UseODE;
 				}
 			}
 		}
diff --git a/source/gameengine/Converter/Makefile b/source/gameengine/Converter/Makefile
index 8f85e4c1a58..ffcdf8a0693 100644
--- a/source/gameengine/Converter/Makefile
+++ b/source/gameengine/Converter/Makefile
@@ -57,4 +57,4 @@ CPPFLAGS += -I../../kernel/gen_system
 CPPFLAGS += -I../Rasterizer/RAS_OpenGLRasterizer
 CPPFLAGS += -I../Network -I../Ketsji/KXNetwork
 CPPFLAGS += -I../Physics/common -I../Physics/Dummy
-
+CPPFLAGS += -I../Physics/BlOde
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
index f74349a3e1a..931b9e3d400 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
@@ -38,8 +38,7 @@
 //#define USE_SUMO_SOLID
 //solid is not available yet
 
-//#define USE_ODE
-//ode is not available yet
+#define USE_ODE
 
 
 class RAS_MeshObject;
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
index 01d02b58132..97828b618f8 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
@@ -31,6 +31,7 @@
  */
 #pragma warning (disable : 4786)
 
+// defines USE_ODE to choose physics engine
 #include "KX_ConvertPhysicsObject.h"
 #include "KX_GameObject.h"
 #include "RAS_MeshObject.h"
@@ -50,11 +51,11 @@
 #ifdef USE_ODE
 
 #include "KX_OdePhysicsController.h"
-#include "odephysicsenvironment.h"
+#include "OdePhysicsEnvironment.h"
 #endif //USE_ODE
 
 
-// USE_SUMO_SOLID is defined in headerfile KX_ConvertPhysicsObjects.h
+// USE_SUMO_SOLID is defined in headerfile KX_ConvertPhysicsObject.h
 #ifdef USE_SUMO_SOLID
 
 
@@ -235,7 +236,7 @@ void	KX_ConvertSumoObject(	class	KX_GameObject* gameobj,
 	// physics object get updated here !
 
 	
-	// lazy evaluation because Havok doesn't support scaling !gameobj->UpdateTransform();
+	// lazy evaluation because we might not support scaling !gameobj->UpdateTransform();
 
 	if (objprop->m_in_active_layer && sumoObj)
 	{
diff --git a/source/gameengine/Ketsji/Makefile b/source/gameengine/Ketsji/Makefile
index 4e0ee06fe1a..1c11d7ca4c5 100644
--- a/source/gameengine/Ketsji/Makefile
+++ b/source/gameengine/Ketsji/Makefile
@@ -49,6 +49,7 @@ CPPFLAGS += -I../Network -IKXNetwork
 CPPFLAGS += -I../Physics/common
 CPPFLAGS += -I../Physics/Dummy
 CPPFLAGS += -I../Physics/Sumo
+CPPFLAGS += -I../Physics/BlOde
 CPPFLAGS += -I.
 
 ###########################
diff --git a/source/gameengine/Physics/Makefile b/source/gameengine/Physics/Makefile
index c04ccb175aa..349c225e7ee 100644
--- a/source/gameengine/Physics/Makefile
+++ b/source/gameengine/Physics/Makefile
@@ -35,6 +35,6 @@ include nan_definitions.mk
 
 SOURCEDIR = source/gameengine/Physics
 DIR = $(OCGDIR)/gameengine/blphys
-DIRS = common Sumo Dummy
+DIRS = common Sumo Dummy BlOde
 
 include nan_subdirs.mk