[simspark-cvs] simspark/spark/kerosin/renderserver renderserver.h, 1.2.2.2, 1.2.2.2.2.1

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

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

Modified Files:
      Tag: projectx
	renderserver.h 
Log Message:
changes due to split off of the baserenderserver


Index: renderserver.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/renderserver/renderserver.h,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.2.2.1
diff -C2 -d -r1.2.2.2 -r1.2.2.2.2.1
*** renderserver.h	16 Feb 2007 15:40:48 -0000	1.2.2.2
--- renderserver.h	30 Mar 2007 01:57:09 -0000	1.2.2.2.2.1
***************
*** 20,27 ****
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  
-    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.
- 
     RenderServer
  
--- 20,23 ----
***************
*** 39,61 ****
  #define KEROSIN_RENDERSERVER_H
  
  #include <salt/frustum.h>
- #include <zeitgeist/class.h>
- #include <zeitgeist/leaf.h>
  #include <oxygen/sceneserver/sceneserver.h>
  #include <kerosin/openglserver/glbase.h>
  
- namespace oxygen
- {
-     class Scene;
-     class SceneServer;
-     class Camera;
-     class BaseNode;
- }
- 
  namespace kerosin
  {
      class OpenGLServer;
  
! class RenderServer : public zeitgeist::Leaf
  {
      //
--- 35,49 ----
  #define KEROSIN_RENDERSERVER_H
  
+ #include "baserenderserver.h"
+ 
  #include <salt/frustum.h>
  #include <oxygen/sceneserver/sceneserver.h>
  #include <kerosin/openglserver/glbase.h>
  
  namespace kerosin
  {
      class OpenGLServer;
  
! class RenderServer : public BaseRenderServer
  {
      //
***************
*** 64,71 ****
  public:
      RenderServer();
!     ~RenderServer();
  
      //! display the current active scene
!     void Render();
  
      //! render the scene with fancy lighting
--- 52,59 ----
  public:
      RenderServer();
!     virtual ~RenderServer() {}
  
      //! display the current active scene
!     virtual void Render();
  
      //! render the scene with fancy lighting
***************
*** 78,94 ****
      void SetAmbientColor(const RGBA& ambient);
  
-     /** update variables from a script */
-     virtual void UpdateCached();
- 
  protected:
-     /** get the active scene node from the sceneServer */
-     bool RenderServer::GetActiveScene();
- 
-     /** set up SceneServer reference */
-     virtual void OnLink();
- 
-     /** reset SceneServer reference */
-     virtual void OnUnlink();
- 
      /** render a scene recursively.
          \param node the scene base node
--- 66,70 ----
***************
*** 104,113 ****
      //
  protected:
-     /** reference to the current active scene */
-     boost::shared_ptr<oxygen::Scene> mActiveScene;
- 
-     /** reference to the SceneServer */
-     CachedPath<oxygen::SceneServer> mSceneServer;
- 
      RGBA mAmbientColor;
  };
--- 80,83 ----
***************
*** 118,134 ****
  
  #endif // KEROSIN_RENDERSERVER_H
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
--- 88,89 ----