[simspark-cvs] simspark/spark/kerosin/inputserver inputcontrol.cpp, 1.5, 1.6 inputcontrol.h, 1.3, 1.4

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/kerosin/inputserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv29374/spark/kerosin/inputserver

Modified Files:
	inputcontrol.cpp inputcontrol.h 
Log Message:
- merged RSGEDIT_SCINTILLA branch

Index: inputcontrol.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/inputserver/inputcontrol.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** inputcontrol.h	31 Mar 2007 13:18:16 -0000	1.3
--- inputcontrol.h	23 Jun 2007 13:36:28 -0000	1.4
***************
*** 22,25 ****
--- 22,26 ----
  
  #include <oxygen/simulationserver/simcontrolnode.h>
+ #include <oxygen/sceneserver/fpscontroller.h>
  #include <kerosin/inputserver/inputserver.h>
  
***************
*** 72,78 ****
      boost::shared_ptr<oxygen::FPSController> GetFPSController();
  
-     /** sets the FPSController to be used */
-     void SetFPSController(boost::shared_ptr<oxygen::FPSController> controller);
- 
      /** sets the horizontal mouse sensitivity */
      void SetHorizontalSensitivity(float s);
--- 73,76 ----
***************
*** 114,120 ****
      bool RegisterInputItem(const std::string& inputItem, const std::string& name);
  
-     /** update variables from a script */
-     virtual void UpdateCached();
- 
  protected:
      virtual void OnLink();
--- 112,115 ----
***************
*** 123,130 ****
  protected:
      /** the controlled FPSController */
!     boost::shared_ptr<oxygen::FPSController> mFPSController;
  
      /** cached reference to the InputServer */
!     boost::shared_ptr<kerosin::InputServer> mInputServer;
  
      /** the size of the last time step */
--- 118,125 ----
  protected:
      /** the controlled FPSController */
!     CachedPath<oxygen::FPSController> mFPSController;
  
      /** cached reference to the InputServer */
!     CachedPath<kerosin::InputServer> mInputServer;
  
      /** the size of the last time step */

Index: inputcontrol.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/inputserver/inputcontrol.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** inputcontrol.cpp	17 Jun 2007 13:38:30 -0000	1.5
--- inputcontrol.cpp	23 Jun 2007 13:36:28 -0000	1.6
***************
*** 21,25 ****
  #include "inputitem.h"
  #include <oxygen/simulationserver/simulationserver.h>
- #include <oxygen/sceneserver/fpscontroller.h>
  #include <zeitgeist/logserver/logserver.h>
  #include <zeitgeist/scriptserver/scriptserver.h>
--- 21,24 ----
***************
*** 46,76 ****
  bool InputControl::SetFPSController(const std::string& path)
  {
!     if (path.empty())
!         {
!             mFPSController.reset();
!             return true;
!         }
! 
!     shared_ptr<Leaf> leaf = GetCore()->Get(path);
! 
!     if (leaf.get() == 0)
!         {
!             GetLog()->Error()
!                 << "(InputControl) ERROR: invalid path "
!                 << path << "'\n";
!             return false;
!         }
! 
!     mFPSController = shared_dynamic_cast<FPSController>
!         (GetCore()->Get(path));
! 
!     if (mFPSController.get() == 0)
!         {
!             // the path is valid but doesn't point to an FPSController;
!             // for convenience search below for a controller
!             mFPSController  =
!                 leaf->FindChildSupportingClass<FPSController>(true);
!         }
! 
      if (mFPSController.get() == 0)
          {
--- 45,49 ----
  bool InputControl::SetFPSController(const std::string& path)
  {
!     RegisterCachedPath(mFPSController, path);
      if (mFPSController.get() == 0)
          {
***************
*** 86,95 ****
  shared_ptr<FPSController> InputControl::GetFPSController()
  {
!     return mFPSController;
! }
! 
! void InputControl::SetFPSController(shared_ptr<FPSController> controller)
! {
!     mFPSController = controller;
  }
  
--- 59,63 ----
  shared_ptr<FPSController> InputControl::GetFPSController()
  {
!     return mFPSController.get();
  }
  
***************
*** 111,116 ****
      scriptServer->CreateVariable("Command.Mouselook", CmdMouseLook);
  
!     mInputServer = shared_dynamic_cast<InputServer>
!         (GetCore()->Get("/sys/server/input"));
  
      if (mInputServer.get() == 0)
--- 79,83 ----
      scriptServer->CreateVariable("Command.Mouselook", CmdMouseLook);
  
!     RegisterCachedPath(mInputServer, "/sys/server/input");
  
      if (mInputServer.get() == 0)
***************
*** 269,273 ****
  }
  
! float 
  InputControl::GetDeltaTime()
  {
--- 236,240 ----
  }
  
! float
  InputControl::GetDeltaTime()
  {
***************
*** 275,279 ****
  }
  
! void 
  InputControl::SetAdvanceTime(bool advance)
  {
--- 242,246 ----
  }
  
! void
  InputControl::SetAdvanceTime(bool advance)
  {
***************
*** 281,285 ****
  }
  
! bool 
  InputControl::GetAdvanceTime()
  {
--- 248,252 ----
  }
  
! bool
  InputControl::GetAdvanceTime()
  {
***************
*** 287,291 ****
  }
  
! bool 
  InputControl::RegisterInputItem(const string& inputItemName, const string& name)
  {
--- 254,258 ----
  }
  
! bool
  InputControl::RegisterInputItem(const string& inputItemName, const string& name)
  {
***************
*** 325,331 ****
  }
  
- void 
- InputControl::UpdateCached()
- {
-     //    mFPSController.reset();
- }
--- 292,293 ----