Demo: implementado el cambio de tamaño de la ventana

units/screen.cpp

@@ -10,10 +10,10 @@ Screen::Screen(SDL_Window *window, SDL_Renderer *renderer, options_t *options)
     this->renderer = renderer;
     this->options = options;
 
-    gameCanvasWidth = options->gameWidth;
-    gameCanvasHeight = options->gameHeight;
-    borderWidth = options->borderWidth * 2;
-    borderHeight = options->borderHeight * 2;
+    gameCanvasWidth = options->screen.nativeWidth;
+    gameCanvasHeight = options->screen.nativeHeight;
+    borderWidth = options->screen.borderWidth * 2;
+    borderHeight = options->screen.borderHeight * 2;
 
     iniFade();
     iniSpectrumFade();
@@ -32,7 +32,7 @@ Screen::Screen(SDL_Window *window, SDL_Renderer *renderer, options_t *options)
     }
 
     // Establece el modo de video
-    setVideoMode(options->videoMode);
+    setVideoMode(options->screen.mode);
 }
 
 // Destructor
@@ -90,7 +90,7 @@ void Screen::setVideoMode(int videoMode)
         // Muestra el puntero
         SDL_ShowCursor(SDL_ENABLE);
 
-        if (options->borderEnabled)
+        if (options->screen.borderEnabled)
         {
             windowWidth = gameCanvasWidth + borderWidth;
             windowHeight = gameCanvasHeight + borderHeight;
@@ -99,13 +99,17 @@ void Screen::setVideoMode(int videoMode)
 
         else
         {
-            windowWidth = gameCanvasWidth;
-            windowHeight = gameCanvasHeight;
-            dest = {0, 0, gameCanvasWidth, gameCanvasHeight};
+            //windowWidth = gameCanvasWidth;
+            windowWidth = gameCanvasWidth * options->screen.nativeZoom * options->screen.windowZoom;
+            //windowHeight = gameCanvasHeight;
+            windowHeight = gameCanvasHeight * options->screen.nativeZoom * options->screen.windowZoom;
+            //dest = {0, 0, gameCanvasWidth, gameCanvasHeight};
+            dest = {0, 0, windowWidth, windowHeight};
         }
 
         // Modifica el tamaño de la ventana
-        SDL_SetWindowSize(window, windowWidth * options->windowSize, windowHeight * options->windowSize);
+        //SDL_SetWindowSize(window, windowWidth * options->screen.windowZoom, windowHeight * options->screen.windowZoom);
+        SDL_SetWindowSize(window, windowWidth, windowHeight);
         SDL_SetWindowPosition(window, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
     }
 
@@ -119,7 +123,7 @@ void Screen::setVideoMode(int videoMode)
         SDL_GetWindowSize(window, &windowWidth, &windowHeight);
 
         // Aplica el escalado al rectangulo donde se pinta la textura del juego
-        if (options->integerScale)
+        if (options->screen.integerScale)
         {
             // Calcula el tamaño de la escala máxima
             int scale = 0;
@@ -133,7 +137,7 @@ void Screen::setVideoMode(int videoMode)
             dest.x = (windowWidth - dest.w) / 2;
             dest.y = (windowHeight - dest.h) / 2;
         }
-        else if (options->keepAspect)
+        else if (options->screen.keepAspect)
         {
             float ratio = (float)gameCanvasWidth / (float)gameCanvasHeight;
             if ((windowWidth - gameCanvasWidth) >= (windowHeight - gameCanvasHeight))
@@ -163,38 +167,36 @@ void Screen::setVideoMode(int videoMode)
     SDL_RenderSetLogicalSize(renderer, windowWidth, windowHeight);
 
     // Actualiza las opciones
-    options->videoMode = videoMode;
-    options->screen.windowWidth = windowWidth;
-    options->screen.windowHeight = windowHeight;
+    options->screen.mode = videoMode;
 }
 
 // Camibia entre pantalla completa y ventana
 void Screen::switchVideoMode()
 {
-    options->videoMode = (options->videoMode == 0) ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0;
-    setVideoMode(options->videoMode);
+    options->screen.mode = (options->screen.mode == 0) ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0;
+    setVideoMode(options->screen.mode);
 }
 
 // Cambia el tamaño de la ventana
 void Screen::setWindowSize(int size)
 {
-    options->windowSize = size;
+    options->screen.windowZoom = size;
     setVideoMode(0);
 }
 
 // Reduce el tamaño de la ventana
 void Screen::decWindowSize()
 {
-    --options->windowSize;
-    options->windowSize = std::max(options->windowSize, 1);
+    --options->screen.windowZoom;
+    options->screen.windowZoom = std::max(options->screen.windowZoom, 1);
     setVideoMode(0);
 }
 
 // Aumenta el tamaño de la ventana
 void Screen::incWindowSize()
 {
-    ++options->windowSize;
-    options->windowSize = std::min(options->windowSize, 4);
+    ++options->screen.windowZoom;
+    options->screen.windowZoom = std::min(options->screen.windowZoom, 4);
     setVideoMode(0);
 }
 
@@ -213,25 +215,25 @@ void Screen::setBlendMode(SDL_BlendMode blendMode)
 // Establece el tamaño del borde
 void Screen::setBorderWidth(int s)
 {
-    options->borderWidth = s;
+    options->screen.borderWidth = s;
 }
 
 // Establece el tamaño del borde
 void Screen::setBorderHeight(int s)
 {
-    options->borderHeight = s;
+    options->screen.borderHeight = s;
 }
 
 // Establece si se ha de ver el borde en el modo ventana
 void Screen::setBorderEnabled(bool value)
 {
-    options->borderEnabled = value;
+    options->screen.borderEnabled = value;
 }
 
 // Cambia entre borde visible y no visible
 void Screen::switchBorder()
 {
-    options->borderEnabled = !options->borderEnabled;
+    options->screen.borderEnabled = !options->screen.borderEnabled;
     setVideoMode(0);
 }