Changeset 119

Timestamp:

08/16/10 21:15:24 (18 months ago)

Author:

Carsten

Message:

Re-established most of the client functionality:

• proper (projection) matrix handling and setup for 3D rendering,
• mouse and keyboard state analysis for player control,
• taking screen-shots (F5) and opening the console (F1),
• regarding application shut-down see < http://thread.gmane.org/gmane.comp.lib.wxwidgets.general/70625> for an open issue.

Location:

cafu/branches/cafu_to_wx

Files:

• Ca3DE/Client/ClientStateInGame.cpp (modified) (3 diffs)
• Ca3DE/Client/ClientWindow.cpp (modified) (1 diff)
• Ca3DE/MainCanvas.cpp (modified) (10 diffs)
• Ca3DE/MainCanvas.hpp (modified) (1 diff)
• Libs/GuiSys/GuiManImpl.cpp (modified) (1 diff)
• Libs/Math3D/Matrix.cpp (modified) (1 diff)
• SConscript (modified) (6 diffs)

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

@@ -383 +383 @@
             Graphs.PosZ   [ClientFrameNr & (512-1)]=((unsigned short)(OurEntityCurrentState->Origin.z/20.0)) & 511;
 
+            MatSys::Renderer->PushMatrix(MatSys::RendererI::PROJECTION    );
+            MatSys::Renderer->PushMatrix(MatSys::RendererI::MODEL_TO_WORLD);
+            MatSys::Renderer->PushMatrix(MatSys::RendererI::WORLD_TO_VIEW );
+
+            MatSys::Renderer->SetMatrix(MatSys::RendererI::PROJECTION,
+                // Note that the far plane is located at infinity for our stencil shadows implementation!
+                // A fovY of 67.5 corresponds to a fovX of 90.0 when the aspect ratio is 4:3.
+                MatrixT::GetProjPerspectiveMatrix(67.5f, float(FrameSize.GetWidth())/float(FrameSize.GetHeight()), 100.0f, -1.0f));
+
+            MatSys::Renderer->SetMatrix(MatSys::RendererI::MODEL_TO_WORLD, MatrixT());
+            MatSys::Renderer->SetMatrix(MatSys::RendererI::WORLD_TO_VIEW,  MatrixT());
+
             World->Draw(FrameTime, OurEntityCurrentState);
+
+            MatSys::Renderer->PopMatrix(MatSys::RendererI::PROJECTION    );
+            MatSys::Renderer->PopMatrix(MatSys::RendererI::MODEL_TO_WORLD);
+            MatSys::Renderer->PopMatrix(MatSys::RendererI::WORLD_TO_VIEW );
 
             // Die Framerate ist zwar World-unabhängig, ihre Anzeige hier aber besser aufgehoben (aus rein kosmetischen Gründen).
