From 60eae1cdda5148e9ebb3ebfc5fb35bbd8f93054c Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Thu, 3 Mar 2016 11:48:47 +1100 Subject: [PATCH] Simple blit kinda works --- 006.simple_blit/blit.s | 16 ++++-- assets/tc.png | Bin 0 -> 12868 bytes base.mk | 10 +++- tools/imagecon/imagecon.c | 116 +++++++++++++++++++++++++++++++++++--- tools/imagecon/imagecon.h | 1 + tools/imagecon/rgba8.png | Bin 0 -> 270 bytes 6 files changed, 127 insertions(+), 16 deletions(-) create mode 100644 assets/tc.png create mode 100644 tools/imagecon/rgba8.png diff --git a/006.simple_blit/blit.s b/006.simple_blit/blit.s index ac75d9a..0704843 100644 --- a/006.simple_blit/blit.s +++ b/006.simple_blit/blit.s @@ -101,7 +101,13 @@ blitWait: btst #6,DMACONR(a6) bne.s .waitblit rts - + +TC_WIDTH equ 64 +TC_HEIGHT equ 64 +TC_WIDTH_BYTES equ TC_WIDTH/8 +TC_WIDTH_WORDS equ TC_WIDTH/16 +TC_XPOS equ 16 +TC_YPOS equ 16 doblit: movem.l d0-a6,-(sp) lea $dff000,a6 @@ -109,10 +115,10 @@ doblit: move.l #$09f00000,BLTCON0(a6) ;A->D copy, no shifts, ascending mode move.l #$ffffffff,BLTAFWM(a6) ;no masking of first/last word move.w #0,BLTAMOD(a6) ;A modulo=bytes to skip between lines - move.w #0,BLTDMOD(a6) ;D modulo - move.l #bitplanes,BLTAPTH(a6) ;source graphic top left corner - move.l #bitplanes+(SCREEN_WIDTH_BYTES*SCREEN_BIT_DEPTH*SCREEN_HEIGHT/2),BLTDPTH(a6) ;destination top left corner - move.w #SCREEN_WIDTH_BYTES*SCREEN_BIT_DEPTH*SCREEN_HEIGHT/4,BLTSIZE(a6) ;rectangle size, starts blit + move.w #SCREEN_WIDTH_BYTES-TC_WIDTH_BYTES,BLTDMOD(a6) ;D modulo + move.l #tc,BLTAPTH(a6) ;source graphic top left corner + move.l #bitplanes+(TC_XPOS)/8+(SCREEN_WIDTH_BYTES*SCREEN_BIT_DEPTH*TC_YPOS),BLTDPTH(a6) ;destination top left corner + move.w #(TC_HEIGHT*SCREEN_BIT_DEPTH)<<6|(TC_WIDTH_WORDS),BLTSIZE(a6) ;rectangle size, starts blit movem.l (sp)+,d0-a6 rts diff --git a/assets/tc.png b/assets/tc.png new file mode 100644 index 0000000000000000000000000000000000000000..8da4c9d42663c5ea1ea6806007b5b3fbb3837c67 GIT binary patch literal 12868 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 [options]\nOptions:\n --output \n --colors \n --quantize\n --output-palette\n --override-palette \n --verbose\n", config.argv[0]); + fprintf(stderr, "%s: --input [options]\nOptions:\n --output \n --colors \n --quantize\n --output-mask\n --output-palette\n --override-palette \n --verbose\n", config.argv[0]); exit(1); } @@ -58,6 +60,10 @@ openFileWrite(const char * s, ...) vsprintf(buffer, s, args); va_end(args); + if (config.verbose) { + printf("Opening %s for writing\n", buffer); + } + FILE* fp = fopen(buffer, "w+"); if (!fp) { abort_("Failed to open %s for writing\n", buffer); @@ -86,6 +92,10 @@ openFileRead(const char * s, ...) void outputPalette(char* outFilename, amiga_color_t* palette, int numColors) { + if (config.verbose) { + printf("outputPalette...\n"); + } + FILE* fp = openFileWrite("%s-copper-list.s", outFilename); FILE* paletteFP = 0; if (config.outputPalette) { @@ -98,7 +108,7 @@ outputPalette(char* outFilename, amiga_color_t* palette, int numColors) for (int i = 0; i < numColors; i++) { if (config.verbose) { - printf("%d: %x %d %d %d\n", i , palette[i].r << 8 | palette[i].g << 4 | palette[i].b, palette[i].r, palette[i].g, palette[i].b); + printf("%02d: hex=%03x r=%03d g=%03d b=%03d a=%03d\n", i , palette[i].r << 8 | palette[i].g << 4 | palette[i].b, palette[i].r, palette[i].g, palette[i].b, palette[i].a); } if (paletteFP) { fprintf(paletteFP, "%03x\n", palette[i].r << 8 | palette[i].g << 4 | palette[i].b); @@ -110,12 +120,20 @@ outputPalette(char* outFilename, amiga_color_t* palette, int numColors) } fclose(fp); + + if (config.verbose) { + printf("done\n\n"); + } } int generateQuantizedPalette(unsigned char* amigaImage, png_bytep* rowPointers, amiga_color_t* palette) { + if (config.verbose) { + printf("generateQuantizedPalette...\n"); + } + liq_attr *attr = liq_attr_create(); liq_image *image = liq_image_create_rgba_rows(attr, (void**)rowPointers, config.width, config.height, 0); @@ -160,11 +178,16 @@ generateQuantizedPalette(unsigned char* amigaImage, png_bytep* rowPointers, amig for (unsigned i = 0; i < pal->count; i++) { if (config.verbose) { - printf("%d %d %d %d\n", i, pal->entries[i].r, pal->entries[i].g, pal->entries[i].b); + printf("%02d: r=%03d g=%03d b=%03d a=%03d\n", i, pal->entries[i].r, pal->entries[i].g, pal->entries[i].b, pal->entries[i].a); } palette[i].r = pal->entries[i].r >> 4; palette[i].g = pal->entries[i].g >> 4; palette[i].b = pal->entries[i].b >> 4; + palette[i].a = pal->entries[i].a >> 4; + } + + if (config.verbose) { + printf("done\n\n"); } return pal->count; @@ -174,6 +197,10 @@ generateQuantizedPalette(unsigned char* amigaImage, png_bytep* rowPointers, amig int generatePalette(unsigned char* amigaImage, png_bytep* rowPointers, amiga_color_t* palette) { + if (config.verbose) { + printf("generatePalette...\n"); + } + int paletteIndex = 0; for (int y=0; y> 4; color.g = ptr[1] >> 4; color.b = ptr[2] >> 4; + color.a = ptr[3] >> 4; int index = -1; for (int i = 0; i < paletteIndex; i++) { @@ -205,28 +233,37 @@ generatePalette(unsigned char* amigaImage, png_bytep* rowPointers, amiga_color_t amigaImage[(config.width*y)+x] = index; } } - + + if (config.verbose) { + printf("done\n\n"); + } + return paletteIndex; } void outputBitplanes(char* outFilename, unsigned char* amigaImage, int numColors) { + + + if (config.verbose) { + printf("outputBitplanes...\n"); + } int numBitPlanes = (int)(log(numColors-1) / log(2))+1; if (config.verbose) { printf("number of colors = %d\n", numColors); printf("number of bitplanes = %d\n", numBitPlanes); } + int byteWidth = (config.width + 7) / 8; - char** bitplanes = malloc(sizeof(void*)+numBitPlanes); + char** bitplanes = malloc(sizeof(void*)*numBitPlanes); for (int i = 0; i < numBitPlanes; i++) { bitplanes[i] = calloc(byteWidth*config.height, 1); } - for (int y = 0, writeIndex = 0; y < config.height; y++) { for (int byte = 0;byte < byteWidth; byte++) { for (int bit = 0; bit < 8; bit++) { @@ -241,6 +278,7 @@ outputBitplanes(char* outFilename, unsigned char* amigaImage, int numColors) } } + FILE* fp = openFileWrite("%s.bin", outFilename); for (int y = 0; y < config.height; y++) { @@ -250,11 +288,64 @@ outputBitplanes(char* outFilename, unsigned char* amigaImage, int numColors) } } fclose(fp); + if (config.verbose) { + printf("done\n\n"); + } +} + +void +outputMask(char* outFilename, unsigned char* amigaImage, amiga_color_t* palette, int numColors) +{ + if (config.verbose) { + printf("outputMask...\n"); + } + int numBitPlanes = (int)(log(numColors-1) / log(2))+1; + + int byteWidth = (config.width + 7) / 8; + + char** bitplanes = malloc(sizeof(void*)*numBitPlanes); + for (int i = 0; i < numBitPlanes; i++) { + bitplanes[i] = calloc(byteWidth*config.height, 1); + } + + + for (int y = 0, writeIndex = 0; y < config.height; y++) { + for (int byte = 0;byte < byteWidth; byte++) { + for (int bit = 0; bit < 8; bit++) { + int x = byte * 8 + 7 - bit; + int paletteIndex = amigaImage[(config.width*y)+x]; + int bitmask = palette[paletteIndex].a > 0 ? 0xFF : 0; + for (int plane_index = 0; plane_index < numBitPlanes; plane_index++) { + char* plane = bitplanes[plane_index]; + plane[writeIndex] |= ((bitmask >> plane_index) & 1) << bit; + } + } + writeIndex++; + } + } + + FILE* fp = openFileWrite("%s-mask.bin", outFilename); + + for (int y = 0; y < config.height; y++) { + for (int plane_index = 0; plane_index < numBitPlanes; plane_index++) { + char* plane = bitplanes[plane_index]; + fwrite(&plane[y*byteWidth], byteWidth, 1, fp); + } + } + fclose(fp); + + if (config.verbose) { + printf("done\n\n"); + } } void processFile(char* outFilename, png_bytep* rowPointers) { + if (config.verbose) { + printf("processFile...\n"); + } + int numColors; amiga_color_t palette[MAX_PALETTE]; @@ -268,8 +359,16 @@ processFile(char* outFilename, png_bytep* rowPointers) numColors = generatePalette(amigaImage, rowPointers, palette); } - outputBitplanes(outFilename, amigaImage, numColors); + outputBitplanes(outFilename, amigaImage, numColors); + + if (config.outputMask) { + outputMask(outFilename, amigaImage, palette, numColors); + } outputPalette(outFilename, palette, numColors); + + if (config.verbose) { + printf("done\n\n"); + } } @@ -286,6 +385,7 @@ main(int argc, char **argv) {"verbose", no_argument, &config.verbose, 1}, {"quantize", no_argument, &config.quantize, 1}, {"output-palette", no_argument, &config.outputPalette, 1}, + {"output-mask", no_argument, &config.outputMask, 1}, {"override-palette", required_argument, 0, 'p'}, {"output", required_argument, 0, 'o'}, {"colors", required_argument, 0, 'c'}, @@ -345,7 +445,7 @@ main(int argc, char **argv) } if (config.verbose) { - printf("Options:\verbose = %d\ninputFile = %s\noutputFile = %s\nmaxColors = %d\n\n", config.verbose, inputFile, outputFile, config.maxColors); + printf("Options:\nverbose = %d\ninputFile = %s\noutputFile = %s\nmaxColors = %d\noutputPalette = %d\noutputMask = %d\n\n", config.verbose, inputFile, outputFile, config.maxColors, config.outputPalette, config.outputMask); } processFile(outputFile, png_read(inputFile)); diff --git a/tools/imagecon/imagecon.h b/tools/imagecon/imagecon.h index 338cde8..3fdeeda 100644 --- a/tools/imagecon/imagecon.h +++ b/tools/imagecon/imagecon.h @@ -7,6 +7,7 @@ typedef struct { int height; int maxColors; int outputPalette; + int outputMask; char* overridePalette; int quantize; int verbose; diff --git a/tools/imagecon/rgba8.png b/tools/imagecon/rgba8.png new file mode 100644 index 0000000000000000000000000000000000000000..495d8c329d2808ff64b9d92e06c5b5f7816d5722 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^p+IcM!3HFwj)flvQdd1)978JRyuIVtakw$0zp81A`JnwB3!