simspark-cvs — CVS Commit Notifications via Email

[simspark-cvs] simspark/spark/oxygen/gamecontrolserver gamecontrolserver.cpp, 1.1.2.2, 1.1.2.2.2.1

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

Update of /cvsroot/simspark/simspark/spark/oxygen/gamecontrolserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15055

Modified Files:
      Tag: projectx
	gamecontrolserver.cpp 
Log Message:
- fix a VC cast warning

Index: gamecontrolserver.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/gamecontrolserver/gamecontrolserver.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -C2 -d -r1.1.2.2 -r1.1.2.2.2.1
*** gamecontrolserver.cpp	28 Feb 2007 20:38:38 -0000	1.1.2.2
--- gamecontrolserver.cpp	31 Mar 2007 13:55:39 -0000	1.1.2.2.2.1
***************
*** 228,232 ****
  GameControlServer::GetAgentCount() const
  {
!     return mAgentMap.size();
  }
  
--- 228,232 ----
  GameControlServer::GetAgentCount() const
  {
!     return static_cast<int>(mAgentMap.size());
  }
  

[simspark-cvs] simspark/spark/kerosin kerosin.vcproj, 1.1.2.3, 1.1.2.3.2.1

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

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

Modified Files:
      Tag: projectx
	kerosin.vcproj 
Log Message:
- add baserenderserver files to kerosin VC project file

Index: kerosin.vcproj
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/kerosin.vcproj,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -C2 -d -r1.1.2.3 -r1.1.2.3.2.1
*** kerosin.vcproj	14 Feb 2007 12:36:05 -0000	1.1.2.3
--- kerosin.vcproj	31 Mar 2007 13:54:58 -0000	1.1.2.3.2.1
***************
*** 509,512 ****
--- 509,524 ----
  		</Filter>
  		<File
+ 			RelativePath=".\renderserver\baserenderserver.cpp"
+ 			>
+ 		</File>
+ 		<File
+ 			RelativePath=".\renderserver\baserenderserver.h"
+ 			>
+ 		</File>
+ 		<File
+ 			RelativePath=".\renderserver\baserenderserver_c.cpp"
+ 			>
+ 		</File>
+ 		<File
  			RelativePath=".\kerosin.cpp"
  			>

[simspark-cvs] simspark/spark/win32 sparkconfig.h, NONE, 1.1.2.1 config.h, 1.1.2.4.2.1, NONE

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

Update of /cvsroot/simspark/simspark/spark/win32
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14267

Added Files:
      Tag: projectx
	sparkconfig.h 
Removed Files:
      Tag: projectx
	config.h 
Log Message:
- rename win32 config.h to sparkconfig.h

--- config.h DELETED ---

--- NEW FILE: sparkconfig.h ---
/** this is a static (i.e. not auto generated) win32 specific
    configuration file
*/
#define HAVE_KEROSIN_KEROSIN_H 1

#define PACKAGE_NAME "simspark"

#define HAVE_WINSOCK2_H 1
#define HAVE_SOCKET 1
#define HAVE_SOCKETTYPE 1

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

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

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

Modified Files:
	inputcontrol.cpp inputcontrol.h 
Log Message:
- added method GetFPSController() to get it's cached location

Index: inputcontrol.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/inputserver/inputcontrol.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** inputcontrol.h	15 Mar 2007 07:26:25 -0000	1.2
--- inputcontrol.h	31 Mar 2007 13:18:16 -0000	1.3
***************
*** 69,72 ****
--- 69,75 ----
      bool SetFPSController(const std::string& path);
  
+     /** returns the cached location of the FPS controller */
+     boost::shared_ptr<oxygen::FPSController> GetFPSController();
+ 
      /** sets the FPSController to be used */
      void SetFPSController(boost::shared_ptr<oxygen::FPSController> controller);

Index: inputcontrol.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/inputserver/inputcontrol.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** inputcontrol.cpp	15 Mar 2007 07:26:25 -0000	1.3
--- inputcontrol.cpp	31 Mar 2007 13:18:16 -0000	1.4
***************
*** 84,87 ****
--- 84,92 ----
  }
  
+ shared_ptr<FPSController> InputControl::GetFPSController()
+ {
+     return mFPSController;
+ }
+ 
  void InputControl::SetFPSController(shared_ptr<FPSController> controller)
  {

[simspark-cvs] simspark/spark/oxygen/sceneserver fpscontroller.cpp, 1.2, 1.3 fpscontroller.h, 1.2, 1.3

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

Update of /cvsroot/simspark/simspark/spark/oxygen/sceneserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31055

Modified Files:
	fpscontroller.cpp fpscontroller.h 
Log Message:
- added method UpdateStatic() that updates the managed body statically, i.e. without using ODE. This is useful to move an associated body while the simulation is paused

- added method NeedStaticUpdate() to query if a call to UpdateStatic() would change the state of the managed body

- factored setup of rotation matirx and forward vector out into method PrepareUpdate()

- added members mHAngleDelta and mVAngleDelta that accumulate the applied angle deltas since the last update of the controller

Index: fpscontroller.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/sceneserver/fpscontroller.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** fpscontroller.h	15 Mar 2007 07:26:28 -0000	1.2
--- fpscontroller.h	31 Mar 2007 13:23:30 -0000	1.3
***************
*** 80,84 ****
--- 80,100 ----
      float GetAcceleration() const;
  
+     /** updates the managed body statically, i.e. without using the
+         dynamics engine; this is useful to move an associated camera
+         when the simulation is paused
+     */
+     void UpdateStatic(float deltaTime);
+ 
+     /** returns true if a call to UpdateStatic will alter the state of
+         the managed body
+     */
+     bool NeedStaticUpdate() const;
+ 
  protected:
+     /** sets up the rotation matrix and directio vector used to update
+         the managed body
+     */
+     void PrepareUpdate(salt::Matrix& matrix, salt::Matrix& fwd, salt::Vector3f& vec);
+ 
      /** calculates and applies the force needed to perfom the
       * activated movements */
***************
*** 95,101 ****
--- 111,123 ----
      float   mHAngle;
  
+     /** applied horizontal delta since last update */
+     float   mHAngleDelta;
+ 
      /** the current vertical angle in degrees */
      float   mVAngle;
  
+     /** applied horizontal delta since last update */
+     float   mVAngleDelta;
+ 
      // event states
  

Index: fpscontroller.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/sceneserver/fpscontroller.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** fpscontroller.cpp	15 Mar 2007 07:26:28 -0000	1.2
--- fpscontroller.cpp	31 Mar 2007 13:23:30 -0000	1.3
***************
*** 27,34 ****
--- 27,44 ----
  using namespace salt;
  
+ // define some magic number here for the static fps controller update
+ // (while the simulation is paused). These should be made
+ // configurable.n
+ static const float STATIC_MIN_ANGLE_DELTA = 0.1f;
+ static const float STATIC_MIN_VELOCITY = 1e-3;
+ static const float STATIC_VELOCITY_DECAY = 0.8f;
+ static const float STATIC_ACCELERATION = 0.01f;
+ 
  FPSController::FPSController() : BodyController()
  {
      mHAngle   = 0.0f;
+     mHAngleDelta = 0.0f;
      mVAngle   = 0.0f;
+     mVAngleDelta = 0.0f;
      mForward  = false;
      mBackward = false;
***************
*** 44,56 ****
  }
  
! void FPSController::PrePhysicsUpdateInternal(float /*deltaTime*/)
  {
-     if (mBody.get() == 0)
-         {
-             return;
-         }
- 
      // determine force direction
!     Vector3f vec(0.0f,0.0f,0.0f);
  
      if (mForward)  vec.y() += 1.0f;
--- 54,61 ----
  }
  
! void FPSController::PrepareUpdate(Matrix& matrix, Matrix& fwd, Vector3f& vec)
  {
      // determine force direction
!     vec = Vector3f(0.0f,0.0f,0.0f);
  
      if (mForward)  vec.y() += 1.0f;
***************
*** 70,78 ****
              }
  
!     Matrix matrix;
      float hAngle = gDegToRad(-mHAngle);
      float vAngle = gDegToRad(-mVAngle);
      matrix.RotationZ(hAngle);
      matrix.RotateX(vAngle);
      mBody->SetRotation(matrix);
  
--- 75,100 ----
              }
  
