Changeset 126

Timestamp:

08/23/10 22:34:43 (18 months ago)

Author:

Carsten

Message:

Added:

• support for changing the video mode,
• switching to full-screen display, and
• parsing the command-line options.

Minor cosmetic enhancements:

• blanked system mouse cursor in our 3D canvas, and
• "Initializing Cafu..." message during initialization.

This completes the transfer of features from (old) file Cafu.cpp to the new wx-based code! :-)

Location:

cafu/branches/cafu_to_wx/Ca3DE

Files:

• AppCafu.cpp (modified) (6 diffs)
• AppCafu.hpp (modified) (3 diffs)
• ConDefs.cpp (modified) (2 diffs)
• MainCanvas.cpp (modified) (3 diffs)
• MainFrame.cpp (modified) (3 diffs)

cafu/branches/cafu_to_wx/Ca3DE/AppCafu.cpp

@@ -40 +40 @@
 #include "../Games/Game.hpp"
 
+#include "wx/cmdline.h"
 #include "wx/filename.h"
 #include "wx/msgdlg.h"
@@ -85 +86 @@
 AppCafu::AppCafu()
     : wxApp(),
+      m_IsFullScreen(false),
       m_MainFrame(NULL)
 {
@@ -117 +119 @@
 
     ConsoleInterpreter->RunCommand("dofile('config.lua');");
+
+    // Parse the command line.
+    if (!wxApp::OnInit()) return false;
 
     // Insert legacy dialog here...
@@ -138 +143 @@
     SoundShaderManager->RegisterSoundShaderScriptsInDir("Games/"+GameName+"/SoundShader", "Games/"+GameName+"/");
 
+    // Change display mode.
+    wxDisplay Display;
+
+    m_DesktopMode=Display.GetCurrentMode();
+
+    if (m_DesktopMode.w==0) m_DesktopMode.w=wxGetDisplaySize().x;
+    if (m_DesktopMode.h==0) m_DesktopMode.h=wxGetDisplaySize().y;
+
+    m_CurrentMode=m_DesktopMode;
+
+    extern ConVarT Options_ClientWindowSizeX;
+    extern ConVarT Options_ClientWindowSizeY;
+    extern ConVarT Options_ClientDisplayBPP;
+    extern ConVarT Options_ClientDisplayRefresh;
+    extern ConVarT Options_ClientFullScreen;
+
+    if (Options_ClientFullScreen.GetValueBool())
+    {
+        const wxVideoMode VideoMode(Options_ClientWindowSizeX.GetValueInt(),
+                                    Options_ClientWindowSizeY.GetValueInt(),
+                                    Options_ClientDisplayBPP.GetValueInt(),
+                                    Options_ClientDisplayRefresh.GetValueInt());
+
+        if (Display.ChangeMode(VideoMode))
+        {
+            m_CurrentMode=Display.GetCurrentMode();
+            m_IsFullScreen=true;
+        }
+        else
+        {
+            wxMessageBox("Cafu tried to change the video mode to\n"+
+                wxString::Format("        %i x %i, %i BPP at %i Hz,\n", VideoMode.w, VideoMode.h, VideoMode.bpp, VideoMode.refresh)+
+                "but it didn't work out (zero values mean system defaults).\n"+
+                "We will use the currently active video mode instead and continue.\n\n"+
+                "Alternatively, you can set a different video mode at the Options menu,\n"+
+                "or tweak the video mode details via the console variables.\n",
+                "Could not change the video mode", wxOK | wxICON_EXCLAMATION);
+        }
+    }
+
     // Create the main frame.
     m_MainFrame=new MainFrameT();
     SetTopWindow(m_MainFrame);
 
-    return wxApp::OnInit();
+    return true;
 }
 
@@ -148 +193 @@
 int AppCafu::OnExit()
 {
+    if (m_CurrentMode!=m_DesktopMode)
+    {
+        wxDisplay Display;
+
+        Display.ChangeMode(m_DesktopMode);
+    }
+
     delete g_WinSock;
     g_WinSock=NULL;
@@ -157 +209 @@
     return wxApp::OnExit();
 }
