Mercurial > hg > dmlib

diff tools/lib64fmts.c @ 2125:56d4dc81774b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename various C64_* constants to D64_*.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 27 May 2019 08:35:35 +0300
parents f12ac487954b
children c1a9519a619f
line wrap: on
line diff
--- a/tools/lib64fmts.c	Mon May 27 08:27:01 2019 +0300
+++ b/tools/lib64fmts.c	Mon May 27 08:35:35 2019 +0300
@@ -924,16 +924,16 @@
     const DMC64Image *img, const int bmoffs, const int scroffs,
     const int shiftX, const int bitmap, const int rasterX, const int rasterY)
 {
-    const int ry = rasterY / C64_SPR_HEIGHT_PX;
-    const int yd = rasterY % C64_SPR_HEIGHT_PX;
-    const int rx = rasterX / C64_SPR_WIDTH_PX;
-    const int xd = rasterX % C64_SPR_WIDTH_PX;
-    const int offs = (ry * 8 + rx) * C64_SPR_SIZE + (yd * C64_SPR_WIDTH_UT) + (xd / 8);
+    const int ry = rasterY / D64_SPR_HEIGHT_PX;
+    const int yd = rasterY % D64_SPR_HEIGHT_PX;
+    const int rx = rasterX / D64_SPR_WIDTH_PX;
+    const int xd = rasterX % D64_SPR_WIDTH_PX;
+    const int offs = (ry * 8 + rx) * D64_SPR_SIZE + (yd * D64_SPR_WIDTH_UT) + (xd / 8);
     const int mask = 1 << (7 - (rasterX & 7));
 
     Uint8 color1 = dmC64GetGenericSCPixel(img, bmoffs, scroffs, shiftX, 0, bitmap, 0);
     Uint8 color2 = img->extraData[0].data[offs] & mask ? 0x0f : 0;
-    Uint8 color3 = img->extraData[0].data[offs + C64_SPR_SIZE * 155] & mask ? img->d022 : 0;
+    Uint8 color3 = img->extraData[0].data[offs + D64_SPR_SIZE * 155] & mask ? img->d022 : 0;
 
     return color3 ? color3 : ( color2 ? color2 : color1 );
 }
@@ -985,7 +985,7 @@
 
     (void) bitmap;
     (void) rasterX;
-    return (c1 * C64_NCOLORS) + c2;
+    return (c1 * D64_NCOLORS) + c2;
 }
 
 
