glstuff

commit 658d7d2fa2cbae237af89484b07db1ff34024695
parent 877629f8495b35be2236f1786a667c1339ef4856
Author: Brian Swetland <swetland@frotz.net>
Date:   Wed, 16 Jan 2013 22:48:00 -0800

update mksdf to write 8bit gray PNGs instead of PGMs

Diffstat:
M
Makefile
 | 
4
++--
M
mksdf.c
 | 
22
++++++----------------

2 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/Makefile b/Makefile
@@ -12,8 +12,8 @@ COMMONOBJS := util.o sdlglue.o loadpng.o loadfile.o loadobj.o
 
 all: test1 test2 test3 test4 mksdf
 
-mksdf: mksdf.c loadpng.c
-	gcc -g -Wall -o mksdf mksdf.c loadpng.c -lm -lpng
+mksdf: mksdf.c loadpng.c savepng.c
+	gcc -g -Wall -o mksdf mksdf.c loadpng.c savepng.c -lm -lpng
 
 TEST1OBJS := test1.o $(COMMONOBJS)
 test1: $(TEST1OBJS)
diff --git a/mksdf.c b/mksdf.c
@@ -74,14 +74,13 @@ int main(int argc, char **argv) {
 	unsigned mw, mh;
 	int x, y;
 
-	if (argc < 2) {
-		fprintf(stderr,"usage: mksdf <pngfile> [ <size> ]\n");
+	if (argc != 4) {
+		fprintf(stderr,"usage: mksdf <pngfile> <size> <outfile>\n");
 		return -1;
-	} else if (argc < 3) {
-		mw = mh = 64;
-	} else {
-		mw = mh = atoi(argv[2]);
 	}
+
+	mw = mh = atoi(argv[2]);
+
 	if (!(map = malloc(mw * mh))) {
 		fprintf(stderr,"out of memory\n");
 		return -1;
@@ -95,15 +94,6 @@ int main(int argc, char **argv) {
 
 	generate(map, mw, mh, tw / mw);
 
-	/* output an ascii PGM for now */
-	printf("P2\n%d %d\n255\n", mw, mh);
-	for (y = 0; y < mh; y++) {
-		for (x = 0; x < mw; x++) 
-			printf("%d ", map[y*mw + x]);
-		printf("\n");
-	}
-	printf("\n");
-
-	return 0;
+	return save_png_gray(argv[3], map, mw, mh);
 }