+
+
+extern ConVarT Options_ServerGameName;
+extern ConVarT Options_ServerWorldName;
+extern ConVarT Options_ServerPortNr;
+extern ConVarT Options_ClientPortNr;
+extern ConVarT Options_ClientRemoteName;
+extern ConVarT Options_ClientRemotePortNr;
+
+extern ConVarT Options_ClientWindowSizeX;
+extern ConVarT Options_ClientWindowSizeY;
+extern ConVarT Options_ClientDisplayBPP;        // TODO
+extern ConVarT Options_ClientDisplayRefresh;    // TODO
+extern ConVarT Options_ClientFullScreen;
+
+extern ConVarT Options_ClientDesiredRenderer;
+extern ConVarT Options_ClientDesiredSoundSystem;
+extern ConVarT Options_ClientTextureDetail;
+extern ConVarT Options_DeathMatchPlayerName;
+extern ConVarT Options_DeathMatchModelName;
+
+
+void AppCafu::OnInitCmdLine(wxCmdLineParser& Parser)
+{
+    Parser.AddOption("con",            "", "Runs the given commands in the console. -con \"x=3;\" is equivalent to appending x=3; to the end of the config.lua file.", wxCMD_LINE_VAL_STRING);
+    Parser.AddOption("svGame",         "", "Name of the MOD / game the server should run ["+Options_ServerGameName.GetValueString()+"]. Case sensitive!", wxCMD_LINE_VAL_STRING);
+    Parser.AddOption("svWorld",        "", "Name of the world the server should run ["+Options_ServerWorldName.GetValueString()+"]. Case sensitive!", wxCMD_LINE_VAL_STRING);
+    Parser.AddOption("svPort",         "", wxString::Format("Server port number [%i].", Options_ServerPortNr.GetValueInt()), wxCMD_LINE_VAL_NUMBER);
+    Parser.AddSwitch("noFS", "clNoFullscreen", "Don't run full-screen, but rather in a window.");
+    Parser.AddOption("clPort",         "", wxString::Format("Client port number [%i].", Options_ClientPortNr.GetValueInt()), wxCMD_LINE_VAL_NUMBER);
+    Parser.AddOption("clRemoteName",   "", "Name or IP of the server we connect to ["+Options_ClientRemoteName.GetValueString()+"].", wxCMD_LINE_VAL_STRING);
+    Parser.AddOption("clRemotePort",   "", wxString::Format("Port number of the remote server [%i].", Options_ClientRemotePortNr.GetValueInt()), wxCMD_LINE_VAL_NUMBER);
+    Parser.AddOption("clTexDetail",    "", wxString::Format("0 high detail, 1 medium detail, 2 low detail [%i].", Options_ClientTextureDetail.GetValueInt()), wxCMD_LINE_VAL_NUMBER);
+    Parser.AddOption("clWinSizeX",     "", wxString::Format("If not full-screen, this is the width  of the window [%i].", Options_ClientWindowSizeX.GetValueInt()), wxCMD_LINE_VAL_NUMBER);
+    Parser.AddOption("clWinSizeY",     "", wxString::Format("If not full-screen, this is the height of the window [%i].", Options_ClientWindowSizeY.GetValueInt()), wxCMD_LINE_VAL_NUMBER);
+    Parser.AddOption("clRenderer",     "", "Override the auto-selection of the best available renderer [auto].", wxCMD_LINE_VAL_STRING);
+    Parser.AddOption("clSoundSystem",  "", "Override the auto-selection of the best available sound system [auto].", wxCMD_LINE_VAL_STRING);
+    Parser.AddOption("clPlayerName",   "", "Player name ["+Options_DeathMatchPlayerName.GetValueString()+"].", wxCMD_LINE_VAL_STRING);
+    Parser.AddOption("clModelName",    "", "Name of the players model ["+Options_DeathMatchModelName.GetValueString()+"].", wxCMD_LINE_VAL_STRING);
+
+    wxApp::OnInitCmdLine(Parser);
+    Parser.AddUsageText("\nDefault values are enclosed in [brackets].");
+    Parser.AddUsageText("It is also ok to omit the \"-svWorld\" option for specifying a world name: \"Cafu MyWorld\" is the same as \"Cafu -svWorld MyWorld\".\n");
+    Parser.SetSwitchChars("-");
+}
+
+
+bool AppCafu::OnCmdLineParsed(wxCmdLineParser& Parser)
+{
+    long int i=0;
+    wxString s="";
+
+    if (Parser.Found("con",           &s)) ConsoleInterpreter->RunCommand(s.ToStdString());
+    if (Parser.Found("svGame",        &s)) Options_ServerGameName=s;
+    if (Parser.Found("svWorld",       &s)) Options_ServerWorldName=s;
+    if (Parser.Found("svPort",        &i)) Options_ServerPortNr=i;
+    if (Parser.Found("noFS")             ) Options_ClientFullScreen=false;
+    if (Parser.Found("clPort",        &i)) Options_ClientPortNr=i;
+    if (Parser.Found("clRemoteName",  &s)) Options_ClientRemoteName=s;
+    if (Parser.Found("clRemotePort",  &i)) Options_ClientRemotePortNr=i;
+    if (Parser.Found("clTexDetail",   &i)) Options_ClientTextureDetail=i % 3;
+    if (Parser.Found("clWinSizeX",    &i)) Options_ClientWindowSizeX=i;
+    if (Parser.Found("clWinSizeY",    &i)) Options_ClientWindowSizeY=i;
+    if (Parser.Found("clRenderer",    &s)) Options_ClientDesiredRenderer=s;
+    if (Parser.Found("clSoundSystem", &s)) Options_ClientDesiredSoundSystem=s;
+    if (Parser.Found("clPlayerName",  &s)) Options_DeathMatchPlayerName=s;
+    if (Parser.Found("clModelName",   &s)) Options_DeathMatchModelName=s;
+
+    if (!Parser.Found("svWorld") && Parser.GetParamCount()==1)
+        Options_ServerWorldName=Parser.GetParam(0);
+
+    return wxApp::OnCmdLineParsed(Parser);
+}