!     matrix.Identity();
      float hAngle = gDegToRad(-mHAngle);
      float vAngle = gDegToRad(-mVAngle);
      matrix.RotationZ(hAngle);
      matrix.RotateX(vAngle);
+ 
+     fwd.Identity();
+     fwd.RotationZ(hAngle);
+ }
+ 
+ void FPSController::PrePhysicsUpdateInternal(float /*deltaTime*/)
+ {
+     if (mBody.get() == 0)
+         {
+             return;
+         }
+ 
+     Matrix matrix;
+     Matrix fwd;
+     Vector3f vec;
+     PrepareUpdate(matrix, fwd, vec);
+ 
      mBody->SetRotation(matrix);
  
***************
*** 82,95 ****
              vec *= force;
  
-             Matrix fwd;
-             fwd.RotationZ(hAngle);
              mBody->AddForce(vec.y() * fwd.Up());
- 
-             Matrix side;
-             side.RotationX(vAngle);
              mBody->AddForce(vec.x() * fwd.Right());
- 
              mBody->AddForce(vec.z() * Vector3f(0,0,1));
          }
  }
  
--- 104,174 ----
              vec *= force;
  
              mBody->AddForce(vec.y() * fwd.Up());
              mBody->AddForce(vec.x() * fwd.Right());
              mBody->AddForce(vec.z() * Vector3f(0,0,1));
          }
+ 
+     mHAngleDelta = 0.0;
+     mVAngleDelta = 0.0;
+ }
+ 
+ bool FPSController::NeedStaticUpdate() const
+ {
+     if (mBody.get() == 0)
+         {
+             return false;
+         }
+ 
+     return (
+             (mForward) ||
+             (mBackward) ||
+             (mRight) ||
+             (mLeft) ||
+             (mUp) ||
+             (mDown) ||
+             (gAbs(mHAngleDelta) >= STATIC_MIN_ANGLE_DELTA) ||
+             (gAbs(mVAngleDelta) >= STATIC_MIN_ANGLE_DELTA) ||
+             (mBody->GetVelocity().Length() > STATIC_MIN_VELOCITY)
+             );
+ }
+ 
+ void FPSController::UpdateStatic(float deltaTime)
+ {
+     if (mBody.get() == 0)
+         {
+             return;
+         }
+ 
+     Matrix matrix;
+     Matrix fwd;
+     Vector3f vec;
+     PrepareUpdate(matrix, fwd, vec);
+ 
+     mBody->SetRotation(matrix);
+ 
+     Vector3f bodyVel = mBody->GetVelocity() + (deltaTime * vec * STATIC_ACCELERATION);
+     bodyVel *= STATIC_VELOCITY_DECAY;
+ 
+     Vector3f velocity =
+         vec.y() * fwd.Up() +
+         vec.x() * fwd.Right() +
+         vec.z() * Vector3f(0,0,1);
+ 
+     matrix.Pos() = mBody->GetPosition() + velocity * bodyVel.Length();
+ 
+     mBody->SetPosition(matrix.Pos());
+     mBody->SetVelocity(velocity);
+ 
+     shared_ptr<BaseNode> bodyParent = shared_static_cast<BaseNode>
+         (make_shared(mBody->GetParent()));
+ 
+     if (bodyParent.get() != 0)
+         {
+             mBody->SynchronizeParent();
+             bodyParent->UpdateHierarchy();
+         }
+ 
+     mHAngleDelta = 0.0;
+     mVAngleDelta = 0.0;
  }
  
***************
*** 97,100 ****
--- 176,180 ----
  {
      mHAngle += delta;
+     mHAngleDelta += delta;
  }
  
***************
*** 102,105 ****
--- 182,186 ----
  {
      mVAngle += delta;
+     mVAngleDelta += delta;
  }
  
***************
*** 107,110 ****
--- 188,192 ----
  {
      mHAngle = angleDeg;
+     mHAngleDelta = 0.0;
  }
  
***************
*** 112,115 ****
--- 194,198 ----
  {
      mVAngle = angleDeg;
+     mVAngleDelta = 0.0;
  }
  

[simspark-cvs] simspark/spark/oxygen/physicsserver body.cpp, 1.3, 1.4 body.h, 1.3, 1.4

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

Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv29583

Modified Files:
	body.cpp body.h 
Log Message:
- factored out update of parent node into method SynchronizeParent()

