Changeset 114

Timestamp:

08/12/10 16:39:08 (18 months ago)

Author:

Carsten

Message:

Liberated a lot of code from knowing the obsolete OpenGLWindowT class (and thus its related SingleOpenGLWindow global pointer)
and the also obsolete, related DirectX code.

Location:

cafu/branches/cafu_to_wx

Files:

• Ca3DE/Client/ScrlInfo.cpp (modified) (1 diff)
• Ca3DE/Client/ScrlInfo.hpp (modified) (1 diff)
• CaTools/MaterialViewer.cpp (modified) (1 diff)
• Games/DeathMatch/Code/DeathMatch.cpp (modified) (3 diffs)
• Games/DeathMatch/Code/HumanPlayer.cpp (modified) (1 diff)
• Games/VSWM/Code/HumanPlayer.cpp (modified) (6 diffs)
• Games/VSWM/Code/VSWM.cpp (modified) (3 diffs)
• Libs/Fonts/Font.cpp (modified) (5 diffs)
• Libs/Fonts/Font.hpp (modified) (1 diff)
• Libs/OpenGL/OpenGLWindowOO.cpp (deleted)
• Libs/OpenGL/OpenGLWindowOO.hpp (deleted)
• Libs/SConscript (modified) (2 diffs)

cafu/branches/cafu_to_wx/Ca3DE/Client/ScrlInfo.cpp

@@ -85 +85 @@
 
 
-void ScrollInfoT::Draw(FontT& Font, unsigned long PosX, unsigned long PosY) const
+void ScrollInfoT::Draw(FontT& Font, unsigned long PosX, unsigned long PosY, float FrameWidth, float FrameHeight) const
 {
     if (NrOfLines==0) return;
 
-    Font.AccPrintBegin();
+    Font.AccPrintBegin(FrameWidth, FrameHeight);
 
     for (char LineNr=0; LineNr<NrOfLines; LineNr++)

cafu/branches/cafu_to_wx/Ca3DE/Client/ScrlInfo.hpp

@@ -50 +50 @@
     ScrollInfoT();
     void Print(const char* PrintString, ...);
-    void Draw(FontT& Font, unsigned long PosX, unsigned long PosY) const;
+    void Draw(FontT& Font, unsigned long PosX, unsigned long PosY, float FrameWidth, float FrameHeight) const;
     void AdvanceTime(float FrameTime);
 };

cafu/branches/cafu_to_wx/CaTools/MaterialViewer.cpp

@@ -504 +504 @@
 
 
-            MyFont->Print(SingleOpenGLWindow->GetWidth()-100, SingleOpenGLWindow->GetHeight()-18, 0x00FFFFFF, "%5.1f FPS", 1.0/DeltaTime);
+            MyFont->Print(SingleOpenGLWindow->GetWidth()-100, SingleOpenGLWindow->GetHeight()-18, float(SingleOpenGLWindow->GetWidth()), float(SingleOpenGLWindow->GetHeight()), 0x00FFFFFF, "%5.1f FPS", 1.0/DeltaTime);
         }
         MatSys::Renderer->EndFrame();

cafu/branches/cafu_to_wx/Games/DeathMatch/Code/DeathMatch.cpp

@@ -36 +36 @@
 #include "MaterialSystem/Renderer.hpp"
 #include "MaterialSystem/TextureMap.hpp"
-#include "OpenGL/OpenGLWindow.hpp"
 #include "TypeSys.hpp"
 #include "SoundSystem/SoundShaderManager.hpp"
@@ -92 +91 @@
 #ifdef _WIN32
 // Under Linux (where DLLs are shared objects), these all resolve to their counterparts in the main executable.
-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;
@@ -106 +104 @@
 // WARNING: When the signature of GetGame() is changed here (e.g. by adding more interface pointer parameters),
 // grep all C++ source code files for "GetGame@", because the number of parameter bytes must be updated there!