@@ -811 +827 @@
     if (World)
     {
-        cf::GuiSys::GuiI* ActiveGui=cf::GuiSys::GuiMan->GetTopmostActiveAndInteractive();
+        cf::GuiSys::GuiI*  ActiveGui =cf::GuiSys::GuiMan->GetTopmostActiveAndInteractive();
+        const wxMouseState MouseState=wxGetMouseState();
         assert(ActiveGui!=NULL);    // The GUI of the client for the world output must always be there.
 
         // This is unfortunately needed, because the users last click (in the GUI) that brought us here may still have the "LMB up" event pending.
-#if 0
-        WasLMBOnceUp|=(SingleOpenGLWindow->GetMouseButtonState() & 0x1)==0;
+        WasLMBOnceUp=WasLMBOnceUp || !MouseState.LeftIsDown();
 
         // FIXME: Should test for ActiveGui==ClientGui instead of ActiveGui->GetScriptName()=="".
         if (ActiveGui->GetScriptName()=="" && WasLMBOnceUp)
         {
-            if (SingleOpenGLWindow->GetMouseButtonState() & 0x1) PlayerCommand.Keys|=PCK_Fire1;  // Button 0
-            if (SingleOpenGLWindow->GetMouseButtonState() & 0x6) PlayerCommand.Keys|=PCK_Fire2;  // Button 1 oder 2
+            if (MouseState.LeftIsDown())                               PlayerCommand.Keys|=PCK_Fire1;
+            if (MouseState.MiddleIsDown() || MouseState.RightIsDown()) PlayerCommand.Keys|=PCK_Fire2;
 
             // Alle anderen Keys via KeyboardState bestimmen und über die volle Frametime anwenden.
@@ -828 +844 @@
             // Mit anderen Worten: Diesen Kram mit in die obige Buffer-Schleife nehmen!
             // Player movement / state
-         // if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_RCONTROL   ]) ;                                       // R_Strg   Run
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_RSHIFT     ] ||                                       // R_Shift  Stealth
-                SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_LSHIFT     ]) PlayerCommand.Keys|=PCK_Walk;           // L_Shift  Stealth
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_UP         ] ||                                       // Up       Walk forward
-                SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_W          ]) PlayerCommand.Keys|=PCK_MoveForward;    // W        Walk forward
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_DOWN       ] ||                                       // Down     Walk backward
-                SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_S          ]) PlayerCommand.Keys|=PCK_MoveBackward;   // S        Walk backward
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_A          ] ||                                       // A        Strafe left
-                SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_COMMA      ]) PlayerCommand.Keys|=PCK_StrafeLeft;     // ,        Strafe left
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_D          ] ||                                       // D        Strafe right
-                SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_PERIOD     ]) PlayerCommand.Keys|=PCK_StrafeRight;    // .        Strafe right
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_R          ]) PlayerCommand.Keys|=PCK_Fire1;          // R        Fire/Respawn
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_RETURN     ] ||                                       // RETURN   Use
-                SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_NUMPADENTER]) PlayerCommand.Keys|=PCK_Use;            // ENTER    Use
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_LEFT       ]) PlayerCommand.Keys|=PCK_TurnLeft;       // Left     Turn left
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_RIGHT      ]) PlayerCommand.Keys|=PCK_TurnRight;      // Right    Turn right
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_PGDN       ]) PlayerCommand.Keys|=PCK_LookUp;         //          Look up
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_PGUP       ]) PlayerCommand.Keys|=PCK_LookDown;       //          Look down
-         // if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_HOME       ]) PlayerCommand.Keys|=PCK_BankCW          //          Bank CW
-         // if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_INSERT     ]) PlayerCommand.Keys|=PCK_BankCCW;        //          Bank CCW
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_END        ]) PlayerCommand.Keys|=PCK_CenterView;
-        }
-#endif
+         // if (wxGetKeyState(WXK_CONTROL)     ) ;                                       // R_Strg   Run
+            if (wxGetKeyState(WXK_SHIFT)       ) PlayerCommand.Keys|=PCK_Walk;           // Shift  Stealth
+            if (wxGetKeyState(WXK_UP) ||                                                 // Up       Walk forward
+                wxGetKeyState(wxKeyCode('W'))  ) PlayerCommand.Keys|=PCK_MoveForward;    // W        Walk forward
+            if (wxGetKeyState(WXK_DOWN) ||                                               // Down     Walk backward
+                wxGetKeyState(wxKeyCode('S'))  ) PlayerCommand.Keys|=PCK_MoveBackward;   // S        Walk backward
+            if (wxGetKeyState(wxKeyCode('A')) ||                                         // A        Strafe left
+                wxGetKeyState(wxKeyCode(','))  ) PlayerCommand.Keys|=PCK_StrafeLeft;     // ,        Strafe left
+            if (wxGetKeyState(wxKeyCode('D')) ||                                         // D        Strafe right
+                wxGetKeyState(wxKeyCode('.'))  ) PlayerCommand.Keys|=PCK_StrafeRight;    // .        Strafe right
+            if (wxGetKeyState(wxKeyCode('R'))  ) PlayerCommand.Keys|=PCK_Fire1;          // R        Fire/Respawn
+            if (wxGetKeyState(WXK_RETURN) ||                                             // RETURN   Use
+                wxGetKeyState(WXK_NUMPAD_ENTER)) PlayerCommand.Keys|=PCK_Use;            // ENTER    Use
+            if (wxGetKeyState(WXK_LEFT        )) PlayerCommand.Keys|=PCK_TurnLeft;       // Left     Turn left
+            if (wxGetKeyState(WXK_RIGHT       )) PlayerCommand.Keys|=PCK_TurnRight;      // Right    Turn right
+            if (wxGetKeyState(WXK_PAGEDOWN    )) PlayerCommand.Keys|=PCK_LookUp;         //          Look up
+            if (wxGetKeyState(WXK_PAGEUP      )) PlayerCommand.Keys|=PCK_LookDown;       //          Look down
+         // if (wxGetKeyState(WXK_HOME        )) PlayerCommand.Keys|=PCK_BankCW          //          Bank CW
+         // if (wxGetKeyState(WXK_INSERT      )) PlayerCommand.Keys|=PCK_BankCCW;        //          Bank CCW
+            if (wxGetKeyState(WXK_END         )) PlayerCommand.Keys|=PCK_CenterView;
+        }
 
 

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