Index: body.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/body.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** body.h	15 Mar 2007 07:26:27 -0000	1.3
--- body.h	31 Mar 2007 13:19:56 -0000	1.4
***************
*** 179,182 ****
--- 179,187 ----
      virtual void DestroyODEObject();
  
+     /** synchronize parent node with the bodies position and
+         orientation
+     */
+     void SynchronizeParent() const;
+ 
  protected:
      /** creates the managed ODE body and moves it to the position of

Index: body.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/body.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** body.cpp	15 Mar 2007 07:26:27 -0000	1.3
--- body.cpp	31 Mar 2007 13:19:56 -0000	1.4
***************
*** 264,271 ****
  }
  
! void Body::PostPhysicsUpdateInternal()
  {
-     // synchronize parent node with the bodies position and
-     // orientation
      const dReal* pos = dBodyGetPosition(mODEBody);
      const dReal* rot = dBodyGetRotation(mODEBody);
--- 264,269 ----
  }
  
! void Body::SynchronizeParent() const
  {
      const dReal* pos = dBodyGetPosition(mODEBody);
      const dReal* rot = dBodyGetRotation(mODEBody);
***************
*** 295,298 ****
--- 293,301 ----
  }
  
+ void Body::PostPhysicsUpdateInternal()
+ {
+     SynchronizeParent();
+ }
+ 
  shared_ptr<Body> Body::GetBody(dBodyID id)
  {

[simspark-cvs] simspark/contrib/rsgedit mainframe.cpp, 1.9, 1.10 mainframe.h, 1.8, 1.9

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

Update of /cvsroot/simspark/simspark/contrib/rsgedit
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1411

Modified Files:
	mainframe.cpp mainframe.h 
Log Message:
- added a second timer to update the FpsController periodically while the simulation is paused
- added member mLastFPSUpdate that hold the simulation time of the last static FPS controller update
- start the FPS timer when the simulation pauses

Index: mainframe.h
===================================================================
RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mainframe.h	15 Mar 2007 07:26:24 -0000	1.8
--- mainframe.h	31 Mar 2007 13:28:50 -0000	1.9
***************
*** 104,107 ****
--- 104,108 ----
  
      void OnLogTimer(wxTimerEvent& event);
+     void OnFPSTimer(wxTimerEvent& event);
  
      /** appends the accumulated log buffer to the log window pane */
***************
*** 159,162 ****
--- 160,168 ----
  protected:
      wxTimer mTimer;
+ 
+     //! simulation time of the last static FPS controller update
+     float mLastFPSUpdate;
+     wxTimer mFPSTimer;
+ 
      wxToolBar* mToolBar;
      SparkTree mSparkTree;

Index: mainframe.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mainframe.cpp	15 Mar 2007 07:26:24 -0000	1.9
--- mainframe.cpp	31 Mar 2007 13:28:50 -0000	1.10
***************
*** 43,49 ****
--- 43,53 ----
  #include <oxygen/simulationserver/simulationserver.h>
  #include <oxygen/sceneserver/sceneserver.h>
+ #include <oxygen/sceneserver/fpscontroller.h>
  #include <kerosin/inputserver/inputcontrol.h>
  #include "simspark.h"
  
+ #define TI_LOG 1
+ #define TI_FPS 2
+ 
  BEGIN_EVENT_TABLE(mainframe, wxFrame)
      EVT_MENU(wxID_EXIT, mainframe::OnExit)
***************
*** 72,76 ****
      EVT_MENU(ID_HELP_ABOUT, mainframe::OnHelpAbout)
  
!     EVT_TIMER(1, mainframe::OnLogTimer)
  
      EVT_TREE_ITEM_EXPANDING(1, mainframe::OnTreeItemExpanding)
--- 76,81 ----
      EVT_MENU(ID_HELP_ABOUT, mainframe::OnHelpAbout)
  
!     EVT_TIMER(TI_LOG, mainframe::OnLogTimer)
!     EVT_TIMER(TI_FPS, mainframe::OnFPSTimer)
  
      EVT_TREE_ITEM_EXPANDING(1, mainframe::OnTreeItemExpanding)
***************
*** 87,91 ****
  mainframe::mainframe(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
      wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE),
