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

diff --git a/rocks.c b/rocks.c
index 1e69ce2..86c76e7 100644
--- a/rocks.c
+++ b/rocks.c
@@ -3,89 +3,250 @@
 #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"
 
-struct rock_struct {
-	float x,y,dx,dy;
-	int active;
-	SDL_Surface *image;
-	struct shape *shape;
-	int type_number;
-}; 
+struct rock rocks[MAXROCKS];
+Sprite *free_rocks;
 
-struct rock_struct rock[MAXROCKS], *rockptr = rock;
+Sprite **rock_buckets[2];
+int n_buckets;
+// we have two sets of buckets -- this variable tells which we are using.
+int p;
+int bw, bh;
+int grid_size;
 
-float rockrate;
+static struct rock prototypes[NROCKS];
 
-SDL_Surface *surf_rock[NROCKS];
-struct shape rock_shapes[NROCKS];
+// timers for rock generation.
+static float rtimers[4];
 
-float rockhtimer = 0;
-int nrocks = 41;
+uint32_t nrocks;
+float nrocks_timer;
+float nrocks_inc_ticks = 2*60*20/(F_ROCKS-I_ROCKS);
 
-float rnd(void);
+// 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 (+/-)
 
-// 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
+static inline Sprite **
+bucket(int x, int y, int p)
+{
+	int b = (x+grid_size)/grid_size + bw*((y+grid_size)/grid_size);
+	return &rock_buckets[p][b];
+}
+
+void
+init_buckets(void)
+{
+	int scr_grid_w = (XSIZE+2*grid_size-1) / grid_size;
+	int scr_grid_h = (YSIZE+2*grid_size-1) / grid_size;
+	bw = 1 + scr_grid_w + 1;
+	bh = 1 + scr_grid_h + 1;
+	n_buckets = bw * bh;
+	
+	rock_buckets[0] = malloc(n_buckets * sizeof(struct rock *));
+	rock_buckets[1] = malloc(n_buckets * sizeof(struct rock *));
+	if(!rock_buckets[0] || !rock_buckets[1]) {
+		fprintf(stderr, "Can't allocate rock buckets.\n");
+		exit(1);
+	}
+	p = 0;
+}
+
+static inline void
+insert_sprite(Sprite **head, Sprite *this)
+{
+	this->next = *head;
+	*head = this;
+}
+
+static inline Sprite *
+remove_sprite(Sprite **head)
+{
+	Sprite *this = *head;
+	*head = this->next;
+	return this;
+}
+
+void
+reset_rocks(void)
+{
+	int i;
+
+	for(i=0; i<MAXROCKS; i++) rocks[i].image = NULL;
 
+	rocks[0].next = NULL;
+	for(i=1; i<MAXROCKS; i++) rocks[i].next = &rocks[i-1];
+	free_rocks = SPRITE(&rocks[MAXROCKS-1]);
+
+	for(i = 0; i<n_buckets; i++) {
+		rock_buckets[0][i] = NULL;
+		rock_buckets[1][i] = NULL;
+	}
+
+	nrocks = I_ROCKS;
+	nrocks_timer = 0;
+}
+
+#define ROCK_LEN sizeof("sprites/rockXX.png")
 
 int
 init_rocks(void)
 {
 	int i;
-	char a[MAX_PATH_LEN];
-	SDL_Surface *temp;
+	char a[ROCK_LEN];
+	int maxw=0, maxh=0;
 
 	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]);
+		snprintf(a, ROCK_LEN, "sprites/rock%02d.png", i);
+		load_sprite(SPRITE(&prototypes[i]), a);
+		prototypes[i].type = ROCK_SPRITE;
+		maxw = max(maxw, prototypes[i].w);
+		maxh = max(maxh, prototypes[i].h);
 	}
+	grid_size = max(maxw, maxh) * 3 / 2;
+	init_buckets();
+	reset_rocks();
 	return 0;
 }
 
+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
-reset_rocks(void)
+rock_sides(float *ti, float *speed_min, float *speed_max)
 {
+	float dx0,dx1, dy0,dy1;
+	float hfactor, vfactor;
 	int i;
 
-	for(i = 0; i<MAXROCKS; i++ ) rock[i].active = 0;
+	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;
 
-	rockrate = 54.0;
+	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;
+		}
+	} 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
 new_rocks(void)
 {
-	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++;
+	int i, type;
+	struct rock *r;
+	float ti[4];
+	float rmin[4];
+	float rmax[4];
+
+	if(nrocks < F_ROCKS) {
+		nrocks_timer += t_frame;
+		if(nrocks_timer >= nrocks_inc_ticks) {
+			nrocks_timer -= nrocks_inc_ticks;
+			nrocks++;
 		}
-		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;
+	}
+
+	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_rocks) return;  // sorry, we ran out of rocks!
+			r = (struct rock *) remove_sprite(&free_rocks);
+			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;
+			}
+			insert_sprite(bucket(r->x, r->y, p), SPRITE(r));
 		}
 	}
 }