@@ -77 +77 @@
 {
     // Call the clients render methods here.
-
-    // We don't want want ortho rendering here, so setup a perspective projection matrix.
-    // TODO 1: Move this into the world rendering code??
-    // TODO 2: Should actually *push* the matrices, properly *set* them and below *pop* them!!
-    //         Also see the TODO in GuiManImplT::RenderAll() for more details!!
-    MatSys::Renderer->PopMatrix(MatSys::RendererI::PROJECTION    );
-    MatSys::Renderer->PopMatrix(MatSys::RendererI::MODEL_TO_WORLD);
-    MatSys::Renderer->PopMatrix(MatSys::RendererI::WORLD_TO_VIEW );
-
     Client->Render(LastFrameTime);
-
-    MatSys::Renderer->PushMatrix(MatSys::RendererI::PROJECTION    );
-    MatSys::Renderer->PushMatrix(MatSys::RendererI::MODEL_TO_WORLD);
-    MatSys::Renderer->PushMatrix(MatSys::RendererI::WORLD_TO_VIEW );
 }
 

cafu/branches/cafu_to_wx/Ca3DE/MainCanvas.cpp

@@ -28 +28 @@
 #include "Server/Server.hpp"
 
+#include "Bitmap/Bitmap.hpp"
 #include "ClipSys/CollisionModelMan.hpp"
 #include "ConsoleCommands/Console.hpp"
@@ -70 +71 @@
     EVT_IDLE(MainCanvasT::OnIdle)
     EVT_SIZE(MainCanvasT::OnSize)
-    // EVT_SHOW(MainCanvasT::OnShow)
 
     EVT_MOTION    (MainCanvasT::OnMouseMove )
