Changeset 136 for cafu/trunk/Games/VSWM/Code/VSWM.cpp

Timestamp:

08/27/10 11:30:01 (21 months ago)

Author:

Carsten

Message:

Reintegrated branches/cafu_to_wx back into trunk!

Files:

• cafu/trunk/Games/VSWM/Code/VSWM.cpp (modified) (2 diffs)

cafu/trunk/Games/VSWM/Code/VSWM.cpp

@@ -13 +13 @@
 #include "MaterialSystem/Renderer.hpp"
 #include "MaterialSystem/TextureMap.hpp"
-#include "OpenGL/OpenGLWindow.hpp"
 
 #include "EntityCreateParams.hpp"
@@ -249 +248 @@
 // by the client. The parameters to this function however are always non-volatile, they don't change over multiple calls.
 // In future implementations I'll possibly change this and load and init the DLL only once, even before the client or server gets instantiated.
-SingleOpenGLWindowT*   SingleOpenGLWindow=NULL;
 cf::GuiSys::GuiManI*   cf::GuiSys::GuiMan=NULL;     // Define the global GuiMan pointer instance -- see GuiMan.hpp for more details.
+MaterialManagerI*      MaterialManager   =NULL;
 cf::ConsoleI*          Console=NULL;
 ConsoleInterpreterI*   ConsoleInterpreter=NULL;
 cf::FileSys::FileManI* cf::FileSys::FileMan=NULL;
 
-DLL_EXPORT void __stdcall InitInterfaces(SingleOpenGLWindowT* SingleWin, MatSys::RendererI* Renderer, MatSys::TextureMapManagerI* TexMapMan, MaterialManagerI* MatMan, cf::GuiSys::GuiManI* GuiMan_, cf::ConsoleI* Console_, ConsoleInterpreterI* ConInterpreter_)
-{
-    SingleOpenGLWindow       =SingleWin;
+DLL_EXPORT void __stdcall InitInterfaces(MatSys::RendererI* Renderer, MatSys::TextureMapManagerI* TexMapMan, MaterialManagerI* MatMan, cf::GuiSys::GuiManI* GuiMan_, cf::ConsoleI* Console_, ConsoleInterpreterI* ConInterpreter_)
+{
     MatSys::Renderer         =Renderer;
     MatSys::TextureMapManager=TexMapMan;