mirror of
https://github.com/deater/dos33fsprogs.git
synced 2024-06-12 11:29:37 +00:00
duke: work on map editor
This commit is contained in:
Vince Weaver
parent
88fafd9c06
commit
461b92653f
|
|
@ -91,5 +91,9 @@ int main(int argc, char **argv) {
|
|||
// note, peek/poke truncate?
|
||||
//2FORI=1013TO1141:C=(PEEK(1843+I/3)-32)/4^(I-INT(I/3)*3):POKEI,C+4*(PEEK(1041+I)-32-INT(C/4)):NEXT:&
|
||||
|
||||
// from Tom Greene @txgx42
|
||||
//1FORI=0TO141:POKE1013+I,4*PEEK(2126+I)-192+(PEEK(2267+I/3)-35)/4^(I-INT(I/3)*3):NEXT
|
||||
//2&",clV5QfWo3NQegoQoX&VPYo8,kYf]J+Y_60T9jb`6dkio^o<\2g000000?0003600L100?H0,B6$-<$I1.I<-?0..?-?0:O@):1K0O):1I7033N30H3-0012345.699<>7<<998654321S4J@M$K$DJ;3%#,1E##'##&*3SS+5[5+F'F//#W##E+D+%#
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,9 @@ DUKE: duke.o
|
|||
|
||||
duke.o: duke.s zp.inc hardware.inc duke.s \
|
||||
graphics/duke_graphics.inc \
|
||||
level1_data.inc \
|
||||
status_bar.s draw_duke.s gr_putsprite_crop.s \
|
||||
draw_tilemap.s \
|
||||
keyboard.s handle_laser.s
|
||||
ca65 -o duke.o duke.s -l duke.lst
|
||||
|
||||
|
|
|
|||
88
duke/draw_tilemap.s
Normal file
88
duke/draw_tilemap.s
Normal file
|
|
@ -0,0 +1,88 @@
|
|||
|
||||
|
||||
draw_tilemap:
|
||||
ldy #0 ; Y on screen currently drawing
|
||||
sty tiley ; we draw two at a time
|
||||
|
||||
ldx #1 ; offset in current screen
|
||||
stx tilemap_offset ; tilemap
|
||||
|
||||
lda #0 ; init odd/even
|
||||
sta tile_odd
|
||||
|
||||
tilemap_outer_loop:
|
||||
ldy tiley ; setup pointer to current Y
|
||||
lda gr_offsets,Y
|
||||
sta GBASL
|
||||
lda gr_offsets+1,Y
|
||||
clc
|
||||
adc DRAW_PAGE
|
||||
sta GBASH
|
||||
|
||||
ldy #6 ; we draw in window 6->34
|
||||
tilemap_loop:
|
||||
ldx tilemap_offset ; get actual tile
|
||||
lda tilemap,X
|
||||
|
||||
asl ; *4 ; get offset in tile
|
||||
asl
|
||||
tax
|
||||
|
||||
lda tile_odd
|
||||
beq not_odd_line
|
||||
inx
|
||||
inx
|
||||
not_odd_line:
|
||||
|
||||
lda tiles,X ; draw two tiles
|
||||
cmp #$AA ; transparency
|
||||
beq skip_tile1
|
||||
sta (GBASL),Y
|
||||
skip_tile1:
|
||||
|
||||
iny
|
||||
lda tiles+1,X
|
||||
cmp #$AA
|
||||
beq skip_tile2
|
||||
sta (GBASL),Y
|
||||
skip_tile2:
|
||||
iny
|
||||
|
||||
inc tilemap_offset
|
||||
|
||||
cpy #34 ; until done
|
||||
bne tilemap_loop
|
||||
|
||||
; move to next line
|
||||
lda tile_odd ; toggle odd/even
|
||||
eor #$1 ; (should we just add/mask?)
|
||||
sta tile_odd
|
||||
bne move_to_odd_line
|
||||
|
||||
move_to_even_line:
|
||||
lda tilemap_offset
|
||||
clc
|
||||
adc #2
|
||||
jmp done_move_to_line
|
||||
|
||||
move_to_odd_line:
|
||||
lda tilemap_offset
|
||||
sec
|
||||
sbc #14
|
||||
|
||||
done_move_to_line:
|
||||
sta tilemap_offset
|
||||
|
||||
ldy tiley ; move to next line
|
||||
iny
|
||||
iny
|
||||
sty tiley
|
||||
|
||||
cpy #40 ; check if at end
|
||||
bne tilemap_outer_loop
|
||||
|
||||
rts
|
||||
|
||||
tilemap_offset: .byte $00
|
||||
tile_odd: .byte $00
|
||||
tiley: .byte $00
|
||||
|
|
@ -38,7 +38,7 @@ duke_start:
|
|||
|
||||
lda #18
|
||||
sta DUKE_X
|
||||
lda #20
|
||||
lda #18
|
||||
sta DUKE_Y
|
||||
lda #1
|
||||
sta DUKE_DIRECTION
|
||||
|
|
@ -67,6 +67,10 @@ duke_loop:
|
|||
|
||||
jsr gr_copy_to_current
|
||||
|
||||
; draw tilemap
|
||||
|
||||
jsr draw_tilemap
|
||||
|
||||
; draw laser
|
||||
|
||||
jsr draw_laser
|
||||
|
|
@ -132,5 +136,6 @@ done_with_duke:
|
|||
|
||||
.include "draw_duke.s"
|
||||
.include "handle_laser.s"
|
||||
.include "draw_tilemap.s"
|
||||
|
||||
|
||||
.include "level1_data.inc"
|
||||
|
|
|
|||
30
duke/level1_data.inc
Normal file
30
duke/level1_data.inc
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
tiles:
|
||||
tile00: .byte $AA,$AA,$AA,$AA
|
||||
tile01: .byte $55,$55,$55,$55
|
||||
tile02: .byte $ff,$5f,$ff,$55
|
||||
tile03: .byte $5f,$5f,$55,$55
|
||||
tile04: .byte $5f,$ff,$5f,$ff
|
||||
tile05: .byte $ff,$55,$ff,$f5
|
||||
tile06: .byte $55,$55,$f5,$f5
|
||||
tile07: .byte $55,$ff,$f5,$ff
|
||||
tile08: .byte $55,$f5,$50,$f5
|
||||
tile09: .byte $ff,$55,$ff,$55
|
||||
tile0a: .byte $55,$ff,$55,$ff
|
||||
tile0b: .byte $99,$99,$09,$09
|
||||
tile0c: .byte $99,$59,$99,$88
|
||||
tile0d: .byte $59,$99,$99,$99
|
||||
tile0e: .byte $8f,$99,$09,$09
|
||||
tile0f: .byte $00,$76,$f7,$05
|
||||
|
||||
tilemap:
|
||||
.byte $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$09,$08,$01,$01,$01,$01
|
||||
.byte $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$05,$06,$06,$06,$06,$06
|
||||
.byte $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$0f,$00,$00,$00,$00,$00
|
||||
.byte $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
|
||||
.byte $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
|
||||
.byte $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
|
||||
.byte $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
|
||||
.byte $00,$00,$00,$00,$00,$00,$00,$0c,$0d,$00,$00,$00,$00,$00,$00,$00
|
||||
.byte $00,$00,$00,$00,$00,$00,$00,$0b,$0e,$00,$00,$00,$00,$00,$00,$00
|
||||
.byte $00,$00,$00,$00,$02,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03
|
||||
|
||||
27
duke/maps/Makefile
Normal file
27
duke/maps/Makefile
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
CC = gcc
|
||||
CFLAGS = -g -Wall -O2
|
||||
|
||||
all: level1_map.inc png2map
|
||||
|
||||
level1_map.inc: level1_map.png png2map
|
||||
./png2map level1_map.png level1_map.inc
|
||||
|
||||
###
|
||||
|
||||
loadpng.o: loadpng.c loadpng.h
|
||||
$(CC) $(CFLAGS) -c loadpng.c
|
||||
|
||||
rle_common.o: rle_common.c rle_common.h
|
||||
$(CC) $(CFLAGS) -c rle_common.c
|
||||
###
|
||||
|
||||
png2map: png2map.o loadpng.o
|
||||
$(CC) $(LFLAGS) -o png2map png2map.o loadpng.o -lpng
|
||||
|
||||
png2map.o: png2map.c loadpng.h
|
||||
$(CC) $(CFLAGS) -c png2map.c
|
||||
|
||||
###
|
||||
|
||||
clean:
|
||||
rm -f *~ *.o *.inc png2map
|
||||
34
duke/maps/level1_map.inc
Normal file
34
duke/maps/level1_map.inc
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
tiles:
|
||||
tile00: .byte $00,$00,$00,$00
|
||||
tile01: .byte $00,$00,$00,$00
|
||||
tile02: .byte $00,$00,$00,$00
|
||||
tile03: .byte $00,$00,$00,$00
|
||||
tile04: .byte $00,$00,$00,$00
|
||||
tile05: .byte $00,$00,$00,$00
|
||||
tile06: .byte $00,$00,$00,$00
|
||||
tile07: .byte $00,$00,$00,$00
|
||||
tile08: .byte $00,$00,$00,$00
|
||||
tile09: .byte $00,$00,$00,$00
|
||||
tile0a: .byte $00,$00,$00,$00
|
||||
tile0b: .byte $00,$00,$00,$00
|
||||
tile0c: .byte $00,$00,$00,$00
|
||||
tile0d: .byte $00,$00,$00,$00
|
||||
tile0e: .byte $00,$00,$00,$00
|
||||
tile0f: .byte $00,$00,$00,$00
|
||||
tile10: .byte $00,$00,$00,$00
|
||||
tile11: .byte $00,$00,$00,$00
|
||||
tile12: .byte $00,$00,$00,$00
|
||||
tile13: .byte $00,$00,$00,$00
|
||||
tile14: .byte $00,$00,$00,$00
|
||||
tile15: .byte $00,$00,$00,$00
|
||||
tile16: .byte $00,$00,$00,$00
|
||||
tile17: .byte $00,$00,$00,$00
|
||||
tile18: .byte $00,$00,$00,$00
|
||||
tile19: .byte $00,$00,$00,$00
|
||||
tile1a: .byte $00,$00,$00,$00
|
||||
tile1b: .byte $00,$00,$00,$00
|
||||
tile1c: .byte $00,$00,$00,$00
|
||||
tile1d: .byte $00,$00,$00,$00
|
||||
tile1e: .byte $00,$00,$00,$00
|
||||
tile1f: .byte $00,$00,$00,$00
|
||||
|
||||
BIN
duke/maps/level1_map.png
Normal file
BIN
duke/maps/level1_map.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.6 KiB |
490
duke/maps/loadpng.c
Normal file
490
duke/maps/loadpng.c
Normal file
|
|
@ -0,0 +1,490 @@
|
|||
/* Loads a 80x48 (or 40x48) PNG image into a 40x48 Apple II layout */
|
||||
/* It's not interleaved like an actual Apple II */
|
||||
/* But the top/bottom are pre-packed into a naive 40x24 array */
|
||||
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
#include <png.h>
|
||||
#include "loadpng.h"
|
||||
|
||||
static int convert_color(int color, char *filename) {
|
||||
|
||||
int c=0;
|
||||
|
||||
switch(color) {
|
||||
case 0x000000: c=0; break; /* black */
|
||||
case 0xe31e60: c=1; break; /* magenta */
|
||||
case 0x604ebd: c=2; break; /* dark blue */
|
||||
case 0xff44fd: c=3; break; /* purple */
|
||||
case 0x00a360: c=4; break; /* dark green */
|
||||
case 0x9c9c9c: c=5; break; /* grey 1 */
|
||||
case 0x14cffd: c=6; break; /* medium blue */
|
||||
case 0xd0c3ff: c=7; break; /* light blue */
|
||||
case 0x607203: c=8; break; /* brown */
|
||||
case 0xff6a3c: c=9; break; /* orange */
|
||||
case 0x9d9d9d: c=10; break; /* grey 2 */
|
||||
case 0xffa0d0: c=11; break; /* pink */
|
||||
case 0x14f53c: c=12; break; /* bright green */
|
||||
case 0xd0dd8d: c=13; break; /* yellow */
|
||||
case 0x72ffd0: c=14; break; /* aqua */
|
||||
case 0xffffff: c=15; break; /* white */
|
||||
default:
|
||||
fprintf(stderr,"Unknown color %x, file %s\n",
|
||||
color,filename);
|
||||
exit(-1);
|
||||
break;
|
||||
}
|
||||
|
||||
return c;
|
||||
}
|
||||
|
||||
/* expects a PNG where the xsize is either 1280x200 */
|
||||
|
||||
int loadpng(char *filename, unsigned char **image_ptr, int *xsize, int *ysize,
|
||||
int png_type) {
|
||||
|
||||
int x,y,ystart,yadd,xadd;
|
||||
int color;
|
||||
FILE *infile;
|
||||
int debug=0;
|
||||
unsigned char *image,*out_ptr;
|
||||
int width, height;
|
||||
int a2_color;
|
||||
|
||||
png_byte bit_depth;
|
||||
png_structp png_ptr;
|
||||
png_infop info_ptr;
|
||||
png_bytep *row_pointers;
|
||||
png_byte color_type;
|
||||
|
||||
unsigned char header[8];
|
||||
|
||||
/* open file and test for it being a png */
|
||||
infile = fopen(filename, "rb");
|
||||
if (infile==NULL) {
|
||||
fprintf(stderr,"Error! Could not open %s\n",filename);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Check the header */
|
||||
fread(header, 1, 8, infile);
|
||||
if (png_sig_cmp(header, 0, 8)) {
|
||||
fprintf(stderr,"Error! %s is not a PNG file\n",filename);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* initialize stuff */
|
||||
png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
|
||||
if (!png_ptr) {
|
||||
fprintf(stderr,"Error create_read_struct\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
info_ptr = png_create_info_struct(png_ptr);
|
||||
if (!info_ptr) {
|
||||
fprintf(stderr,"Error png_create_info_struct\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
png_init_io(png_ptr, infile);
|
||||
png_set_sig_bytes(png_ptr, 8);
|
||||
|
||||
png_read_info(png_ptr, info_ptr);
|
||||
|
||||
width = png_get_image_width(png_ptr, info_ptr);
|
||||
height = png_get_image_height(png_ptr, info_ptr);
|
||||
|
||||
if (width==1280) {
|
||||
*xsize=1280;
|
||||
xadd=1;
|
||||
}
|
||||
else {
|
||||
fprintf(stderr,"Unsupported width %d\n",width);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (png_type==PNG_WHOLETHING) {
|
||||
*ysize=height;
|
||||
ystart=0;
|
||||
yadd=2;
|
||||
}
|
||||
else if (png_type==PNG_ODDLINES) {
|
||||
*ysize=height/2;
|
||||
ystart=1;
|
||||
yadd=4;
|
||||
}
|
||||
else if (png_type==PNG_EVENLINES) {
|
||||
*ysize=height/2;
|
||||
ystart=0;
|
||||
yadd=4;
|
||||
}
|
||||
else {
|
||||
fprintf(stderr,"Unknown PNG type\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
color_type = png_get_color_type(png_ptr, info_ptr);
|
||||
bit_depth = png_get_bit_depth(png_ptr, info_ptr);
|
||||
|
||||
if (debug) {
|
||||
printf("PNG: width=%d height=%d depth=%d\n",width,height,bit_depth);
|
||||
if (color_type==PNG_COLOR_TYPE_RGB) printf("Type RGB\n");
|
||||
else if (color_type==PNG_COLOR_TYPE_RGB_ALPHA) printf("Type RGBA\n");
|
||||
else if (color_type==PNG_COLOR_TYPE_PALETTE) printf("Type palette\n");
|
||||
printf("Generating output size %d x %d\n",*xsize,*ysize);
|
||||
}
|
||||
|
||||
// number_of_passes = png_set_interlace_handling(png_ptr);
|
||||
png_read_update_info(png_ptr, info_ptr);
|
||||
|
||||
row_pointers = (png_bytep*) malloc(sizeof(png_bytep) * height);
|
||||
for (y=0; y<height; y++) {
|
||||
/* FIXME: do we ever free these? */
|
||||
row_pointers[y] = (png_byte*) malloc(png_get_rowbytes(png_ptr,info_ptr));
|
||||
}
|
||||
|
||||
png_read_image(png_ptr, row_pointers);
|
||||
|
||||
fclose(infile);
|
||||
|
||||
/* FIXME: this should be 40x24 max??? */
|
||||
image=calloc(width*height,sizeof(unsigned char));
|
||||
if (image==NULL) {
|
||||
fprintf(stderr,"Memory error!\n");
|
||||
return -1;
|
||||
}
|
||||
out_ptr=image;
|
||||
|
||||
if (color_type==PNG_COLOR_TYPE_RGB_ALPHA) {
|
||||
for(y=ystart;y<height;y+=yadd) {
|
||||
for(x=0;x<width;x+=xadd) {
|
||||
|
||||
/* top color */
|
||||
color= (row_pointers[y][x*xadd*4]<<16)+
|
||||
(row_pointers[y][x*xadd*4+1]<<8)+
|
||||
(row_pointers[y][x*xadd*4+2]);
|
||||
if (debug) {
|
||||
printf("%x ",color);
|
||||
}
|
||||
|
||||
a2_color=convert_color(color,filename);
|
||||
|
||||
/* bottom color */
|
||||
color= (row_pointers[y+1][x*xadd*4]<<16)+
|
||||
(row_pointers[y+1][x*xadd*4+1]<<8)+
|
||||
(row_pointers[y+1][x*xadd*4+2]);
|
||||
if (debug) {
|
||||
printf("%x ",color);
|
||||
}
|
||||
|
||||
a2_color|=(convert_color(color,filename)<<4);
|
||||
|
||||
*out_ptr=a2_color;
|
||||
out_ptr++;
|
||||
}
|
||||
if (debug) printf("\n");
|
||||
}
|
||||
}
|
||||
else if (color_type==PNG_COLOR_TYPE_PALETTE) {
|
||||
for(y=ystart;y<height;y+=yadd) {
|
||||
for(x=0;x<width;x+=xadd) {
|
||||
|
||||
if (bit_depth==8) {
|
||||
/* top color */
|
||||
a2_color=row_pointers[y][x];
|
||||
|
||||
/* bottom color */
|
||||
color=row_pointers[y+(yadd/2)][x];
|
||||
|
||||
a2_color|=(color<<4);
|
||||
|
||||
if (debug) {
|
||||
printf("%x ",a2_color);
|
||||
}
|
||||
|
||||
*out_ptr=a2_color;
|
||||
out_ptr++;
|
||||
}
|
||||
else if (bit_depth==4) {
|
||||
/* top color */
|
||||
a2_color=row_pointers[y][x/2];
|
||||
if (x%2==0) {
|
||||
a2_color=(a2_color>>4);
|
||||
}
|
||||
a2_color&=0xf;
|
||||
|
||||
/* bottom color */
|
||||
color=row_pointers[y+(yadd/2)][x/2];
|
||||
if (x%2==0) {
|
||||
color=(color>>4);
|
||||
}
|
||||
color&=0xf;
|
||||
|
||||
a2_color|=(color<<4);
|
||||
|
||||
if (debug) {
|
||||
printf("%x ",a2_color);
|
||||
}
|
||||
|
||||
*out_ptr=a2_color;
|
||||
out_ptr++;
|
||||
|
||||
}
|
||||
}
|
||||
if (debug) printf("\n");
|
||||
}
|
||||
}
|
||||
else {
|
||||
printf("Unknown color type\n");
|
||||
}
|
||||
|
||||
/* Stripe test image */
|
||||
// for(x=0;x<40;x++) for(y=0;y<40;y++) image[(y*width)+x]=y%16;
|
||||
|
||||
/*
|
||||
Addr Row /80 %40
|
||||
$400 0 0 0 0
|
||||
$428 28 16 0
|
||||
$450 50 32 0
|
||||
$480 80 2 1
|
||||
$4A8 a8 18 1
|
||||
$4D0 d0 34 1
|
||||
$500 100 3 2
|
||||
0,0 0,1 0,2....0,39 16,0 16,1 ....16,39 32,0..32,39, X X X X X X X X
|
||||
*/
|
||||
|
||||
*image_ptr=image;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* for 80 column mode or double-lores */
|
||||
int loadpng80(char *filename, unsigned char **image_ptr, int *xsize, int *ysize,
|
||||
int png_type) {
|
||||
|
||||
int x,y,ystart,yadd,xadd;
|
||||
int color;
|
||||
FILE *infile;
|
||||
int debug=0;
|
||||
unsigned char *image,*out_ptr;
|
||||
int width, height;
|
||||
int a2_color;
|
||||
|
||||
png_byte bit_depth;
|
||||
png_structp png_ptr;
|
||||
png_infop info_ptr;
|
||||
png_bytep *row_pointers;
|
||||
png_byte color_type;
|
||||
|
||||
unsigned char header[8];
|
||||
|
||||
/* open file and test for it being a png */
|
||||
infile = fopen(filename, "rb");
|
||||
if (infile==NULL) {
|
||||
fprintf(stderr,"Error! Could not open %s\n",filename);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Check the header */
|
||||
fread(header, 1, 8, infile);
|
||||
if (png_sig_cmp(header, 0, 8)) {
|
||||
fprintf(stderr,"Error! %s is not a PNG file\n",filename);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* initialize stuff */
|
||||
png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
|
||||
if (!png_ptr) {
|
||||
fprintf(stderr,"Error create_read_struct\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
info_ptr = png_create_info_struct(png_ptr);
|
||||
if (!info_ptr) {
|
||||
fprintf(stderr,"Error png_create_info_struct\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
png_init_io(png_ptr, infile);
|
||||
png_set_sig_bytes(png_ptr, 8);
|
||||
|
||||
png_read_info(png_ptr, info_ptr);
|
||||
|
||||
width = png_get_image_width(png_ptr, info_ptr);
|
||||
height = png_get_image_height(png_ptr, info_ptr);
|
||||
|
||||
if (width==80) {
|
||||
*xsize=80;
|
||||
xadd=1;
|
||||
}
|
||||
else {
|
||||
fprintf(stderr,"Unsupported width %d\n",width);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (png_type==PNG_WHOLETHING) {
|
||||
*ysize=height;
|
||||
ystart=0;
|
||||
yadd=2;
|
||||
}
|
||||
else if (png_type==PNG_ODDLINES) {
|
||||
*ysize=height/2;
|
||||
ystart=1;
|
||||
yadd=4;
|
||||
}
|
||||
else if (png_type==PNG_EVENLINES) {
|
||||
*ysize=height/2;
|
||||
ystart=0;
|
||||
yadd=4;
|
||||
}
|
||||
else {
|
||||
fprintf(stderr,"Unknown PNG type\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
color_type = png_get_color_type(png_ptr, info_ptr);
|
||||
bit_depth = png_get_bit_depth(png_ptr, info_ptr);
|
||||
|
||||
if (debug) {
|
||||
printf("PNG: width=%d height=%d depth=%d\n",width,height,bit_depth);
|
||||
if (color_type==PNG_COLOR_TYPE_RGB) printf("Type RGB\n");
|
||||
else if (color_type==PNG_COLOR_TYPE_RGB_ALPHA) printf("Type RGBA\n");
|
||||
else if (color_type==PNG_COLOR_TYPE_PALETTE) printf("Type palette\n");
|
||||
printf("Generating output size %d x %d\n",*xsize,*ysize);
|
||||
}
|
||||
|
||||
// number_of_passes = png_set_interlace_handling(png_ptr);
|
||||
png_read_update_info(png_ptr, info_ptr);
|
||||
|
||||
row_pointers = (png_bytep*) malloc(sizeof(png_bytep) * height);
|
||||
for (y=0; y<height; y++) {
|
||||
/* FIXME: do we ever free these? */
|
||||
row_pointers[y] = (png_byte*) malloc(png_get_rowbytes(png_ptr,info_ptr));
|
||||
}
|
||||
|
||||
png_read_image(png_ptr, row_pointers);
|
||||
|
||||
fclose(infile);
|
||||
|
||||
/* FIXME: this should be 40x24 max??? */
|
||||
image=calloc(width*height,sizeof(unsigned char));
|
||||
if (image==NULL) {
|
||||
fprintf(stderr,"Memory error!\n");
|
||||
return -1;
|
||||
}
|
||||
out_ptr=image;
|
||||
|
||||
if (color_type==PNG_COLOR_TYPE_RGB_ALPHA) {
|
||||
for(y=ystart;y<height;y+=yadd) {
|
||||
for(x=0;x<width;x+=xadd) {
|
||||
|
||||
/* top color */
|
||||
color= (row_pointers[y][x*xadd*4]<<16)+
|
||||
(row_pointers[y][x*xadd*4+1]<<8)+
|
||||
(row_pointers[y][x*xadd*4+2]);
|
||||
if (debug) {
|
||||
printf("%x ",color);
|
||||
}
|
||||
|
||||
a2_color=convert_color(color,filename);
|
||||
|
||||
/* bottom color */
|
||||
color= (row_pointers[y+1][x*xadd*4]<<16)+
|
||||
(row_pointers[y+1][x*xadd*4+1]<<8)+
|
||||
(row_pointers[y+1][x*xadd*4+2]);
|
||||
if (debug) {
|
||||
printf("%x ",color);
|
||||
}
|
||||
|
||||
a2_color|=(convert_color(color,filename)<<4);
|
||||
|
||||
*out_ptr=a2_color;
|
||||
out_ptr++;
|
||||
}
|
||||
if (debug) printf("\n");
|
||||
}
|
||||
}
|
||||
else if (color_type==PNG_COLOR_TYPE_PALETTE) {
|
||||
for(y=ystart;y<height;y+=yadd) {
|
||||
for(x=0;x<width;x+=xadd) {
|
||||
|
||||
if (bit_depth==8) {
|
||||
/* top color */
|
||||
a2_color=row_pointers[y][x];
|
||||
|
||||
/* bottom color */
|
||||
color=row_pointers[y+(yadd/2)][x];
|
||||
|
||||
a2_color|=(color<<4);
|
||||
|
||||
if (debug) {
|
||||
printf("%x ",a2_color);
|
||||
}
|
||||
|
||||
*out_ptr=a2_color;
|
||||
out_ptr++;
|
||||
}
|
||||
else if (bit_depth==4) {
|
||||
/* top color */
|
||||
a2_color=row_pointers[y][x/2];
|
||||
if (x%2==0) {
|
||||
a2_color=(a2_color>>4);
|
||||
}
|
||||
a2_color&=0xf;
|
||||
|
||||
/* bottom color */
|
||||
color=row_pointers[y+(yadd/2)][x/2];
|
||||
if (x%2==0) {
|
||||
color=(color>>4);
|
||||
}
|
||||
color&=0xf;
|
||||
|
||||
a2_color|=(color<<4);
|
||||
|
||||
if (debug) {
|
||||
printf("%x ",a2_color);
|
||||
}
|
||||
|
||||
*out_ptr=a2_color;
|
||||
out_ptr++;
|
||||
|
||||
}
|
||||
}
|
||||
if (debug) printf("\n");
|
||||
}
|
||||
}
|
||||
else {
|
||||
printf("Unknown color type\n");
|
||||
}
|
||||
|
||||
/* Stripe test image */
|
||||
// for(x=0;x<40;x++) for(y=0;y<40;y++) image[(y*width)+x]=y%16;
|
||||
|
||||
/*
|
||||
Addr Row /80 %40
|
||||
$400 0 0 0 0
|
||||
$428 28 16 0
|
||||
$450 50 32 0
|
||||
$480 80 2 1
|
||||
$4A8 a8 18 1
|
||||
$4D0 d0 34 1
|
||||
$500 100 3 2
|
||||
0,0 0,1 0,2....0,39 16,0 16,1 ....16,39 32,0..32,39, X X X X X X X X
|
||||
*/
|
||||
|
||||
*image_ptr=image;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
9
duke/maps/loadpng.h
Normal file
9
duke/maps/loadpng.h
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
#define PNG_WHOLETHING 0
|
||||
#define PNG_ODDLINES 1
|
||||
#define PNG_EVENLINES 2
|
||||
|
||||
int loadpng(char *filename, unsigned char **image_ptr, int *xsize, int *ysize,
|
||||
int png_type);
|
||||
int loadpng80(char *filename, unsigned char **image_ptr, int *xsize, int *ysize,
|
||||
int png_type);
|
||||
|
||||
64
duke/maps/png2map.c
Normal file
64
duke/maps/png2map.c
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
#include "loadpng.h"
|
||||
|
||||
|
||||
/* converts a png of map to format by our duke engine */
|
||||
|
||||
/* 1280x200 image */
|
||||
/* 256 sprites of size 2x4 in a 16x16 grid at 8,4 */
|
||||
|
||||
|
||||
static unsigned char tiles[256][2][4];
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
|
||||
int i,j;
|
||||
int numtiles=32;
|
||||
|
||||
unsigned char *image;
|
||||
int xsize,ysize;
|
||||
FILE *outfile;
|
||||
|
||||
if (argc<3) {
|
||||
fprintf(stderr,"Usage:\t%s INFILE OUTFILE\n\n",argv[0]);
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
outfile=fopen(argv[2],"w");
|
||||
if (outfile==NULL) {
|
||||
fprintf(stderr,"Error! Could not open %s\n",argv[2]);
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
if (loadpng(argv[1],&image,&xsize,&ysize,PNG_WHOLETHING)<0) {
|
||||
fprintf(stderr,"Error loading png!\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
fprintf(stderr,"Loaded image %d by %d\n",xsize,ysize);
|
||||
|
||||
|
||||
fprintf(outfile,"tiles:\n");
|
||||
for(i=0;i<numtiles;i++) {
|
||||
fprintf(outfile,"tile%02x:\t.byte ",i);
|
||||
for(j=0;j<4;j++) {
|
||||
fprintf(outfile,"$%02x",tiles[i][0][0]);
|
||||
if (j!=3) fprintf(outfile,",");
|
||||
}
|
||||
fprintf(outfile,"\n");
|
||||
}
|
||||
|
||||
fprintf(outfile,"\n");
|
||||
|
||||
fclose(outfile);
|
||||
|
||||
return 0;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user