@@ -433 +433 @@
 
 
+static const char* ScreenShotSuffixTypes[] = { "jpg", "png", "bmp", NULL };
+static ConVarT ScreenShotSuffix("screenSuffix", "jpg", ConVarT::FLAG_MAIN_EXE, "The suffix to be used for screen-shot image files. Only \"jpg\", \"png\" and \"bmp\" are allowed.", ScreenShotSuffixTypes);
+
+
+void MainCanvasT::TakeScreenshot() const
+{
+    const unsigned int      Width =GetClientSize().GetWidth();
+    const unsigned int      Height=GetClientSize().GetHeight();
+    static ArrayT<uint32_t> FrameBuffer;
+
+    FrameBuffer.Overwrite();
+    FrameBuffer.PushBackEmpty(Width*Height);
+
+    // Read the pixels fromt the OpenGL back buffer into FrameBuffer.
+    // Note that the first two parameters (0, 0) specify the left BOTTOM corner of the desired rectangle!
+    glReadPixels(0, 0, Width, Height, GL_RGBA, GL_UNSIGNED_BYTE, &FrameBuffer[0]);
+
+    // As mentioned above is the data in the FrameBuffer bottom-up.
+    // Thus now swap all lines (vertical mirroring).
+    for (unsigned int y=0; y<Height/2; y++)
+    {
+        uint32_t* UpperRow=&FrameBuffer[0]+        y   *Width;
+        uint32_t* LowerRow=&FrameBuffer[0]+(Height-y-1)*Width;
+
+        for (unsigned int x=0; x<Width; x++)
+        {
+            const uint32_t Swap=*UpperRow;
+
+            *UpperRow=*LowerRow;
+            *LowerRow=Swap;
+
+            UpperRow++;
+            LowerRow++;
+        }
+    }
+
+    // Find the next free image name and save the file.
+    for (unsigned int Nr=0; Nr<100000; Nr++)
+    {
+        const wxString FileName=wxString::Format("pic%04u", Nr) + "." + ScreenShotSuffix.GetValueString();
+
+        if (!wxFileExists(FileName))
+        {
+            if (BitmapT(Width, Height, &FrameBuffer[0]).SaveToDisk(FileName))
+            {
+                Console->Print(std::string("Screenshot \"")+FileName.ToStdString()+"\" saved.\n");
+            }
+            else
+            {
+                Console->Warning(std::string("Screenshot \"")+FileName.ToStdString()+"\" could not be saved.\n");
+            }
+            return;
+        }
+    }
+}
+
+
 void MainCanvasT::OnPaint(wxPaintEvent& PE)
 {
     wxPaintDC dc(this);     // It is VERY important not to omit this, or otherwise everything goes havoc.
 
-    if (m_InitState==INIT_REQUIRED) Initialize();
+    if (m_InitState==INIT_REQUIRED)
+    {
+        // This code is in this place due to a few peculiarities of OpenGL under GTK that do not exist under MSW:
+        //   - An OpenGL context can only be made current with a canvas that is shown on the screen.
+        //   - Relying on EVT_SHOW however is not a good approach, see the discussions at
+        //     <http://thread.gmane.org/gmane.comp.lib.wxwidgets.general/68490> and
+        //     <http://thread.gmane.org/gmane.comp.lib.wxwidgets.general/70607> for details.
+        // Consequently, the first and best opportunity for initialization is here.
+        Initialize();
+    }
 }
 
@@ -457 +523 @@
 
     // Beende das Programm, wenn das letzte aktive GUI geschlossen wurde.
-    // if (cf::GuiSys::GuiMan->GetNumberOfActiveGUIs()==0) Close();
+    // if (cf::GuiSys::GuiMan->GetNumberOfActiveGUIs()==0) m_Parent->Close();
 
     static ConVarT quit("quit", false, ConVarT::FLAG_MAIN_EXE, "The program quits if this variable is set to 1 (true).");
@@ -463 +529 @@
     {
         quit.SetValue(false);   // Immediately reset the value, so that we're able to restart the game from a loop that governs the master loop...
-        Close();
+        m_Parent->Close();
     }
 
@@ -503 +569 @@
     if (m_Server) m_Server->MainLoop();
 }