-DLL_EXPORT cf::GameSys::GameI* __stdcall GetGame(SingleOpenGLWindowT* SingleWin, MatSys::RendererI* Renderer, MatSys::TextureMapManagerI* TexMapMan, MaterialManagerI* MatMan, cf::GuiSys::GuiManI* GuiMan_, cf::ConsoleI* Console_, ConsoleInterpreterI* ConInterpreter_, cf::ClipSys::CollModelManI* CollModelMan_, SoundSysI* SoundSystem_, SoundShaderManagerI* SoundShaderManager_)
+DLL_EXPORT cf::GameSys::GameI* __stdcall GetGame(MatSys::RendererI* Renderer, MatSys::TextureMapManagerI* TexMapMan, MaterialManagerI* MatMan, cf::GuiSys::GuiManI* GuiMan_, cf::ConsoleI* Console_, ConsoleInterpreterI* ConInterpreter_, cf::ClipSys::CollModelManI* CollModelMan_, SoundSysI* SoundSystem_, SoundShaderManagerI* SoundShaderManager_)
 {
 #ifdef _WIN32
     // Under Linux (where DLLs are shared objects), these all resolve to their counterparts in the main executable.
-    SingleOpenGLWindow       =SingleWin;
     MatSys::Renderer         =Renderer;
     MatSys::TextureMapManager=TexMapMan;

cafu/branches/cafu_to_wx/Games/DeathMatch/Code/HumanPlayer.cpp

@@ -1024 +1024 @@
             {
                 case StateOfExistance_Dead:
-                    HUD_Font1.Print(50, SingleOpenGLWindow->GetHeight()/2-4, 0x00FF0000, "You're dead.");
+                    HUD_Font1.Print(50, 1024/2-4, 800.0f, 600.0f, 0x00FF0000, "You're dead.");
                     break;
 
                 case StateOfExistance_FrozenSpectator:
-                    HUD_Font1.Print(50, SingleOpenGLWindow->GetHeight()/2+16, 0x00FF0000, "Press FIRE (left mouse button) to respawn!");
+                    HUD_Font1.Print(50, 1024/2+16, 800.0f, 600.0f, 0x00FF0000, "Press FIRE (left mouse button) to respawn!");
                     break;
             }

cafu/branches/cafu_to_wx/Games/VSWM/Code/HumanPlayer.cpp

@@ -23 +23 @@
 #include "MaterialSystem/Renderer.hpp"
 #include "Math3D/Matrix.hpp"
-#include "OpenGL/OpenGLWindow.hpp"
 #include "TextParser/TextParser.hpp"
 
@@ -858 +857 @@
                     // is made from a prediction Think()ing, or a real server-side Think()ing.
                     // In the worst case (with prediction), the quit message is posted multiple times.
-                    if (SingleOpenGLWindow) SingleOpenGLWindow->PostQuitMessage();
+                    // if (SingleOpenGLWindow) SingleOpenGLWindow->PostQuitMessage();   // FIXME: Set ConVar "quit" to true instead!
 
                     if (FrameTime>=0.0 && LogFile!=NULL)
@@ -947 +946 @@
                     // is made from a prediction Think()ing, or a real server-side Think()ing.
                     // In the worst case (with prediction), the quit message is posted multiple times.
-                    if (SingleOpenGLWindow) SingleOpenGLWindow->PostQuitMessage();
+                    // if (SingleOpenGLWindow) SingleOpenGLWindow->PostQuitMessage();   // FIXME: Set ConVar "quit" to true instead!
 
                     if (FrameTime>=0.0 && LogFile!=NULL)
@@ -1295 +1294 @@
                 static FontT Font1("Fonts/Arial");
                 const float  TimeRemaining=3.0f-float(State.Velocity.x);
-
-                     if (TimeRemaining>=2.0) Font1.Print(SingleOpenGLWindow->GetWidth()/2-47, SingleOpenGLWindow->GetHeight()/2, 0x00FF0000, "   3   ");
-                else if (TimeRemaining>=1.0) Font1.Print(SingleOpenGLWindow->GetWidth()/2-47, SingleOpenGLWindow->GetHeight()/2, 0x00FF0000, "   2   ");
-                else if (TimeRemaining>=0.0) Font1.Print(SingleOpenGLWindow->GetWidth()/2-47, SingleOpenGLWindow->GetHeight()/2, 0x00FF0000, "   1   ");
-             // else if (TimeRemaining>=0.0) Font1.Print(SingleOpenGLWindow->GetWidth()/2-47, SingleOpenGLWindow->GetHeight()/2, 0x00FF0000, "  Go!  ");
+                const int FrameWidth =1024;
+                const int FrameHeight= 786;
+
+                     if (TimeRemaining>=2.0) Font1.Print(FrameWidth/2-47, FrameHeight/2, float(FrameWidth), float(FrameHeight), 0x00FF0000, "   3   ");
+                else if (TimeRemaining>=1.0) Font1.Print(FrameWidth/2-47, FrameHeight/2, float(FrameWidth), float(FrameHeight), 0x00FF0000, "   2   ");
+                else if (TimeRemaining>=0.0) Font1.Print(FrameWidth/2-47, FrameHeight/2, float(FrameWidth), float(FrameHeight), 0x00FF0000, "   1   ");
+             // else if (TimeRemaining>=0.0) Font1.Print(FrameWidth/2-47, FrameHeight/2, float(FrameWidth), float(FrameHeight), 0x00FF0000, "  Go!  ");
                 else
                 {
                     // OLD CODE (yes, it was only one line):
-                    // Font1.Print(SingleOpenGLWindow->GetWidth()/2-75, SingleOpenGLWindow->GetHeight()/2, 0x00FF0000, "Ready!");
+                    // Font1.Print(FrameWidth/2-75, FrameHeight/2, float(FrameWidth), float(FrameHeight), 0x00FF0000, "Ready!");
 
                     static const std::string        HudImgMatName="Hud/Ready";
@@ -1316 +1317 @@
                     MatSys::Renderer->SetMatrix(MatSys::RendererI::MODEL_TO_WORLD, MatrixT());
                     MatSys::Renderer->SetMatrix(MatSys::RendererI::WORLD_TO_VIEW,  MatrixT());
-                    MatSys::Renderer->SetMatrix(MatSys::RendererI::PROJECTION,     MatrixT::GetProjOrthoMatrix(0.0f, float(SingleOpenGLWindow->GetWidth()), float(SingleOpenGLWindow->GetHeight()), 0.0f, -1.0f, 1.0f));
+                    MatSys::Renderer->SetMatrix(MatSys::RendererI::PROJECTION,     MatrixT::GetProjOrthoMatrix(0.0f, float(FrameWidth), float(FrameHeight), 0.0f, -1.0f, 1.0f));
 
                     static MatSys::MeshT TextMesh(MatSys::MeshT::Quads);
@@ -1325 +1326 @@
                     const unsigned long h=HudImgHeight/2;
 
-                    TextMesh.Vertices[0].SetOrigin(SingleOpenGLWindow->GetWidth()/2-w, SingleOpenGLWindow->GetHeight()/2-h); TextMesh.Vertices[0].SetTextureCoord(0.0f, 0.0f);
-                    TextMesh.Vertices[1].SetOrigin(SingleOpenGLWindow->GetWidth()/2+w, SingleOpenGLWindow->GetHeight()/2-h); TextMesh.Vertices[1].SetTextureCoord(1.0f, 0.0f);
-                    TextMesh.Vertices[2].SetOrigin(SingleOpenGLWindow->GetWidth()/2+w, SingleOpenGLWindow->GetHeight()/2+h); TextMesh.Vertices[2].SetTextureCoord(1.0f, 1.0f);
-                    TextMesh.Vertices[3].SetOrigin(SingleOpenGLWindow->GetWidth()/2-w, SingleOpenGLWindow->GetHeight()/2+h); TextMesh.Vertices[3].SetTextureCoord(0.0f, 1.0f);
+                    TextMesh.Vertices[0].SetOrigin(FrameWidth/2-w, FrameHeight/2-h); TextMesh.Vertices[0].SetTextureCoord(0.0f, 0.0f);
+                    TextMesh.Vertices[1].SetOrigin(FrameWidth/2+w, FrameHeight/2-h); TextMesh.Vertices[1].SetTextureCoord(1.0f, 0.0f);
+                    TextMesh.Vertices[2].SetOrigin(FrameWidth/2+w, FrameHeight/2+h); TextMesh.Vertices[2].SetTextureCoord(1.0f, 1.0f);
+                    TextMesh.Vertices[3].SetOrigin(FrameWidth/2-w, FrameHeight/2+h); TextMesh.Vertices[3].SetTextureCoord(0.0f, 1.0f);
 
                     MatSys::Renderer->SetCurrentMaterial(HudImgRM);

cafu/branches/cafu_to_wx/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;
@@ -256 +254 @@
 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;

cafu/branches/cafu_to_wx/Libs/Fonts/Font.cpp

@@ -36 +36 @@
 #include "MaterialSystem/Renderer.hpp"
 #include "Math3D/Matrix.hpp"
-#include "OpenGL/OpenGLWindow.hpp"
 
 #if defined(_WIN32)
@@ -76 +75 @@
 
 
-void FontT::Print(int PosX, int PosY, unsigned long Color, const char* PrintString, ...)
+void FontT::Print(int PosX, int PosY, float FrameWidth, float FrameHeight, unsigned long Color, const char* PrintString, ...)
 {
     if (!PrintString) return;
@@ -87 +86 @@
     va_end(ArgList);
 
-    AccPrintBegin();
+    AccPrintBegin(FrameWidth, FrameHeight);
     AccPrint(PosX, PosY, Color, PrintBuffer);
     AccPrintEnd();
@@ -93 +92 @@
 
 
-void FontT::AccPrintBegin()
+void FontT::AccPrintBegin(float FrameWidth, float FrameHeight)
 {
     // Save the current matrices.
@@ -100 +99 @@
     MatSys::Renderer->PushMatrix(MatSys::RendererI::WORLD_TO_VIEW );
 
-    MatSys::Renderer->SetMatrix(MatSys::RendererI::PROJECTION,     MatrixT::GetProjOrthoMatrix(0.0f, float(SingleOpenGLWindow->GetWidth()), float(SingleOpenGLWindow->GetHeight()), 0.0f, -1.0f, 1.0f));
+    MatSys::Renderer->SetMatrix(MatSys::RendererI::PROJECTION,     MatrixT::GetProjOrthoMatrix(0.0f, FrameWidth, FrameHeight, 0.0f, -1.0f, 1.0f));
  // MatSys::Renderer->SetMatrix(MatSys::RendererI::MODEL_TO_WORLD, MatrixT());      // Set below, in AccPrint().
     MatSys::Renderer->SetMatrix(MatSys::RendererI::WORLD_TO_VIEW,  MatrixT());

cafu/branches/cafu_to_wx/Libs/Fonts/Font.hpp

@@ -55 +55 @@
 
     /// Prints PrintString at (PosX, PosY) in color Color.
-    void Print(int PosX, int PosY, unsigned long Color, const char* PrintString, ...);
+    void Print(int PosX, int PosY, float FrameWidth, float FrameHeight, unsigned long Color, const char* PrintString, ...);
 
     /// Accumulative printing functions. Faster if you have to call Print() a lot.
-    void AccPrintBegin();
+    void AccPrintBegin(float FrameWidth, float FrameHeight);
     void AccPrint(int PosX, int PosY, unsigned long Color, const char* PrintString, ...);
     void AccPrintEnd();

cafu/branches/cafu_to_wx/Libs/SConscript

@@ -25 +25 @@
 
 
-if sys.platform=="win32":
-    Win32Objects=env.Object("DirectX/DirectInput.cpp", CPPPATH=env['CPPPATH']+["#/ExtLibs/DirectX7/include"])
-else:
-    Win32Objects=[]
-
 env.StaticLibrary(
     target="cfsCoreLib",
@@ -36 +31 @@
                     GuiSys/ConsoleByWindow.cpp GuiSys/Coroutines.cpp GuiSys/InitWindowTypes.cpp GuiSys/GuiImpl.cpp GuiSys/GuiManImpl.cpp
                     GuiSys/Window.cpp GuiSys/WindowCreateParams.cpp GuiSys/WindowChoice.cpp GuiSys/WindowEdit.cpp GuiSys/WindowListBox.cpp GuiSys/WindowModel.cpp GuiSys/WindowPtr.cpp GuiSys/EditorData.cpp
-                    FileSys/FileManImpl.cpp FileSys/FileSys_LocalPath.cpp FileSys/FileSys_ZipArchive_GV.cpp FileSys/File_local.cpp FileSys/File_memory.cpp FileSys/Password.cpp""") +
-           env.Object("OpenGL/OpenGLWindow.cpp", CPPPATH=env['CPPPATH']+["#/ExtLibs/DirectX7/include"]) +
-           Win32Objects,
+                    FileSys/FileManImpl.cpp FileSys/FileSys_LocalPath.cpp FileSys/FileSys_ZipArchive_GV.cpp FileSys/File_local.cpp FileSys/File_memory.cpp FileSys/Password.cpp"""),
     CPPPATH=env['CPPPATH']+["#/ExtLibs/bullet/src",    # For the BulletAdapterT classes.
                             "#/ExtLibs/lua/src", "#/ExtLibs/zlib"])
+
+
+
+# This library is obsolete, and only used for our legacy programs in CaTools.
+if sys.platform=="win32":
+    env.StaticLibrary(target="cfsOpenGL",
+        source=["OpenGL/OpenGLWindow.cpp", "DirectX/DirectInput.cpp"],
+        CPPPATH=env['CPPPATH']+["#/ExtLibs/DirectX7/include"])
+else:
+    env.StaticLibrary(target="cfsOpenGL", source="OpenGL/OpenGLWindow.cpp")