simspark-cvs

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

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

Modified Files:
	material2dtexture.cpp materialsolid.cpp 
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)

Index: materialsolid.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/materialserver/materialsolid.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** materialsolid.cpp	18 Feb 2006 19:41:48 -0000	1.2
--- materialsolid.cpp	15 Mar 2007 07:26:26 -0000	1.3
***************
*** 21,24 ****
--- 21,25 ----
  */
  #include "materialsolid.h"
+ #include <kerosin/openglserver/openglwrapper.h>
  #include <kerosin/openglserver/openglserver.h>
  

Index: material2dtexture.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/materialserver/material2dtexture.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** material2dtexture.cpp	5 Dec 2005 21:38:22 -0000	1.1
--- material2dtexture.cpp	15 Mar 2007 07:26:26 -0000	1.2
***************
*** 21,29 ****
  */
  #include "material2dtexture.h"
  #include <kerosin/textureserver/textureserver.h>
  #include <kerosin/textureserver/texture.h>
  #include <kerosin/openglserver/openglserver.h>
- #include <zeitgeist/logserver/logserver.h>
- #include <zeitgeist/scriptserver/scriptserver.h>
  
  using namespace zeitgeist;
--- 21,30 ----
  */
  #include "material2dtexture.h"
+ #include <zeitgeist/logserver/logserver.h>
+ #include <zeitgeist/scriptserver/scriptserver.h>
  #include <kerosin/textureserver/textureserver.h>
  #include <kerosin/textureserver/texture.h>
+ #include <kerosin/openglserver/openglwrapper.h>
  #include <kerosin/openglserver/openglserver.h>
  
  using namespace zeitgeist;
***************
*** 80,84 ****
      if (mTexDiffuse.get() != 0)
          {
!             glActiveTextureARB(GL_TEXTURE0_ARB);
              glEnable(GL_TEXTURE_2D);
              mTexDiffuse->Bind();
--- 81,85 ----
      if (mTexDiffuse.get() != 0)
          {
!             OpenGLServer::glActiveTextureARB(GL_TEXTURE0_ARB);
              glEnable(GL_TEXTURE_2D);
              mTexDiffuse->Bind();
***************
*** 87,91 ****
      if (mTexNormal.get() != 0)
          {
!             glActiveTextureARB(GL_TEXTURE1_ARB);
              glEnable(GL_TEXTURE_2D);
              mTexNormal->Bind();
--- 88,92 ----
      if (mTexNormal.get() != 0)
          {
!             OpenGLServer::glActiveTextureARB(GL_TEXTURE1_ARB);
              glEnable(GL_TEXTURE_2D);
              mTexNormal->Bind();
***************
*** 94,98 ****
      if (mTexSpecular.get() != 0)
          {
!             glActiveTextureARB(GL_TEXTURE2_ARB);
              glEnable(GL_TEXTURE_2D);
              mTexSpecular->Bind();
--- 95,99 ----
      if (mTexSpecular.get() != 0)
          {
!             OpenGLServer::glActiveTextureARB(GL_TEXTURE2_ARB);
              glEnable(GL_TEXTURE_2D);
              mTexSpecular->Bind();