Ticket #8220: advmame3x.diff

scummvm/README

@@ -346 +346 @@
         Ctrl-z OR Alt-x        - quit
         Keyboard Arrow Keys    - simulate mouse movement
         Ctrl-f                 - runs in fast mode.
-        Ctrl-Alt 1-9           - Switch between graphics filters
+        Ctrl-Alt 0-9           - Switch between graphics filters
         Ctrl-Alt 1             - Switch beetwen bilinear and non-linear filtering [OpenGL backend]
         Ctrl-Alt 2             - Don't fit the game in the whole screen (black borders) [OpenGL backend]
         Ctrl-Alt 3             - Fit the game in the whole screen (no black borders) [OpenGL backend]
@@ -408 +408 @@
         super2xsai - Enhanced 2xsai filtering. 640x400 screen/window size
         supereagle - Less blurry than 2xsai, but slower. Also 640x400
         advmame2x  - 640x400 scaling. Doesn't rely on blurring like 2xSAI.
+        advmame3x  - 960x600 scaling. Doesn't rely on blurring like 2xSAI.
         tv2x       - 640x400 scaling. Horizontal scanlines.
         dotmatrix  - 640x400 scaling. Dot matrix effect.
 

scummvm/backends/sdl/sdl-common.cpp

@@ -544 +544 @@
                                 break;
                         }
 #endif
-                        // Ctr-Alt-1 till Ctrl-Alt-9 will change the GFX mode
-                        if (b == (KBD_CTRL|KBD_ALT) && 
-                                (ev.key.keysym.sym>='1') && (ev.key.keysym.sym<='9')) {
-                                Property prop;
-                                prop.gfx_mode = ev.key.keysym.sym - '1';
-                                property(PROP_SET_GFX_MODE, &prop);
-                                break;
+                        // Ctr-Alt-<key> will change the GFX mode
+                        if (b == (KBD_CTRL|KBD_ALT)) {
+                                char keys[] = "1234567890";
+                                char *ptr;
+
+                                ptr = strchr(keys, ev.key.keysym.sym);
+                                if (ptr != NULL) {
+                                        Property prop;
+
+                                        prop.gfx_mode = ptr - keys;
+                                        property(PROP_SET_GFX_MODE, &prop);
+                                        break;
+                                }
                         }
 
 #ifdef QTOPIA

scummvm/backends/sdl/sdl.cpp

@@ -99 +99 @@
                 _scaleFactor = 2;
                 _scaler_proc = AdvMame2x;
                 break;
+        case GFX_ADVMAME3X:
+                _scaleFactor = 3;
+                _scaler_proc = AdvMame3x;
+                break;
         case GFX_TV2X:
                 _scaleFactor = 2;
                 _scaler_proc = TV2x;
@@ -360 +364 @@
 #endif
                 return 1;
         } else if (param == PROP_SET_GFX_MODE) {
-                if (value->gfx_mode >= 9)
+                if (value->gfx_mode >= 10)
                         return 0;
 
                 _mode = value->gfx_mode;

scummvm/backends/sdl/sdl_gl.cpp

@@ -570 +570 @@
                                 _glScreenStart = 0;
                                 break;
                         default: // SDL backend
-                                if (value->gfx_mode >= 9)
+                                if (value->gfx_mode >= 10)
                                   return 0;
 
                                 _mode = value->gfx_mode;

scummvm/common/gameDetector.cpp

@@ -90 +90 @@
         {"super2xsai", "Super2xSAI", GFX_SUPER2XSAI},
         {"supereagle", "SuperEagle", GFX_SUPEREAGLE},
         {"advmame2x", "AdvMAME2x", GFX_ADVMAME2X},
+        {"advmame3x", "AdvMAME3x", GFX_ADVMAME3X},
         {"tv2x", "TV2x", GFX_TV2X},
         {"dotmatrix", "DotMatrix", GFX_DOTMATRIX},
 #else

scummvm/common/scaler.cpp

@@ -746 +746 @@
         }
 }
 
+void AdvMame3x(uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch,
+                                                         int width, int height) {
+        unsigned int nextlineSrc = srcPitch / sizeof(uint16);
+        uint16 *p = (uint16 *)srcPtr;
+
+        unsigned int nextlineDst = dstPitch / sizeof(uint16);
+        uint16 *q = (uint16 *)dstPtr;
+        
+        uint16 A, B, C;
+        uint16 D, E, F;
+        uint16 G, H, I;
+
+        while (height--) {
+                B = C = *(p - nextlineSrc);
+                E = F = *(p);
+                H = I = *(p + nextlineSrc);
+                for (int i = 0; i < width; ++i) {
+                        p++;
+                        A = B; B = C; C = *(p - nextlineSrc);
+                        D = E; E = F; F = *(p);
+                        G = H; H = I; I = *(p + nextlineSrc);
+
+                        *(q) = D == B && B != F && D != H ? D : E;
+                        *(q + 1) = E;
+                        *(q + 2) = B == F && B != D && F != H ? F : E;
+                        *(q + nextlineDst) = E;
+                        *(q + nextlineDst + 1) = E;
+                        *(q + nextlineDst + 2) = E;
+                        *(q + 2 * nextlineDst) = D == H && D != B && H != F ? D : E;
+                        *(q + 2 * nextlineDst + 1) = E;
+                        *(q + 2 * nextlineDst + 2) = H == F && D != H && B != F ? F : E;
+                        q += 3;
+                }
+                p += nextlineSrc - width;
+                q += (nextlineDst - width) * 3;
+        }
+}
+
 void Normal1x(uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch,
                                                         int width, int height) {
         while (height--) {

scummvm/common/scaler.h

@@ -31 +31 @@
 DECLARE_SCALER(Super2xSaI);
 DECLARE_SCALER(SuperEagle);
 DECLARE_SCALER(AdvMame2x);
+DECLARE_SCALER(AdvMame3x);
 DECLARE_SCALER(Normal1x);
 DECLARE_SCALER(Normal2x);
 DECLARE_SCALER(Normal3x);
@@ -46 +47 @@
         GFX_SUPER2XSAI = 4,
         GFX_SUPEREAGLE = 5,
         GFX_ADVMAME2X = 6,
-        GFX_TV2X = 7,
-        GFX_DOTMATRIX = 8,
+        GFX_ADVMAME3X = 7,
+        GFX_TV2X = 8,
+        GFX_DOTMATRIX = 9,
         
         GFX_FLIPPING = 100,     // Palmos
         GFX_DOUBLEBUFFER = 101  // Palmos