Merge remote-tracking branch 'upstream/master' into xy-point-extent

Author: morganchristiansson

CGame.cpp

@@ -11,6 +11,8 @@
 #include "files.h"
 #include "globals.h"
 #include "s25util/file_handle.h"
+#include <libsiedler2/ArchivItem_Ini.h>
+#include <libsiedler2/libsiedler2.h>
 #include <boost/filesystem.hpp>
 #include <boost/nowide/cstdio.hpp>
 #include <boost/program_options.hpp>
@@ -156,6 +158,39 @@ void CGame::delMapObj()
     MapObj.reset();
 }
 
+void CGame::enterEditor(const boost::filesystem::path& filepath)
+{
+    for(auto& menu : Menus)
+        menu->setWaste();
+    setMapObj(std::make_unique<CMap>(filepath));
+}
+
+void CGame::LoadSettings()
+{
+    const bfs::path settingsPath = RTTRCONFIG.ExpandPath("<RTTR_USERDATA>/s25edit.ini");
+    libsiedler2::Archiv settings;
+    if(libsiedler2::Load(settingsPath, settings) != 0)
+        return;
+    const auto* ini = dynamic_cast<const libsiedler2::ArchivItem_Ini*>(settings.find("editor"));
+    if(!ini)
+        return;
+    GameResolution.x = ini->getValue("width", static_cast<int>(GameResolution.x));
+    GameResolution.y = ini->getValue("height", static_cast<int>(GameResolution.y));
+    fullscreen = ini->getValue("fullscreen", fullscreen);
+}
+
+void CGame::SaveSettings() const
+{
+    libsiedler2::Archiv settings;
+    settings.push(std::make_unique<libsiedler2::ArchivItem_Ini>("editor"));
+    auto& ini = dynamic_cast<libsiedler2::ArchivItem_Ini&>(*settings.find("editor"));
+    ini.setValue("width", GameResolution.x);
+    ini.setValue("height", GameResolution.y);
+    ini.setValue("fullscreen", static_cast<int>(fullscreen));
+    const bfs::path settingsPath = RTTRCONFIG.ExpandPath("<RTTR_USERDATA>/s25edit.ini");
+    libsiedler2::Write(settingsPath, settings);
+}
+
 void CGame::GameLoop()
 {
     for(auto&& callback : Callbacks)
@@ -309,6 +344,7 @@ int main(int argc, char* argv[])
         auto s2 = std::make_unique<CGame>(
           Extent(programOptions["width"].as<unsigned>(), programOptions["height"].as<unsigned>()),
           programOptions["fullscreen"].as<bool>());
+        s2->LoadSettings();
         result = s2->Execute();
     } catch(...)
     {

CGame.h

@@ -7,6 +7,7 @@
 
 #include "CIO/CFont.h"
 #include "SdlSurface.h"
+#include <boost/filesystem/path.hpp>
 #include <Point.h>
 #include <memory>
 #include <vector>
@@ -42,6 +43,7 @@ class CGame
     CFont lastFps;
 
     Uint32 lastFrameTime = 0;
+    unsigned suppressResizeEvents_ = 0;
 
     // structure for mouse cursor
     struct
@@ -65,15 +67,20 @@ class CGame
     std::unique_ptr<CMap> MapObj;
 
     void SetAppIcon();
+    void RecreateDisplayResources();
 
 public:
+    void LoadSettings();
+    void SaveSettings() const;
+
     CGame(Extent GameResolution_, bool fullscreen_);
     ~CGame();
 
     int Execute();
 
     bool Init();
     bool ReCreateWindow();
+    void UpdateDisplaySize(const Extent& newSize);
 
     void EventHandling(SDL_Event* Event);
 
@@ -92,6 +99,7 @@ class CGame
     void setMapObj(std::unique_ptr<CMap> MapObj);
     CMap* getMapObj();
     void delMapObj();
+    void enterEditor(const boost::filesystem::path& filepath);
     SDL_Surface* getDisplaySurface() const { return Surf_Display.get(); };
     auto getRes() const { return GameResolution; }
 };

CGame_Event.cpp