!     mTimer(this,1)
  {
      mToolBar = 0;
--- 92,96 ----
  mainframe::mainframe(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
      wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE),
!     mTimer(this,TI_LOG), mFPSTimer(this,TI_FPS)
  {
      mToolBar = 0;
***************
*** 334,337 ****
--- 339,390 ----
  }
  
+ void mainframe::OnFPSTimer(wxTimerEvent& event)
+ {
+     shared_ptr<SimSpark> spark = wxGetApp().GetSpark();
+ 
+     if (
+         (spark.get() == 0) ||
+         (spark->GetSimState() != S_PAUSED)
+         )
+         {
+             return;
+         }
+ 
+     shared_ptr<InputControl> inputCtr = spark->GetInputControl();
+     if (inputCtr.get() == 0)
+         {
+             return;
+         }
+ 
+     inputCtr->StartCycle();
+ 
+     shared_ptr<FPSController> fps = inputCtr->GetFPSController();
+     if (
+         (fps.get() == 0) ||
+         (! fps->NeedStaticUpdate())
+         )
+         {
+             // currently no update need, check again after full interval
+             mFPSTimer.Start(FPS_UPDATE_INTERVAL);
+             return;
+         }
+ 
+     shared_ptr<SimulationServer> sim = spark->GetSimulationServer();
+     if (sim.get() == 0)
+     {
+         return;
+     }
+ 
+     float now = sim->GetTime();
+     fps->UpdateStatic(std::max<float>(0, now - mLastFPSUpdate));
+     mLastFPSUpdate = now;
+ 
+     wxClientDC dc(this);
+     mCanvas->Render(dc);
+ 
+     // recheck and update as soon as posssible
+     mFPSTimer.Start(1);
+ }
+ 
  void mainframe::UpdateLogWindow()
  {
***************
*** 414,418 ****
      if (inputCtr.get() != 0)
          {
!             inputCtr->SetFPSController("/usr/scene/camera/physics/controller");
              inputCtr->SetAdvanceTime(false);
          }
--- 467,471 ----
      if (inputCtr.get() != 0)
          {
!             inputCtr->SetFPSController(MAINFRAME_FPS_CONTROLLER.c_str());
              inputCtr->SetAdvanceTime(false);
          }
***************
*** 421,424 ****
--- 474,479 ----
      sim->Init(0,0);
      sim->SetAutoTimeMode(false);
+ 
+     mLastFPSUpdate = 0.0;
  }
  
***************
*** 426,433 ****
--- 481,492 ----
  {
      sim->Done();
+ 
+     mLastFPSUpdate = sim->GetTime();
+     mFPSTimer.Start(FPS_UPDATE_INTERVAL);
  }
  
  void mainframe::StartSimulation()
  {
+     mFPSTimer.Stop();
      shared_ptr<SimSpark> spark = wxGetApp().GetSpark();
      if (

[simspark-cvs] simspark/contrib/rsgedit sparkglcanvas.cpp,1.5,1.6

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

Update of /cvsroot/simspark/simspark/contrib/rsgedit
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv332

Modified Files:
	sparkglcanvas.cpp 
Log Message:
- add input events to the InputSystem regardless of the simulation state.

Index: sparkglcanvas.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/sparkglcanvas.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sparkglcanvas.cpp	15 Mar 2007 07:26:24 -0000	1.5
--- sparkglcanvas.cpp	31 Mar 2007 13:26:41 -0000	1.6
***************
*** 253,265 ****
          }
  
-     shared_ptr<SimSpark> spark = wxGetApp().GetSpark();
-     if (
-         (spark.get() == 0) ||
-         (spark->GetSimState() != S_RUNNING)
-         )
-         {
-             return;
-         }
- 
      mInputSystem->AddInput(input);
  }
--- 253,256 ----

[simspark-cvs] simspark/contrib/rsgedit constants.cpp, 1.2, 1.3 constants.h, 1.2, 1.3

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

Update of /cvsroot/simspark/simspark/contrib/rsgedit
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32113

Modified Files:
	constants.cpp constants.h 
Log Message:
- added FPS_UPDATE_INTERVAL that defines the default timer interval to update the FPS controller while the simulation is paused

Index: constants.h
===================================================================
RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/constants.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** constants.h	15 Mar 2007 07:26:24 -0000	1.2
--- constants.h	31 Mar 2007 13:25:13 -0000	1.3
***************
*** 22,25 ****
--- 22,26 ----
  
  #include <wx/defs.h>
+ #include <wx/string.h>
  
  enum ESimState
***************
*** 57,62 ****
--- 58,69 ----
  extern const int LOGWND_UPDATE_INTERVAL;
  
+ // the update interval of fps controller while the simulation is paused */
+ extern const int FPS_UPDATE_INTERVAL;
+ 
  // the default width of the tree window pane [pixel]
  extern const int TREEWND_DEFAULT_WIDTH;
  
+ // the default path to the fps controller
+ extern const wxString MAINFRAME_FPS_CONTROLLER;
+ 
  #endif // RSGEDIT_CONSTANTS_H

Index: constants.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/constants.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** constants.cpp	15 Mar 2007 07:26:24 -0000	1.2
--- constants.cpp	31 Mar 2007 13:25:13 -0000	1.3
***************
*** 29,32 ****
--- 29,38 ----
  const int LOGWND_UPDATE_INTERVAL = 100;
  
+ // the update interval of fps controller while the simulation is paused */
+ const int FPS_UPDATE_INTERVAL = 40;
+ 
  // the default width of the tree window pane [pixel]
  const int TREEWND_DEFAULT_WIDTH = 270;
+ 
+ // the default path to the fps controller
+ const wxString MAINFRAME_FPS_CONTROLLER = "/usr/scene/camera/physics/controller";

[simspark-cvs] simspark/spark ChangeLog,1.1.2.2.2.2,1.1.2.2.2.3

[Oliver O. <fr...@us...>]

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

Modified Files:
      Tag: projectx
	ChangeLog 
Log Message:
*** empty log message ***

Index: ChangeLog
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/ChangeLog,v
retrieving revision 1.1.2.2.2.2
retrieving revision 1.1.2.2.2.3
diff -C2 -d -r1.1.2.2.2.2 -r1.1.2.2.2.3
*** ChangeLog	30 Mar 2007 03:29:14 -0000	1.1.2.2.2.2
--- ChangeLog	30 Mar 2007 04:25:41 -0000	1.1.2.2.2.3
***************
*** 1,46 ****
! 2007-03-30  Oliver Obst  <fr...@cs...>
  
! 	* salt/fileclasses.h: - added a static method Sep() to RFile,
! 	returning the OS-specific path separator - added a static method
! 	BundlePath() to RFile, returning the OS-specific bundle path
! 	- removed static global method PathSeparator()
  	
! 	* salt/defines.h: changed config.h to sparkconfig.h
! * oxygen/simulationserver/simulationserver.cpp: writing exit
! 	message to cerr, whitespace changes
! * oxygen/physicsserver/odewrapper.h: changed config.h to sparkconfig.h
! 	* kerosin/renderserver/renderserver_c.cpp: changes due to split
! 	off of the baserenderserver
! * kerosin/renderserver/renderserver.h: changes due to split off of
! 	the baserenderserver
! * kerosin/renderserver/renderserver.cpp: changes due to split off of the baserenderserver
! 	* kerosin/renderserver/rendercontrol_c.cpp: changes due to split off of the baserenderserver
! 	* kerosin/renderserver/rendercontrol.h, * kerosin/renderserver/rendercontrol.cpp: changes due to split off
! 	of the baserenderserver
! 	* kerosin/openglserver/openglsystem.h: added a pure virtual method
! 	to get a handle for the window
! 	* kerosin/openglserver/openglserver.h:
! 	* kerosin/openglserver/openglserver.cpp: 
! 	added method to get a handle string for the glwindow
  
! 	* kerosin/imageserver/imageserver.h: changed config.h to sparkconfig.h
  
! 	* kerosin/imageserver/image.h: changed config.h to sparkconfig.h
  
! 	* kerosin/kerosin.cpp
! 	* kerosin/Makefile.am: added baserenderserver
  
! 	* Makefile.am: changed config.h to sparkconfig.h
! 	* spark/spark.h: changed config.h to sparkconfig.h
! 	* test/coretest/main.cpp: changed config.h to sparkconfig.h
! 	* utility/rcssnet/udpsocket.cpp: changed config.h to sparkconfig.h
! 	* utility/rcssnet/tcpsocket.cpp: changed config.h to sparkconfig.h
! 	* utility/rcssnet/socket.hpp: changed config.h to sparkconfig.h
! 	* utility/rcssnet/socket.cpp: changed config.h to sparkconfig.h
! 	* utility/rcssnet/exception.cpp: changed config.h to sparkconfig.h
! 	* utility/rcssnet/addr.cpp: changed config.h to sparkconfig.h
  	
  
! 	2007-03-07 Oliver Obst <fr...@us...>
  
  	* salt/sharedlibrary.cpp: 
--- 1,67 ----
! 2007-03-30 Oliver Obst <fr...@us...>
  
! 	* kerosin/renderserver/baserenderserver.h,
! 	* kerosin/renderserver/baserenderserver.cpp,
! 	* kerosin/renderserver/baserenderserver_c.cpp:
! 	added an abstract base renderer, designed to implement different renderservers
  	
! 	* kerosin/renderserver/renderserver.h:
! 	* kerosin/renderserver/renderserver.cpp:
! 	* kerosin/renderserver/renderserver_c.cpp: 
! 	* kerosin/renderserver/rendercontrol_c.cpp: 
! 	* kerosin/renderserver/rendercontrol.h, 
! 	* kerosin/renderserver/rendercontrol.cpp:
! 	- changes due to split off of the baserenderserver
  
! 	* configure.ac: 
! 	- changed config.h to sparkconfig.h 
! 	- check for MacOS corefoundation.h 
! 	- make spark-config executable at the end of the configuration
  
! 	* salt/fileclasses.cpp: 
! 	- include corefoundation header 
! 	- changed config.h to sparkconfig.h
  
! 	* zeitgeist/scriptserver/scriptserver.cpp: 
! 	- replaced config.h by sparkconfig.h 
! 	- pathname changes due to changes in file classes 
! 	- fixed pkgdatadir
  
! 	* zeitgeist/zeitgeist-config.in: 
! 	- added framework for building MacOS apps using zeitgeist
! 
! 	* Makefile.am, spark/spark.h, test/coretest/main.cpp, 
! 	  utility/rcssnet/udpsocket.cpp, utility/rcssnet/tcpsocket.cpp, 
! 	  utility/rcssnet/socket.hpp, utility/rcssnet/socket.cpp, 
! 	  utility/rcssnet/exception.cpp, utility/rcssnet/addr.cpp,
! 	  zeitgeist/class.h,  kerosin/imageserver/imageserver.h, 
! 	  kerosin/imageserver/image.h, salt/path.h, salt/defines.h,
! 	  oxygen/physicsserver/odewrapper.h:
! 	- changed config.h to sparkconfig.h
! 
! 	* salt/sharedlibrary.h:
! 	* salt/rect.h: 
! 	* salt/tvector.h: 
! 	- removed config.h inclusion
! 
! 	* salt/sharedlibrary.cpp: 
! 	- including fileclasses.h
  	
+ 	* salt/fileclasses.h, salt/fileclasses.cpp: 
+ 	- added a static method Sep() to RFile, returning the OS-specific path separator 
+ 	- added a static method BundlePath() to RFile, returning the OS-specific bundle path 
+ 	- changed config.h to sparkconfig.h
+ 	- removed static global method PathSeparator()
+ 	
+ 	* kerosin/openglserver/openglsystem.h: 
+ 	- added a pure virtual method to get a handle for the window
  
! 	* kerosin/openglserver/openglserver.h, kerosin/openglserver/openglserver.cpp: 
! 	- added method to get a handle string for the glwindow
! 
! 	* kerosin/kerosin.cpp, kerosin/Makefile.am: 
! 	- added baserenderserver	
! 
! 2007-03-07 Oliver Obst <fr...@us...>
  
  	* salt/sharedlibrary.cpp: 

[simspark-cvs] simspark/spark .cvsignore,1.1,1.1.4.1

[Oliver O. <fr...@us...>]

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

Modified Files:
      Tag: projectx
	.cvsignore 
Log Message:


Index: .cvsignore
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** .cvsignore	19 Dec 2005 20:09:16 -0000	1.1
--- .cvsignore	30 Mar 2007 04:12:29 -0000	1.1.4.1
***************
*** 3,8 ****
  aclocal.m4
  autom4te.cache
! config.h
! config.h.in
  config.log
  config.status
--- 3,8 ----
  aclocal.m4
  autom4te.cache
! sparkconfig.h
! sparkconfig.h.in
  config.log
  config.status

[simspark-cvs] simspark/spark/utility/libobj .cvsignore, NONE, 1.1.2.1

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/utility/libobj
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28556/utility/libobj

Added Files:
      Tag: projectx
	.cvsignore 
Log Message:


--- NEW FILE: .cvsignore ---
*.la
*.lo
.deps
.dirstamp
.libs
Makefile
Makefile.in

[simspark-cvs] simspark/spark/plugin/rosimporter .cvsignore, NONE, 1.1.2.1

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/plugin/rosimporter
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28556/plugin/rosimporter

Added Files:
      Tag: projectx
	.cvsignore 
Log Message:


--- NEW FILE: .cvsignore ---
*.la
*.lo
.deps
.dirstamp
.libs
Makefile
Makefile.in

[simspark-cvs] simspark/spark/plugin/openglsyssdl .cvsignore, NONE, 1.1.2.1

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/plugin/openglsyssdl
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28556/plugin/openglsyssdl

Added Files:
      Tag: projectx
	.cvsignore 
Log Message:


--- NEW FILE: .cvsignore ---
*.la
*.lo
.deps
.dirstamp
.libs
Makefile
Makefile.in

[simspark-cvs] simspark/spark/utility/tinyxml .cvsignore, NONE, 1.1.2.1

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/utility/tinyxml
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28556/utility/tinyxml

Added Files:
      Tag: projectx
	.cvsignore 
Log Message:


--- NEW FILE: .cvsignore ---
*.la
*.lo
.deps
.dirstamp
.libs
Makefile
Makefile.in

[simspark-cvs] simspark/spark/plugin .cvsignore,NONE,1.1.2.1

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/plugin
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28556/plugin

Added Files:
      Tag: projectx
	.cvsignore 
Log Message:


--- NEW FILE: .cvsignore ---
.dirstamp
Makefile
Makefile.in

[simspark-cvs] simspark/spark/zeitgeist/randomserver .cvsignore, 1.1, 1.1.4.1

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/zeitgeist/randomserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27770/zeitgeist/randomserver

Modified Files:
      Tag: projectx
	.cvsignore 
Log Message:


Index: .cvsignore
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/randomserver/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** .cvsignore	5 Dec 2005 21:50:00 -0000	1.1
--- .cvsignore	30 Mar 2007 04:08:00 -0000	1.1.4.1
***************
*** 2,5 ****
--- 2,6 ----
  *.lo
  .deps
+ .dirstamp
  .libs
  Makefile

[simspark-cvs] simspark/spark/zeitgeist/fileserver .cvsignore, 1.1, 1.1.4.1

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/zeitgeist/fileserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27770/zeitgeist/fileserver

Modified Files:
      Tag: projectx
	.cvsignore 
Log Message:


Index: .cvsignore
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/fileserver/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** .cvsignore	5 Dec 2005 21:50:00 -0000	1.1
--- .cvsignore	30 Mar 2007 04:08:00 -0000	1.1.4.1
***************
*** 2,5 ****
--- 2,6 ----
  *.lo
  .deps
+ .dirstamp
  .libs
  Makefile

[simspark-cvs] simspark/spark/zeitgeist/scriptserver .cvsignore, 1.1, 1.1.4.1

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27770/zeitgeist/scriptserver

Modified Files:
      Tag: projectx
	.cvsignore 
Log Message:


Index: .cvsignore
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** .cvsignore	5 Dec 2005 21:50:02 -0000	1.1
--- .cvsignore	30 Mar 2007 04:08:01 -0000	1.1.4.1
***************
*** 2,5 ****
--- 2,6 ----
  *.lo
  .deps
+ .dirstamp
  .libs
  Makefile

[simspark-cvs] simspark/spark/zeitgeist/logserver .cvsignore, 1.1, 1.1.4.1

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/zeitgeist/logserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27770/zeitgeist/logserver

Modified Files:
      Tag: projectx
	.cvsignore 
Log Message:


Index: .cvsignore
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/logserver/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** .cvsignore	5 Dec 2005 21:50:00 -0000	1.1
--- .cvsignore	30 Mar 2007 04:08:00 -0000	1.1.4.1
***************
*** 2,5 ****
--- 2,6 ----
  *.lo
  .deps
+ .dirstamp
  .libs
  Makefile

[simspark-cvs] simspark/spark/spark .cvsignore,1.1,1.1.4.1

[Oliver O. <fr...@us...>]

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

Modified Files:
      Tag: projectx
	.cvsignore 
Log Message:


Index: .cvsignore
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/spark/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** .cvsignore	19 Dec 2005 20:09:18 -0000	1.1
--- .cvsignore	30 Mar 2007 04:08:01 -0000	1.1.4.1
***************
*** 1,6 ****
  .deps
  .libs
  Makefile
  Makefile.in
! *.la
! *.lo
--- 1,8 ----
+ *.la
+ *.lo
  .deps
+ .dirstamp
  .libs
  Makefile
  Makefile.in
! spark-config

[simspark-cvs] simspark/spark/kerosin/renderserver baserenderserver.cpp, NONE, 1.1.2.1 baserenderserver.h, NONE, 1.1.2.1 baserenderserver_c.cpp, NONE, 1.1.2.1

[Oliver O. <fr...@us...>]

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

Added Files:
      Tag: projectx
	baserenderserver.cpp baserenderserver.h baserenderserver_c.cpp 
Log Message:
added baserenderserver class

--- NEW FILE: baserenderserver.cpp ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of simspark
   Tue May 9 2006
   Copyright (C) 2002,2003 Koblenz University
   Copyright (C) 2007 RoboCup Soccer Server 3D Maintenance Group
   $Id: baserenderserver.cpp,v 1.1.2.1 2007/03/30 04:04:33 fruit Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

   BaseRenderServer

   NOTE: This is an abstract renderserver in order to support different render servers

   HISTORY:
       29/03/07 - OO  - Initial version

*/
#include "baserenderserver.h"
#include <oxygen/sceneserver/sceneserver.h>
#include <oxygen/sceneserver/scene.h>
#include <zeitgeist/logserver/logserver.h>

using namespace oxygen;
using namespace kerosin;
using namespace salt;
using namespace zeitgeist;

void
BaseRenderServer::OnLink()
{
    // setup SceneServer reference
    RegisterCachedPath(mSceneServer, "/sys/server/scene");

    if (mSceneServer.expired())
    {
        GetLog()->Error() << "(BaseRenderServer) ERROR: SceneServer not found\n";
    }
}

void
BaseRenderServer::OnUnlink()
{
    mActiveScene.reset();
    Leaf::OnUnlink();
}

bool
BaseRenderServer::GetActiveScene()
{
    if (mSceneServer.expired())
    {
        mActiveScene.reset();
    }

    mActiveScene = mSceneServer->GetActiveScene();

    if (mActiveScene.get() == 0)
    {
        GetLog()->Error() << "(BaseRenderServer) ERROR: found no active scene\n";
        return false;
    }

    return true;
}

void 
BaseRenderServer::UpdateCached()
{
    mActiveScene.reset();
}

--- NEW FILE: baserenderserver_c.cpp ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of simspark
   Tue May 9 2006
   Copyright (C) 2002,2003 Koblenz University
   Copyright (C) 2007 RoboCup Soccer Server 3D Maintenance Group
   $Id: baserenderserver_c.cpp,v 1.1.2.1 2007/03/30 04:04:33 fruit Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "baserenderserver.h"
#include <oxygen/sceneserver/sceneserver.h>

using namespace boost;
using namespace kerosin;
using namespace zeitgeist;


void 
CLASS(BaseRenderServer)::DefineClass()
{
    DEFINE_BASECLASS(zeitgeist/Leaf);
}

--- NEW FILE: baserenderserver.h ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of simspark
   Tue May 9 2006
   Copyright (C) 2002,2003 Koblenz University
   Copyright (C) 2007 RoboCup Soccer Server 3D Maintenance Group
   $Id: baserenderserver.h,v 1.1.2.1 2007/03/30 04:04:33 fruit Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

   BaseRenderServer

   NOTE: This is an abstract renderserver in order to support different render servers

   HISTORY:
       29/03/07 - OO  - Initial version

*/
#ifndef KEROSIN_BASERENDERSERVER_H
#define KEROSIN_BASERENDERSERVER_H

#include <zeitgeist/class.h>
#include <zeitgeist/leaf.h>

namespace oxygen
{
    class Scene;
    class SceneServer;
    class Camera;
    class BaseNode;
}

namespace kerosin
{

class BaseRenderServer : public zeitgeist::Leaf
{
public:
    virtual ~BaseRenderServer() {}

    //! display the current active scene
    virtual void Render() = 0;

protected:
    /** get the active scene node from the sceneServer */
    virtual bool GetActiveScene();

    /** set up SceneServer reference */
    virtual void OnLink();

    /** reset SceneServer reference */
    virtual void OnUnlink();

    /** update variables from a script */
    virtual void UpdateCached();

    //
    // Members
    //
protected:
    /** reference to the current active scene */
    boost::shared_ptr<oxygen::Scene> mActiveScene;

    /** reference to the SceneServer */
    CachedPath<oxygen::SceneServer> mSceneServer;
};

DECLARE_ABSTRACTCLASS(BaseRenderServer);

} //namespace kerosin

#endif // KEROSIN_BASERENDERSERVER_H

[simspark-cvs] simspark/spark configure.ac,1.5.2.2,1.5.2.2.2.1

[Oliver O. <fr...@us...>]

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

Modified Files:
      Tag: projectx
	configure.ac 
Log Message:
changed config.h to sparkconfig.h
check for MacOS corefoundation.h
make spark-config executable at the end of the configuration


Index: configure.ac
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/configure.ac,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.2.2.1
diff -C2 -d -r1.5.2.2 -r1.5.2.2.2.1
*** configure.ac	28 Feb 2007 09:00:33 -0000	1.5.2.2
--- configure.ac	30 Mar 2007 03:56:17 -0000	1.5.2.2.2.1
***************
*** 2,6 ****
  AC_INIT([simspark], 0.1, [sim...@li...])
  AC_CONFIG_SRCDIR([salt/salt.h])
! AC_CONFIG_HEADER([config.h])
  AC_CONFIG_AUX_DIR([config.aux])
  
--- 2,6 ----
  AC_INIT([simspark], 0.1, [sim...@li...])
  AC_CONFIG_SRCDIR([salt/salt.h])
! AC_CONFIG_HEADER([sparkconfig.h])
  AC_CONFIG_AUX_DIR([config.aux])
  
***************
*** 52,55 ****
--- 52,56 ----
  AC_CHECK_HEADERS([float.h limits.h memory.h stdlib.h string.h])
  AC_CHECK_HEADERS([execinfo.h])
+ AC_CHECK_HEADERS([CoreFoundation/CoreFoundation.h])
  
  AC_CHECK_HEADER([boost/version.hpp],,
***************
*** 159,162 ****
  		 test -f oxygen/oxygen-config && chmod a+x oxygen/oxygen-config && \
  		 test -f kerosin/kerosin-config && chmod a+x kerosin/kerosin-config && \
! 		 test -f app/simulator/rcsoccersim3D && chmod +x app/simulator/rcsoccersim3D])
  AC_OUTPUT