@@ -1111,8 +1111,8 @@
 {
     { // #0: Koala Painter type memory layout
         D64_FMT_MC,
-        C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
-        C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+        D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
+        D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
         2, 1,
         NULL, NULL,
         NULL,
@@ -1127,8 +1127,8 @@
 
     { // #1: Black Mail FLI Graph
         D64_FMT_MC | D64_FMT_FLI,
-        C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
-        C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+        D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
+        D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
         2, 1,
         NULL, NULL,
         fmtGetPixelBlackMailFLI,
@@ -1143,8 +1143,8 @@
 
     { // #2: Art Studio etc. Hires
         D64_FMT_HIRES,
-        C64_SCR_WIDTH   , C64_SCR_HEIGHT,
-        C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
+        D64_SCR_WIDTH   , D64_SCR_HEIGHT,
+        D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
         1, 1,
         NULL, NULL,
         NULL,
@@ -1157,8 +1157,8 @@
 
     { // #3: FunPaint II
         D64_FMT_MC | D64_FMT_FLI | D64_FMT_ILACE,
-        C64_SCR_WIDTH, C64_SCR_HEIGHT,
-        C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+        D64_SCR_WIDTH, D64_SCR_HEIGHT,
+        D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
         1, 1,
         NULL, NULL,
         fmtGetPixelFunPaint2,
@@ -1177,8 +1177,8 @@
 
     { // #4: DrazPaint 1.x & 2
         D64_FMT_MC,
-        C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
-        C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+        D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
+        D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
         2, 1,
         NULL, NULL,
         NULL,
@@ -1193,8 +1193,8 @@
 
     { // #5: DrazLace 1.0
         D64_FMT_MC | D64_FMT_ILACE,
-        C64_SCR_WIDTH   , C64_SCR_HEIGHT,
-        C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
+        D64_SCR_WIDTH   , D64_SCR_HEIGHT,
+        D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
         1, 1,
         NULL, NULL,
         NULL,
@@ -1211,8 +1211,8 @@
 
     { // #6: TruePaint
         D64_FMT_MC | D64_FMT_ILACE,
-        C64_SCR_WIDTH   , C64_SCR_HEIGHT,
-        C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
+        D64_SCR_WIDTH   , D64_SCR_HEIGHT,
+        D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
         1, 1,
         NULL, NULL,
         fmtGetPixelTruePaint,
@@ -1230,8 +1230,8 @@
 
     { // #7: ECI Graphic Editor Hires FLI
         D64_FMT_HIRES | D64_FMT_FLI,
-        C64_SCR_WIDTH,    C64_SCR_HEIGHT,
-        C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
+        D64_SCR_WIDTH,    D64_SCR_HEIGHT,
+        D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
         1, 1,
         fmtConvertECIBMP2Image, NULL,
         fmtGetPixelECI,
@@ -1247,8 +1247,8 @@
 
     { // #8: Cosmos Designs Hires Manager
         D64_FMT_HIRES | D64_FMT_FLI,
-        C64_SCR_WIDTH, 24*8, // Actually 296 x 192 (=24*8)
-        C64_SCR_CH_WIDTH, 24,
+        D64_SCR_WIDTH, 24*8, // Actually 296 x 192 (=24*8)
+        D64_SCR_CH_WIDTH, 24,
         1, 1,
         NULL, NULL,
         fmtGetPixelCrestHIFLIorCDHM,
@@ -1261,8 +1261,8 @@
 
     { // #9: FBI Crew FLI Designer 1.x & 2.0
         D64_FMT_MC | D64_FMT_FLI,
-        C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
-        C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+        D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
+        D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
         2, 1,
         NULL, NULL,
         fmtGetPixelFLIDesigner,
@@ -1276,8 +1276,8 @@
 
     { // #10: Doodle
         D64_FMT_HIRES,
-        C64_SCR_WIDTH   , C64_SCR_HEIGHT,
-        C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
+        D64_SCR_WIDTH   , D64_SCR_HEIGHT,
+        D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
         1, 1,
         NULL, NULL,
         NULL,
@@ -1336,8 +1336,8 @@
         NULL, NULL,
         {
             D64_FMT_MC,
-            C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
-            C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
+            D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
             2, 1,
             NULL, NULL,
             NULL,
@@ -1358,8 +1358,8 @@
         NULL, NULL,
         {
             D64_FMT_MC,
-            C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
-            C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
+            D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
             2, 1,
             NULL, NULL,
             NULL,
@@ -1408,8 +1408,8 @@
         NULL, NULL,
         {
             D64_FMT_MC,
-            C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
-            C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
+            D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
             2, 1,
             NULL, NULL,
             NULL,
@@ -1431,8 +1431,8 @@
         NULL, NULL,
         {
             D64_FMT_MC,
-            C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
-            C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
+            D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
             2, 1,
             NULL, NULL,
             NULL,
@@ -1453,8 +1453,8 @@
         NULL, NULL,
         {
             D64_FMT_MC,
-            C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
-            C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
+            D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
             2, 1,
             NULL, NULL,
             NULL,
@@ -1477,8 +1477,8 @@
         NULL, NULL,
         {
             D64_FMT_MC,
-            C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
-            C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
+            D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
             2, 1,
             NULL, NULL,
             NULL,
@@ -1499,8 +1499,8 @@
         NULL, NULL,
         {
             D64_FMT_MC,
-            C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
-            C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
+            D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
             2, 1,
             NULL, NULL,
             NULL,
@@ -1522,8 +1522,8 @@
         NULL, NULL,
         {
             D64_FMT_MC,
-            C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
-            C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
+            D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
             2, 1,
             NULL, NULL,
             NULL,
@@ -1544,8 +1544,8 @@
         NULL, NULL,
         {
             D64_FMT_MC,
-            C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
-            C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
+            D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
             2, 1,
             NULL, NULL,
             NULL,
@@ -1568,8 +1568,8 @@
         NULL, NULL,
         {
             D64_FMT_MC,
-            C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
-            C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
+            D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
             2, 1,
             NULL, NULL,
             NULL,
@@ -1591,8 +1591,8 @@
         NULL, NULL,
         {
             D64_FMT_MC,
-            C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
-            C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
+            D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
             2, 1,
             NULL, NULL,
             NULL,
@@ -1663,8 +1663,8 @@
         NULL, NULL,
         {
             D64_FMT_HIRES,
-            C64_SCR_WIDTH   , C64_SCR_HEIGHT,
-            C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH   , D64_SCR_HEIGHT,
+            D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
             1, 1,
             NULL, NULL,
             NULL,
@@ -1684,8 +1684,8 @@
         NULL, NULL,
         {
             D64_FMT_HIRES,
-            C64_SCR_WIDTH   , C64_SCR_HEIGHT,
-            C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH   , D64_SCR_HEIGHT,
+            D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
             1, 1,
             NULL, NULL,
             NULL,
@@ -1704,8 +1704,8 @@
         NULL, NULL,
         {
             D64_FMT_HIRES,
-            C64_SCR_WIDTH   , C64_SCR_HEIGHT,
-            C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH   , D64_SCR_HEIGHT,
+            D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
             1, 1,
             NULL, NULL,
             NULL,
@@ -1724,8 +1724,8 @@
         NULL, NULL,
         {
             D64_FMT_MC | D64_FMT_FLI,
-            C64_SCR_WIDTH / 2, C64_SCR_HEIGHT * 2,
-            C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH / 2, D64_SCR_HEIGHT * 2,
+            D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
             2, 1,
             NULL, NULL,
             fmtGetPixelBFLI,
@@ -1789,8 +1789,8 @@
         NULL, NULL,
         { // Almost same layout as Koala Painter, but FPT has D020
             D64_FMT_MC,
-            C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
-            C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
+            D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
             2, 1,
             NULL, NULL,
             NULL,
@@ -1812,8 +1812,8 @@
         NULL, NULL,
         {
             D64_FMT_MC,
-            C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
-            C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
+            D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
             2, 1,
             NULL, NULL,
             NULL,
@@ -1870,8 +1870,8 @@
         NULL, NULL,
         {
             D64_FMT_MC | D64_FMT_FLI | D64_FMT_ILACE,
-            C64_SCR_WIDTH, C64_SCR_HEIGHT,
-            C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH, D64_SCR_HEIGHT,
+            D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
             1, 1,
             NULL, NULL,
             fmtGetPixelFunPaint2, // The format is essentially same as FP2
@@ -1899,8 +1899,8 @@
         NULL, NULL,
         {
             D64_FMT_MC | D64_FMT_FLI,
-            C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
-            C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
+            D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
             2, 1,
             NULL, NULL,
             fmtGetPixelHCB,
@@ -1910,7 +1910,7 @@
                 { DO_COPY       , DS_SCREEN_RAM  , 0x0800, 0,  0,   0, NULL, NULL },
                 { DO_COPY       , DS_SCREEN_RAM  , 0x0c00, 1,  0,   0, NULL, NULL },
                 { DO_COPY       , DS_BITMAP_RAM  , 0x1000, 0,  0,   0, NULL, NULL },
-                { DO_COPY       , DS_EXTRA_DATA  , 0x2f40, 0,  C64_SCR_HEIGHT / 4,   0, NULL, NULL },
+                { DO_COPY       , DS_EXTRA_DATA  , 0x2f40, 0,  D64_SCR_HEIGHT / 4,   0, NULL, NULL },
                 { DO_LAST       , 0              , 0     , 0,  0,   0, NULL, NULL },
             }
         },
@@ -1923,8 +1923,8 @@
         NULL, NULL,
         {
             D64_FMT_HIRES | D64_FMT_FLI,
-            192, C64_SCR_HEIGHT,
-            24, C64_SCR_CH_HEIGHT,
+            192, D64_SCR_HEIGHT,
+            24, D64_SCR_CH_HEIGHT,
             2, 1,
             NULL, NULL,
             fmtGetPixelPentelPaint,
@@ -1934,7 +1934,7 @@
                 { DO_SET_MEM_LO , DS_BGCOL       , 0x9580 - 0x4800, 0,  0,   0, NULL, NULL },
                 { DO_SET_MEM_LO , DS_D022        , 0x9581 - 0x4800, 0,  0,   0, NULL, NULL }, // Sprite color
                 { DO_SET_MEM_LO , DS_COLOR_RAM   , 0x9582 - 0x4800, 0,  0,   0, NULL, NULL },
-                { DO_COPY       , DS_EXTRA_DATA  , 0x5ac0 - 0x4800, 0,  C64_SPR_SIZE * 235,   0, NULL, NULL }, // Sprite data
+                { DO_COPY       , DS_EXTRA_DATA  , 0x5ac0 - 0x4800, 0,  D64_SPR_SIZE * 235,   0, NULL, NULL }, // Sprite data
                 { DO_LAST       , 0              , 0     , 0,  0,   0, NULL, NULL },
             }
         },
@@ -1947,8 +1947,8 @@
         NULL, NULL,
         {
             D64_FMT_HIRES | D64_FMT_FLI,
-            C64_SCR_WIDTH, C64_SCR_HEIGHT,    // Actually 296 x 112 (=14*8)
-            C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
+            D64_SCR_WIDTH, D64_SCR_HEIGHT,    // Actually 296 x 112 (=14*8)
+            D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
             1, 1,
             NULL, NULL,
             fmtGetPixelCrestHIFLIorCDHM,