ditched the separate shape struct.

diff --git a/rocks.c b/rocks.c
index d01d794..a32652a 100644 (file)
--- a/rocks.c
+++ b/rocks.c
@@ -19,11 +19,10 @@ int p;
 int bw, bh;
 int grid_size;
 
 int bw, bh;
 int grid_size;
 

-SDL_Surface *surf_rock[NROCKS];
-struct shape rock_shapes[NROCKS];
+static struct rock prototypes[NROCKS];

 
 // timers for rock generation.
 
 // timers for rock generation.

-float rtimers[4];
+static float rtimers[4];

 
 uint32_t nrocks;
 float nrocks_timer;
 
 uint32_t nrocks;
 float nrocks_timer;

@@ -63,8 +62,8 @@ init_buckets(void)
 void
 transfer_rock(struct rock *r, struct rock **from, struct rock **to)
 {
 void
 transfer_rock(struct rock *r, struct rock **from, struct rock **to)
 {

-       *from = &r->next->rock;
-       r->next = SPRITE(*to);
+       *from = r->next;
+       r->next = *to;

        *to = r;
 }
 
        *to = r;
 }
 

@@ -74,8 +73,11 @@ reset_rocks(void)
        int i;
 
        for(i=0; i<MAXROCKS; i++) rocks[i].image = NULL;
        int i;
 
        for(i=0; i<MAXROCKS; i++) rocks[i].image = NULL;