--- 160,163 ----
  		 test -f oxygen/oxygen-config && chmod a+x oxygen/oxygen-config && \
  		 test -f kerosin/kerosin-config && chmod a+x kerosin/kerosin-config && \
! 		 test -f spark/spark-config && chmod +x spark/spark-config ])
  AC_OUTPUT

[simspark-cvs] simspark/spark/salt fileclasses.cpp, 1.1.2.1, 1.1.2.1.2.1

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/salt
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21238

Modified Files:
      Tag: projectx
	fileclasses.cpp 
Log Message:
- include corefoundation header
- changed config.h to sparkconfig.h


Index: fileclasses.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/salt/fileclasses.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -C2 -d -r1.1.2.1 -r1.1.2.1.2.1
*** fileclasses.cpp	13 Feb 2007 19:42:14 -0000	1.1.2.1
--- fileclasses.cpp	30 Mar 2007 03:50:31 -0000	1.1.2.1.2.1
***************
*** 1,5 ****
! /* -*- mode: c++ -*-
     
!    this file is part of rcssserver3D
     Fri May 9 2003
     Copyright (C) 2003 Koblenz University
--- 1,5 ----
! /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
     
!    this file is part of simspark
     Fri May 9 2003
     Copyright (C) 2003 Koblenz University
***************
*** 23,26 ****
--- 23,34 ----
  #include <cstring>
  
+ #if HAVE_CONFIG_H
+ #include <sparkconfig.h>
+ #endif
+ 
+ #if HAVE_COREFOUNDATION_COREFOUNDATION_H
+ #include <CoreFoundation/CoreFoundation.h>
+ #endif
+ 
  namespace salt
  {
***************
*** 40,43 ****
--- 48,89 ----
  using namespace salt;
  
+ std::string
+ RFile::Sep()
+ {
+ #ifdef WIN32
+     return "\\";
+ #else
+     return "/";
+ #endif
+ }
+ 
+ std::string
+ RFile::BundlePath()
+ {
+ #if HAVE_COREFOUNDATION_COREFOUNDATION_H
+     char path[1024];
+     CFBundleRef mainBundle = CFBundleGetMainBundle();
+     assert(mainBundle);
+ 
+     CFURLRef mainBundleURL = CFBundleCopyBundleURL(mainBundle);
+     assert(mainBundleURL);
+ 
+     CFStringRef cfStringRef = CFURLCopyFileSystemPath( mainBundleURL, kCFURLPOSIXPathStyle);
+     assert(cfStringRef);
+ 
+     CFStringGetCString(cfStringRef, path, 1024, kCFStringEncodingASCII);
+ 
+     CFRelease(mainBundleURL);
+     CFRelease(cfStringRef);
+ 
+     return std::string(path) + Sep();    
+ #else
+ # ifdef PREFIX
+     return PREFIX + Sep() + "share" + Sep() + PACKAGE_NAME;
+ # else
+     return "." + Sep();
+ # endif
+ #endif
+ }
  
  //------------------------------------------------------------------------------------------------

[simspark-cvs] simspark/spark/zeitgeist/scriptserver scriptserver.cpp, 1.2.2.4.2.1, 1.2.2.4.2.2

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv18478

Modified Files:
      Tag: projectx
	scriptserver.cpp 
Log Message:
- replaced config.h by sparkconfig.h
- pathname changes due to changes in file classes
- fixed pkgdatadir


Index: scriptserver.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver/scriptserver.cpp,v
retrieving revision 1.2.2.4.2.1
retrieving revision 1.2.2.4.2.2
diff -C2 -d -r1.2.2.4.2.1 -r1.2.2.4.2.2
*** scriptserver.cpp	7 Mar 2007 09:39:30 -0000	1.2.2.4.2.1
--- scriptserver.cpp	30 Mar 2007 03:43:18 -0000	1.2.2.4.2.2
***************
*** 33,44 ****
  
  #ifdef HAVE_CONFIG_H
! /* The include search path includes config.h of ruby as well. My system shows a strange behavior
!    when resolving the search paths:
!    using - include <config.h> - *before* the rubywrapper includes the correct file (our config.h)
!    using - include <config.h> - *after* the rubywrapper includes the ruby - config.h
!    using the same line before *and* after the rubywrapper includes the correct file before the rubywrapper, 
!    and the wrong one after.... :-(
! */
! #include "../config.h"
  #endif
  
