Fixed fullscreen toggle/broken savegame

Author: cfrankb

src/animator.cpp

@@ -25,6 +25,7 @@
 #include <set>
 #include <array>
 #include "shared/IFile.h"
+#include "logger.h"
 
 constexpr uint8_t NO_SPECIAL_ID = 0;
 constexpr const size_t SEQ_COUNT = 30;
@@ -135,24 +136,28 @@ bool CAnimator::read(IFile &sfile)
 {
     if (sfile.read(m_tileMainLayer, sizeof(m_tileMainLayer)) != IFILE_OK)
     {
+        LOGE("failed to read tileMainLayer");
         return false;
     }
     if (sfile.read(m_tileLayer, sizeof(m_tileLayer)) != IFILE_OK)
     {
+        LOGE("failed to read tileLayer");
         return false;
     }
-    return false;
+    return true;
 }
 
 bool CAnimator::write(IFile &sfile) const
 {
     if (sfile.write(m_tileMainLayer, sizeof(m_tileMainLayer)) != IFILE_OK)
     {
+        LOGE("failed to write tileMainLayer");
         return false;
     }
     if (sfile.write(m_tileLayer, sizeof(m_tileLayer)) != IFILE_OK)
     {
+        LOGE("failed to write tileMainLayer");
         return false;
     }
-    return false;
+    return true;
 }

src/game.cpp

@@ -1213,7 +1213,10 @@ bool CGame::read(IFile &sfile)
 
     // read animation state
     if (!m_animator->read(sfile))
+    {
+        LOGE("Failed to read animator state");
         return false;
+    }
 
     return true;
 }

src/gamemixin.cpp

