From: Markus R. <rol...@us...> - 2007-02-23 19:21:15
|
Update of /cvsroot/simspark/simspark/spark/kerosin/sceneserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5018/sceneserver Modified Files: Tag: WIN32 axis.cpp light.cpp staticmesh.cpp Log Message: - use openglwrapper.h Index: light.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/sceneserver/light.cpp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** light.cpp 16 Feb 2007 15:40:48 -0000 1.1.2.2 --- light.cpp 23 Feb 2007 19:21:10 -0000 1.1.2.3 *************** *** 25,36 **** */ #include "light.h" - #include <kerosin/renderserver/renderserver.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; Index: axis.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/sceneserver/axis.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** axis.cpp 15 Feb 2006 00:59:02 -0000 1.2 --- axis.cpp 23 Feb 2007 19:21:10 -0000 1.2.2.1 *************** *** 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.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** staticmesh.cpp 18 Feb 2007 12:03:53 -0000 1.2.2.2 --- staticmesh.cpp 23 Feb 2007 19:21:10 -0000 1.2.2.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> |