--- 33,37 ----
  
  #ifdef HAVE_CONFIG_H
! #include <sparkconfig.h>
  #endif
  
***************
*** 256,260 ****
      rb_define_global_function("dirs",         RUBY_METHOD_FUNC(dirs), 0);
  
!     mRelPathPrefix = string("..") + salt::PathSeparator + ".." + salt::PathSeparator;
  }
  
--- 249,253 ----
      rb_define_global_function("dirs",         RUBY_METHOD_FUNC(dirs), 0);
  
!     mRelPathPrefix = string("..") + salt::RFile::Sep() + ".." + salt::RFile::Sep();
  }
  
***************
*** 484,488 ****
  {
      // run the init script in the sourceDir
!     string sourcePath = sourceDir + salt::PathSeparator + name;
      GetLog()->Debug() << "(ScriptServer) Running " << sourcePath << "... ";
  
--- 477,481 ----
  {
      // run the init script in the sourceDir
!     string sourcePath = sourceDir + salt::RFile::Sep() + name;
      GetLog()->Debug() << "(ScriptServer) Running " << sourcePath << "... ";
  
***************
*** 507,511 ****
      }
  
!     string destPath = destDir + salt::PathSeparator + name;
  
      GetLog()->Normal() << "Copying " << sourcePath
--- 500,504 ----
      }
  