@@ -63,7 +63,14 @@ void CGame::EventHandling(SDL_Event* Event)
 
             switch(Event->key.keysym.sym)
             {
-                case SDLK_F2: fullscreen = !fullscreen; break;
+                case SDLK_RETURN:
+                case SDLK_KP_ENTER:
+                    if(Event->key.keysym.mod & KMOD_ALT)
+                    {
+                        fullscreen = !fullscreen;
+                        SaveSettings();
+                    }
+                    break;
 
 #ifdef _ADMINMODE
                 case SDLK_F3: // if CTRL and ALT are pressed
@@ -377,6 +384,20 @@ void CGame::EventHandling(SDL_Event* Event)
             break;
         }
 
+        case SDL_WINDOWEVENT:
+        {
+            if(Event->window.event == SDL_WINDOWEVENT_RESIZED)
+            {
+                if(suppressResizeEvents_ > 0)
+                {
+                    suppressResizeEvents_--;
+                    break; // Skip stale event from our own window recreation
+                }
+                UpdateDisplaySize(Extent(Event->window.data1, Event->window.data2));
+            }
+            break;
+        }
+
         case SDL_QUIT: Running = false; break;
 
         default: break;

CGame_Init.cpp

@@ -5,6 +5,8 @@
 
 #include "CGame.h"
 #include "CIO/CFile.h"
+#include "CIO/CMenu.h"
+#include "CIO/CWindow.h"
 #include "CMap.h"
 #include "CSurface.h"
 #include "SGE/sge_blib.h"
@@ -17,27 +19,44 @@
 
 bool CGame::ReCreateWindow()
 {
+    suppressResizeEvents_ = 3;
     displayTexture_.reset();
     renderer_.reset();
     window_.reset();
     window_.reset(SDL_CreateWindow("Return to the Roots Map editor [BETA]", SDL_WINDOWPOS_CENTERED,
                                    SDL_WINDOWPOS_CENTERED, GameResolution.x, GameResolution.y,
-                                   fullscreen ? SDL_WINDOW_FULLSCREEN : 0));
+                                   fullscreen ? SDL_WINDOW_FULLSCREEN : SDL_WINDOW_RESIZABLE));
     if(!window_)
         return false;
     renderer_.reset(SDL_CreateRenderer(window_.get(), -1, 0));
     if(!renderer_)
         return false;
-    displayTexture_ = makeSdlTexture(renderer_, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, GameResolution.x,
-                                     GameResolution.y);
-    Surf_Display = makeRGBSurface(GameResolution.x, GameResolution.y, true);
+    RecreateDisplayResources();
     if(!displayTexture_ || !Surf_Display)
         return false;
 
     SetAppIcon();
     return true;
 }
 