-
-
-// void MainCanvasT::OnShow(wxShowEvent& SE)
-// {
-//     wxMessageBox(wxString::Format("%i %i", SE.IsShown(), m_IsInited));
-//     if (SE.IsShown() && !m_IsInited)
-//     {
-//         // This code is in this place due to a few peculiarities of OpenGL under GTK that do not exist under MSW:
-//         //   - First, an OpenGL context can only be made current with a canvas that is shown on the screen.
-//         //   - Second, calling Show() in the ctor above doesn't show the frame immediately - that requires
-//         //     getting back to the main event loop first.
-//         // Consequently, the first and best opportunity for initializing the MatSys is here.
-//         Initialize();
-//     }
-// }
 
 
@@ -745 +796 @@
 void MainCanvasT::OnKeyDown(wxKeyEvent& KE)
 {
+    if (m_InitState!=INIT_SUCCESS) return;
+
+    switch (KE.GetKeyCode())
+    {
+        case WXK_F1:
+        {
+            // Activate the in-game console GUI (it's "F1" now, not CK_GRAVE ("^", accent grave) any longer).
+            extern ConVarT    Options_ServerGameName;
+            cf::GuiSys::GuiI* ConsoleGui=cf::GuiSys::GuiMan->Find("Games/"+Options_ServerGameName.GetValueString()+"/GUIs/Console.cgui");
+
+            // ConsoleGui should be the same as in Initialize(), but could be NULL on file not found, parse error, etc.
+            if (ConsoleGui!=NULL && !ConsoleGui->GetIsActive())
+            {
+                ConsoleGui->Activate();
+                cf::GuiSys::GuiMan->BringToFront(ConsoleGui);
+
+                static bool InitialHelpMsgPrinted=false;
+
+                if (!InitialHelpMsgPrinted)
+                {
+                    Console->Print("\n");
+                    Console->Print("Welcome to the Cafu console!\n");
+                    Console->Print("Enter   help()   to obtain more information.\n");
+                    Console->Print("\n");
+                    InitialHelpMsgPrinted=true;
+                }
+
+                // Handled the key.
+                return;
+            }
+
+            // Let the active GUI handle the key below (e.g. for closing the console again).
+            break;
+        }
+
+        case WXK_F5:
+        {
+            TakeScreenshot();
+            return;
+        }
+    }
+
     // Look for the pressed keys keycode in the table and translate it to a CaKeyCode if found.
     for (int KeyCodeNr=0; KeyCodes[KeyCodeNr].wxKC!=0; KeyCodeNr++)
@@ -756 +849 @@
 
             cf::GuiSys::GuiMan->ProcessDeviceEvent(KeyboardEvent);
-            return;
+            // We should probably return here if the GuiMan handled the key, break (only when unhandled) for calling KE.Skip() otherwise.
+            break;
         }
     }
@@ -766 +860 @@
 void MainCanvasT::OnKeyUp(wxKeyEvent& KE)
 {
+    if (m_InitState!=INIT_SUCCESS) return;
+
     // Look for the released keys keycode in the table and translate it to a CaKeyCode if found.
     for (int KeyCodeNr=0; KeyCodes[KeyCodeNr].wxKC!=0; KeyCodeNr++)
@@ -787 +883 @@
 void MainCanvasT::OnKeyChar(wxKeyEvent& KE)
 {
+    if (m_InitState!=INIT_SUCCESS) return;
+
     CaKeyboardEventT KeyboardEvent;
 

cafu/branches/cafu_to_wx/Ca3DE/MainCanvas.hpp

@@ -59 +59 @@
 
     void Initialize();
+    void TakeScreenshot() const;
 
     void OnPaint(wxPaintEvent& PE);
     void OnSize(wxSizeEvent& SE);
     void OnIdle(wxIdleEvent& IE);   ///< The idle event handler runs one frame of the Cafu Engine (client and/or server).
- // void OnShow(wxShowEvent& SE);   ///< Event handler for "has been shown" events.
 
     void OnMouseMove (wxMouseEvent& ME);

cafu/branches/cafu_to_wx/Libs/GuiSys/GuiManImpl.cpp

@@ -174 +174 @@
     }
 
-    // Render the GUIs in back-to-front order.
+    // We assume that the caller doesn't expect us to preserve (push/pop) the matrices...
+    const float zNear=0.0f;
+    const float zFar =1.0f;
+    MatSys::Renderer->SetMatrix(MatSys::RendererI::PROJECTION,     MatrixT::GetProjOrthoMatrix(0.0f, VIRTUAL_SCREEN_SIZE_X, VIRTUAL_SCREEN_SIZE_Y, 0.0f, zNear, zFar));
+    MatSys::Renderer->SetMatrix(MatSys::RendererI::MODEL_TO_WORLD, MatrixT());
+    MatSys::Renderer->SetMatrix(MatSys::RendererI::WORLD_TO_VIEW,  MatrixT());
+
+    // Render the active GUIs in back-to-front order.
     for (unsigned long GuiNr=StartGuiNr; GuiNr<Guis.Size(); GuiNr++)
     {
-        // TODO:
-        // 1) Remove the next (no-comment-) line.
-        // 2) Move the matrix push, set and pop code out of this loop!
-        // 3) Fix the clients ClientWindowT::Render() method by fixing the matrix setup code inside it
-        //    (it probably belongs into the world rendering method anyway)!!
-        if (!Guis[GuiNr]->GetIsActive()) continue;
-
-        // Setup the matrices.
-        MatSys::Renderer->PushMatrix(MatSys::RendererI::PROJECTION    );
-        MatSys::Renderer->PushMatrix(MatSys::RendererI::MODEL_TO_WORLD);
-        MatSys::Renderer->PushMatrix(MatSys::RendererI::WORLD_TO_VIEW );
-
-        const float zNear=0.0f;
-        const float zFar =1.0f;
-        MatSys::Renderer->SetMatrix(MatSys::RendererI::PROJECTION,     MatrixT::GetProjOrthoMatrix(0.0f, VIRTUAL_SCREEN_SIZE_X, VIRTUAL_SCREEN_SIZE_Y, 0.0f, zNear, zFar));
-        MatSys::Renderer->SetMatrix(MatSys::RendererI::MODEL_TO_WORLD, MatrixT());
-        MatSys::Renderer->SetMatrix(MatSys::RendererI::WORLD_TO_VIEW,  MatrixT());
-
-        if (Guis[GuiNr]->GetIsActive()) Guis[GuiNr]->Render();
-
-        // Restore the previously active matrices.
-        MatSys::Renderer->PopMatrix(MatSys::RendererI::PROJECTION    );
-        MatSys::Renderer->PopMatrix(MatSys::RendererI::MODEL_TO_WORLD);
-        MatSys::Renderer->PopMatrix(MatSys::RendererI::WORLD_TO_VIEW );
+        if (Guis[GuiNr]->GetIsActive())
+            Guis[GuiNr]->Render();
     }
 }

