Big patches:

Erwin Coumans: Abstract the physics engine
Charlie C: Joystick fixes
Me: Moved the ray cast (shadows, mouse sensor & ray sensor)

1 files changed, 16 insertions, 2 deletions

diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
index 65f42141045..fde27e822d6 100644
--- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
@@ -51,7 +51,10 @@ public:
 	virtual void		beginFrame();
 	virtual void		endFrame();
 // Perform an integration step of duration 'timeStep'.
-	virtual	bool		proceed (double	timeStep);
+	virtual	bool		proceedDeltaTime(double  curTime,float timeStep);
+	virtual	void		setFixedTimeStep(bool useFixedTimeStep,float fixedTimeStep);
+	virtual	float		getFixedTimeStep();
+
 	virtual	void		setGravity(float x,float y,float z);
 
 	virtual int			createConstraint(class PHY_IPhysicsController* ctrl,class PHY_IPhysicsController* ctrl2,PHY_ConstraintType type,
@@ -59,10 +62,21 @@ public:
 			float axisX,float axisY,float axisZ);
 
 	virtual void		removeConstraint(int constraintid);
-	virtual PHY_IPhysicsController* rayTest(void* ignoreClient, float fromX,float fromY,float fromZ, float toX,float toY,float toZ, 
+	virtual PHY_IPhysicsController* rayTest(PHY_IPhysicsController* ignoreClient, float fromX,float fromY,float fromZ, float toX,float toY,float toZ, 
 									float& hitX,float& hitY,float& hitZ,float& normalX,float& normalY,float& normalZ);
 
 
+	//gamelogic callbacks
+		virtual void addSensor(PHY_IPhysicsController* ctrl) {}
+		virtual void removeSensor(PHY_IPhysicsController* ctrl) {}
+		virtual void addTouchCallback(int response_class, PHY_ResponseCallback callback, void *user)
+		{
+		}
+		virtual void requestCollisionCallback(PHY_IPhysicsController* ctrl) {}
+		virtual PHY_IPhysicsController*	CreateSphereController(float radius,const PHY__Vector3& position) {return 0;}
+		virtual PHY_IPhysicsController* CreateConeController(float coneradius,float coneheight) { return 0;}
+
+
 };
 
 #endif //_DUMMYPHYSICSENVIRONMENT