Update of /cvsroot/simspark/simspark/spark/spark
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28688
Modified Files:
spark.cpp spark.h
Log Message:
- added method GetInputServer
Index: spark.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/spark/spark.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** spark.cpp 19 Dec 2005 20:09:18 -0000 1.1
--- spark.cpp 2 Jan 2006 20:39:14 -0000 1.2
***************
*** 24,27 ****
--- 24,28 ----
#include <oxygen/oxygen.h>
#include <kerosin/renderserver/rendercontrol.h>
+ #include <kerosin/inputserver/inputserver.h>
#include <kerosin/inputserver/inputcontrol.h>
***************
*** 136,140 ****
return shared_dynamic_cast<InputControl>
! (mSimulationServer->GetControlNode("kerosin/InputControl"));
}
--- 137,147 ----
return shared_dynamic_cast<InputControl>
! (mSimulationServer->GetControlNode("InputControl"));
! }
!
! shared_ptr<InputServer> Spark::GetInputServer()
! {
! return shared_dynamic_cast<kerosin::InputServer>
! (mZeitgeist->GetCore()->Get("/sys/server/input"));
}
***************
*** 147,154 ****
return shared_dynamic_cast<RenderControl>
! (mSimulationServer->GetControlNode("kerosin/RenderControl"));
}
-
shared_ptr<ScriptServer> Spark::GetScriptServer()
{
--- 154,160 ----
return shared_dynamic_cast<RenderControl>
! (mSimulationServer->GetControlNode("RenderControl"));
}
shared_ptr<ScriptServer> Spark::GetScriptServer()
{
Index: spark.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/spark/spark.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** spark.h 19 Dec 2005 20:09:18 -0000 1.1
--- spark.h 2 Jan 2006 20:39:14 -0000 1.2
***************
*** 45,48 ****
--- 45,49 ----
class InputControl;
class RenderControl;
+ class InputServer;
}
***************
*** 89,92 ****
--- 90,96 ----
boost::shared_ptr<oxygen::SceneServer> GetSceneServer();
+ /** returns the InputServer */
+ boost::shared_ptr<kerosin::InputServer> GetInputServer();
+
/** returns the current active Scene */
boost::shared_ptr<oxygen::Scene> GetActiveScene();
|