@@ -93,85 +254,135 @@ new_rocks(void)
 void
 move_rocks(void)
 {
-	int i;
+	int b;
+	Sprite *r, **head;
 
 	// Move all the rocks
-	for(i = 0; i < MAXROCKS; i++) {
-		if(rock[i].active) {
+	for(b=0; b<n_buckets; b++) {
+		head=&rock_buckets[p][b]; r=*head;
+		while(*head) {
+			r=*head;
+
 			// 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;
-			}
-			if(rock[i].x < -rock[i].image->w || rock[i].x > XSIZE) rock[i].active = 0;
+			r->x += (r->dx - screendx)*t_frame;
+			r->y += (r->dy - screendy)*t_frame;
+
+			// clip it, or sort it into the other bucket set
+			// (either way we move it out of this list).
+			if(r->x + r->image->w < 0 || r->x >= XSIZE
+					|| r->y + r->image->h < 0 || r->y >= YSIZE) {
+				insert_sprite(&free_rocks, remove_sprite(head));
+				r->image = NULL;
+			} else insert_sprite(bucket(r->x, r->y, 1-p), remove_sprite(head));
 		}
 	}
+	p = 1-p;  // switch current set of buckets.
 }
 
 void
 draw_rocks(void)
 {
 	int i;
-	SDL_Rect src, dest;
+	SDL_Rect dest;
 
-	src.x = 0; src.y = 0;
+	for(i=0; i<MAXROCKS; i++) {
+		if(!rocks[i].image) continue;
+		dest.x = rocks[i].x; dest.y = rocks[i].y;
+		SDL_BlitSurface(rocks[i].image,NULL,surf_screen,&dest);
+	}
+}
+
+int
+hit_in_bucket(Sprite *r, Sprite *s)
+{
+	for(; r; r=r->next) {
+		if(collide(r, s)) return true;
+	}
+	return false;
+}
 
-	for(i = 0; i<MAXROCKS; i++) {
-		if(rock[i].active) {
-			src.w = rock[i].image->w;
-			src.h = rock[i].image->h;
+int
+hit_rocks(Sprite *s)
+{
+	int l, r, t, b;
+	Sprite **bucket;
 
-			dest.w = src.w;
-			dest.h = src.h;
-			dest.x = (int) rock[i].x;
-			dest.y = (int) rock[i].y;
+	l = (s->x + grid_size) / grid_size;
+	r = (s->x + s->w + grid_size) / grid_size;
+	t = (s->y + grid_size) / grid_size;
+	b = (s->y + s->h + grid_size) / grid_size;
+	bucket = &rock_buckets[p][l + t*bw];
 
-			SDL_BlitSurface(rock[i].image,&src,surf_screen,&dest);
+	if(hit_in_bucket(*bucket, s)) return true;
+	if(l > 0 && hit_in_bucket(*(bucket-1), s)) return true;
+	if(t > 0 && hit_in_bucket(*(bucket-bw), s)) return true;
+	if(l > 0 && t > 0 && hit_in_bucket(*(bucket-1-bw), s)) return true;
 
-		}
+	if(r > l) {
+		if(hit_in_bucket(*(bucket+1), s)) return true;
+		if(t > 0 && hit_in_bucket(*(bucket+1-bw), s)) return true;
 	}
+	if(b > t) {
+		if(hit_in_bucket(*(bucket+bw), s)) return true;
+		if(l > 0 && hit_in_bucket(*(bucket-1+bw), s)) return true;
+	}
+	if(r > l && b > t && hit_in_bucket(*(bucket+1+bw), s)) return true;
+	return false;
 }
 
 int
-hit_rocks(float x, float y, struct shape *shape)
+pixel_hit_in_bucket(Sprite *r, float x, float y)
 {
-	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;
-		}
+	for(; r; r=r->next) {
+		if(pixel_collide(r, x, y)) return 1;
 	}
 	return 0;
 }
 
+int
+pixel_hit_rocks(float x, float y)
+{
+	int ix, iy;
+	int l, t;
+	Sprite **bucket;
+
+	ix = x + grid_size; iy = y + grid_size;
+	l = ix / grid_size; t = iy / grid_size;
+	bucket = &rock_buckets[p][l + t*bw];
+	if(pixel_hit_in_bucket(*bucket, x, y)) return true;
+	if(l > 0 && pixel_hit_in_bucket(*(bucket-1), x, y)) return true;
+	if(t > 0 && pixel_hit_in_bucket(*(bucket-bw), x, y)) return true;
+	if(l > 0 && t > 0 && pixel_hit_in_bucket(*(bucket-1-bw), x, y)) return true;
+	return false;
+}
+
 void
 blast_rocks(float x, float y, float radius, int onlyslow)
 {
-	int i;
+	int b;
+	Sprite *r;
 	float dx, dy, n;
 
-	for(i = 0; i<MAXROCKS; i++ ) {
-		if(rock[i].x <= 0) continue;
+	if(onlyslow) return;
 
-		// 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(b=0; b<n_buckets; b++) {
+		for(r=rock_buckets[p][b]; r; r=r->next) {
+			if(r->x <= 0) continue;
 
-		dx = rock[i].x - x;
-		dy = rock[i].y - y;
+			// 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 && (r->dx - screendx < -4 || r->dx - screendx > 3)) continue;
 
-		n = sqrt(dx*dx + dy*dy);
-		if(n < radius) {
-			n *= 20;
-			rock[i].dx += rockrate*(dx+30)/n;
-			rock[i].dy += rockrate*dy/n;
+			dx = r->x - x;
+			dy = r->y - y;
+
+			n = sqrt(dx*dx + dy*dy);
+			if(n < radius) {
+				n *= 15;
+				r->dx += 54.0*dx/n;
+				r->dy += 54.0*dy/n;
+			}
 		}
 	}
 }