summaryrefslogtreecommitdiff
path: root/clld.c
diff options
context:
space:
mode:
Diffstat (limited to 'clld.c')
-rw-r--r--clld.c511
1 files changed, 365 insertions, 146 deletions
diff --git a/clld.c b/clld.c
index b08e0de..ca28220 100644
--- a/clld.c
+++ b/clld.c
@@ -93,165 +93,381 @@ static int usage() {
return 0;
}
+/* Get the direction of a collision. */
+uint8_t isleft = 0;
+uint8_t isright = 0;
+uint8_t istop = 0;
+uint8_t isbottom = 0;
+uint8_t isinfloor_x = 0;
+uint8_t isinfloor_y = 0;
+
+uint8_t get_coldir(uint8_t flt, uint8_t col_type, int hmpeak, struct colis *cursor, struct colis *floor) {
+ uint8_t coldir = 0;
+ uint8_t isinfloor_left = 0;
+ uint8_t isinfloor_right = 0;
+ uint8_t isinfloor_top = 0;
+ uint8_t isinfloor_bottom = 0;
+ switch (col_type) {
+ case AABB:
+ if (flt) {
+ isleft = cursor->c2 > floor->c1-cursor->xvel-1;
+ isright = cursor->c1 < floor->c2-cursor->xvel+1;
+ istop = cursor->d2 > floor->d1-cursor->yvel-1;
+ isbottom = cursor->d1 < floor->d2-cursor->yvel+1;
+
+ isinfloor_left = cursor->d2 > floor->d1;
+ isinfloor_right = cursor->d1 < floor->d2;
+ isinfloor_top = cursor->c2 > floor->c1;
+ isinfloor_bottom = cursor->c1 < floor->c2;
+ } else {
+ isleft = cursor->a2 > floor->a1-cursor->xvel-1;
+ isright = cursor->a1 < floor->a2-cursor->xvel+1;
+ istop = cursor->b2 > floor->b1-cursor->yvel-1;
+ isbottom = cursor->b1 < floor->b2-cursor->yvel+1;
+
+ isinfloor_left = cursor->b2 > floor->b1;
+ isinfloor_right = cursor->b1 < floor->b2;
+ isinfloor_top = cursor->a2 > floor->a1;
+ isinfloor_bottom = cursor->a1 < floor->a2;
+ }
+ isinfloor_x = isinfloor_left && isinfloor_right ;
+ isinfloor_y = isinfloor_top && isinfloor_bottom;
+ break;
+ case THM:
+ if (flt) {
+ /* Did the cursor collide with the floor from the left? */
+ isleft = cursor->c2 > floor->c1-cursor->xvel-1;
+ /* Did the cursor collide with the floor from the right? */
+ isright = cursor->c1 < (floor->c2-cursor->w)-cursor->xvel+1;
+
+ /* Is the floor's heightmap vertically flipped? */
+ if (!floor->flp) {
+ /* Did the cursor collide with the floor from the top? */
+ istop = cursor->d2 > (floor->d2-hmpeak)-cursor->yvel;
+ /* Did the cursor collide with the floor from the bottom? */
+ isbottom = cursor->d1 < floor->d2-cursor->yvel+1;
+
+ /* Is the bottom of the cursor below the floor's leftmost height? */
+ isinfloor_left = floor->d2-cursor->d2 < floor->heightmap[0] && cursor->xvel > 0;
+ /* Is the bottom of the cursor below the floor's rightmost height? */
+ isinfloor_right = floor->d2-cursor->d2 < floor->heightmap[floor->w-1] && cursor->xvel < 0;
+ /* Is the bottom of the cursor at, or above the floor's ground? */
+ isinfloor_top = floor->d2-cursor->d2 >= 0;
+ /* Is the top of the cursor at, or below the floor's ground? */
+ isinfloor_bottom = floor->d2-cursor->d1 <= 0;
+ } else {
+ /* Did the cursor collide with the floor from the top? */
+ istop = cursor->d2 > floor->d1-cursor->yvel-1;
+ /* Did the cursor collide with the floor from the bottom? */
+ isbottom = cursor->d1 < (floor->d1+hmpeak)-cursor->yvel;
+
+ /* Is the bottom of the cursor below the floor's leftmost height? */
+ isinfloor_left = floor->d1-cursor->d1 > -floor->heightmap[0] && cursor->xvel > 0;
+ /* Is the bottom of the cursor below the floor's rightmost height? */
+ isinfloor_right = floor->d1-cursor->d1 > -floor->heightmap[floor->w-1] && cursor->xvel < 0;
+ /* Is the bottom of the cursor at, or above the floor's height? */
+ isinfloor_top = floor->d1-cursor->d2 >= 0 && cursor->yvel > 0;
+ /* Is the top of the cursor at, or above the floor's height? */
+ isinfloor_bottom = cursor->d1-floor->d1 >= 0;
+ }
+ } else {
+ /* Did the cursor collide with the floor from the left? */
+ isleft = cursor->a2 > floor->a1-cursor->xvel-1;
+ /* Did the cursor collide with the floor from the right? */
+ isright = cursor->a1 < (floor->a2-cursor->w)-cursor->xvel+1;
+
+ /* Is the floor's heightmap vertically flipped? */
+ if (!floor->flp) {
+ /* Did the cursor collide with the floor from the top? */
+ istop = cursor->b2 > (floor->b2-hmpeak)-cursor->yvel;
+ /* Did the cursor collide with the floor from the bottom? */
+ isbottom = cursor->b1 < floor->b2-cursor->yvel+1;
+
+ /* Is the bottom of the cursor below the floor's leftmost height? */
+ isinfloor_left = floor->b2-cursor->b2 < floor->heightmap[0];
+ /* Is the bottom of the cursor below the floor's rightmost height? */
+ isinfloor_right = floor->b2-cursor->b2 < floor->heightmap[floor->w-1];
+ /* Is the bottom of the cursor at, or above the floor's ground? */
+ isinfloor_top = floor->b2-cursor->b2 >= 0;
+ /* Is the top of the cursor at, or below the floor's ground? */
+ isinfloor_bottom = floor->b2-cursor->b1 <= 0;
+ } else {
+ /* Did the cursor collide with the floor from the top? */
+ istop = cursor->b2 > floor->b1-cursor->yvel-1;
+ /* Did the cursor collide with the floor from the bottom? */
+ isbottom = cursor->b1 < (floor->b1+hmpeak)-cursor->yvel;
+
+ /* Is the bottom of the cursor below the floor's leftmost height? */
+ isinfloor_left = floor->b1-cursor->b1 > -floor->heightmap[0];
+ /* Is the bottom of the cursor below the floor's rightmost height? */
+ isinfloor_right = floor->b1-cursor->b1 > -floor->heightmap[floor->w-1];
+ /* Is the bottom of the cursor at, or above the floor's ground? */
+ isinfloor_top = floor->b1-cursor->b2 >= 0 && cursor->yvel > 0;
+ /* Is the top of the cursor at, or below the floor's ground? */
+ isinfloor_bottom = cursor->b1-floor->b1 >= 0;
+ }
+ }
+ isinfloor_x = isinfloor_left ^ isinfloor_right ;
+ isinfloor_y = isinfloor_top ^ isinfloor_bottom;
+ break;
+ }
+ if (isinfloor_x) {
+ coldir |= isleft << 0;
+ coldir |= isright << 1;
+ }
+ if (isinfloor_y) {
+ coldir |= istop << 2;
+ coldir |= isbottom << 3;
+ }
+ return coldir;
+}
+
/* Tile Heightmap Collision. */
-int thm(uint8_t flt, int hmpeak, struct colis cursor, struct colis floor) {
+int thm(int hmpeak, struct colis *cursor, struct colis *floor) {
int newy = 0;
- if (!flt) {
- cursor.clx = (cursor.a2 > floor.a1-(int)cursor.xvel-1 && cursor.b2 > floor.b1) && (cursor.a1 < (floor.a2-cursor.w)-(int)cursor.xvel+1 && cursor.b1 < floor.b2);
- cursor.cly = (cursor.b2 >= floor.b1-(int)cursor.yvel && cursor.a2 >= floor.a1) && (cursor.b1 <= floor.b2-(int)cursor.yvel && cursor.a1 <= floor.a2);
- uint8_t l;
- uint8_t r;
- uint8_t t;
- uint8_t b;
- if (!floor.flp) {
- l = (cursor.a2 > floor.a1-(int)cursor.xvel-1 && floor.b2-cursor.b2 < (int)floor.heightmap[0] && cursor.xvel > 0);
- r = (cursor.a1 < (floor.a2-cursor.w)-(int)cursor.xvel+1 && floor.b2-cursor.b2 < (int)floor.heightmap[floor.w-1] && cursor.xvel < 0);
- t = (cursor.b2 > (floor.b2-hmpeak)-(int)cursor.yvel && floor.b2-cursor.b2 >= 0);
- b = (cursor.b1 < floor.b2-(int)cursor.yvel+1 && floor.b2-cursor.b1 <= 0);
- } else {
- l = (cursor.a2 > floor.a1-(int)cursor.xvel-1 && floor.b1-cursor.b1 > -(int)floor.heightmap[0] && cursor.xvel > 0);
- r = (cursor.a1 < (floor.a2-cursor.w)-(int)cursor.xvel+1 && floor.b1-cursor.b1 > -(int)floor.heightmap[floor.w-1] && cursor.xvel < 0);
- t = (cursor.b2 > floor.b1-(int)cursor.yvel-1 && floor.b1-cursor.b2 >= 0 && cursor.yvel > 0);
- b = (cursor.b1 < (floor.b1+hmpeak)-(int)cursor.yvel && cursor.b1-floor.b1 >= 0);
+ cursor->clx = (cursor->a2 > floor->a1-cursor->xvel-1 && cursor->b2 > floor->b1) && (cursor->a1 < (floor->a2-cursor->w)-cursor->xvel+1 && cursor->b1 < floor->b2);
+ cursor->cly = (cursor->b2 >= floor->b1-cursor->yvel && cursor->a2 >= floor->a1) && (cursor->b1 <= floor->b2-cursor->yvel && cursor->a1 <= floor->a2);
+ uint8_t coldir = get_coldir(0, THM, hmpeak, cursor, floor);
+
+ if (cursor->clx && (cursor->a2-floor->a1 < 0 || cursor->a2-floor->a1 > floor->w)) {
+ switch (coldir & 3) {
+ case 1: cursor->pos.x = (floor->pos.x-cursor->xvel)-cursor->w-1; break;
+ case 2: cursor->pos.x = (floor->a2-cursor->w)-cursor->xvel+1; break;
+ }
+ cursor->xvel = 0;
+ floor->xvel = 0;
+ }
+ if (cursor->cly && cursor->a2-floor->a1 < floor->w) {
+ newy = floor->heightmap[cursor->a2-floor->a1];
+ switch (coldir & 12) {
+ case 4:
+ if (!floor->flp) {
+ cursor->pos.y = ((floor->b2-cursor->h)-newy)-cursor->yvel;
+ } else {
+ cursor->pos.y = (floor->pos.y-cursor->h)-cursor->yvel;
+ }
+ break;
+ case 8:
+ if (!floor->flp) {
+ cursor->pos.y = (floor->pos.y+floor->h)-cursor->yvel+1;
+ } else {
+ cursor->pos.y = (floor->pos.y+newy)-cursor->yvel;
+ }
+ break;
}
+ cursor->yvel = 0;
+ floor->yvel = 0;
+ }
+ cursor->gnded = (cursor->pos.y == ((floor->b2-cursor->h)-newy)-cursor->yvel);
+ printf("%u, %u\n%u\n%i\n%i, %i\n%07.06f, %07.06f\n", cursor->clx, cursor->cly, cursor->gnded, newy, cursor->pos.x, cursor->pos.y, cursor->xvel, cursor->yvel);
+ printf("%u, %u\n%u\n%i\n%i, %i\n%07.06f, %07.06f\n", floor->clx, floor->cly, floor->gnded, newy, floor->pos.x, floor->pos.y, floor->xvel, floor->yvel);
+ return 0;
+}
- if (cursor.clx) {
- if (cursor.a2-floor.a1 < 0 || cursor.a2-floor.a1 > floor.w) {
- if (l)
- cursor.pos.x = (floor.pos.x-(int)cursor.xvel)-cursor.w-1;
- else if (r)
- cursor.pos.x = (floor.a2-cursor.w)-(int)cursor.xvel+1;
- cursor.xvel = 0;
- }
+/* Floating point Tile Heightmap Collision. */
+int fthm(int hmpeak, struct colis *cursor, struct colis *floor) {
+ int newy = 0;
+ cursor->clx = (cursor->c2 > floor->c1-cursor->xvel-1 && cursor->d2 > floor->d1) && (cursor->c1 < (floor->c2-cursor->w)-cursor->xvel+1 && cursor->d1 < floor->d2);
+ cursor->cly = (cursor->d2 >= floor->d1-cursor->yvel && cursor->c2 >= floor->c1) && (cursor->d1 <= floor->d2-cursor->yvel && cursor->c1 <= floor->c2);
+ uint8_t coldir = get_coldir(1, THM, hmpeak, cursor, floor);
+
+ if (cursor->clx && cursor->c2-floor->c1 < -1 || cursor->c2-floor->c1 > floor->w) {
+ switch (coldir & 3) {
+ case 1: cursor->pos.fx = (floor->pos.fx-cursor->xvel)-cursor->w-1; break;
+ case 2: cursor->pos.fx = (floor->c2-cursor->w)-cursor->xvel+1; break;
+ }
+ cursor->xvel = 0;
+ cursor->xvel = 0;
+ }
+ if (cursor->cly && cursor->c2-floor->c1 < floor->w) {
+ newy = floor->heightmap[(int)cursor->c2-(int)floor->c1];
+ switch (coldir & 12) {
+ case 4:
+ if (!floor->flp) {
+ cursor->pos.fy = ((floor->d2-cursor->h)-newy)-cursor->yvel;
+ } else {
+ cursor->pos.fy = (floor->pos.fy-cursor->h)-cursor->yvel;
+ }
+ break;
+ case 8:
+ if (!floor->flp) {
+ cursor->pos.fy = (floor->pos.fy+floor->h)-cursor->yvel;
+ } else {
+ cursor->pos.fy = (floor->pos.fy+newy)-cursor->yvel;
+ }
+ break;
}
- if (cursor.cly) {
- if (cursor.a2-floor.a1 < floor.w) {
- newy = (int)floor.heightmap[cursor.a2-floor.a1];
- if (t)
- (!floor.flp) ? (cursor.pos.y = ((floor.b2-cursor.h)-newy)-(int)cursor.yvel) : (cursor.pos.y = (floor.pos.y-cursor.h)-(int)cursor.yvel);
- else if (b)
- (!floor.flp) ? (cursor.pos.y = (floor.pos.y+floor.h)-(int)cursor.yvel+1) : (cursor.pos.y = (floor.pos.y+newy)-(int)cursor.yvel);
- cursor.yvel = 0;
+ cursor->yvel = 0;
+ floor->yvel = 0;
+ }
+ cursor->gnded = (cursor->pos.fy == ((floor->d2-cursor->h)-newy)-cursor->yvel);
+ printf("%u, %u\n%u\n%i\n%07.06f, %07.06f\n%07.06f, %07.06f\n", cursor->clx, cursor->cly, cursor->gnded, newy, cursor->pos.fx, cursor->pos.fy, cursor->xvel, cursor->yvel);
+ printf("%u, %u\n%u\n%i\n%07.06f, %07.06f\n%07.06f, %07.06f\n", floor->clx, floor->cly, floor->gnded, newy, floor->pos.fx, floor->pos.fy, floor->xvel, floor->yvel);
+ return 0;
+}
+
+
+/* Axis Aligned Bounding Box Collision. */
+int aabb(struct colis *cursor, struct colis *floor) {
+ uint8_t coldir = get_coldir(0, AABB, -1, cursor, floor);
+ uint8_t left = (cursor->xvel > 0) && (!floor->xvel || floor->xvel != 0);
+ uint8_t right = (cursor->xvel < 0) && (!floor->xvel || floor->xvel != 0);
+ uint8_t top = (cursor->yvel > 0) && (!floor->yvel || floor->yvel != 0);
+ uint8_t bottom = (cursor->yvel < 0) && (!floor->yvel || floor->yvel != 0);
+
+ cursor->clx = (coldir & 0x03) == 0x03;
+ cursor->cly = (coldir & 0x0C) == 0x0C;
+ /* Is the Cursor is on the ground? */
+ cursor->gnded = (cursor->b2 == floor->b1-cursor->yvel-1);
+ if (cursor->clx) {
+ if (left) {
+ cursor->pos.x = (floor->pos.x-cursor->xvel)-cursor->w-1;
+ } else if (!left && floor->xvel != 0) {
+ if (!right && floor->xvel < 0) {
+ cursor->pos.x = (floor->pos.x-cursor->xvel)-cursor->w-1;
}
}
- cursor.gnded = (cursor.pos.y == ((floor.b2-cursor.h)-newy)-(int)cursor.yvel) ? 1 : 0;
- printf("%u, %u\n%u\n%i\n%i, %i\n%07.06f, %07.06f\n", cursor.clx, cursor.cly, cursor.gnded, newy, cursor.pos.x, cursor.pos.y, cursor.xvel, cursor.yvel);
- } else {
- cursor.clx = (cursor.c2 > floor.c1-cursor.xvel-1 && cursor.d2 > floor.d1) && (cursor.c1 < (floor.c2-cursor.w)-cursor.xvel+1 && cursor.d1 < floor.d2);
- cursor.cly = (cursor.d2 >= floor.d1-cursor.yvel && cursor.c2 >= floor.c1) && (cursor.d1 <= floor.d2-cursor.yvel && cursor.c1 <= floor.c2);
- uint8_t l;
- uint8_t r;
- uint8_t t;
- uint8_t b;
- if (!floor.flp) {
- l = (cursor.c2 > floor.c1-cursor.xvel-1 && floor.d2-cursor.d2 < (int)floor.heightmap[0] && cursor.xvel > 0);
- r = (cursor.c1 < (floor.c2-cursor.w)-cursor.xvel+1 && floor.d2-cursor.d2 < (int)floor.heightmap[floor.w-1] && cursor.xvel < 0);
- t = (cursor.d2 > (floor.d2-hmpeak)-cursor.yvel && floor.d2-cursor.d2 >= 0);
- b = (cursor.d1 < floor.d2-cursor.yvel+1 && floor.d2-cursor.d1 <= 0);
- } else {
- l = (cursor.c2 > floor.c1-cursor.xvel-1 && floor.d1-cursor.d1 > -(int)floor.heightmap[0] && cursor.xvel > 0);
- r = (cursor.c1 < (floor.c2-cursor.w)-cursor.xvel+1 && floor.d1-cursor.d1 > -(int)floor.heightmap[floor.w-1] && cursor.xvel < 0);
- t = (cursor.d2 > floor.d1-cursor.yvel-1 && floor.d1-cursor.d2 >= 0 && cursor.yvel > 0);
- b = (cursor.c1 < (floor.d1+hmpeak)-cursor.yvel && cursor.d1-floor.d1 >= 0);
+ if (right) {
+ cursor->pos.x = (floor->pos.x+floor->w)-cursor->xvel+1;
+ } else if (!right && floor->xvel != 0) {
+ if (!left && floor->xvel > 0) {
+ cursor->pos.x = (floor->pos.x+floor->w)-cursor->xvel+1;
+ }
}
-
- if (cursor.clx) {
- if (cursor.c2-floor.c1 < -1 || cursor.c2-floor.c1 > floor.w) {
- if (l)
- cursor.pos.fx = (floor.pos.fx-cursor.xvel)-cursor.w-1;
- else if (r)
- cursor.pos.fx = (floor.c2-cursor.w)-cursor.xvel+1;
- cursor.xvel = 0;
+ cursor->xvel = 0;
+ floor->xvel = 0;
+ }
+ if (cursor->cly) {
+ if (top) {
+ cursor->pos.y = (floor->pos.y-cursor->yvel)-cursor->h-1;
+ } else if (!top && floor->yvel != 0) {
+ if (!bottom && floor->yvel < 0) {
+ cursor->pos.y = (floor->pos.y-cursor->yvel)-cursor->h-1;
}
}
- if (cursor.cly) {
- if (cursor.c2-floor.c1 < floor.w) {
- newy = (int)floor.heightmap[(int)cursor.c2-(int)floor.c1];
- if (t)
- (!floor.flp) ? (cursor.pos.fy = ((floor.d2-cursor.h)-newy)-cursor.yvel) : (cursor.pos.fy = (floor.pos.fy-cursor.h)-cursor.yvel);
- else if (b)
- (!floor.flp) ? (cursor.pos.fy = (floor.pos.fy+floor.h)-cursor.yvel) : (cursor.pos.fy = (floor.pos.fy+newy)-cursor.yvel);
- cursor.yvel = 0;
+ if (bottom) {
+ cursor->pos.y = (floor->pos.y+floor->h)-cursor->yvel+1;
+ } else if (!bottom && floor->yvel != 0) {
+ if (!top && floor->yvel > 0) {
+ cursor->pos.y = (floor->pos.y+floor->h)-cursor->yvel+1;
}
}
- cursor.gnded = (cursor.pos.fy == ((floor.d2-cursor.h)-newy)-cursor.yvel) ? 1 : 0;
- printf("%u, %u\n%u\n%i\n%07.06f, %07.06f\n%07.06f, %07.06f\n", cursor.clx, cursor.cly, cursor.gnded, newy, cursor.pos.fx, cursor.pos.fy, cursor.xvel, cursor.yvel);
+ cursor->yvel = 0;
+ floor->yvel = 0;
}
+ printf("%u, %u\n%u\n%i, %i\n%07.06f, %07.06f\n", cursor->clx, cursor->cly, cursor->gnded, cursor->pos.x, cursor->pos.y, cursor->xvel, cursor->yvel);
+ printf("%u, %u\n%u\n%i, %i\n%07.06f, %07.06f\n", floor->clx, floor->cly, floor->gnded, floor->pos.x, floor->pos.y, floor->xvel, floor->yvel);
return 0;
}
-/* Axis Aligned Bounding Box Collision. */
-int aabb(uint8_t flt, struct colis cursor, struct colis floor) {
- uint8_t l = (!flt) ? (cursor.a2 > floor.a1-(int)cursor.xvel-1 && cursor.b2 > floor.b1) : (cursor.c2 > floor.c1-cursor.xvel-1 && cursor.d2 > floor.d1);
- uint8_t r = (!flt) ? (cursor.a1 < floor.a2-(int)cursor.xvel+1 && cursor.b1 < floor.b2) : (cursor.c1 < floor.c2-cursor.xvel+1 && cursor.d1 < floor.d2);
- uint8_t t = (!flt) ? (cursor.b2 > floor.b1-(int)cursor.yvel-1 && cursor.a2 > floor.a1) : (cursor.d2 > floor.d1-cursor.yvel-1 && cursor.c2 > floor.c1);
- uint8_t b = (!flt) ? (cursor.b1 < floor.b2-(int)cursor.yvel+1 && cursor.a1 < floor.a2) : (cursor.d1 < floor.d2-cursor.yvel+1 && cursor.c1 < floor.c2);
- cursor.clx = l && r;
- cursor.cly = t && b;
+/* Floating point Axis Aligned Bounding Box Collision. */
+int faabb(struct colis *cursor, struct colis *floor) {
+ uint8_t coldir = get_coldir(1, AABB, -1, cursor, floor);
+ uint8_t left = (cursor->xvel > 0) && (!floor->xvel || floor->xvel != 0);
+ uint8_t right = (cursor->xvel < 0) && (!floor->xvel || floor->xvel != 0);
+ uint8_t top = (cursor->yvel > 0) && (!floor->yvel || floor->yvel != 0);
+ uint8_t bottom = (cursor->yvel < 0) && (!floor->yvel || floor->yvel != 0);
+
+ cursor->clx = (coldir & 0x03) == 0x03;
+ cursor->cly = (coldir & 0x0C) == 0x0C;
/* Is the Cursor is on the ground? */
- cursor.gnded = (cursor.b2 == floor.b1-(int)cursor.yvel-1) ? 1 : 0;
- /* Is the Cursor coming from the left? */
- if (l && cursor.xvel > 0)
- (!flt) ? (cursor.pos.x = (floor.pos.x-(int)cursor.xvel)-cursor.w-1) : (cursor.pos.fx = (floor.pos.fx-cursor.xvel)-(double)cursor.w-1);
- /* Is the Cursor coming from the right? */
- else if (r && cursor.xvel < 0)
- (!flt) ? (cursor.pos.x = (floor.pos.x+floor.w)-(int)cursor.xvel+1) : (cursor.pos.fx = (floor.pos.fx+(double)floor.w)-cursor.xvel+1);
- cursor.xvel = 0;
- /* Is the Cursor coming from the top? */
- if (t && cursor.yvel > 0)
- (!flt) ? (cursor.pos.y = (floor.pos.y-(int)cursor.yvel)-cursor.h-1) : (cursor.pos.fy = (floor.pos.fy-cursor.yvel)-(double)cursor.h-1);
- /* Is the Cursor coming from the bottom? */
- else if (b && cursor.yvel < 0)
- (!flt) ? (cursor.pos.y = (floor.pos.y+floor.h)-(int)cursor.yvel+1) : (cursor.pos.fy = (floor.pos.fy+(double)floor.h)-cursor.yvel+1);
- cursor.yvel = 0;
- if (!flt)
- printf("%u, %u\n%u\n%i, %i\n%07.06f, %07.06f\n", cursor.clx, cursor.cly, cursor.gnded, cursor.pos.x, cursor.pos.y, cursor.xvel, cursor.yvel);
- else
- printf("%u, %u\n%u\n%07.06f, %07.06f\n%07.06f, %07.06f\n", cursor.clx, cursor.cly, cursor.gnded, cursor.pos.fx, cursor.pos.fy, cursor.xvel, cursor.yvel);
+ cursor->gnded = (cursor->d2 == floor->d1-cursor->yvel-1);
+ if (cursor->clx) {
+ if (left) {
+ cursor->pos.fx = (floor->pos.fx-cursor->xvel)-cursor->w-1;
+ } else if (!left && floor->xvel != 0) {
+ if (!right && floor->xvel < 0) {
+ cursor->pos.fx = (floor->pos.fx-cursor->xvel)-cursor->w-1;
+ }
+ }
+ if (right) {
+ cursor->pos.fx = (floor->pos.fx+floor->w)-cursor->xvel+1;
+ } else if (!right && floor->xvel != 0) {
+ if (!left && floor->xvel > 0) {
+ cursor->pos.fx = (floor->pos.fx+floor->w)-cursor->xvel+1;
+ }
+ }
+ cursor->xvel = 0;
+ floor->xvel = 0;
+ }
+ if (cursor->cly) {
+ if (top) {
+ cursor->pos.fy = (floor->pos.fy-cursor->yvel)-cursor->h-1;
+ } else if (!top && floor->yvel != 0) {
+ if (!bottom && floor->yvel < 0) {
+ cursor->pos.fy = (floor->pos.fy-cursor->yvel)-cursor->h-1;
+ }
+ }
+ if (bottom) {
+ cursor->pos.fy = (floor->pos.fy+floor->h)-cursor->yvel+1;
+ } else if (!bottom && floor->yvel != 0) {
+ if (!top && floor->yvel > 0) {
+ cursor->pos.fy = (floor->pos.fy+floor->h)-cursor->yvel+1;
+ }
+ }
+ cursor->yvel = 0;
+ floor->yvel = 0;
+ }
+ printf("%u, %u\n%u\n%07.06f, %07.06f\n%07.06f, %07.06f\n", cursor->clx, cursor->cly, cursor->gnded, cursor->pos.fx, cursor->pos.fy, cursor->xvel, cursor->yvel);
+ printf("%u, %u\n%u\n%07.06f, %07.06f\n%07.06f, %07.06f\n", floor->clx, floor->cly, floor->gnded, floor->pos.fx, floor->pos.fy, floor->xvel, floor->yvel);
return 0;
}
int main(int argc, char **argv) {
int c;
+ FILE *fp = NULL;
+ uint8_t isfile = 0;
/* Enable custom error messages, and optional arguments/ */
opterr = 0;
/* Get options. */
- while ((c = getopt(argc, argv, opts)) != -1) {
- switch(c) {
- case 'c':
- colltype = atoi(optarg);
- break;
- case 'v':
- verbose = atoi(optarg);
- break;
- case 'h':
- usage();
- return 2;
- case '?':
- if (isprint(optopt)) {
- if (optopt == 'c') {
- fprintf(stderr, "Setting colltype to default.\n");
- colltype = -1;
- break;
- } else if (optopt == 'v') {
- fprintf(stderr, "Enabling single level verbosity.\n");
- verbose = 1;
- break;
+ while (optind < argc) {
+ if ((c = getopt(argc, argv, opts)) != -1) {
+ switch(c) {
+ case 'c':
+ colltype = atoi(optarg);
+ break;
+ case 'v':
+ verbose = atoi(optarg);
+ break;
+ case 'h':
+ usage();
+ return 2;
+ case '?':
+ if (isprint(optopt)) {
+ if (optopt == 'c') {
+ fprintf(stderr, "Setting colltype to default.\n");
+ colltype = -1;
+ break;
+ } else if (optopt == 'v') {
+ fprintf(stderr, "Enabling single level verbosity.\n");
+ verbose = 1;
+ break;
+ } else {
+ fprintf(stderr
+ , "The option that you have typed in, which in this case\n"
+ "is -%c, does not exist.\n"
+ "Try looking at the help message, or RTFM, next time.\n"
+ , optopt);
+ }
} else {
fprintf(stderr
- , "The option that you have typed in, which in this case\n"
- "is -%c, does not exist.\n"
- "Try looking at the help message, or RTFM, next time.\n"
- , optopt);
+ , "What the fuck are you trying to type in, a binary blob?\n"
+ "Because of this, clld will exit, so, stop acting like a\n"
+ "jackass.\n");
}
- } else {
- fprintf(stderr
- , "What the fuck are you trying to type in, a binary blob?\n"
- "Because of this, clld will exit, so, stop acting like a\n"
- "jackass.\n");
+ return -1;
+ default: ;
+ }
+ } else {
+ if (!isfile) {
+ fp = fopen(argv[optind], "r");
+ if (fp == NULL) {
+ fprintf(stderr, "Failed to open file %s\n", optarg);
+ return -1;
}
- return -1;
- default: ;
+ }
+ isfile = (fp != NULL);
+ optind++;
}
}
@@ -264,19 +480,18 @@ int main(int argc, char **argv) {
* the process of getting collision data, to one for loop.
*/
struct colis tmp;
- int hmpeak;
+ int hmpeak = 0;
/* Get collision type. */
char *buf = NULL;
size_t size;
-
- getline(&buf, &size, stdin);
+ getline(&buf, &size, (isfile) ? fp : stdin);
if (colltype == -1)
colltype = atoi(strtok(buf, "\n"));
for (int coll = 0; coll <= 1; coll++) {
buf = NULL;
- getline(&buf, &size, stdin);
+ getline(&buf, &size, (isfile) ? fp : stdin);
/*
* Format is:
*
@@ -293,11 +508,12 @@ int main(int argc, char **argv) {
if (colltype == THM && coll) {
/* Get vertical flip flag */
buf = NULL;
- getline(&buf, &size, stdin);
+ getline(&buf, &size, (isfile) ? fp : stdin);
floor.flp = buf[0] - '0';
/* Get Heightmap */
buf = NULL;
- size_t newidth = getline(&buf, &size, stdin);
+ size_t newidth = getline(&buf, &size, (isfile) ? fp : stdin);
+
/*
* Format is:
*
@@ -332,7 +548,7 @@ int main(int argc, char **argv) {
uint8_t delms = 0;
char *tmp2;
buf = NULL;
- getline(&buf, &size, stdin);
+ getline(&buf, &size, (isfile) ? fp : stdin);
for (int j = 0; buf[j] != '\0'; j++)
if (buf[j] == ',')
delms++;
@@ -367,11 +583,14 @@ int main(int argc, char **argv) {
}
}
/* Get X, and Y velocity. */
- if(!coll) {
- buf = NULL;
- getline(&buf, &size, stdin);
+ buf = NULL;
+ getline(&buf, &size, (isfile) ? fp : stdin);
+ if (!coll) {
cursor.xvel = atof(strtok(buf, ","));
cursor.yvel = atof(strtok(NULL, "\n"));
+ } else {
+ floor.xvel = atof(strtok(buf, ","));
+ floor.yvel = atof(strtok(NULL, "\n"));
}
(!flt) ? (cursor.a1 = cursor.pos.x) : (cursor.c1 = cursor.pos.fx);
@@ -383,11 +602,12 @@ int main(int argc, char **argv) {
(!flt) ? (floor.b1 = floor.pos.y) : (floor.d1 = floor.pos.fy);
(!flt) ? (floor.b2 = floor.pos.y+floor.h) : (floor.d2 = floor.pos.fy+floor.h);
- if (colltype == THM && coll)
- thm(flt, hmpeak, cursor, floor);
-
- if (colltype == AABB && coll)
- aabb(flt, cursor, floor);
+ if (coll) {
+ switch (colltype) {
+ case THM : (!flt) ? thm(hmpeak, &cursor, &floor) : fthm(hmpeak, &cursor, &floor); break;
+ case AABB: (!flt) ? aabb(&cursor, &floor ) : faabb(&cursor, &floor ); break;
+ }
+ }
}
uint8_t a = 0;
unsigned int i = 0;
@@ -396,6 +616,5 @@ int main(int argc, char **argv) {
free(floor.heightmap);
}
fflush(stdout);
-
return 0;
}
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2024-05-08 02:18:13 +0000