X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=rocks.c;h=ed98cac172b5781bd55f2a13ef705a8285eecfcd;hp=1e69ce2342a2bad00e5f5023b4ee364314f1467b;hb=148882a3cc520f34616a1175ed157fe258d68dcc;hpb=36430b3c87da1304d1de5bf9d294545f46d6f3a0

diff --git a/rocks.c b/rocks.c
index 1e69ce2..ed98cac 100644
--- a/rocks.c
+++ b/rocks.c
@@ -3,175 +3,225 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "common.h"
 #include "config.h"
 #include "file.h"
 #include "globals.h"
+#include "mt.h"
 #include "rocks.h"
-#include "shape.h"
+#include "sprite.h"
 
-struct rock_struct {
-	float x,y,dx,dy;
-	int active;
-	SDL_Surface *image;
-	struct shape *shape;
-	int type_number;
-}; 
+static struct rock rocks[MAXROCKS];
+static struct rock prototypes[NROCKS];
 
-struct rock_struct rock[MAXROCKS], *rockptr = rock;
+// timers for rock generation.
+static float rtimers[4];
 
-float rockrate;
+uint32_t nrocks = NORMAL_I_ROCKS;
+uint32_t initial_rocks = NORMAL_I_ROCKS;
+uint32_t final_rocks = NORMAL_F_ROCKS;
+float nrocks_timer = 0;
+float nrocks_inc_ticks = 2*60*20/(NORMAL_F_ROCKS-NORMAL_I_ROCKS);
 
-SDL_Surface *surf_rock[NROCKS];
-struct shape rock_shapes[NROCKS];
+// constants for rock generation.
+#define KH (32*20)  // 32 s for a speed=1 rock to cross the screen horizontally.
+#define KV (24*20)  // 24 s for a speed=1 rock to cross the screen vertically.
+#define RDX 2.5  // range for rock dx values (+/-)
+#define RDY 2.5  // range for rock dy values (+/-)
 
-float rockhtimer = 0;
-int nrocks = 41;
-
-float rnd(void);
-
-// used for rock generation.
-#define KH (1.0/32.0)
-#define KV (1.0/24.0)
-#define RXMIN 5.0
-#define RXMAX 10.0
-#define RYMIN (-0.5)
-#define RYMAX 0.5
-
-
-int
-init_rocks(void)
+void
+reset_rocks(void)
 {
-	int i;
-	char a[MAX_PATH_LEN];
-	SDL_Surface *temp;
-
-	for(i = 0; i<NROCKS; 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));
-		get_shape(surf_rock[i], &rock_shapes[i]);
-	}
-	return 0;
+	nrocks = initial_rocks;
+	nrocks_inc_ticks = 2*60*20/(final_rocks-initial_rocks);
+	nrocks_timer = 0;
 }
 
+#define ROCK_LEN sizeof("sprites/rockXX.png")
+
 void
-reset_rocks(void)
+load_rocks(void)
 {
 	int i;
+	char a[ROCK_LEN];
+
+	for(i=0; i<NROCKS; i++) {
+		snprintf(a, ROCK_LEN, "sprites/rock%02d.png", i);
+		load_sprite(SPRITE(&prototypes[i]), a);
+		prototypes[i].sprite_type = ROCK;
+		prototypes[i].flags = MOVE|DRAW|COLLIDE;
+	}
+
+	memset(rocks, 0, MAXROCKS*sizeof(struct rock));
 
-	for(i = 0; i<MAXROCKS; i++ ) rock[i].active = 0;
+	for(i=1; i<MAXROCKS; i++) rocks[i].next = &rocks[i-1];
+	free_sprites[ROCK] = SPRITE(&rocks[MAXROCKS-1]);
 
-	rockrate = 54.0;
+	reset_rocks();
 }
 
+enum { LEFT, RIGHT, TOP, BOTTOM };
+
+
+// compute the number of rocks/tick that should be coming from each side,
+// and the speed ranges of rocks coming from each side
 void
