Ticket #8792: float-scaler.patch

backends/platform/sdl/graphics.cpp

@@ -30 +30 @@
 #include "graphics/scaler.h"
 #include "graphics/surface.h"
 
+#ifndef DISABLE_FLOAT_SCALER
+#include "common/config-manager.h"
+#include "common/singleton.h"
+extern float gScale; // from scaler.cpp
+#endif
+
 static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
         {"1x", "Normal (no scaling)", GFX_NORMAL},
         {"2x", "2x", GFX_DOUBLESIZE},
@@ -45 +51 @@
 #endif
         {"tv2x", "TV2x", GFX_TV2X},
         {"dotmatrix", "DotMatrix", GFX_DOTMATRIX},
+        {"user", "User defined float scaling", GFX_FLOAT},
         {0, 0, 0}
 };
 
@@ -70 +77 @@
                 { GFX_NORMAL, GFX_SUPER2XSAI, -1, -1 },
                 { GFX_NORMAL, GFX_SUPEREAGLE, -1, -1 },
                 { GFX_NORMAL, GFX_TV2X, -1, -1 },
-                { GFX_NORMAL, GFX_DOTMATRIX, -1, -1 }
+                { GFX_NORMAL, GFX_DOTMATRIX, -1, -1 },
+                { GFX_NORMAL, GFX_FLOAT, -1, -1 }
         };
 
 #ifndef DISABLE_SCALERS
@@ -147 +155 @@
 bool OSystem_SDL::setGraphicsMode(int mode) {
         Common::StackLock lock(_graphicsMutex);
 
-        int newScaleFactor = 1;
+        scale_t newScaleFactor = 1;
         ScalerProc *newScalerProc;
+#ifndef DISABLE_FLOAT_SCALER
+        float f;
+        Common::String s;
+#endif
 
         switch(mode) {
         case GFX_NORMAL:
@@ -203 +215 @@
                 newScaleFactor = 2;
                 newScalerProc = DotMatrix;
                 break;
+#ifndef DISABLE_FLOAT_SCALER
+        case GFX_FLOAT:
+                s = Common::Singleton<Common::ConfigManager>::instance().get("gfx_scale");
+                f = atof(s.c_str());
+                if (f > 0.0f && f <= 3.0f) {
+                        newScaleFactor = f;
+                        gScale = f;
+                } else {
+                        newScaleFactor = 1.0f;
+                        gScale = 1.0f;
+                }
+                newScalerProc = UserScaler;
+                break;
+#endif // DISABLE_FLOAT_SCALER
 #endif // DISABLE_SCALERS
 
         default:
@@ -1446 +1472 @@
         // the game. This only works well with the non-blurring scalers so we
         // actually only use the 1x, 1.5x, 2x and AdvMame scalers.
 
-        if (_cursorTargetScale == 1 && (_mode == GFX_DOUBLESIZE || _mode == GFX_TRIPLESIZE))
+        if (_cursorTargetScale == 1 && (_mode == GFX_DOUBLESIZE || _mode == GFX_TRIPLESIZE) || 
+                        _mode == GFX_FLOAT)
                 scalerProc = _scalerProc;
         else
-                scalerProc = scalersMagn[_cursorTargetScale - 1][_scaleFactor - 1];
+                scalerProc = scalersMagn[(int)_cursorTargetScale - 1][(int)_scaleFactor - 1];
 
         scalerProc((byte *)_mouseOrigSurface->pixels + _mouseOrigSurface->pitch + 2,
                 _mouseOrigSurface->pitch, (byte *)_mouseSurface->pixels, _mouseSurface->pitch,
@@ -1514 +1541 @@
         }
 
         SDL_Rect dst;
-        int scale;
+        scale_t scale;
         int width, height;
         int hotX, hotY;
 

backends/platform/sdl/sdl.h

@@ -64 +64 @@
         GFX_HQ2X = 8,
         GFX_HQ3X = 9,
         GFX_TV2X = 10,
-        GFX_DOTMATRIX = 11
+        GFX_DOTMATRIX = 11,
+        GFX_FLOAT = 12,
 };
 
 
@@ -270 +271 @@
         bool _forceFull;
         ScalerProc *_scalerProc;
         int _scalerType;
-        int _scaleFactor;
+        scale_t _scaleFactor;
         int _mode;
         int _transactionMode;
         bool _fullscreen;
@@ -339 +340 @@
         SDL_Rect _mouseBackup;
         MousePos _mouseCurState;
         byte _mouseKeyColor;
-        int _cursorTargetScale;
+        scale_t _cursorTargetScale;
         bool _cursorPaletteDisabled;
         SDL_Surface *_mouseOrigSurface;
         SDL_Surface *_mouseSurface;

common/scummsys.h

@@ -441 +441 @@
         typedef unsigned short uint16;
         typedef signed short int16;
 
+#ifndef DISABLE_FLOAT_SCALER
+        typedef float scale_t;
+#else
+        typedef int scale_t;
+#endif
+
         #ifdef SCUMMVM_USE_LONG_INT
         typedef unsigned long uint32;
         typedef signed long int32;

graphics/scaler.cpp

@@ -320 +320 @@
         }
 }
 
+#ifndef DISABLE_FLOAT_SCALER
+
+float gScale;
+void UserScaler(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch,
+                                int width, int height) {
+        
+        float scale = gScale;
+        if (scale <= 0.0f || scale > 3.0f)
+                scale = 1.0f;
+
+        for (int y = 0; y < height; y++) {
+                for (int x = 0; x < width; x++) {
+                        int xMin, yMin;
+                        uint16 pixel = *((uint16 *)(srcPtr + srcPitch * y) + x);
+                        // calculate the point where this pixel would be on a scalar coordinate system
+                        xMin = x * scale;
+                        yMin = y * scale;
+
+#define DESTOF(a, b, c) do { *(uint16 *)((dstPtr + (dstPitch * (b)) + (a)*2)) = pixel; } while (0)
+                        DESTOF(xMin, yMin, pixel);
+                        if (scale > 1.0) {
+                                DESTOF(xMin + 1, yMin, pixel);
+                                DESTOF(xMin, yMin + 1, pixel);
+                                DESTOF(xMin + 1, yMin + 1, pixel);
+                                if (scale > 2.0 && x < width - 1 && y < height - 1) {
+                                        DESTOF(xMin + 2, yMin, pixel);
+                                        DESTOF(xMin + 2, yMin + 1, pixel);
+                                        DESTOF(xMin + 2, yMin + 2, pixel);
+                                        DESTOF(xMin + 1, yMin + 2, pixel);
+                                        DESTOF(xMin, yMin + 2, pixel);
+                                }
+                        }
+                }
+        }
+}
+#endif // DISABLE_FLOAT_SCALER
+
 #endif

graphics/scaler.h

@@ -48 +48 @@
 DECLARE_SCALER(Normal1o5x);
 DECLARE_SCALER(TV2x);
 DECLARE_SCALER(DotMatrix);
+DECLARE_SCALER(UserScaler);
 
 #ifndef DISABLE_HQ_SCALERS
 DECLARE_SCALER(HQ2x);