+void CGame::RecreateDisplayResources()
+{
+    displayTexture_.reset();
+    displayTexture_ = makeSdlTexture(renderer_, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, GameResolution.x,
+                                     GameResolution.y);
+    Surf_Display = makeRGBSurface(GameResolution.x, GameResolution.y, true);
+}
+
+void CGame::UpdateDisplaySize(const Extent& newSize)
+{
+    GameResolution = newSize;
+    RecreateDisplayResources();
+    for(auto& menu : Menus)
+        menu->resetSurface();
+    for(auto& wnd : Windows)
+        wnd->resetSurface();
+}
+
 bool CGame::Init()
 {
     std::cout << "Return to the Roots Map editor\n";

CGame_Render.cpp

@@ -39,6 +39,7 @@ void CGame::SetAppIcon()
 
 void CGame::Render()
 {
+    suppressResizeEvents_ = 0;
     if(Extent(Surf_Display->w, Surf_Display->h) != GameResolution
        || fullscreen != ((SDL_GetWindowFlags(window_.get()) & SDL_WINDOW_FULLSCREEN) != 0))
     {

CIO/CControlContainer.h

@@ -68,6 +68,11 @@ class CControlContainer
     }
     void setWaste() { waste = true; }
     bool isWaste() const { return waste; }
+    void resetSurface()
+    {
+        surface.reset();
+        needRender = true;
+    }
     // Methods
     CButton* addButton(void callback(int), int clickedParam, Position pos = {0, 0}, Extent size = {20, 20},
                        int color = BUTTON_GREY, const char* text = nullptr, int picture = -1);

CMakeLists.txt

@@ -38,7 +38,7 @@ ELSE()
 ENDIF()
 
 add_executable(s25edit ${MAIN_SOURCES} ${CIO_SOURCES} ${icon_RC})
-target_link_libraries(s25edit PRIVATE SGE rttrConfig s25Common gamedata endian::static Boost::nowide PUBLIC Boost::disable_autolinking Boost::program_options)
+target_link_libraries(s25edit PRIVATE SGE rttrConfig s25Common gamedata siedler2 endian::static Boost::nowide PUBLIC Boost::disable_autolinking Boost::program_options)
 target_include_directories(s25edit PRIVATE include)
 target_compile_features(s25edit PRIVATE cxx_std_17)
 

callbacks.cpp

@@ -133,6 +133,7 @@ void callback::mainmenu(int Param)
     {
         ENDGAME = 1,
         STARTEDITOR,
+        LOADMAP,
         OPTIONS
     };
 
@@ -141,11 +142,11 @@ void callback::mainmenu(int Param)
         case INITIALIZING_CALL:
             MainMenu = global::s2->RegisterMenu(std::make_unique<CMenu>(SPLASHSCREEN_MAINMENU));
             MainMenu->addButton(mainmenu, ENDGAME, Position(50, 400), Extent(200, 20), BUTTON_RED1, "Quit program");
+            MainMenu->addButton(mainmenu, STARTEDITOR, Position(50, 160), Extent(200, 20), BUTTON_RED1, "Start editor");
+            MainMenu->addButton(mainmenu, LOADMAP, Position(50, 200), Extent(200, 20), BUTTON_GREEN2, "Load map");
 #ifdef _ADMINMODE
-            MainMenu->addButton(submenu1, INITIALIZING_CALL, Position(50, 200), Extent(200, 20), BUTTON_GREY,
-                                "Submenu_1");
+            MainMenu->addButton(submenu1, INITIALIZING_CALL, Position(50, 240), Extent(200, 20), BUTTON_GREY, "Submenu_1");
 #endif
-            MainMenu->addButton(mainmenu, STARTEDITOR, Position(50, 160), Extent(200, 20), BUTTON_RED1, "Start editor");
             MainMenu->addButton(mainmenu, OPTIONS, Position(50, 370), Extent(200, 20), BUTTON_GREEN2, "Options");
             break;
 
@@ -158,14 +159,9 @@ void callback::mainmenu(int Param)
             global::s2->Running = false;
             break;
 
-        case STARTEDITOR:
-            assert(MainMenu);
-            PleaseWait(INITIALIZING_CALL);
-            global::s2->setMapObj(std::make_unique<CMap>(""));
-            MainMenu->setWaste();
-            MainMenu = nullptr;
-            PleaseWait(WINDOW_QUIT_MESSAGE);
-            break;
+        case STARTEDITOR: global::s2->enterEditor(""); break;
+
+        case LOADMAP: EditorLoadMenu(INITIALIZING_CALL); break;
 
         case OPTIONS:
             assert(MainMenu);
@@ -230,7 +226,8 @@ void callback::submenuOptions(int Param)
         SELECTBOX_1920_1400,
         SELECTBOX_1920_1440,
         SELECTBOX_2048_1152,
-        SELECTBOX_2048_1536
+        SELECTBOX_2048_1536,
+        SELECTBOX_3840_2160
     };
 
     switch(Param)
@@ -252,9 +249,9 @@ void callback::submenuOptions(int Param)
             if(ButtonFullscreen)
                 SubMenu->delButton(ButtonFullscreen);
             ButtonFullscreen =
-              SubMenu->addButton(submenuOptions, FULLSCREEN, Position(global::s2->GameResolution.x / 2 - 100, 190),
+              SubMenu->addButton(submenuOptions, FULLSCREEN, Position(global::s2->GameResolution.x / 2 - 100, 410),
                                  Extent(200, 20), BUTTON_RED1, (global::s2->fullscreen ? "WINDOW" : "FULLSCREEN"));
-            SelectBoxRes = SubMenu->addSelectBox(ButtonFullscreen->getPos() - Position(0, 120), Extent(200, 110),
+            SelectBoxRes = SubMenu->addSelectBox(ButtonFullscreen->getPos() - Position(0, 340), Extent(200, 330),
                                                  FontSize::Medium, FontColor::Yellow, BUTTON_GREY);
             SelectBoxRes->addOption("800 x 600 (SVGA)", submenuOptions, SELECTBOX_800_600);
             SelectBoxRes->addOption("832 x 624 (Half Megapixel)", submenuOptions, SELECTBOX_832_624);
@@ -298,6 +295,7 @@ void callback::submenuOptions(int Param)
             SelectBoxRes->addOption("1920 x 1440", submenuOptions, SELECTBOX_1920_1440);
             SelectBoxRes->addOption("2048 x 1152 (QWXGA)", submenuOptions, SELECTBOX_2048_1152);
             SelectBoxRes->addOption("2048 x 1536 (SUXGA)", submenuOptions, SELECTBOX_2048_1536);
+            SelectBoxRes->addOption("3840 x 2160 (4K UHD)", submenuOptions, SELECTBOX_3840_2160);
             break;
 
         case MAINMENU:
@@ -318,6 +316,7 @@ void callback::submenuOptions(int Param)
 
         case GRAPHICS_CHANGE:
             assert(SubMenu);
+            global::s2->SaveSettings();
             SubMenu->setWaste();
             TextResolution = nullptr;
             ButtonFullscreen = nullptr;
@@ -578,6 +577,12 @@ void callback::submenuOptions(int Param)
             submenuOptions(GRAPHICS_CHANGE);
             break;
 
+        case SELECTBOX_3840_2160:
+            global::s2->GameResolution.x = 3840;
+            global::s2->GameResolution.y = 2160;
+            submenuOptions(GRAPHICS_CHANGE);
+            break;
+
         default: break;
     }
 }
@@ -611,7 +616,7 @@ void callback::EditorHelpMenu(int Param)
                                      "..............................F1");
             SelectBoxHelp->addOption(
               "Window/"
-              "Fullscreen........................................................................................F2");
+              "Fullscreen...................................................................................Alt+Enter");
             SelectBoxHelp->addOption(
               "Zoom in/normal/out......................................................................F5/F6/"
               "F7");