!     string destPath = destDir + salt::RFile::Sep() + name;
  
      GetLog()->Normal() << "Copying " << sourcePath
***************
*** 542,546 ****
      }
  
!     dotDir = string(home) + salt::PathSeparator + mDotName;
      return true;
  }
--- 535,539 ----
      }
  
!     dotDir = string(home) + salt::RFile::Sep() + mDotName;
      return true;
  }
***************
*** 600,613 ****
          CreateDotDir(dotDir);
  
! #ifdef WIN32
!     string pkgdatadir = ".\\";
! #else
!     // some macro magic (not at all)
!     string pkgdatadir = PREFIX "/share/" PACKAGE_NAME;
! 
!     //std::cout << "dotDir = " << dotDir << std::endl;
!     //std::cout << "pkgdatadir = " << pkgdatadir << std::endl;
!     //std::cout << "filename = " << fileName << std::endl;
  #endif
  
      ERunScriptErrorType result = eNotFound;
--- 593,602 ----
          CreateDotDir(dotDir);
  
!     // get the (OS specific) path to the script directory
!     string pkgdatadir = salt::RFile::BundlePath();
! #if __APPLE__
!     pkgdatadir += "Contents/Resources/";
  #endif
+     std::cerr << "Getting scripts at " << pkgdatadir << "\n";
  
      ERunScriptErrorType result = eNotFound;
