[simspark-cvs] simspark/spark/spark Makefile.am,1.3,1.4 spark.cpp,1.2,1.3 spark.h,1.2,1.3

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	Makefile.am spark.cpp spark.h 
Log Message:
made spark wrapper independent of kerosin

Index: spark.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/spark/spark.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** spark.cpp	2 Jan 2006 20:39:14 -0000	1.2
--- spark.cpp	8 Mar 2006 18:17:03 -0000	1.3
***************
*** 21,32 ****
  #include "spark.h"
  #include <zeitgeist/zeitgeist.h>
- #include <kerosin/kerosin.h>
  #include <oxygen/oxygen.h>
  #include <kerosin/renderserver/rendercontrol.h>
  #include <kerosin/inputserver/inputserver.h>
  #include <kerosin/inputserver/inputcontrol.h>
  
- using namespace spark;
  using namespace kerosin;
  using namespace oxygen;
  using namespace zeitgeist;
--- 21,36 ----
  #include "spark.h"
  #include <zeitgeist/zeitgeist.h>
  #include <oxygen/oxygen.h>
+ 
+ #if HAVE_KEROSIN_H
+ #include <kerosin/kerosin.h>
  #include <kerosin/renderserver/rendercontrol.h>
  #include <kerosin/inputserver/inputserver.h>
  #include <kerosin/inputserver/inputcontrol.h>
  
  using namespace kerosin;
+ #endif
+ 
+ using namespace spark;
  using namespace oxygen;
  using namespace zeitgeist;
***************
*** 37,42 ****
  Spark::Spark(const string& relPathPrefix) :
      mZeitgeist(new Zeitgeist("." PACKAGE_NAME, relPathPrefix)),
!     mOxygen(new Oxygen(*mZeitgeist)),
!     mKerosin(new Kerosin(*mZeitgeist))
  {
  }
--- 41,48 ----
  Spark::Spark(const string& relPathPrefix) :
      mZeitgeist(new Zeitgeist("." PACKAGE_NAME, relPathPrefix)),
!     mOxygen(new Oxygen(*mZeitgeist))
! #if HAVE_KEROSIN_H
!     , mKerosin(new Kerosin(*mZeitgeist))
! #endif
  {
  }
***************
*** 52,71 ****
  }
  
! bool Spark::Init(int argc, char** argv)
  {
      mLogServer = mZeitgeist->GetCore()->GetLogServer();
      if (mLogServer.get() == 0)
!         {
!             cout << "(Spark) ERROR: LogServer not found\n";
!             return false;
!         }
  
      mScriptServer = mZeitgeist->GetCore()->GetScriptServer();
      if (mScriptServer.get() == 0)
!         {
!             mLogServer->Error()
!                 << "(Spark) ERROR: ScriptServer not found\n";
!             return false;
!         }
  
      // run the spark init script
--- 58,77 ----
  }
  
! bool 
! Spark::Init(int argc, char** argv)
  {
      mLogServer = mZeitgeist->GetCore()->GetLogServer();
      if (mLogServer.get() == 0)
!     {
!         cerr << "(Spark) ERROR: LogServer not found\n";
!         return false;
!     }
  
      mScriptServer = mZeitgeist->GetCore()->GetScriptServer();
      if (mScriptServer.get() == 0)
!     {
!         mLogServer->Error() << "(Spark) ERROR: ScriptServer not found\n";
!         return false;
!     }
  
      // run the spark init script
***************
*** 81,88 ****
  
      if (mSceneServer.get() == 0)
!         {
!             mLogServer->Error() << "(Spark) ERROR: SceneServer not found\n";
!             return false;
!         }
  
      mSimulationServer = shared_dynamic_cast<SimulationServer>
--- 87,94 ----
  
      if (mSceneServer.get() == 0)
!     {
!         mLogServer->Error() << "(Spark) ERROR: SceneServer not found\n";
!         return false;
!     }
  
      mSimulationServer = shared_dynamic_cast<SimulationServer>
***************
*** 90,97 ****
  
      if (mSimulationServer.get() == 0)
!         {
!             mLogServer->Error() << "(Spark) ERROR: SimulationServer not found\n";
!             return false;
!         }
  
      // run the app defined init
--- 96,103 ----
  
      if (mSimulationServer.get() == 0)
!     {
!         mLogServer->Error() << "(Spark) ERROR: SimulationServer not found\n";
!         return false;
!     }
  
      // run the app defined init
***************
*** 99,138 ****
  }
  
! bool Spark::InitApp(int /*argc*/, char** /*argv*/)
  {
      return true;
  }
  
! Zeitgeist& Spark::GetZeitgeist()
  {
      return (*mZeitgeist);
  }
  
! shared_ptr<Core> Spark::GetCore()
  {
      return mZeitgeist->GetCore();
  }
  
! shared_ptr<zeitgeist::LogServer> Spark::GetLog()
  {
      return mZeitgeist->GetCore()->GetLogServer();
  }
  
! shared_ptr<SceneServer> Spark::GetSceneServer()
  {
      return mSceneServer;
  }
  
! shared_ptr<SimulationServer> Spark::GetSimulationServer()
  {
      return mSimulationServer;
  }
  
! shared_ptr<InputControl> Spark::GetInputControl()
  {
      if (mSimulationServer.get() == 0)
!         {
!             return shared_ptr<InputControl>();
!         }
  
      return shared_dynamic_cast<InputControl>
--- 105,152 ----
  }
  