cafu/branches/cafu_to_wx/Ca3DE/AppCafu.hpp

@@ -36 +36 @@
 
 #include "wx/app.h"
+#include "wx/display.h"
 
 
@@ -48 +49 @@
     AppCafu();
 
+    /// This method returns the desktops video mode (that was active before the Cafu application was started).
+    const wxVideoMode& GetDesktopMode() const { return m_DesktopMode; }
+
+    /// This method returns the current video mode, which may be identical to the desktops video mode
+    /// (in which case the mode as not switched at all at app init), or any custom mode.
+    const wxVideoMode& GetCurrentMode() const { return m_CurrentMode; }
+
+    /// Returns whether we're running in full-screen mode (with video mode changed, no frame border, etc.)
+    /// or in a regular window (on the desktop, with frame border, etc.).
+    bool IsFullScreen() const { return m_IsFullScreen; }
+
+    /// Returns the main frame of the Cafu application.
     MainFrameT* GetMainFrame() const { return m_MainFrame; }
 
@@ -56 +69 @@
     private:
 
+    void OnInitCmdLine(wxCmdLineParser& Parser);
+    bool OnCmdLineParsed(wxCmdLineParser& Parser);
+
+    wxVideoMode m_DesktopMode;      ///< The desktops video mode.
+    wxVideoMode m_CurrentMode;      ///< The video mode we're currently using.
+    bool        m_IsFullScreen;     ///< Whether we are running in full-screen mode (with video mode changed, no frame border, etc.) or in a regular window (on the desktop, with frame border, etc.).
     MainFrameT* m_MainFrame;
 };

cafu/branches/cafu_to_wx/Ca3DE/ConDefs.cpp

@@ -54 +54 @@
 /*static*/ ConVarT Options_DeathMatchPlayerName    ("dlg_dmPlayerName",      "Player", ConVarT::FLAG_MAIN_EXE | ConVarT::FLAG_PERSISTENT, "Player name for the DeathMatch game.");
 /*static*/ ConVarT Options_DeathMatchModelName     ("dlg_dmModelName",        "James", ConVarT::FLAG_MAIN_EXE | ConVarT::FLAG_PERSISTENT, "Name of the model to use for the DeathMatch game.");
-/*static*/ ConVarT Options_ClientFullScreen        ("dlg_clFullScreen",          true, ConVarT::FLAG_MAIN_EXE | ConVarT::FLAG_PERSISTENT, "If the clients runs in full-screen or windowed mode.");
+/*static*/ ConVarT Options_ClientFullScreen        ("dlg_clFullScreen",          true, ConVarT::FLAG_MAIN_EXE | ConVarT::FLAG_PERSISTENT, "When true, the video mode is changed on startup and fullscreen display is used. Otherwise, Cafu runs in an application window on the desktop.");
 /*static*/ ConVarT Options_ClientWindowSizeX       ("dlg_clWindowSizeX",         1024, ConVarT::FLAG_MAIN_EXE | ConVarT::FLAG_PERSISTENT, "The size of the client window in X direction.");
 /*static*/ ConVarT Options_ClientWindowSizeY       ("dlg_clWindowSizeY",          768, ConVarT::FLAG_MAIN_EXE | ConVarT::FLAG_PERSISTENT, "The size of the client window in Y direction.");
