From: Jason Woofenden <jason@jasonwoof.com>
Date: Wed, 6 Apr 2005 22:19:29 +0000 (+0000)
Subject: custom rocks
X-Git-Tag: 0.1~9
X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=commitdiff_plain;h=5bc27bd36ff9d698e4e757a5dd8f981b31cfaeab

custom rocks
---

diff --git a/Makefile b/Makefile
index 4c95ae4..f191d81 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,8 @@ my_objects := file.o score.o sound.o main.o $(if $(DEBUG),debug.o)
 libs := SFont.o
 objects := $(libs) $(my_objects)
 
+graphics := data/sprites/ship.png data/sprites/rock00.png data/sprites/rock01.png data/sprites/rock02.png data/sprites/rock03.png data/sprites/rock04.png data/sprites/rock05.png data/sprites/rock06.png data/sprites/rock07.png data/sprites/rock08.png data/sprites/rock09.png data/sprites/rock10.png data/sprites/rock11.png data/sprites/rock12.png data/sprites/rock13.png data/sprites/rock14.png data/sprites/rock15.png data/sprites/rock16.png data/sprites/rock17.png data/sprites/rock18.png data/sprites/rock19.png data/sprites/rock20.png data/sprites/rock21.png data/sprites/rock22.png data/sprites/rock23.png data/sprites/rock24.png data/sprites/rock25.png data/sprites/rock26.png data/sprites/rock27.png data/sprites/rock28.png data/sprites/rock29.png data/sprites/rock30.png data/sprites/rock31.png data/sprites/rock32.png data/sprites/rock33.png data/sprites/rock34.png data/sprites/rock35.png data/sprites/rock36.png data/sprites/rock37.png data/sprites/rock38.png data/sprites/rock39.png data/sprites/rock40.png data/sprites/rock41.png data/sprites/rock42.png data/sprites/rock43.png data/sprites/rock44.png data/sprites/rock45.png data/sprites/rock46.png data/sprites/rock47.png data/sprites/rock48.png data/sprites/rock49.png
+
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL) -o games -g games
 INSTALL_DATA = $(INSTALL) -m 644
@@ -30,7 +32,8 @@ INSTALL_DATA = $(INSTALL) -m 644
 DATA_PREFIX = /usr/share/vor
 PROGRAM_PREFIX = /usr/games/bin
 
-all: vor data/sprites/ship.png
+
+all: vor $(graphics)
 
 %.o: %.c
 	$(CC) $(cflags) -c -o $@ $<
@@ -52,6 +55,12 @@ data/sprites/ship.png: ship.pov pnmoutline Makefile
 	pnmtopng -transparent =white data/sprites/ship.pnm >$@
 	rm ship.png ship.pnm data/sprites/ship.pnm
 
+data/sprites/rock%.png: rocks.pov Makefile
+	povray -Irocks.pov -D +H52 +W52 +K`echo "$@" | grep -o '[0-9][0-9]'` +Fp -O$@.pnm
+	pnmcrop < $@.pnm > $@-c.pnm
+	pnmtopng -transparent black < $@-c.pnm > $@
+	rm $@.pnm $@-c.pnm
+
 clean:
 	rm -f *.o vor pnmoutline data/sprites/ship.png
 
diff --git a/config.h b/config.h
index 8e50c7a..9e2fd94 100644
--- a/config.h
+++ b/config.h
@@ -11,7 +11,7 @@
 #define YSIZE 480
 
 // number of rock image files.
-#define NROCKS 6
+#define NROCKS 50
 // image file containing font for score stuff.
 #define BIG_FONT_FILE "fonts/score.png"
 
diff --git a/data/sprites/rock0.png b/data/sprites/rock0.png
deleted file mode 100644
index 809aab2..0000000
Binary files a/data/sprites/rock0.png and /dev/null differ
diff --git a/data/sprites/rock1.png b/data/sprites/rock1.png
deleted file mode 100644
index 7cb937d..0000000
Binary files a/data/sprites/rock1.png and /dev/null differ
diff --git a/data/sprites/rock2.png b/data/sprites/rock2.png
deleted file mode 100644
index 23b2e8c..0000000
Binary files a/data/sprites/rock2.png and /dev/null differ
diff --git a/data/sprites/rock3.png b/data/sprites/rock3.png
deleted file mode 100644
index e233668..0000000
Binary files a/data/sprites/rock3.png and /dev/null differ
diff --git a/data/sprites/rock4.png b/data/sprites/rock4.png
deleted file mode 100644
index 51f9a89..0000000
Binary files a/data/sprites/rock4.png and /dev/null differ
diff --git a/data/sprites/rock5.png b/data/sprites/rock5.png
deleted file mode 100644
index b70f502..0000000
Binary files a/data/sprites/rock5.png and /dev/null differ
diff --git a/main.c b/main.c
index 058fbad..be5ae97 100644
--- a/main.c
+++ b/main.c
@@ -565,7 +565,7 @@ init(int fullscreen) {
 	for(i = 0; i<NROCKS; i++) {
 		char a[MAX_PATH_LEN];
 
-		snprintf(a,MAX_PATH_LEN,add_path("sprites/rock%d.png"),i);
+		snprintf(a,MAX_PATH_LEN,add_path("sprites/rock%02d.png"),i);
 		NULLERROR(temp = IMG_Load(a));
 		NULLERROR(surf_rock[i] = SDL_DisplayFormat(temp));
 	}