cafu/branches/cafu_to_wx/Libs/Math3D/Matrix.cpp

@@ -66 +66 @@
 MatrixT MatrixT::GetProjPerspectiveMatrix(float fovY, float aspect, float zNear, float zFar)
 {
+    if (zFar<=zNear)
+    {
+        // If zFar <= zNear, the far plane is assumed to be at infinity (a useful special case for stencil shadow projections).
+        // This code is also used in <http://trac.cafu.de/browser/cafu/trunk/Libs/OpenGL/OpenGLWindow.cpp?rev=100#L137>.
+        const float cotanFovY=1.0f/tan(fovY*3.14159265358979323846f/360.0f);
+
+        return MatrixT(
+            cotanFovY/aspect,      0.0f,  0.0f,        0.0f,
+                        0.0f, cotanFovY,  0.0f,        0.0f,
+                        0.0f,      0.0f, -1.0f, -2.0f*zNear,
+                        0.0f,      0.0f, -1.0f,        0.0f);
+    }
+
     const float ymax= zNear*float(tan(fovY*3.14159265358979323846f/360.0f));
     const float ymin=-ymax;

cafu/branches/cafu_to_wx/SConscript

@@ -51 +51 @@
                        + Split("gdi32 glu32 opengl32 user32") + ['cfsOpenGL', 'dinput', 'dxguid'])
 elif sys.platform=="linux2":
-    # envTools.Append(LINKFLAGS = ['-Wl,--export-dynamic'])     # Not needed any more, .so libs now link to the required .a libs directly, just as under Windows.
+    # envTools.Append(LINKFLAGS=['-Wl,--export-dynamic'])       # Not needed any more, .so libs now link to the required .a libs directly, just as under Windows.
     # GLU is needed for the TerrainViewerOld *and* for e.g. gluBuild2DMipmaps() in the renderers...
     envTools.Append(CPPPATH=['/usr/include/freetype2'])         # As of 2009-09-10, this line is to become unnecessary in the future, see /usr/include/ftbuild.h for details.
@@ -82 +82 @@
     wxPath="#/ExtLibs/wxWidgets";
 
-    wxEnv.Append(CPPPATH = [wxPath+'/include'])
+    wxEnv.Append(CPPPATH=[wxPath+'/include'])
+    wxEnv.Append(LIBS=Split("advapi32 comctl32 comdlg32 gdi32 ole32 oleaut32 opengl32 rpcrt4 shell32 user32 winspool wsock32"))
 
     # TODO: Move this into the SConstruct file (including the wx include path above).
