Mercurial > hg > dmlib
changeset 2125:56d4dc81774b
Rename various C64_* constants to D64_*.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 27 May 2019 08:35:35 +0300 |
| parents | a17b37872d8e |
| children | cffadb745484 |
| files | tools/64vw.c tools/gfxconv.c tools/lib64fmts.c tools/lib64gfx.c tools/lib64gfx.h |
| diffstat | 5 files changed, 141 insertions(+), 141 deletions(-) [+] |
line wrap: on
line diff
--- a/tools/64vw.c Mon May 27 08:27:01 2019 +0300 +++ b/tools/64vw.c Mon May 27 08:35:35 2019 +0300 @@ -47,8 +47,8 @@ void dmSetScaleFactor(float factor) { - optScrWidth = (int) ((float) C64_SCR_WIDTH * factor * C64_SCR_PAR_XY); - optScrHeight = (int) ((float) C64_SCR_HEIGHT * factor); + optScrWidth = (int) ((float) D64_SCR_WIDTH * factor * D64_SCR_PAR_XY); + optScrHeight = (int) ((float) D64_SCR_HEIGHT * factor); } @@ -529,7 +529,7 @@ dmC64ImageFree(cimage); if (surf == NULL && (surf = SDL_CreateRGBSurfaceWithFormat(0, - C64_SCR_WIDTH, C64_SCR_HEIGHT, 8, SDL_PIXELFORMAT_INDEX8)) == NULL) + D64_SCR_WIDTH, D64_SCR_HEIGHT, 8, SDL_PIXELFORMAT_INDEX8)) == NULL) { dmErrorMsg("Could not allocate surface.\n"); goto exit;
--- a/tools/gfxconv.c Mon May 27 08:27:01 2019 +0300 +++ b/tools/gfxconv.c Mon May 27 08:35:35 2019 +0300 @@ -133,7 +133,7 @@ int optNRemapTable = 0, optScaleMode = SCALE_AUTO; DMMapValue optRemapTable[DM_MAX_COLORS]; -int optColorMap[C64_NCOLORS]; +int optColorMap[D64_NCOLORS]; char *optCharROMFilename = NULL; @@ -740,7 +740,7 @@ { int index, ncolors; if (!dmParseMapOptionString(optArg, optColorMap, - &ncolors, C64_NCOLORS, FALSE, "color index option")) + &ncolors, D64_NCOLORS, FALSE, "color index option")) return FALSE; dmMsg(1, "Set color index mapping: "); @@ -1026,7 +1026,7 @@ void dmDumpCharASCII(FILE *outFile, const Uint8 *buf, const size_t offs, const int fmt, const BOOL multicolor) { - for (size_t yc = 0; yc < C64_CHR_HEIGHT_UT; yc++) + for (size_t yc = 0; yc < D64_CHR_HEIGHT_UT; yc++) { fprintf(outFile, "%04" DM_PRIx_SIZE_T " : ", offs + yc); dmPrintByte(outFile, buf[yc], fmt, multicolor); @@ -1039,10 +1039,10 @@ { size_t bufOffs, xc, yc; - for (bufOffs = yc = 0; yc < C64_SPR_HEIGHT_UT; yc++) + for (bufOffs = yc = 0; yc < D64_SPR_HEIGHT_UT; yc++) { fprintf(outFile, "%04" DM_PRIx_SIZE_T " ", offs + bufOffs); - for (xc = 0; xc < C64_SPR_WIDTH_UT; xc++) + for (xc = 0; xc < D64_SPR_WIDTH_UT; xc++) { dmPrintByte(outFile, buf[bufOffs], fmt, multicolor); fprintf(outFile, " "); @@ -1576,11 +1576,11 @@ int yc; if (xoffs < 0 || yoffs < 0 || - xoffs + C64_CHR_WIDTH_PX > image->width || - yoffs + C64_CHR_HEIGHT_PX > image->height) + xoffs + D64_CHR_WIDTH_PX > image->width || + yoffs + D64_CHR_HEIGHT_PX > image->height) return FALSE; - for (yc = 0; yc < C64_CHR_HEIGHT_UT; yc++) + for (yc = 0; yc < D64_CHR_HEIGHT_UT; yc++) { const Uint8 *sp = image->data + ((yc + yoffs) * image->pitch) + xoffs; buf[yc] = dmConvertByte(sp, multicolor); @@ -1596,16 +1596,16 @@ int yc, xc; if (xoffs < 0 || yoffs < 0 || - xoffs + C64_SPR_WIDTH_PX > image->width || - yoffs + C64_SPR_HEIGHT_PX > image->height) + xoffs + D64_SPR_WIDTH_PX > image->width || + yoffs + D64_SPR_HEIGHT_PX > image->height) return FALSE; - for (yc = 0; yc < C64_SPR_HEIGHT_UT; yc++) + for (yc = 0; yc < D64_SPR_HEIGHT_UT; yc++) { - for (xc = 0; xc < C64_SPR_WIDTH_PX / C64_SPR_WIDTH_UT; xc++) + for (xc = 0; xc < D64_SPR_WIDTH_PX / D64_SPR_WIDTH_UT; xc++) { const Uint8 *sp = image->data + ((yc + yoffs) * image->pitch) + (xc * 8) + xoffs; - buf[(yc * C64_SPR_WIDTH_UT) + xc] = dmConvertByte(sp, multicolor); + buf[(yc * D64_SPR_WIDTH_UT) + xc] = dmConvertByte(sp, multicolor); } } @@ -1625,16 +1625,16 @@ switch (outFormat) { case FFMT_CHAR: - outBufSize = C64_CHR_SIZE; - outBlockW = image->width / C64_CHR_WIDTH_PX; - outBlockH = image->height / C64_CHR_HEIGHT_PX; + outBufSize = D64_CHR_SIZE; + outBlockW = image->width / D64_CHR_WIDTH_PX; + outBlockH = image->height / D64_CHR_HEIGHT_PX; outType = "char"; break; case FFMT_SPRITE: - outBufSize = C64_SPR_SIZE; - outBlockW = image->width / C64_SPR_WIDTH_PX; - outBlockH = image->height / C64_SPR_HEIGHT_PX; + outBufSize = D64_SPR_SIZE; + outBlockW = image->width / D64_SPR_WIDTH_PX; + outBlockH = image->height / D64_SPR_HEIGHT_PX; outType = "sprite"; break; @@ -1677,7 +1677,7 @@ { case FFMT_CHAR: if (!dmConvertImage2Char(buf, image, - bx * C64_CHR_WIDTH_PX, by * C64_CHR_HEIGHT_PX, + bx * D64_CHR_WIDTH_PX, by * D64_CHR_HEIGHT_PX, multicolor)) { ret = DMERR_DATA_ERROR; @@ -1687,7 +1687,7 @@ case FFMT_SPRITE: if (!dmConvertImage2Sprite(buf, image, - bx * C64_SPR_WIDTH_PX, by * C64_SPR_HEIGHT_PX, + bx * D64_SPR_WIDTH_PX, by * D64_SPR_HEIGHT_PX, multicolor)) { ret = DMERR_DATA_ERROR; @@ -1725,17 +1725,17 @@ switch (optInType) { case FFMT_CHAR: - outSize = C64_CHR_SIZE; - outWidth = C64_CHR_WIDTH_UT; - outWidthPX = C64_CHR_WIDTH_PX; - outHeight = C64_CHR_HEIGHT_UT; + outSize = D64_CHR_SIZE; + outWidth = D64_CHR_WIDTH_UT; + outWidthPX = D64_CHR_WIDTH_PX; + outHeight = D64_CHR_HEIGHT_UT; break; case FFMT_SPRITE: - outSize = C64_SPR_SIZE; - outWidth = C64_SPR_WIDTH_UT; - outWidthPX = C64_SPR_WIDTH_PX; - outHeight = C64_SPR_HEIGHT_UT; + outSize = D64_SPR_SIZE; + outWidth = D64_SPR_WIDTH_UT; + outWidthPX = D64_SPR_WIDTH_PX; + outHeight = D64_SPR_HEIGHT_UT; break; default: @@ -1913,7 +1913,7 @@ int i, n, res; // Default color mapping - for (i = 0; i < C64_NCOLORS; i++) + for (i = 0; i < D64_NCOLORS; i++) optColorMap[i] = i; // Initialize c64 image conversion spec
--- 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,
--- a/tools/lib64gfx.c Mon May 27 08:27:01 2019 +0300 +++ b/tools/lib64gfx.c Mon May 27 08:35:35 2019 +0300 @@ -13,7 +13,7 @@ // Based on Pepto's palette, stolen from VICE -DMColor dmDefaultC64Palette[C64_NCOLORS] = +DMColor dmDefaultC64Palette[D64_NCOLORS] = { { 0x00, 0x00, 0x00, 0xff }, { 0xFF, 0xFF, 0xFF, 0xff }, @@ -114,7 +114,7 @@ int dmSetDefaultC64Palette(DMImage *img) { int res; - if ((res = dmPaletteAlloc(&(img->pal), C64_NCOLORS, 255)) != DMERR_OK) + if ((res = dmPaletteAlloc(&(img->pal), D64_NCOLORS, 255)) != DMERR_OK) return res; memcpy(img->pal->colors, dmDefaultC64Palette, img->pal->ncolors * sizeof(DMColor)); @@ -126,14 +126,14 @@ int dmSetMixedColorC64Palette(DMImage *img) { int res; - if ((res = dmPaletteAlloc(&(img->pal), C64_NCOLORS * C64_NCOLORS, -1)) != DMERR_OK) + if ((res = dmPaletteAlloc(&(img->pal), D64_NCOLORS * D64_NCOLORS, -1)) != DMERR_OK) return res; int n = 0; - for (int n1 = 0; n1 < C64_NCOLORS; n1++) + for (int n1 = 0; n1 < D64_NCOLORS; n1++) { const DMColor *col1 = &dmDefaultC64Palette[n1]; - for (int n2 = 0; n2 < C64_NCOLORS; n2++) + for (int n2 = 0; n2 < D64_NCOLORS; n2++) { const DMColor *col2 = &dmDefaultC64Palette[n2]; img->pal->colors[n].r = (col1->r + col2->r) / 2; @@ -271,7 +271,7 @@ dmFree(img->charData); // Extra data .. - for (int i = 0; i < C64_MAX_EXTRA_DATA; i++) + for (int i = 0; i < D64_MAX_EXTRA_DATA; i++) dmC64MemBlockFree(&img->extraData[i]); dmMemset(img, 0, sizeof(DMC64Image)); @@ -775,7 +775,7 @@ break; case DS_EXTRA_DATA: - if (op->bank < 0 || op->bank >= C64_MAX_EXTRA_DATA) + if (op->bank < 0 || op->bank >= D64_MAX_EXTRA_DATA) { return dmError(DMERR_INTERNAL, "Invalid bank %d definition in generic encode/decode operator %d @ #%d.\n", @@ -816,7 +816,7 @@ break; case DS_CHAR_DATA: - return C64_MAX_CHARS * C64_CHR_SIZE; + return D64_MAX_CHARS * D64_CHR_SIZE; break; case DS_D020: @@ -1317,7 +1317,7 @@ const int scroffs = scroffsy + x; const int xshift = 7 - (xc & 7); const int chr = src->screen[0].data[scroffs]; - const size_t chrOffs = (chr * C64_CHR_SIZE) + yb; + const size_t chrOffs = (chr * D64_CHR_SIZE) + yb; if (chrOffs >= src->charData[0].size) { @@ -1339,7 +1339,7 @@ const int scroffs = scroffsy + x; const int xshift = 7 - (xc & 7); const int chr = src->screen[0].data[scroffs]; - const size_t chrOffs = ((chr & 0x3f) * C64_CHR_SIZE) + yb; + const size_t chrOffs = ((chr & 0x3f) * D64_CHR_SIZE) + yb; if (chrOffs >= src->charData[0].size) { @@ -1367,7 +1367,7 @@ const int scroffs = scroffsy + x; const int chr = src->screen[0].data[scroffs]; const int col = src->color[0].data[scroffs]; - const size_t chrOffs = (chr * C64_CHR_SIZE) + yb; + const size_t chrOffs = (chr * D64_CHR_SIZE) + yb; if (chrOffs >= src->charData[0].size) {
--- a/tools/lib64gfx.h Mon May 27 08:27:01 2019 +0300 +++ b/tools/lib64gfx.h Mon May 27 08:35:35 2019 +0300 @@ -24,34 +24,34 @@ // Bitmap constants -#define C64_SCR_WIDTH 320 -#define C64_SCR_HEIGHT 200 -#define C64_SCR_CH_WIDTH (C64_SCR_WIDTH/8) -#define C64_SCR_CH_HEIGHT (C64_SCR_HEIGHT/8) -#define C64_MAX_EXTRA_DATA 64 +#define D64_SCR_WIDTH 320 +#define D64_SCR_HEIGHT 200 +#define D64_SCR_CH_WIDTH (D64_SCR_WIDTH/8) +#define D64_SCR_CH_HEIGHT (D64_SCR_HEIGHT/8) +#define D64_MAX_EXTRA_DATA 64 // C64 video screen pixel aspect ratio on PAL -#define C64_SCR_PAR_XY (0.9365f) +#define D64_SCR_PAR_XY (0.9365f) // Sprite constants -#define C64_SPR_WIDTH_PX 24 -#define C64_SPR_HEIGHT_PX 21 -#define C64_SPR_WIDTH_UT (C64_SPR_WIDTH_PX / 8) // bytes -#define C64_SPR_HEIGHT_UT C64_SPR_HEIGHT_PX -#define C64_SPR_SIZE ((C64_SPR_WIDTH_UT * C64_SPR_HEIGHT_UT) + 1) +#define D64_SPR_WIDTH_PX 24 +#define D64_SPR_HEIGHT_PX 21 +#define D64_SPR_WIDTH_UT (D64_SPR_WIDTH_PX / 8) // bytes +#define D64_SPR_HEIGHT_UT D64_SPR_HEIGHT_PX +#define D64_SPR_SIZE ((D64_SPR_WIDTH_UT * D64_SPR_HEIGHT_UT) + 1) // Character constants -#define C64_CHR_WIDTH_PX 8 -#define C64_CHR_HEIGHT_PX 8 -#define C64_CHR_WIDTH_UT 1 // bytes -#define C64_CHR_HEIGHT_UT 8 // lines -#define C64_CHR_SIZE (C64_CHR_WIDTH_UT * C64_CHR_HEIGHT_UT) +#define D64_CHR_WIDTH_PX 8 +#define D64_CHR_HEIGHT_PX 8 +#define D64_CHR_WIDTH_UT 1 // bytes +#define D64_CHR_HEIGHT_UT 8 // lines +#define D64_CHR_SIZE (D64_CHR_WIDTH_UT * D64_CHR_HEIGHT_UT) // Etc. -#define C64_NCOLORS 16 -#define C64_VIDBANK_SIZE (16*1024) -#define C64_MAX_SPRITES 1024 -#define C64_MAX_CHARS 256 +#define D64_NCOLORS 16 +#define D64_VIDBANK_SIZE (16*1024) +#define D64_MAX_SPRITES 1024 +#define D64_MAX_CHARS 256 // Different supported flags/modes @@ -150,7 +150,7 @@ { BOOL multicolor, xexpand, yexpand; int color, xc, yc; - Uint8 data[C64_SPR_HEIGHT_UT][C64_SPR_WIDTH_UT]; + Uint8 data[D64_SPR_HEIGHT_UT][D64_SPR_WIDTH_UT]; } DMC64Sprite; @@ -177,9 +177,9 @@ // Extra data areas used by some formats, // for example raster colours might be stored - DMC64MemBlock extraData[C64_MAX_EXTRA_DATA]; + DMC64MemBlock extraData[D64_MAX_EXTRA_DATA]; - //DMC64Sprite sprites[C64_MAX_SPRITES]; + //DMC64Sprite sprites[D64_MAX_SPRITES]; } DMC64Image; @@ -301,7 +301,7 @@ // // Global variables // -extern DMColor dmDefaultC64Palette[C64_NCOLORS]; +extern DMColor dmDefaultC64Palette[D64_NCOLORS]; extern DMC64ImageFormat dmC64ImageFormats[]; extern const int ndmC64ImageFormats;