[simspark-cvs] simspark/spark/kerosin/sceneserver axis.cpp, 1.2, 1.3 light.cpp, 1.1, 1.2 light.h, 1.1, 1.2 staticmesh.cpp, 1.2, 1.3

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

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

Modified Files:
	axis.cpp light.cpp light.h staticmesh.cpp 
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)

Index: light.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/sceneserver/light.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** light.h	5 Dec 2005 21:38:23 -0000	1.1
--- light.h	15 Mar 2007 07:26:26 -0000	1.2
***************
*** 24,27 ****
--- 24,28 ----
  
  #include <kerosin/openglserver/glbase.h>
+ #include <kerosin/openglserver/openglserver.h>
  #include "staticmesh.h"
  #include "oxygen/geometryserver/indexbuffer.h"
***************
*** 121,126 ****
      std::vector<oxygen::IndexBuffer> mCachedIndices;
  
!     /** reference to the RenderServer */
!     boost::shared_ptr<OpenGLServer> mOpenGLServer;
  };
  
--- 122,127 ----
      std::vector<oxygen::IndexBuffer> mCachedIndices;
  
!     /** reference to the OpenGLServer */
!     CachedPath<OpenGLServer> mOpenGLServer;
  };
  

Index: light.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/sceneserver/light.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** light.cpp	5 Dec 2005 21:38:23 -0000	1.1
--- light.cpp	15 Mar 2007 07:26:26 -0000	1.2
***************
*** 25,37 ****
  */
  #include "light.h"
- #include <kerosin/renderserver/renderserver.h>
- #include <kerosin/openglserver/openglserver.h>
  #include <zeitgeist/logserver/logserver.h>
! 
! /*
! // define the symbol BOOL to prevent opcode.h to typedef BOOL
! #define BOOL BOOL
! #include <opcode/Opcode.h>
! */
  
  using namespace boost;
--- 25,31 ----
  */
  #include "light.h"
  #include <zeitgeist/logserver/logserver.h>
! #include <kerosin/openglserver/openglwrapper.h>
! #include <kerosin/renderserver/renderserver.h>
  
  using namespace boost;
***************
*** 159,163 ****
  void Light::FlushCache()
  {
!     const unsigned int n = mCachedIndices.size();
      for (unsigned int i=0; i<n; ++i)
          {
--- 153,159 ----
  void Light::FlushCache()
  {
!     const unsigned int n
!         = static_cast<unsigned int>(mCachedIndices.size());
! 
      for (unsigned int i=0; i<n; ++i)
          {
***************
*** 175,213 ****
  void Light::OnLink()
  {
!     mOpenGLServer = shared_dynamic_cast<OpenGLServer>
!         (GetCore()->Get("sys/server/opengl"));
  
!     if (mOpenGLServer.get() == 0)
          {
              GetLog()->Error()
                  << "(Light) ERROR: OpenGLServer not found\n";
!         } else
!             {
!                 mGLLight = mOpenGLServer->AllocLight();
! 
!                 if (mGLLight < 0)
!                     {
!                         GetLog()->Error()
!                             << "(Light) ERROR: No more OpenGL lights available\n";
!                     }
! 
! #if 0
!                 mVP = mOpenGLServer->LoadARBVertexProgram("sys/program/omnilight.vp");
!                 if (mVP == 0)
!                     {
!                         GetLog()->Error()
!                             << "(Light) ERROR: Could not load vertex program\n";
!                     }
! 
!                 mFP = mOpenGLServer->LoadARBFragmentProgram("sys/program/omnilight.fp");
!                 if (mFP == 0)
!                     {
!                         GetLog()->Error()
!                             << "(Light) ERROR: Could not load fragment program\n";
!                     }
! #endif
  
!             }
  
  }
  
--- 171,190 ----
  void Light::OnLink()
  {
!     RegisterCachedPath(mOpenGLServer, "sys/server/opengl");
  
!     if (mOpenGLServer.expired())
          {
              GetLog()->Error()
                  << "(Light) ERROR: OpenGLServer not found\n";
!             return;
!         }
  
!     mGLLight = mOpenGLServer->AllocLight();
  
+     if (mGLLight < 0)
+         {
+             GetLog()->Error()
+                 << "(Light) ERROR: No more OpenGL lights available\n";
+         }
  }
  
***************
*** 215,219 ****
  {
      if (
!         (mOpenGLServer.get() != 0) &&
          (mGLLight >= 0)
          )
--- 192,196 ----
  {
      if (
!         (! mOpenGLServer.expired()) &&
          (mGLLight >= 0)
          )
***************
*** 223,227 ****
          }
  
!     mOpenGLServer.reset();
  }
  
--- 200,204 ----
          }
  
!     BaseNode::OnUnlink();
  }
  

Index: axis.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/sceneserver/axis.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** axis.cpp	15 Feb 2006 00:59:02 -0000	1.2
--- axis.cpp	15 Mar 2007 07:26:26 -0000	1.3
***************
*** 21,25 ****
  */
  #include "axis.h"
! #include "../openglserver/openglserver.h"
  #include <kerosin/openglserver/glbase.h>
  
--- 21,25 ----
  */
  #include "axis.h"
! #include "../openglserver/openglwrapper.h"
  #include <kerosin/openglserver/glbase.h>
  

Index: staticmesh.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/sceneserver/staticmesh.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** staticmesh.cpp	15 Feb 2006 00:57:05 -0000	1.2
--- staticmesh.cpp	15 Mar 2007 07:26:26 -0000	1.3
***************
*** 22,26 ****
  #include "staticmesh.h"
  #include <zeitgeist/logserver/logserver.h>
! #include <kerosin/openglserver/openglserver.h>
  #include <kerosin/materialserver/material.h>
  #include <kerosin/materialserver/materialserver.h>
--- 22,26 ----
  #include "staticmesh.h"
  #include <zeitgeist/logserver/logserver.h>
! #include <kerosin/openglserver/openglwrapper.h>
  #include <kerosin/materialserver/material.h>
  #include <kerosin/materialserver/materialserver.h>
***************
*** 54,58 ****
          }
  
!     const int n = mMesh->GetVertexCount() * 3;
  
      const float* arPos = mMesh->GetPos().get();
--- 54,58 ----
          }
  
!     const int n = mMesh->GetVertexCount();
  
      const float* arPos = mMesh->GetPos().get();
***************
*** 76,80 ****
  void StaticMesh::RenderInternal()
  {
!     if (mMesh.get() == 0)
          {
              return;
--- 76,83 ----
  void StaticMesh::RenderInternal()
  {
!     if (
!         (mMesh.get() == 0) ||
!         (mMaterials.empty())
!         )
          {
              return;