@@ -96 +97 @@
     LibPath += "_lib"
 
-    wxEnv.Append(LIBPATH = [wxPath+LibPath])
+    wxEnv.Append(LIBPATH=[wxPath+LibPath])
 
     if buildMode=="dbg":
-        wxEnv.Append(CPPPATH = [wxPath+LibPath+"/mswud"])
-        wxEnv.Append(LIBS = Split("wxbase29ud wxbase29ud_net wxjpegd wxmsw29ud_adv wxmsw29ud_core wxmsw29ud_gl wxmsw29ud_aui wxmsw29ud_propgrid wxregexud"))
+        wxEnv.Append(CPPPATH=[wxPath+LibPath+"/mswud"])
+        wxEnv.Append(LIBS=Split("wxbase29ud wxbase29ud_net wxjpegd wxmsw29ud_adv wxmsw29ud_core wxmsw29ud_gl wxmsw29ud_aui wxmsw29ud_propgrid wxregexud"))
     else:
-        wxEnv.Append(CPPPATH = [wxPath+LibPath+"/mswu"])
-        wxEnv.Append(LIBS = Split("wxbase29u wxbase29u_net wxjpeg wxmsw29u_adv wxmsw29u_core wxmsw29u_gl wxmsw29u_aui wxmsw29u_propgrid wxregexu"))
+        wxEnv.Append(CPPPATH=[wxPath+LibPath+"/mswu"])
+        wxEnv.Append(LIBS=Split("wxbase29u wxbase29u_net wxjpeg wxmsw29u_adv wxmsw29u_core wxmsw29u_gl wxmsw29u_aui wxmsw29u_propgrid wxregexu"))
 
 elif sys.platform=="linux2":
     # Geht es auch ohne die naechste Zeile? Woher weiss es, dass es freetype linken soll???
-    wxEnv.Append(LIBS = Split("wx_gtk2u_gl-2.9 wx_gtk2u_aui-2.9 wx_gtk2u_propgrid-2.9 wx_gtk2u_xrc-2.9 wx_gtk2u_qa-2.9 wx_gtk2u_html-2.9 wx_gtk2u_adv-2.9 wx_gtk2u_core-2.9 wx_baseu_xml-2.9 wx_baseu_net-2.9 wx_baseu-2.9"))
+    wxEnv.Append(LIBS=Split("wx_gtk2u_gl-2.9 wx_gtk2u_aui-2.9 wx_gtk2u_propgrid-2.9 wx_gtk2u_xrc-2.9 wx_gtk2u_qa-2.9 wx_gtk2u_html-2.9 wx_gtk2u_adv-2.9 wx_gtk2u_core-2.9 wx_baseu_xml-2.9 wx_baseu_net-2.9 wx_baseu-2.9"))
     wxEnv.ParseConfig(Dir("#/ExtLibs/wxWidgets").abspath + "/build-gtk/wx-config --cxxflags --libs std,gl")
 
@@ -117 +118 @@
 if sys.platform=="win32":
     envCafu.Append(LIBS=Split("SceneGraph MatSys SoundSys cfsLib cfsCoreLib cfs_png cfs_jpeg bulletcollision minizip z lua ClipSys GuiSysNullEditor"))
-    envCafu.Append(LIBS=Split("lightwave"))    # For the GuiSys::ModelWindowT class.
-    envCafu.Append(LIBS=Split("advapi32 comctl32 comdlg32 gdi32 ole32 oleaut32 opengl32 rpcrt4 shell32 user32 winspool wsock32"))
+    envCafu.Append(LIBS=Split("lightwave"))     # For the GuiSys::ModelWindowT class.
 