@@ -741,7 +746,6 @@ void callback::EditorMainMenu(int Param)
 void callback::EditorLoadMenu(int Param)
 {
     static CWindow* WNDLoad = nullptr;
-    static CMap* MapObj = nullptr;
     static std::string curFilename;
 
     enum
@@ -758,8 +762,6 @@ void callback::EditorLoadMenu(int Param)
                 break;
             WNDLoad = global::s2->RegisterWindow(std::make_unique<CWindow>(
               EditorLoadMenu, WINDOWQUIT, WindowPos::Center, Extent(280, 320), "Load", WINDOW_GREEN1, WINDOW_CLOSE));
-            MapObj = global::s2->getMapObj();
-
             auto* CB_Filename = WNDLoad->addSelectBox(Position(10, 5), Extent(160, 280), FontSize::Medium);
             curFilename.clear();
             for(const auto& itFile : bfs::directory_iterator(global::userMapsPath))
@@ -799,15 +801,15 @@ void callback::EditorLoadMenu(int Param)
             EditorAnimalMenu(MAP_QUIT);
             EditorPlayerMenu(MAP_QUIT);
 
-            MapObj->destructMap();
             bfs::path filepath = global::userMapsPath / curFilename;
             if(!filepath.has_extension())
                 filepath.replace_extension("SWD");
             if(!bfs::exists(filepath))
                 filepath.replace_extension("WLD");
             if(!bfs::exists(filepath))
                 filepath.replace_extension("SWD");
-            MapObj->constructMap(filepath);
+
+            global::s2->enterEditor(filepath);
 
             // we need to check which of these windows was active before
             /*