-       rocks[0].next = NULL; free_rocks = &rocks[MAXROCKS-1];
-       for(i = 1; i<MAXROCKS; i++) rocks[i].next = SPRITE(&rocks[i-1]);
+
+       rocks[0].next = NULL;
+       for(i=1; i<MAXROCKS; i++) rocks[i].next = &rocks[i-1];
+       free_rocks = &rocks[MAXROCKS-1];
+

        for(i = 0; i<n_buckets; i++) {
                rock_buckets[0][i] = NULL;
                rock_buckets[1][i] = NULL;
        for(i = 0; i<n_buckets; i++) {
                rock_buckets[0][i] = NULL;
                rock_buckets[1][i] = NULL;

@@ -96,10 +98,9 @@ init_rocks(void)
 
        for(i = 0; i<NROCKS; i++) {
                snprintf(a, ROCK_LEN, "sprites/rock%02d.png", i);
 
        for(i = 0; i<NROCKS; i++) {
                snprintf(a, ROCK_LEN, "sprites/rock%02d.png", i);

-               NULLERROR(surf_rock[i] = load_image(a));
-               get_shape(surf_rock[i], &rock_shapes[i]);
-               maxw = max(maxw, rock_shapes[i].w);
-               maxh = max(maxh, rock_shapes[i].h);
+               load_sprite(SPRITE(&prototypes[i]), a);
+               maxw = max(maxw, prototypes[i].w);
+               maxh = max(maxh, prototypes[i].h);

        }
        grid_size = max(maxw, maxh) * 3 / 2;
        init_buckets();
        }
        grid_size = max(maxw, maxh) * 3 / 2;
        init_buckets();

@@ -178,8 +179,8 @@ weighted_rnd_range(float min, float max) {
 void
 new_rocks(void)
 {
 void
 new_rocks(void)
 {

-       int i;
-       struct rock *r;
+       int i, type;
+       struct rock *r, **tmp;

        float ti[4];
        float rmin[4];
        float rmax[4];
        float ti[4];
        float rmin[4];
        float rmax[4];

@@ -202,10 +203,10 @@ new_rocks(void)
                while(rtimers[i] >= 1) {
                        rtimers[i] -= 1;
                        if(!free_rocks) return;  // sorry, we ran out of rocks!
                while(rtimers[i] >= 1) {
                        rtimers[i] -= 1;
                        if(!free_rocks) return;  // sorry, we ran out of rocks!

-                       r = free_rocks;
-                       r->type = urnd() % NROCKS;
-                       r->image = surf_rock[r->type];
-                       r->shape = &rock_shapes[r->type];
+                       r = free_rocks; free_rocks = r->next;
+                       type = urnd() % NROCKS;
+                       *r = prototypes[type];
+                       r->type = type;

                        switch(i) {
                                case RIGHT:
                                        r->x = XSIZE;
                        switch(i) {
                                case RIGHT:
                                        r->x = XSIZE;

@@ -236,7 +237,8 @@ new_rocks(void)
                                        r->dy = weighted_rnd_range(rmin[i], rmax[i]) + screendy;
                                        break;
                        }
                                        r->dy = weighted_rnd_range(rmin[i], rmax[i]) + screendy;
                                        break;
                        }

-                       transfer_rock(r, &free_rocks, bucket(r->x, r->y, p));
+                       tmp = bucket(r->x, r->y, p);
+                       r->next = *tmp; *tmp = r;

                }
        }
 }
                }
        }
 }

@@ -286,7 +288,7 @@ draw_rocks(void)
 int
 hit_in_bucket(struct rock *r, Sprite *s)
 {
 int
 hit_in_bucket(struct rock *r, Sprite *s)
 {

-       for(; r; r=&r->next->rock) {
+       for(; r; r=r->next) {

                if(collide(SPRITE(r), s)) return true;
        }
        return false;
                if(collide(SPRITE(r), s)) return true;
        }
        return false;

@@ -295,14 +297,13 @@ hit_in_bucket(struct rock *r, Sprite *s)
 int
 hit_rocks(Sprite *s)
 {
 int
 hit_rocks(Sprite *s)
 {

-       struct base_sprite *sp = &s->sprite;

        int l, r, t, b;
        struct rock **bucket;
 
        int l, r, t, b;
        struct rock **bucket;
 

-       l = (sp->x + grid_size) / grid_size;
-       r = (sp->x + sp->shape->w + grid_size) / grid_size;
-       t = (sp->y + grid_size) / grid_size;
-       b = (sp->y + sp->shape->h + grid_size) / grid_size;
+       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];
 
        if(hit_in_bucket(*bucket, s)) return true;
        bucket = &rock_buckets[p][l + t*bw];
 
        if(hit_in_bucket(*bucket, s)) return true;

@@ -325,9 +326,8 @@ hit_rocks(Sprite *s)
 int
 pixel_hit_in_bucket(struct rock *r, float x, float y)
 {
 int
 pixel_hit_in_bucket(struct rock *r, float x, float y)
 {

-       for(; r; r=&r->next->rock) {
-               if(x < r->x || y < r->y) continue;
-               if(pixel_collide(x - r->x, y - r->y, r->shape)) return 1;
+       for(; r; r=r->next) {
+               if(pixel_collide(SPRITE(r), x, y)) return 1;

        }
        return 0;
 }
        }
        return 0;
 }

@@ -359,7 +359,7 @@ blast_rocks(float x, float y, float radius, int onlyslow)
        if(onlyslow) return;
 
        for(b=0; b<n_buckets; b++) {
        if(onlyslow) return;
 
        for(b=0; b<n_buckets; b++) {

-               for(r=rock_buckets[p][b]; r; r=&r->next->rock) {
+               for(r=rock_buckets[p][b]; r; r=r->next) {

                        if(r->x <= 0) continue;
 
                        // This makes it so your explosion from dying magically doesn't leave
                        if(r->x <= 0) continue;
 
                        // This makes it so your explosion from dying magically doesn't leave

diff --git a/sprite.c b/sprite.c
index 9a9d953..760af11 100644 (file)
--- a/sprite.c
+++ b/sprite.c
@@ -3,139 +3,118 @@
 #include "sprite.h"
 
 void
 #include "sprite.h"
 
 void

-load_sprite(Sprite *sprite, char *filename)
+load_sprite(Sprite *s, char *filename)

 {
 {

-       struct base_sprite *spr = &sprite->sprite;
-       spr->image = load_image(filename);
-       if(!spr->image) return;
-       if(!spr->shape) {
-               spr->shape = malloc(sizeof(struct shape));
-               if(!spr->shape) {
-                       fprintf(stderr, "load_sprite(): can't allocate shape structure.\n");
-                       exit(1);
-               }
-               get_shape(spr->image, spr->shape);
-       }
+       s->image = load_image(filename);
+       if(s->image) get_shape(s);

 }
 
 void
 }
 
 void

-get_shape(SDL_Surface *img, struct shape *s)
+get_shape(Sprite *s)

 {
        int x, y;
        uint16_t *px, transp;
        uint32_t bits = 0, bit, *p;
 
 {
        int x, y;
        uint16_t *px, transp;
        uint32_t bits = 0, bit, *p;
 

-       if(img->format->BytesPerPixel != 2) {
+       if(s->image->format->BytesPerPixel != 2) {

                fprintf(stderr, "get_shape(): not a 16-bit image!\n");
                exit(1);
        }
 
                fprintf(stderr, "get_shape(): not a 16-bit image!\n");
                exit(1);
        }
 

-       s->area = 0;
-       s->w = img->w; s->h = img->h;
-       s->mw = ((img->w+31)>>5);
-       s->mask = malloc(4*s->mw*s->h);
+       s->w = s->image->w; s->h = s->image->h;
+       s->mask_w = ((s->image->w+31)>>5);
+       s->mask = malloc(4*s->mask_w*s->h);

        if(!s->mask) {
                fprintf(stderr, "get_shape(): can't allocate bitmask.\n");
                exit(1);
        }
 
        if(!s->mask) {
                fprintf(stderr, "get_shape(): can't allocate bitmask.\n");
                exit(1);
        }
 

-       SDL_LockSurface(img);
-       px = img->pixels;
-       transp = img->format->colorkey;
+       SDL_LockSurface(s->image);
+       px = s->image->pixels;
+       transp = s->image->format->colorkey;

        p = s->mask;
        p = s->mask;

-       for(y=0; y<img->h; y++) {
+       for(y=0; y<s->image->h; y++) {

                bit = 0;
                bit = 0;

-               for(x=0; x<img->w; x++) {
+               for(x=0; x<s->image->w; x++) {

                        if(!bit) { bits = 0; bit = 0x80000000; }
                        if(!bit) { bits = 0; bit = 0x80000000; }

-                       if(*px++ != transp) { bits |= bit; s->area++; }
+                       if(*px++ != transp) { bits |= bit; }

                        bit >>= 1;
                        bit >>= 1;

-                       if(!bit || x == img->w - 1) { *(p++) = bits; }
+                       if(!bit || x == s->image->w - 1) { *(p++) = bits; }

                }
                }

-               px = (uint16_t *) ((uint8_t *) px + img->pitch - 2*img->w);
+               px = (uint16_t *) ((uint8_t *) px + s->image->pitch - 2*s->image->w);

        }
        }

-       SDL_UnlockSurface(img);
+       SDL_UnlockSurface(s->image);

 }
 
 static int
 }
 
 static int

-line_collide(int xov, struct shape *r, uint32_t *rbits, struct shape *s, uint32_t *sbits)
+line_collide(int xov, unsigned bit, uint32_t *amask, uint32_t *bmask)

 {
 {

-       int lshift, n, i, ret = 0;
-       uint32_t lbits;
-       struct shape *st;
-       uint32_t *bt;
-
-
-       if(xov < 0) {
-               st = r; r = s; s = st;
-               bt = rbits; rbits = sbits; sbits = bt;
-               xov = -xov;
-       }
-
+       int i, words = (xov-1) >> 5;
+       uint32_t abits;

 
 

-       lshift = (r->w - xov) & 31; 
-       rbits += (r->w - xov) >> 5;
-       n = (xov + 31) >> 5;
-       for(i=0; i<n-1; i++) {
-               lbits = *rbits++ << lshift;
-               lbits |= *rbits >> (32 - lshift);
-               if(lbits & *sbits++) ret = 1;
+       for(i=0; i<words; i++) {
+               abits = *amask++ << bit;
+               abits |= *amask >> (32-bit);
+               if(abits & *bmask++) return true;

        }
        }

-       lbits = *rbits << lshift;
-       if(lbits & *sbits) ret = 1;
+       abits = *amask << bit;
+       if(abits & *bmask) return true;

 
 

-       return ret;
+       return false;

 }
 
 static int
 }
 
 static int

-mask_collide(int xov, int yov, struct shape *r, struct shape *s)
+mask_collide(int xov, int yov, Sprite *a, Sprite *b)

 {
 {

-       int y, ry, sy;
-       uint32_t *rbits, *sbits;
+       int y;
+       int xoffset = a->w - xov;
+       int word = xoffset >> 5, bit = xoffset & 31;
+       uint32_t *amask = a->mask, *bmask = b->mask;

 
        if(yov > 0) {
 
        if(yov > 0) {

-               ry = r->h - yov; sy = 0;
-               rbits = r->mask + (r->h - yov) * r->mw;
-               sbits = s->mask;
+               amask = a->mask + ((a->h - yov) * a->mask_w) + word;
+               bmask = b->mask;

        } else {
        } else {

-               ry = 0; sy = s->h + yov;
-               rbits = r->mask;
-               sbits = s->mask + (s->h + yov) * s->mw;
+               yov = -yov;
+               amask = a->mask;
+               bmask = b->mask + ((b->h - yov) * b->mask_w) + word;

        }
 
        }
 

-       for(y=0; y<abs(yov); y++) {
-               if(line_collide(xov, r, rbits, s, sbits)) return 1;
-               rbits += r->mw; sbits += s->mw;
+       for(y=0; y<yov; y++) {
+               if(line_collide(xov, bit, amask, bmask)) return 1;
+               amask += a->mask_w; bmask += b->mask_w;

        }
 
        return 0;
 }
 
 int
        }
 
        return 0;
 }
 
 int

-collide(Sprite *r, Sprite *s)
+collide(Sprite *a, Sprite *b)

 {
 {

-       struct shape *rs = r->sprite.shape;
-       struct shape *ss = s->sprite.shape;
-       int dx = s->sprite.x - r->sprite.x;
-       int dy = s->sprite.y - r->sprite.y;
-       int xov, yov;
+       int dx, dy, xov, yov;
+
+       if(b->x < a->x) { Sprite *tmp = a; a = b; b = tmp; }
+
+       dx = b->x - a->x;
+       dy = b->y - a->y;

 
 

-       if(dx >= 0) xov = max(min(rs->w - dx, ss->w), 0);
-       else xov = -max(min(ss->w + dx, rs->w), 0);
+       xov = max(min(a->w - dx, b->w), 0);

 
 

-       if(dy >= 0) yov = max(min(rs->h - dy, ss->h), 0);
-       else yov = -max(min(ss->h + dy, rs->h), 0);
+       if(dy >= 0) yov = max(min(a->h - dy, b->h), 0);
+       else yov = -max(min(a->h - -dy, b->h), 0);

 
        if(xov == 0 || yov == 0) return false;
 
        if(xov == 0 || yov == 0) return false;

-       else return mask_collide(xov, yov, rs, ss);
+       else return mask_collide(xov, yov, a, b);

 }
 
 int
 }
 
 int

-pixel_collide(unsigned int xoff, unsigned int yoff, struct shape *r)
+pixel_collide(Sprite *s, int x, int y)

 {
        uint32_t pmask;
        
 {
        uint32_t pmask;
        

-       if(xoff >= r->w || yoff >= r->h) return 0;
+       if(x < s->x || y < s->y || x >= s->x + s->w || y >= s->y + s->h) return 0;

 
 

-       pmask = 0x80000000 >> (xoff&0x1f);
-       return r->mask[(yoff*r->mw) + (xoff>>5)] & pmask;
+       x -= s->x; y -= s->y;
+       pmask = 0x80000000 >> (x&0x1f);
+       return s->mask[(y*s->mask_w) + (x>>5)] & pmask;

 }
 }

diff --git a/sprite.h b/sprite.h
index 939de08..7df8631 100644 (file)
--- a/sprite.h
+++ b/sprite.h
@@ -4,73 +4,62 @@
 #include <SDL.h>
 #include <inttypes.h>
 
 #include <SDL.h>
 #include <inttypes.h>
 

-typedef union sprite Sprite;
+typedef struct sprite Sprite;

 
 

+#define SPRITE(x) ((Sprite *) (x))

 
 

-// Shape stuff
+#define BASE_SPRITE 0
+#define SHIP_SPRITE 1
+#define ROCK_SPRITE 2

 
 

-struct shape {
+struct sprite {
+       uint8_t type;
+       Sprite *next;
+       float x, y;
+       float dx, dy;
+       SDL_Surface *image;

        int w, h;
        int w, h;

-       int mw; // mask width (number of uint32's)
+       int mask_w;

        uint32_t *mask;
        uint32_t *mask;

-       uint32_t area;

 };
 
 };
 

-void get_shape(SDL_Surface *img, struct shape *s);
+void get_shape(Sprite *s);

 int collide(Sprite *r, Sprite *s);
 int collide(Sprite *r, Sprite *s);

-int pixel_collide(unsigned int xdiff, unsigned int ydiff, struct shape *r);
+int pixel_collide(Sprite *s, int x, int y);

 
 
 
 
 
 

-// Sprite stuff
-
-#define SPRITE(x) ((Sprite *) (x))
+// extended sprites

 
 

-struct base_sprite {
-       uint8_t type;
-       Sprite *next;
+struct ship {
+       // core sprite fields
+       uint8_t sprite_type;
+       struct ship *next;

        float x, y;
        float dx, dy;
        SDL_Surface *image;
        float x, y;
        float dx, dy;
        SDL_Surface *image;

-       struct shape *shape;
+       int w, h;
+       int mask_w;
+       uint32_t *mask;
+       // SHIP extras
+       int lives;
+       int jets;

 };
 
 struct rock {
        // core sprite fields
        uint8_t sprite_type;
 };
 
 struct rock {
        // core sprite fields
        uint8_t sprite_type;

-       Sprite *next;
+       struct rock *next;

        float x, y;
        float dx, dy;
        SDL_Surface *image;
        float x, y;
        float dx, dy;
        SDL_Surface *image;

-       struct shape *shape;
+       int w, h;
+       int mask_w;
+       uint32_t *mask;

        // ROCK extras
        int type;
 };
 
        // ROCK extras
        int type;
 };
 

-struct ship {
-       // core sprite fields
-       uint8_t sprite_type;
-       Sprite *next;
-       float x, y;
-       float dx, dy;
-       SDL_Surface *image;
-       struct shape *shape;
-       // SHIP extras
-       int lives;
-       int jets;
-};
-
-union sprite {
-       uint8_t type;
-       struct base_sprite sprite;
-       struct rock rock;
-       struct ship ship;
-};
-
-#define BASE_SPRITE 0
-#define SHIP_SPRITE 1
-#define ROCK_SPRITE 2
-

 SDL_Surface *load_image(char *filename);
 void load_sprite(Sprite *sprite, char *filename);
 
 SDL_Surface *load_image(char *filename);
 void load_sprite(Sprite *sprite, char *filename);