-    WinResource=envCafu.RES("Ca3DE/Cafu.rc")    # + envCafu.RES("Ca3DE/Dialog1.rc")
+    WinResource = envCafu.RES("Ca3DE/Cafu.rc")  # + envCafu.RES("Ca3DE/Dialog1.rc")
 
 elif sys.platform=="linux2":
     # -Wl,-rpath,.           is so that also the . directory is searched for dynamic libraries when they're opened.
     # -Wl,--export-dynamic   is so that the exe exports its symbols so that the MatSys, SoundSys and game .so libs can in turn resolve theirs.
-    envCafu.Append(LINKFLAGS = ['-Wl,-rpath,.', '-Wl,--export-dynamic'])
+    envCafu.Append(LINKFLAGS=['-Wl,-rpath,.', '-Wl,--export-dynamic'])
     envCafu.Append(LIBS=Split("MatSys SoundSys SceneGraph cfsLib cfsCoreLib cfs_png cfs_jpeg bulletdynamics bulletcollision bulletmath openal alut mpg123 ogg vorbis vorbisfile minizip z lua lightwave ClipSys GuiSysNullEditor"))
 
@@ -152 +152 @@
     envCafu.Append(LINKCOM=" -Wl,--allow-multiple-definition -Wl,--whole-archive -lcfsLib -lbulletdynamics -lbulletcollision -lbulletmath -lopenal -lalut -lmpg123 -logg -lvorbis -lvorbisfile -Wl,--no-whole-archive -llightwave -lz")
 
-    WinResource=[]
+    WinResource = []
 
 EngineCommonAndServerObjs = envCafu.StaticObject(Split("""Ca3DE/AppCafu.cpp Ca3DE/MainCanvas.cpp Ca3DE/MainFrame.cpp Ca3DE/ConDefs.cpp
@@ -166 +166 @@
 envCaWE = wxEnv.Clone()
 envCaWE.Append(CPPPATH=['ExtLibs/lua/src', 'ExtLibs/noise/src'])
-envCaWE.Append(LIBS = Split("SceneGraph MatSys cfsCoreLib cfsLib ClipSys cfs_png cfs_jpeg bulletcollision noise lua minizip lightwave z"))
+envCaWE.Append(LIBS=Split("SceneGraph MatSys cfsCoreLib cfsLib ClipSys cfs_png cfs_jpeg bulletcollision noise lua minizip lightwave z"))
 
 if sys.platform=="win32":
     envCaWE.Append(CPPPATH=['ExtLibs/freetype/include'])    # Windows builds use our local copy, Linux builds (must) use the systems freetype library instead.
-    envCaWE.Append(LIBS = Split("freetype"))
-    envCaWE.Append(LIBS = Split("advapi32 comctl32 comdlg32 gdi32 ole32 oleaut32 opengl32 rpcrt4 shell32 user32 winspool wsock32"))
+    envCaWE.Append(LIBS=Split("freetype"))
 
-    WinResource=envCaWE.RES("CaWE/CaWE.rc")
+    WinResource = envCaWE.RES("CaWE/CaWE.rc")
 
 elif sys.platform=="linux2":
-    envCaWE.Append(CPPPATH=['/usr/include/freetype2'])      # As of 2009-09-10, this line is to become unnecessary in the future, see /usr/include/ftbuild.h for details.
-    envCaWE.Append(LINKFLAGS = ['-Wl,--export-dynamic'])    # Need this so that the Renderer DLLs can have their unresolved symbols dynamically resolved at load time.
+    envCaWE.Append(CPPPATH=['/usr/include/freetype2'])  # As of 2009-09-10, this line is to become unnecessary in the future, see /usr/include/ftbuild.h for details.
+    envCaWE.Append(LINKFLAGS=['-Wl,--export-dynamic'])  # Need this so that the Renderer DLLs can have their unresolved symbols dynamically resolved at load time.
 
-    WinResource=[]
+    WinResource = []
 
-SourceFilesList=(Glob("CaWE/*.cpp")
+SourceFilesList = (Glob("CaWE/*.cpp")
     +Glob("CaWE/FontWizard/*.cpp")
     +Glob("CaWE/GuiEditor/*.cpp")+Glob("CaWE/GuiEditor/Commands/*.cpp")+Glob("CaWE/GuiEditor/EditorData/*.cpp")