! bool 
! Spark::InitApp(int /*argc*/, char** /*argv*/)
  {
      return true;
  }
  
! Zeitgeist& 
! Spark::GetZeitgeist()
  {
      return (*mZeitgeist);
  }
  
! shared_ptr<Core> 
! Spark::GetCore()
  {
      return mZeitgeist->GetCore();
  }
  
! shared_ptr<zeitgeist::LogServer> 
! Spark::GetLog()
  {
      return mZeitgeist->GetCore()->GetLogServer();
  }
  
! shared_ptr<SceneServer> 
! Spark::GetSceneServer()
  {
      return mSceneServer;
  }
  
! shared_ptr<SimulationServer> 
! Spark::GetSimulationServer()
  {
      return mSimulationServer;
  }
  
! #if HAVE_KEROSIN_H
! shared_ptr<InputControl> 
! Spark::GetInputControl()
  {
      if (mSimulationServer.get() == 0)
!     {
!         return shared_ptr<InputControl>();
!     }
  
      return shared_dynamic_cast<InputControl>
***************
*** 140,144 ****
  }
  
! shared_ptr<InputServer> Spark::GetInputServer()
  {
      return shared_dynamic_cast<kerosin::InputServer>
--- 154,159 ----
  }
  
! shared_ptr<InputServer> 
! Spark::GetInputServer()
  {
      return shared_dynamic_cast<kerosin::InputServer>
***************
*** 146,174 ****
  }
  
! shared_ptr<RenderControl> Spark::GetRenderControl()
  {
      if (mSimulationServer.get() == 0)
!         {
!             return shared_ptr<RenderControl>();
!         }
  
      return shared_dynamic_cast<RenderControl>
          (mSimulationServer->GetControlNode("RenderControl"));
  }
  
! shared_ptr<ScriptServer> Spark::GetScriptServer()
  {
      return mScriptServer;
  }
  
! shared_ptr<Scene> Spark::GetActiveScene()
  {
      shared_ptr<Scene> scene = mSceneServer->GetActiveScene();
  
      if (scene.get() == 0)
!         {
!             mLogServer->Warning()
!                 << "(Spark) Warning: no active scene registered\n";
!         }
  
      return scene;
--- 161,193 ----
  }
  
! shared_ptr<RenderControl> 
! Spark::GetRenderControl()
  {
      if (mSimulationServer.get() == 0)
!     {
!         return shared_ptr<RenderControl>();
!     }
  
      return shared_dynamic_cast<RenderControl>
          (mSimulationServer->GetControlNode("RenderControl"));
  }
+ #endif // HAVE_KEROSIN_H
  
! shared_ptr<ScriptServer> 
! Spark::GetScriptServer()
  {
      return mScriptServer;
  }
  
! shared_ptr<Scene> 
! Spark::GetActiveScene()
  {
      shared_ptr<Scene> scene = mSceneServer->GetActiveScene();
  
      if (scene.get() == 0)
!     {
!         mLogServer->Warning() 
!             << "(Spark) Warning: no active scene registered\n";
!     }
  
      return scene;

Index: Makefile.am
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/spark/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	8 Mar 2006 16:49:48 -0000	1.3
--- Makefile.am	8 Mar 2006 18:17:03 -0000	1.4
***************
*** 1,3 ****
- if BUILD_KEROSIN
  if DEBUG
  pkglib_LTLIBRARIES = libspark_debug.la
--- 1,2 ----
***************
*** 14,19 ****
  endif
  
- endif
- 
  bin_SCRIPTS = spark-config
  
--- 13,16 ----
***************
*** 33,36 ****
  nobase_libpkginclude_HEADERS = \
  spark.h
- 
- 
--- 30,31 ----

Index: spark.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/spark/spark.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** spark.h	2 Jan 2006 20:39:14 -0000	1.2
--- spark.h	8 Mar 2006 18:17:03 -0000	1.3
***************
*** 21,24 ****
--- 21,28 ----
  #define SPARK_SPARK_H
  
+ #if HAVE_CONFIG_H
+ #include <config.h>
+ #endif
+ 
  #include <string>
  #include <boost/shared_ptr.hpp>
***************
*** 40,43 ****
--- 44,48 ----
  }
  
+ #if HAVE_KEROSIN_H
  namespace kerosin
  {
***************
*** 47,50 ****
--- 52,56 ----
      class InputServer;
  }
+ #endif
  
  namespace spark
***************
*** 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();
--- 96,99 ----
***************
*** 99,102 ****
--- 102,109 ----
      boost::shared_ptr<oxygen::SimulationServer> GetSimulationServer();
  
+ #if HAVE_KEROSIN_H
+     /** returns the InputServer */
+     boost::shared_ptr<kerosin::InputServer> GetInputServer();
+ 
      /** returns the input control node */
      boost::shared_ptr<kerosin::InputControl> GetInputControl();
***************
*** 104,107 ****
--- 111,115 ----
      /** returns the render control node */
      boost::shared_ptr<kerosin::RenderControl> GetRenderControl();
+ #endif
  
  protected:
***************
*** 113,117 ****
--- 121,127 ----
      boost::shared_ptr<zeitgeist::Zeitgeist> mZeitgeist;
      boost::shared_ptr<oxygen::Oxygen> mOxygen;
+ #if HAVE_KEROSIN_H
      boost::shared_ptr<kerosin::Kerosin> mKerosin;
+ #endif
  };