***************
*** 621,625 ****
      {
          GetLog()->Debug() << "(ScriptServer) : Ran init script '"
!                           << dotDir << salt::PathSeparator << fileName << "'\n";
          return true;
      }
--- 610,614 ----
      {
          GetLog()->Debug() << "(ScriptServer) : Ran init script '"
!                           << dotDir << salt::RFile::Sep() << fileName << "'\n";
          return true;
      }
***************
*** 628,637 ****
      {
          GetLog()->Debug() << "(ScriptServer) : Did not find init script '"
!                           << dotDir << salt::PathSeparator << fileName << "'\n";
      }
      else if (result == eError)
      {
          GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
!                           << dotDir << salt::PathSeparator << fileName << "'\n";
          return false;
      }
--- 617,626 ----
      {
          GetLog()->Debug() << "(ScriptServer) : Did not find init script '"
!                           << dotDir << salt::RFile::Sep() << fileName << "'\n";
      }
      else if (result == eError)
      {
          GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
!                           << dotDir << salt::RFile::Sep() << fileName << "'\n";
          return false;
      }
***************
*** 644,648 ****
      {
          GetLog()->Debug() << "(ScriptServer) : Ran init script '"
!                           << pkgdatadir << salt::PathSeparator << fileName << "'\n";
          return true;
      }
--- 633,637 ----
      {
          GetLog()->Debug() << "(ScriptServer) : Ran init script '"
!                           << pkgdatadir << salt::RFile::Sep() << fileName << "'\n";
          return true;
      }
***************
*** 651,660 ****
      {
          GetLog()->Debug() << "(ScriptServer) : Did not find init script '"
!                           << pkgdatadir << salt::PathSeparator << fileName << "'\n";
      }
      else if (result == eError)
      {
          GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
!                           << pkgdatadir << salt::PathSeparator << fileName << "'\n";
      }
  
--- 640,649 ----
      {
          GetLog()->Debug() << "(ScriptServer) : Did not find init script '"
!                           << pkgdatadir << salt::RFile::Sep() << fileName << "'\n";
      }
      else if (result == eError)
      {
          GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
!                           << pkgdatadir << salt::RFile::Sep() << fileName << "'\n";
      }
  
***************
*** 670,674 ****
      {
          GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
!                           << mRelPathPrefix+relPath << salt::PathSeparator << fileName << "'\n";
      }
  
--- 659,663 ----
      {
          GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
!                           << mRelPathPrefix+relPath << salt::RFile::Sep() << fileName << "'\n";
      }