@@ -62 +62 @@
 /*static*/ ConVarT Options_ClientRemoteName        ("dlg_clRemoteName", "192.168.1.1", ConVarT::FLAG_MAIN_EXE | ConVarT::FLAG_PERSISTENT, "Name or IP of the server the client connects to.");
 /*static*/ ConVarT Options_ClientRemotePortNr      ("dlg_clRemotePort",         30000, ConVarT::FLAG_MAIN_EXE | ConVarT::FLAG_PERSISTENT, "Port number of the remote server.", 0, 0xFFFF);
-/*static*/ ConVarT Options_ClientDisplayBPP        ("dlg_clDisplayBPP",             1, ConVarT::FLAG_MAIN_EXE,                            "Use 0 for 16 BPP, 1 for 32 BPP.", 0, 1);
+/*static*/ ConVarT Options_ClientDisplayBPP        ("dlg_clDisplayBPP",            32, ConVarT::FLAG_MAIN_EXE,                            "The display depth in bits-per-pixel. Normally use 32, or 0 for system default.", 0, 64);
+/*static*/ ConVarT Options_ClientDisplayRefresh    ("dlg_clDisplayRefresh",         0, ConVarT::FLAG_MAIN_EXE,                            "The display refresh rate. Use 0 for system default, check with your monitor specs for any other value.");
 /*static*/ ConVarT Options_ClientTextureDetail     ("dlg_clTextureDetail",          0, ConVarT::FLAG_MAIN_EXE | ConVarT::FLAG_PERSISTENT, "0 high detail, 1 medium detail, 2 low detail", 0, 2);
 /*static*/ ConVarT Options_ServerGameName          ("dlg_svGameName",    "DeathMatch", ConVarT::FLAG_MAIN_EXE,                            "Name of the game (MOD) to load.");

cafu/branches/cafu_to_wx/Ca3DE/MainCanvas.cpp

@@ -125 +125 @@
     m_GLContext=new wxGLContext(this);
 
+    SetCursor(wxCURSOR_BLANK);
     SetBackgroundStyle(wxBG_STYLE_PAINT);
 }
@@ -504 +505 @@
     if (m_InitState==INIT_REQUIRED)
     {
+        dc.SetBackground(*wxBLACK_BRUSH);
+        dc.Clear();
+        dc.SetBackgroundMode(wxTRANSPARENT);
+        dc.SetTextForeground(wxColour(255, 200, 0));
+        dc.DrawText("Initializing Cafu...", 10, 40);
+
         // 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.
@@ -892 +899 @@
             return;
         }
+
+        case WXK_F11:
+        {
+            m_Parent->ShowFullScreen(!m_Parent->IsFullScreen());
+            return;
+        }
     }
 

cafu/branches/cafu_to_wx/Ca3DE/MainFrame.cpp

@@ -23 +23 @@
 
 #include "MainFrame.hpp"
+#include "AppCafu.hpp"
 #include "MainCanvas.hpp"
 
@@ -31 +32 @@
 
 
+static long int GetStyle()
+{
+    // This seems to be a limitation of Windows:
+    // Creating a frame with a border that is shown full-screen in a video mode
+    // other than the default (desktop) mode does not properly fill the screen...
+    return wxGetApp().IsFullScreen() ? 0 : wxDEFAULT_FRAME_STYLE;
+}
+
+
 MainFrameT::MainFrameT()
-    : wxFrame(NULL /*parent*/, wxID_ANY, wxString("Cafu Engine - ") + __DATE__),
+    : wxFrame(NULL /*parent*/, wxID_ANY, wxString("Cafu Engine - ") + __DATE__, wxDefaultPosition, wxDefaultSize, GetStyle()),
       m_MainCanvas(NULL)
 {
@@ -49 +59 @@
 
     // Show the frame - it is not shown by default...
-    Show();
+    if (wxGetApp().IsFullScreen()) ShowFullScreen(true); else Show();
 }