@@ -1849,6 +1849,7 @@ void CGameMixin::clearJoyStates()
 
 bool CGameMixin::read(IFile &sfile, std::string &name)
 {
+    LOGI("Reading savegame");
     auto readfile = [&sfile](auto ptr, auto size)
     {
         return sfile.read(ptr, size) == 1;
@@ -1857,6 +1858,9 @@ bool CGameMixin::read(IFile &sfile, std::string &name)
     {
         return false;
     }
+
+    LOGI("game reading completed");
+
     clearButtonStates();
     clearJoyStates();
     clearKeyStates();

src/runtime.cpp

@@ -362,13 +362,31 @@ void CRuntime::run()
     mainLoop();
 }
 
+void CRuntime::handleWindowResize()
+{
+    int w = 0, h = 0;
+    SDL_GetRenderOutputSize(m_app.renderer, &w, &h);
+
+    SDL_Rect vp{0, 0, w, h};
+    SDL_SetRenderViewport(m_app.renderer, &vp);
+
+    SDL_SetRenderLogicalPresentation(
+        m_app.renderer,
+        640, // logical width
+        480, // logical height
+        SDL_LOGICAL_PRESENTATION_INTEGER_SCALE);
+
+    LOGI("Resize handled: render output %dx%d", w, h);
+}
+
 /**
  * @brief Read input devices for user inputs
  *
  */
 void CRuntime::doInput()
 {
     SDL_Event event;
+    bool skip = false;
     while (SDL_PollEvent(&event))
     {
         // SDL_Window *window = SDL_GetWindowFromID(event.window.windowID);
@@ -447,15 +465,37 @@ void CRuntime::doInput()
             LOGI("SDL_EVENT_WINDOW_HIDDEN");
             break;
 
+        case SDL_EVENT_WINDOW_SAFE_AREA_CHANGED:
+            LOGI("SDL_EVENT_WINDOW_SAFE_AREA_CHANGED");
+            skip = true;
+            /*
+            SDL_Rect safe;
+            if (SDL_GetWindowSafeArea(window, &safe))
+            {
+                SDL_Log("Safe area changed: x=%d y=%d w=%d h=%d",
+                        safe.x, safe.y, safe.w, safe.h);
+            }
+            */
+            [[fallthrough]];
+
+        case SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED:
+            if (!skip)
+                LOGI("SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED");
+            skip = true;
+            [[fallthrough]];
+
         case SDL_EVENT_WINDOW_RESIZED:
-            LOGI("SDL_EVENT_WINDOW_RESIZED");
+            if (!skip)
+                LOGI("SDL_EVENT_WINDOW_RESIZED");
+
             if (!m_app.isFullscreen)
             {
                 LOGI("resized %d x %d", getWidth(), getHeight());
                 SDL_SetWindowSize(m_app.window, event.window.data1, event.window.data2);
             }
             m_engine->resize(getWidth(), getHeight());
             onOrientationChange();
+            handleWindowResize();
             break;
 
         case SDL_EVENT_WINDOW_MINIMIZED:
@@ -471,10 +511,6 @@ void CRuntime::doInput()
             onOrientationChange();
             break;
 
-        case SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED:
-            LOGI("SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED");
-            break;
-
         case SDL_EVENT_WINDOW_MOUSE_ENTER:
             // LOGI("SDL_EVENT_WINDOW_MOUSE_ENTER");
             break;
@@ -495,18 +531,6 @@ void CRuntime::doInput()
             LOGI("SDL_EVENT_WINDOW_DISPLAY_SCALE_CHANGED");
             break;
 
-        case SDL_EVENT_WINDOW_SAFE_AREA_CHANGED:
-            LOGI("SDL_EVENT_WINDOW_SAFE_AREA_CHANGED");
-            /*
-            SDL_Rect safe;
-            if (SDL_GetWindowSafeArea(window, &safe))
-            {
-                SDL_Log("Safe area changed: x=%d y=%d w=%d h=%d",
-                        safe.x, safe.y, safe.w, safe.h);
-            }
-            */
-            break;
-
         case SDL_EVENT_CLIPBOARD_UPDATE:
             LOGI("SDL_EVENT_CLIPBOARD_UPDATE");
             break;
@@ -1534,18 +1558,42 @@ void CRuntime::initOptions()
     m_trace = isTrue(m_config["trace"]);
 }
 
+#ifdef __EMSCRIPTEN__
+EM_JS(void, fix_canvas_css, (), {
+    if (!Module || !Module.canvas)
+        return;
+    const c = Module.canvas;
+    c.style.width = '100vw';
+    c.style.height = '100vh';
+    c.style.maxWidth = 'none';
+    c.style.maxHeight = 'none';
+    c.style.display = 'block';
+    document.body.style.margin = '0';
+    document.body.style.padding = '0';
+    document.body.style.overflow = 'hidden';
+});
+#endif
+
 /**
  * @brief  Function to toggle fullscreen mode on/off
  *
  */
 void CRuntime::toggleFullscreen()
 {
+    LOGI("toggleFullscreen");
 #ifdef __EMSCRIPTEN__
+
+    fix_canvas_css();
+
     if (m_config["webfullscreen"] == "true")
     {
-        if (!SDL_SetWindowFullscreen(m_app.window, m_app.isFullscreen))
+        if (!SDL_SetRenderLogicalPresentation(
+                m_app.renderer,
+                640, // logical width
+                480, // logical height
+                SDL_LOGICAL_PRESENTATION_INTEGER_SCALE))
         {
-            LOGE("Fullscreen toggle error: %s", SDL_GetError());
+            LOGE("toggleFullscreen >> SDL_SetRenderLogicalPresentation error: %s", SDL_GetError());
         }
     }
     else
@@ -1572,41 +1620,21 @@ void CRuntime::toggleFullscreen()
             emscripten_exit_fullscreen();
         }
 
-        /*
-        if (!m_app.isFullscreen)
-        {
-            EmscriptenFullscreenStrategy strategy{};
-            strategy.scaleMode = EMSCRIPTEN_FULLSCREEN_SCALE_ASPECT;
-            strategy.canvasResolutionScaleMode =
-                EMSCRIPTEN_FULLSCREEN_CANVAS_SCALE_STDDEF;
-            strategy.filteringMode =
-                EMSCRIPTEN_FULLSCREEN_FILTERING_NEAREST;
-            strategy.canvasResizedCallback = nullptr;
-            strategy.canvasResizedCallbackUserData = nullptr;
-
-            emscripten_enter_soft_fullscreen("#canvas", &strategy);
-        }
-        else
-        {
-            emscripten_exit_soft_fullscreen();
-        }
-
-        if (m_app.isFullscreen)
+        int w = 0, h = 0;
+        for (int i = 0; i < 5 && (w == 0 || h == 0); ++i)
         {
-            EmscriptenFullscreenStrategy strategy = {
-                .scaleMode = EMSCRIPTEN_FULLSCREEN_SCALE_DEFAULT,
-                .canvasResolutionScaleMode = EMSCRIPTEN_FULLSCREEN_CANVAS_SCALE_NONE,
-                .filteringMode = EMSCRIPTEN_FULLSCREEN_FILTERING_DEFAULT,
-                .canvasResizedCallback = nullptr,
-                .canvasResizedCallbackUserData = nullptr};
-            emscripten_enter_soft_fullscreen("#canvas", &strategy);
+            SDL_GetRenderOutputSize(m_app.renderer, &w, &h);
+            SDL_Delay(1);
         }
-        else
-        {
-            emscripten_exit_soft_fullscreen();
-        }
-        */
+        SDL_Rect vp{0, 0, w, h};
+        SDL_SetRenderViewport(m_app.renderer, &vp);
     }
+    SDL_SetRenderLogicalPresentation(
+        m_app.renderer,
+        640, // 640
+        480, // 480
+        SDL_LOGICAL_PRESENTATION_INTEGER_SCALE);
+
 #else
     if (m_app.isFullscreen)
     {
@@ -1912,7 +1940,7 @@ bool CRuntime::fileExists(const std::string &name) const
 const std::string CRuntime::getSavePath() const
 {
 #ifdef __EMSCRIPTEN__
-    return SAVEGAME_FILE;
+    return m_workspace + SAVEGAME_FILE;
 #else
     return m_workspace + SAVEGAME_FILE;
 #endif
@@ -2627,6 +2655,7 @@ bool CRuntime::isValidSavegame(const std::string &filepath)
 
     if (!fileExists(filepath))
     {
+        LOGW("savegame `%s` doesn't exists", filepath.c_str());
         return false;
     }
 
@@ -2639,6 +2668,7 @@ bool CRuntime::isValidSavegame(const std::string &filepath)
         sfile.close();
         if (!CGame::validateSignature(sig, version))
         {
+            LOGW("savegame invalid signature");
             return false;
         }
         return true;

src/runtime.h

@@ -79,6 +79,7 @@ class CRuntime : public CGameMixin
     bool saveToFile(const std::string filepath, const std::string name);
     bool loadFromFile(const std::string filepath, std::string &name);
     bool isValidSavegame(const std::string &filepath);
+    void handleWindowResize();
 
 private:
     typedef struct

src/template/body.html

@@ -180,7 +180,7 @@
 
         // Hide button if running on itch.io (they provide their own)
         if (window.self !== window.top) {
-          fsBtn.style.display = 'none';
+     //     fsBtn.style.display = 'none';
         }
 
         // Fullscreen button click handler