mirror of
https://github.com/deater/dos33fsprogs.git
synced 2025-02-21 07:29:18 +00:00
dhgr_viewer: automate
This commit is contained in:
Vince Weaver
parent
95451c2149
commit
bf13f24098
31
graphics/dhgr_viewer/Makefile
Normal file
31
graphics/dhgr_viewer/Makefile
Normal file
@ -0,0 +1,31 @@
|
||||
include ../../Makefile.inc
|
||||
|
||||
DOS33 = ../../utils/dos33fs-utils/dos33
|
||||
B2D = ../../utils/bmp2dhr/b2d
|
||||
PNG_TO_40x96 = ../../utils/gr-utils/png_to_40x96
|
||||
PNG_TO_RLE = ../../utils/gr-utils/png2rle
|
||||
EMPTY_DISK = ../../empty_disk/empty.dsk
|
||||
TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft
|
||||
|
||||
all: make_dhgr_viewer
|
||||
|
||||
|
||||
###
|
||||
|
||||
make_dhgr_viewer: make_dhgr_viewer.o
|
||||
$(CC) $(LFLAGS) -o make_dhgr_viewer make_dhgr_viewer.o
|
||||
|
||||
make_dhgr_viewer.o: make_dhgr_viewer.c
|
||||
$(CC) $(CFLAGS) -c make_dhgr_viewer.c
|
||||
|
||||
###
|
||||
|
||||
HELLO: hello.bas
|
||||
$(TOKENIZE) < hello.bas > HELLO
|
||||
|
||||
###
|
||||
|
||||
|
||||
clean:
|
||||
rm -f *~ *.o *.lst HELLO make_dhgr_viewer
|
||||
|
||||
288
graphics/dhgr_viewer/make_dhgr_viewer.c
Normal file
288
graphics/dhgr_viewer/make_dhgr_viewer.c
Normal file
@ -0,0 +1,288 @@
|
||||
/* TODO: bail if will over-write files */
|
||||
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#define MAX_FILES 1024
|
||||
|
||||
static char *png_filenames[MAX_FILES];
|
||||
static char *zx02_aux_filenames[MAX_FILES];
|
||||
static char *zx02_bin_filenames[MAX_FILES];
|
||||
static char *labels[MAX_FILES];
|
||||
|
||||
/* Format:
|
||||
|
||||
file_label FILE.ZX02 file.png
|
||||
|
||||
*/
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
|
||||
char *result;
|
||||
char string[BUFSIZ];
|
||||
int num_files=0;
|
||||
int i,j,count,line=0;
|
||||
char temp_png[BUFSIZ];
|
||||
char temp_zx02[BUFSIZ];
|
||||
char temp_label[BUFSIZ];
|
||||
char s_filename[BUFSIZ];
|
||||
char filename_base[BUFSIZ];
|
||||
char temp[BUFSIZ];
|
||||
|
||||
FILE *sss;
|
||||
|
||||
/******************************************/
|
||||
/* parse command line */
|
||||
/******************************************/
|
||||
|
||||
if (argc>1) {
|
||||
strcpy(filename_base,argv[1]);
|
||||
}
|
||||
else {
|
||||
strcpy(filename_base,"dhires_plain");
|
||||
}
|
||||
sprintf(s_filename,"%s.s",filename_base);
|
||||
|
||||
/******************************************/
|
||||
/* scan in data */
|
||||
/******************************************/
|
||||
|
||||
while(1) {
|
||||
line++;
|
||||
result=fgets(string,BUFSIZ,stdin);
|
||||
if (result==NULL) {
|
||||
break;
|
||||
}
|
||||
if (result[0]=='#') continue;
|
||||
|
||||
count=sscanf(string,"%s %s %s",temp_label,temp_zx02,temp_png);
|
||||
if (count!=3) {
|
||||
fprintf(stderr,"WARNING! weird input line %d (%d)\n",line,count);
|
||||
fprintf(stderr,"\t%s",string);
|
||||
}
|
||||
else {
|
||||
labels[num_files]=strdup(temp_label);
|
||||
png_filenames[num_files]=strdup(temp_png);
|
||||
|
||||
sprintf(temp,"%s.AUX.ZX02",temp_zx02);
|
||||
zx02_aux_filenames[num_files]=strdup(temp);
|
||||
|
||||
sprintf(temp,"%s.BIN.ZX02",temp_zx02);
|
||||
zx02_bin_filenames[num_files]=strdup(temp);
|
||||
|
||||
num_files++;
|
||||
if (num_files>=MAX_FILES) {
|
||||
fprintf(stderr,"ERROR! Too many files!\n");
|
||||
exit(-1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (num_files==0) {
|
||||
fprintf(stderr,"ERROR! No files found!\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
/******************************************/
|
||||
/* generate S file */
|
||||
/******************************************/
|
||||
|
||||
sss=fopen(s_filename,"w");
|
||||
if (sss==NULL) {
|
||||
fprintf(stderr,"ERRROR opening %s\n",s_filename);
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
|
||||
fprintf(sss,"; Some nice hires images\n\n");
|
||||
fprintf(sss,".include \"../dhires_main.s\"\n\n");
|
||||
fprintf(sss,"MAX_FILES = %d\n\n",num_files);
|
||||
|
||||
fprintf(sss,"bin_filenames_low:\n");
|
||||
for(i=0;i<num_files;i++) {
|
||||
fprintf(sss,"\t.byte <%s_filename_bin\n",labels[i]);
|
||||
}
|
||||
fprintf(sss,"\n");
|
||||
|
||||
fprintf(sss,"bin_filenames_high:\n");
|
||||
for(i=0;i<num_files;i++) {
|
||||
fprintf(sss,"\t.byte >%s_filename_bin\n",labels[i]);
|
||||
}
|
||||
fprintf(sss,"\n");
|
||||
|
||||
fprintf(sss,"aux_filenames_low:\n");
|
||||
for(i=0;i<num_files;i++) {
|
||||
fprintf(sss,"\t.byte <%s_filename_aux\n",labels[i]);
|
||||
}
|
||||
fprintf(sss,"\n");
|
||||
|
||||
fprintf(sss,"aux_filenames_high:\n");
|
||||
for(i=0;i<num_files;i++) {
|
||||
fprintf(sss,"\t.byte >%s_filename_aux\n",labels[i]);
|
||||
}
|
||||
fprintf(sss,"\n");
|
||||
|
||||
|
||||
fprintf(sss,"; filename to open is 30-character Apple text:\n");
|
||||
|
||||
for(i=0;i<num_files;i++) {
|
||||
fprintf(sss,"%s_filename_bin:\t; %s\n",labels[i],zx02_bin_filenames[i]);
|
||||
fprintf(sss,"\t.byte ");
|
||||
for(j=0;j<strlen(zx02_bin_filenames[i]);j++) {
|
||||
if (j!=0) fprintf(sss,",");
|
||||
fprintf(sss,"\'%c\'|$80",zx02_bin_filenames[i][j]);
|
||||
}
|
||||
fprintf(sss,",$00\n\n");
|
||||
|
||||
fprintf(sss,"%s_filename_aux:\t; %s\n",labels[i],zx02_aux_filenames[i]);
|
||||
fprintf(sss,"\t.byte ");
|
||||
for(j=0;j<strlen(zx02_aux_filenames[i]);j++) {
|
||||
if (j!=0) fprintf(sss,",");
|
||||
fprintf(sss,"\'%c\'|$80",zx02_aux_filenames[i][j]);
|
||||
}
|
||||
fprintf(sss,",$00\n\n");
|
||||
|
||||
|
||||
}
|
||||
fclose(sss);
|
||||
|
||||
|
||||
/******************************************/
|
||||
/* generate Makefile */
|
||||
/******************************************/
|
||||
|
||||
/* don't over-write as a precaution */
|
||||
if (access("Makefile", F_OK) == 0) {
|
||||
fprintf(stderr,"Makefile already exists! Out of caution giving up.\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
sss=fopen("Makefile","w");
|
||||
if (sss==NULL) {
|
||||
fprintf(stderr,"ERRROR opening Makefile\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
fprintf(sss,"include ../../../Makefile.inc\n\n");
|
||||
fprintf(sss,"ZX02 = ~/research/6502_compression/zx02.git/build/zx02\n");
|
||||
fprintf(sss,"PNG_TO_HGR = ../../../utils/hgr-utils/png2hgr\n");
|
||||
fprintf(sss,"LINKER_SCRIPTS = ../../../linker_scripts\n");
|
||||
fprintf(sss,"DOS33 = ../../../utils/dos33fs-utils/dos33\n");
|
||||
fprintf(sss,"EMPTY_DISK = ../../../empty_disk/empty.dsk\n");
|
||||
fprintf(sss,"TOKENIZE = ../../../utils/asoft_basic-utils/tokenize_asoft\n");
|
||||
|
||||
fprintf(sss,"\n");
|
||||
|
||||
fprintf(sss,"all:\t%s.dsk\n\n",filename_base);
|
||||
|
||||
fprintf(sss,"####\n\n");
|
||||
|
||||
fprintf(sss,"DHIRES:\t%s.o\n",filename_base);
|
||||
fprintf(sss,"\tld65 -o DHIRES %s.o -C $(LINKER_SCRIPTS)/apple2_c00.inc\n\n",filename_base);
|
||||
|
||||
fprintf(sss,"%s.o:\t%s.s ../dhires_main.s ../zx02_optim.s \\\n",filename_base,filename_base);
|
||||
fprintf(sss,"\t\t../zp.inc ../hardware.inc\n");
|
||||
fprintf(sss,"\tca65 -o %s.o %s.s -l %s.lst\n",filename_base,filename_base,filename_base);
|
||||
|
||||
fprintf(sss,"####\n\n");
|
||||
|
||||
fprintf(sss,"HELLO:\t../hello.bas\n");
|
||||
fprintf(sss,"\t$(TOKENIZE) < ../hello.bas > HELLO\n\n");
|
||||
|
||||
fprintf(sss,"####\n\n");
|
||||
|
||||
fprintf(sss,"%s.dsk:\tHELLO DHIRES\\\n",filename_base);
|
||||
for(i=0;i<num_files;i++) {
|
||||
fprintf(sss,"\t\t%s.aux.zx02 %s.bin.zx02",
|
||||
png_filenames[i],png_filenames[i]);
|
||||
if (i!=(num_files-1)) {
|
||||
fprintf(sss,"\\");
|
||||
}
|
||||
fprintf(sss,"\n");
|
||||
}
|
||||
fprintf(sss,"\tcp $(EMPTY_DISK) %s.dsk\n",filename_base);
|
||||
fprintf(sss,"\t$(DOS33) -y %s.dsk SAVE A HELLO\n",filename_base);
|
||||
fprintf(sss,"\t$(DOS33) -y %s.dsk BSAVE -a 0x0c00 DHIRES\n",filename_base);
|
||||
for(i=0;i<num_files;i++) {
|
||||
fprintf(sss,"\t$(DOS33) -y %s.dsk BSAVE -a 0xa000 %s.aux.zx02 %s\n",
|
||||
filename_base,
|
||||
png_filenames[i],zx02_aux_filenames[i]);
|
||||
fprintf(sss,"\t$(DOS33) -y %s.dsk BSAVE -a 0xa000 %s.bin.zx02 %s\n",
|
||||
filename_base,
|
||||
png_filenames[i],zx02_bin_filenames[i]);
|
||||
}
|
||||
|
||||
fclose(sss);
|
||||
|
||||
|
||||
/******************************************/
|
||||
/* generate Makefile.graphics */
|
||||
/******************************************/
|
||||
|
||||
sss=fopen("Makefile.graphics","w");
|
||||
if (sss==NULL) {
|
||||
fprintf(stderr,"ERRROR opening Makefile\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
fprintf(sss,"include ../../../Makefile.inc\n\n");
|
||||
fprintf(sss,"ZX02 = ~/research/6502_compression/zx02.git/build/zx02\n");
|
||||
fprintf(sss,"PNG_TO_HGR = ../../../utils/hgr-utils/png2hgr\n");
|
||||
fprintf(sss,"PNG_TO_DHGR = ../../../utils/hgr-utils/png2dhgr\n");
|
||||
fprintf(sss,"LINKER_SCRIPTS = ../../../linker_scripts\n");
|
||||
fprintf(sss,"DOS33 = ../../../utils/dos33fs-utils/dos33\n");
|
||||
fprintf(sss,"EMPTY_DISK = ../../../empty_disk/empty.dsk\n");
|
||||
fprintf(sss,"TOKENIZE = ../../../utils/asoft_basic-utils/tokenize_asoft\n");
|
||||
|
||||
fprintf(sss,"\n");
|
||||
|
||||
fprintf(sss,"all:\\\n");
|
||||
for(i=0;i<num_files;i++) {
|
||||
fprintf(sss,"\t\t%s.aux.zx02 %s.bin.zx02",
|
||||
png_filenames[i],png_filenames[i]);
|
||||
if (i!=(num_files-1)) {
|
||||
fprintf(sss,"\\");
|
||||
}
|
||||
fprintf(sss,"\n");
|
||||
}
|
||||
|
||||
// fprintf(sss,"\tcp $(EMPTY_DISK) %s.dsk\n",filename_base);
|
||||
// fprintf(sss,"\t$(DOS33) -y %s.dsk SAVE A HELLO\n",filename_base);
|
||||
// fprintf(sss,"\t$(DOS33) -y %s.dsk BSAVE -a 0x0c00 HIRES\n",filename_base);
|
||||
// for(i=0;i<num_files;i++) {
|
||||
// fprintf(sss,"\t$(DOS33) -y %s.dsk BSAVE -a 0xa000 %s.hgr.zx02 %s\n",
|
||||
// filename_base,
|
||||
// png_filenames[i],zx02_filenames[i]);
|
||||
// }
|
||||
|
||||
|
||||
for(i=0;i<num_files;i++) {
|
||||
|
||||
fprintf(sss,"\n####\n\n");
|
||||
fprintf(sss,"%s.aux.zx02:\t%s.AUX\n",png_filenames[i],png_filenames[i]);
|
||||
fprintf(sss,"\t$(ZX02) %s.AUX %s.aux.zx02\n",png_filenames[i],png_filenames[i]);
|
||||
fprintf(sss,"\n");
|
||||
fprintf(sss,"%s.AUX:\t%s.png\n",png_filenames[i],png_filenames[i]);
|
||||
fprintf(sss,"\t$(PNG_TO_DHGR) %s.png %s\n",png_filenames[i],png_filenames[i]);
|
||||
fprintf(sss,"\n");
|
||||
|
||||
fprintf(sss,"%s.bin.zx02:\t%s.BIN\n",png_filenames[i],png_filenames[i]);
|
||||
fprintf(sss,"\t$(ZX02) %s.BIN %s.bin.zx02\n",png_filenames[i],png_filenames[i]);
|
||||
fprintf(sss,"\n");
|
||||
fprintf(sss,"%s.BINr:\t%s.png\n",png_filenames[i],png_filenames[i]);
|
||||
fprintf(sss,"\t$(PNG_TO_DHGR) %s.png %s\n",png_filenames[i],png_filenames[i]);
|
||||
fprintf(sss,"\n");
|
||||
|
||||
}
|
||||
|
||||
fprintf(sss,"####\n\n");
|
||||
fprintf(sss,"clean:\n");
|
||||
fprintf(sss,"\trm -f *~ *.o *.lst\n\n");
|
||||
|
||||
fclose(sss);
|
||||
|
||||
return 0;
|
||||
}
|
||||
BIN
graphics/dhgr_viewer/plain/c64.png
Normal file
BIN
graphics/dhgr_viewer/plain/c64.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.8 KiB |
4
graphics/dhgr_viewer/plain/plain.data
Normal file
4
graphics/dhgr_viewer/plain/plain.data
Normal file
@ -0,0 +1,4 @@
|
||||
# label dos3.3 name prefix for png file
|
||||
c64 C64 c64 '
|
||||
stardew_dhgr STARDEW stardew_dhgr '
|
||||
sworg SWORG sworg '
|
||||
BIN
graphics/dhgr_viewer/plain/stardew_dhgr.png
Normal file
BIN
graphics/dhgr_viewer/plain/stardew_dhgr.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 36 KiB |
BIN
graphics/dhgr_viewer/plain/sworg.png
Normal file
BIN
graphics/dhgr_viewer/plain/sworg.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 21 KiB |
@ -71,6 +71,7 @@ int loadpng(char *filename,
|
||||
unsigned char *image,*out_ptr;
|
||||
int width, height;
|
||||
int a2_color;
|
||||
int skip=1;
|
||||
|
||||
png_byte bit_depth;
|
||||
png_structp png_ptr;
|
||||
@ -121,11 +122,15 @@ int loadpng(char *filename,
|
||||
color_type = png_get_color_type(png_ptr, info_ptr);
|
||||
bit_depth = png_get_bit_depth(png_ptr, info_ptr);
|
||||
|
||||
if (width!=140) {
|
||||
if ((width!=140) && (width!=280)) {
|
||||
fprintf(stderr,"Unknown width %d\n",width);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (width==280) {
|
||||
skip=2;
|
||||
}
|
||||
|
||||
if (height!=192) {
|
||||
fprintf(stderr,"Unknown height %d\n",height);
|
||||
return -1;
|
||||
@ -183,7 +188,7 @@ int loadpng(char *filename,
|
||||
|
||||
|
||||
for(y=0;y<height;y++) {
|
||||
for(x=0;x<width;x++) {
|
||||
for(x=0;x<width;x+=skip) {
|
||||
|
||||
color= (row_pointers[y][x*bytes_per_pixel]<<16)+
|
||||
(row_pointers[y][x*bytes_per_pixel+1]<<8)+
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user