-new_rocks(void)
+rock_sides(float *ti, float *speed_min, float *speed_max)
 {
-	int i = 0;
-	float hfactor = KH*nrocks*7.5;
-
-	rockhtimer += hfactor*gamerate/20;
-	if(rockhtimer >= 1) {
-		while(rockptr->active && i<MAXROCKS) {
-			if(++rockptr - rock >= MAXROCKS) rockptr = rock;
-			i++;
+	float dx0,dx1, dy0,dy1;
+	float hfactor, vfactor;
+	int i;
+
+	for(i=0; i<4; i++) ti[i] = 0;
+	for(i=0; i<4; i++) speed_min[i] = 0;
+	for(i=0; i<4; i++) speed_max[i] = 0;
+	hfactor = (float)nrocks/KH; vfactor = (float)nrocks/KV;
+
+	dx0 = -RDX - screendx; dx1 = RDX - screendx;
+	dy0 = -RDY - screendy; dy1 = RDY - screendy;
+
+	if(dx0 < 0) {
+		speed_max[RIGHT] = -dx0;
+		if(dx1 < 0) {
+			// Rocks moving left only. So the RIGHT side of the screen
+			speed_min[RIGHT] = -dx1;
+			ti[RIGHT] = -(dx0+dx1)/2;
+		} else {
+			// Rocks moving left and right
+			speed_max[LEFT] = dx1;
+			ti[RIGHT] = -dx0/2;
+			ti[LEFT] = dx1/2;
 		}
-		if(!rockptr->active) {
-			rockhtimer -= 1;
-			rockptr->dx = -5.0*(1.0 + rnd());
-			rockptr->dy = rnd()-0.5;
-			rockptr->type_number = random() % NROCKS;
-			rockptr->image = surf_rock[rockptr->type_number];
-			rockptr->shape = &rock_shapes[rockptr->type_number];
-			rockptr->x = (float)XSIZE;
-			rockptr->y = rnd()*(YSIZE + rockptr->image->h);
-			rockptr->active = 1;
+	} else {
+		// Rocks moving right only. So the LEFT side of the screen
+		speed_min[LEFT] = dx0;
+		speed_max[LEFT] = dx1;
+		ti[LEFT] = (dx0+dx1)/2;
+	}
+	ti[LEFT] *= hfactor;
+	ti[RIGHT] *= hfactor;
+
+	if(dy0 < 0) {
+		speed_max[BOTTOM] = -dy0;
+		if(dy1 < 0) {
+			// Rocks moving up only. So the BOTTOM of the screen
+			speed_min[BOTTOM] = -dy1;
+			ti[BOTTOM] = -(dy0+dy1)/2;
+		} else {
+			// Rocks moving up and down
+			speed_max[TOP] = dy1;
+			ti[BOTTOM] = -dy0/2;
+			ti[TOP] = dy1/2;
 		}
+	} else {
+		// Rocks moving down only. so the TOP of the screen
+		speed_min[TOP] = dy0;
+		speed_max[TOP] = dy1;
+		ti[TOP] = (dy0+dy1)/2;
 	}
+	ti[TOP] *= vfactor;
+	ti[BOTTOM] *= vfactor;
+}
+
+float
+weighted_rnd_range(float min, float max) {
+	return sqrt(min * min + frnd() * (max * max - min * min));
 }
 
 void
-move_rocks(void)
+new_rocks(void)
 {
-	int i;
+	int i, type;
+	struct rock *r;
+	float ti[4];
+	float rmin[4];
+	float rmax[4];
+
+	if(nrocks < final_rocks) {
+		nrocks_timer += t_frame;
+		if(nrocks_timer >= nrocks_inc_ticks) {
+			nrocks_timer -= nrocks_inc_ticks;
+			nrocks++;
+		}
+	}
 
-	// Move all the rocks
-	for(i = 0; i < MAXROCKS; i++) {
-		if(rock[i].active) {
-			// move
-			rock[i].x += rock[i].dx*gamerate;
-			rock[i].y += rock[i].dy*gamerate + yscroll;
-			// clip
-			if(rock[i].y < -rock[i].image->h || rock[i].y > YSIZE) {
-				// rock[i].active = 0;
-				rock[i].y = (YSIZE - rock[i].image->h) - rock[i].y;
-				rock[i].y += (rock[i].dy*gamerate + yscroll) * 1.01;
+	rock_sides(ti, rmin, rmax);
+
+	// increment timers
+	for(i=0; i<4; i++) rtimers[i] += ti[i]*t_frame;
+
+	// generate rocks
+	for(i=0; i<4; i++) {
+		while(rtimers[i] >= 1) {
+			rtimers[i] -= 1;
+			if(!free_sprites[ROCK]) return;  // sorry, we ran out of rocks!
+			r = (struct rock *) remove_sprite(&free_sprites[ROCK]);
+			type = urnd() % NROCKS;
+			*r = prototypes[type];
+			r->type = type;
+			switch(i) {
+				case RIGHT:
+					r->x = XSIZE;
+					r->y = frnd()*(YSIZE + r->image->h);
+
+					r->dx = -weighted_rnd_range(rmin[i], rmax[i]) + screendx;
+					r->dy = RDY*crnd();
+					break;
+				case LEFT:
+					r->x = -r->image->w;
+					r->y = frnd()*(YSIZE + r->image->h);
+
+					r->dx = weighted_rnd_range(rmin[i], rmax[i]) + screendx;
+					r->dy = RDY*crnd();
+					break;
+				case BOTTOM:
+					r->x = frnd()*(XSIZE + r->image->w);
+					r->y = YSIZE;
+
+					r->dx = RDX*crnd();
+					r->dy = -weighted_rnd_range(rmin[i], rmax[i]) + screendy;
+					break;
+				case TOP:
+					r->x = frnd()*(XSIZE + r->image->w);
+					r->y = -r->image->h;
+
+					r->dx = RDX*crnd();
+					r->dy = weighted_rnd_range(rmin[i], rmax[i]) + screendy;
+					break;
 			}
-			if(rock[i].x < -rock[i].image->w || rock[i].x > XSIZE) rock[i].active = 0;
+			add_sprite(SPRITE(r));
 		}
 	}
 }
 
+
 void
 draw_rocks(void)
 {
 	int i;
-	SDL_Rect src, dest;
-
-	src.x = 0; src.y = 0;
-
-	for(i = 0; i<MAXROCKS; i++) {
-		if(rock[i].active) {
-			src.w = rock[i].image->w;
-			src.h = rock[i].image->h;
-
-			dest.w = src.w;
-			dest.h = src.h;
-			dest.x = (int) rock[i].x;
-			dest.y = (int) rock[i].y;
-
-			SDL_BlitSurface(rock[i].image,&src,surf_screen,&dest);
-
-		}
-	}
-}
-
-int
-hit_rocks(float x, float y, struct shape *shape)
-{
-	int i;
-
-	for(i=0; i<MAXROCKS; i++) {
-		if(rock[i].active) {
-			if(collide(x-rock[i].x, y-rock[i].y, rock[i].shape, shape)) 
-				return 1;
-		}
-	}
-	return 0;
+	for(i=0; i<MAXROCKS; i++) draw_sprite(SPRITE(&rocks[i]));
 }
 
 void
-blast_rocks(float x, float y, float radius, int onlyslow)
+blast_rocks(float x, float y, float radius)
 {
 	int i;
+	Sprite *r;
 	float dx, dy, n;
 
-	for(i = 0; i<MAXROCKS; i++ ) {
-		if(rock[i].x <= 0) continue;
-
-		// This makes it so your explosion from dying magically doesn't leave
-		// any rocks that aren't moving much on the x axis. If onlyslow is set,
-		// only rocks that are barely moving will be pushed.
-		if(onlyslow && (rock[i].dx < -4 || rock[i].dx > 3)) continue;
+	for(i=0; i<MAXROCKS; i++) {
+		if(!rocks[i].flags) continue;
+		r = SPRITE(&rocks[i]);
+		if(r->x <= 0) continue;
 
-		dx = rock[i].x - x;
-		dy = rock[i].y - y;
+		dx = r->x - x;
+		dy = r->y - y;
 
 		n = sqrt(dx*dx + dy*dy);
 		if(n < radius) {
-			n *= 20;
-			rock[i].dx += rockrate*(dx+30)/n;
-			rock[i].dy += rockrate*dy/n;
+			n *= 15;
+			r->dx += 54.0*dx/n;
+			r->dy += 54.0*dy/n;
 		}
 	}
 }