[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, 14 insertions, 20 deletions

diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h
index 35b23ecc60a..50338827694 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.h
+++ b/source/gameengine/Ketsji/KX_TouchSensor.h
@@ -38,8 +38,13 @@
 #include "SCA_ISensor.h"
 #include "ListValue.h"
 
+#include <SOLID/SOLID.h>
+#include "SM_Scene.h"
+
 #include "KX_ClientObjectInfo.h"
 
+class KX_TouchEventManager;
+
 class KX_TouchSensor : public SCA_ISensor
 {
 protected:
@@ -52,10 +57,9 @@ protected:
 	bool					m_bFindMaterial;
 	class SCA_EventManager*	m_eventmgr;
 	
-	//class SM_Object*		m_sumoObj;
-	//DT_ObjectHandle			m_solidHandle;
-	//SM_ClientObjectInfo		m_client_info;
-	//DT_RespTableHandle		m_resptable;
+	class SM_Object*		m_sumoObj;
+	DT_ObjectHandle			m_solidHandle;
+	DT_RespTableHandle		m_resptable;
 
 
 	bool					m_bCollision;
@@ -67,7 +71,7 @@ protected:
 public:
 	KX_TouchSensor(class SCA_EventManager* eventmgr,
 		class KX_GameObject* gameobj,
-		class SM_Object* sumoObj,
+		/*class SM_Object* sumoObj,*/
 		bool fFindMaterial,
 		const STR_String& touchedpropname,
 		PyTypeObject* T=&Type) ;
@@ -88,25 +92,15 @@ public:
 	virtual bool Evaluate(CValue* event);
 	virtual void ReParent(SCA_IObject* parent);
 	
-/*	static void collisionResponse(void *client_data, 
-								  void *object1,
-								  void *object2,
-								  const DT_CollData *coll_data)	{
-		class KX_TouchSensor* sensor = (class KX_TouchSensor*) client_data;
-		sensor->HandleCollision(object1,object2,coll_data);
-	}
-	
-
-	
-	void RegisterSumo();
+	virtual void RegisterSumo(KX_TouchEventManager* touchman);
 
-  	virtual void HandleCollision(void* obj1,void* obj2,
+	virtual DT_Bool HandleCollision(void* obj1,void* obj2,
 						 const DT_CollData * coll_data); 
 
 
-  //	SM_Object*	GetSumoObject() { return m_sumoObj; };
+	SM_Object*	GetSumoObject() { return m_sumoObj; };
 
-  */
+  
 
 	virtual bool IsPositiveTrigger() {
 		bool result = m_bTriggered;
@@ -115,7 +109,7 @@ public:
 	}
 
 	
-	void EndFrame();
+	virtual void EndFrame();
 
 	// todo: put some info for collision maybe