Ticket #8156: tv2x-20030109.2.diff

backends/sdl/sdl-common.cpp

@@ -485 +485 @@
                                         quit();
                                         break;
                                 }
-                                // Ctr-Alt-1 till Ctrl-Alt-7 will change the GFX mode
+                                // Ctr-Alt-1 till Ctrl-Alt-8 will change the GFX mode
                                 if (b == (KBD_CTRL|KBD_ALT) && 
-                                    (ev.key.keysym.sym>='1') && (ev.key.keysym.sym<='7')) {
+                                    (ev.key.keysym.sym>='1') && (ev.key.keysym.sym<='8')) {
                                         Property prop;
                                         prop.gfx_mode = ev.key.keysym.sym - '1';
                                         property(PROP_SET_GFX_MODE, &prop);

backends/sdl/sdl.cpp

@@ -99 +99 @@
                 _scaleFactor = 2;
                 _scaler_proc = AdvMame2x;
                 break;
+  case GFX_TV2X:
+    _scaleFactor = 2;
+    _scaler_proc = TV2x;
+    break;
 
         case GFX_DOUBLESIZE:
                 _scaleFactor = 2;
@@ -339 +343 @@
 #endif
                 return 1;
         } else if (param == PROP_SET_GFX_MODE) {
-                if (value->gfx_mode >= 7)
+                if (value->gfx_mode >= 8)
                         return 0;
 
                 _mode = value->gfx_mode;

common/gameDetector.cpp

@@ -47 +47 @@
         "\t-p<path>   - look for game in <path>\n"
         "\t-x[<num>]  - load this savegame (default: 0 - autosave)\n"
         "\t-f         - fullscreen mode\n"
-        "\t-g<mode>   - graphics mode (normal,2x,3x,2xsai,super2xsai,supereagle,advmame2x)\n"
+        "\t-g<mode>   - graphics mode (normal,2x,3x,2xsai,super2xsai,supereagle,advmame2x,tv2x)\n"
         "\t-e<mode>   - set music engine (see README for details)\n"
         "\t-a         - specify game is amiga version\n"
         "\n"
@@ -178 +178 @@
         {"super2xsai", "Super2xSAI", GFX_SUPER2XSAI},
         {"supereagle", "SuperEagle", GFX_SUPEREAGLE},
         {"advmame2x", "AdvMAME2x", GFX_ADVMAME2X},
+  {"tv2x", "TV2x", GFX_TV2X},
         {0, 0}
 };
 

common/scaler.cpp

@@ -810 +810 @@
                 dstPtr += dstPitch3;
         }
 }
+
+void TV2x(uint8 *srcPtr, uint32 srcPitch, uint8 *null, uint8 *dstPtr, uint32 dstPitch, 
+            int width, int height)
+{
+        unsigned int nextlineSrc = srcPitch / sizeof(short);
+        short *p = (short *)srcPtr;
+
+        unsigned int nextlineDst = dstPitch / sizeof(short);
+        short *q = (short *)dstPtr;
+
+        while(height--) {
+                for (int i = 0, j = 0; i < width; ++i, j += 2) {
+                        unsigned short p1 = *(p + i);
+                        unsigned short p2 = *(p + i + nextlineSrc);
+                        unsigned short pi = (unsigned short)((INTERPOLATE(p1, p2) & colorMask) >> 1);
+
+                        *(q + j) = p1;
+                        *(q + j + 1) = p1;
+                        *(q + j + nextlineDst) = pi;
+                        *(q + j + nextlineDst + 1) = pi;
+                }
+                p += nextlineSrc;
+                q += nextlineDst << 1;
+        }
+}

common/scaler.h

@@ -36 +36 @@
                                                                 uint8 *dstPtr, uint32 dstPitch, int width, int height);
 extern void Normal3x(uint8 *srcPtr, uint32 srcPitch, uint8 *null,
                                                                 uint8 *dstPtr, uint32 dstPitch, int width, int height);
+extern void TV2x(uint8 *srcPtr, uint32 srcPitch, uint8 *null,
+                                                                uint8 *dstPtr, uint32 dstPitch, int width, int height);
 
 #endif

common/system.h

@@ -215 +215 @@
         GFX_2XSAI = 3,
         GFX_SUPER2XSAI = 4,
         GFX_SUPEREAGLE = 5,
-        GFX_ADVMAME2X = 6
+        GFX_ADVMAME2X = 6,
+  GFX_TV2X = 7
 };
 
 

gui/options.cpp

@@ -69 +69 @@
         gfxPopUp->appendEntry("Super2xSAI");
         gfxPopUp->appendEntry("SuperEagle");
         gfxPopUp->appendEntry("AdvMAME2x");
+        gfxPopUp->appendEntry("TV2x");
         gfxPopUp->setSelected(0);
 
         // The MIDI mode popup & a label