[GameEngine] Commit all Kester's changes made to the gameengine to restore 2.25 like physics.

[SCons] Build with Solid as default when enabling the gameengine in the build process
[SCons] Build solid and qhull from the extern directory and link statically against them

That was about it.

There are a few things that needs double checking:

* Makefiles
* Projectfiles
* All the other systems than Linux and Windows on which the build (with scons) has been successfully tested.

1 files changed, 23 insertions, 8 deletions

diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
index bf40baf5594..3ed3e2bfa8f 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
@@ -32,22 +32,35 @@
 #ifndef KX_CONVERTPHYSICSOBJECTS
 #define KX_CONVERTPHYSICSOBJECTS
 
-
+/* These are defined by the build system... */
 //#define USE_SUMO_SOLID
-//solid is not available yet
-
-#define USE_ODE
+//#define USE_ODE
 
 class RAS_MeshObject;
 class KX_Scene;
 
+typedef enum {
+	KX_BOUNDBOX,
+	KX_BOUNDSPHERE,
+	KX_BOUNDCYLINDER,
+	KX_BOUNDCONE,
+	KX_BOUNDMESH
+} KX_BoundBoxClass;
 
-struct KX_Bounds
+struct KX_BoxBounds
 {
 	float m_center[3];
 	float m_extends[3];
 };
 
+/* Cone/Cylinder */
+struct KX_CBounds
+{
+	float m_radius;
+	float m_height;
+};
+
+
 struct KX_ObjectProperties
 {
 	bool	m_dyna;
@@ -59,9 +72,11 @@ struct KX_ObjectProperties
 	bool	m_isactor;
 	bool	m_concave;
 	bool	m_isdeformable;
-	bool	m_implicitsphere ;
-	bool	m_implicitbox;
-	KX_Bounds	m_boundingbox;
+	KX_BoundBoxClass	m_boundclass;
+	union {
+		KX_BoxBounds	box;
+		KX_CBounds	c;
+	} m_boundobject;
 };
 
 #ifdef USE_ODE