Hunde.

[hackover2013-badge-firmware.git] / badge / jumpnrun / collision.c

diff --git a/badge/jumpnrun/collision.c b/badge/jumpnrun/collision.c
index 66b6e2b..34ab099 100644 (file)
--- a/badge/jumpnrun/collision.c
+++ b/badge/jumpnrun/collision.c
@@ -1,33 +1,30 @@
 #include "collision.h"
 
 #include "collision.h"
 

-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof*(arr))
-
-void collision_displace(vec2d           *desired_pos,
-                       rectangle const *current,
-                       rectangle const *obstacle,
-                       vec2d           *inertia,
-                       bool            *touching_ground) {
-  rectangle desired = *current;
+void collision_displace(vec2d             *desired_pos,
+                       jumpnrun_moveable *current,
+                       rectangle   const *obstacle,
+                       vec2d             *inertia_mod) {
+  rectangle desired = current->current_box;

   rectangle_move_to(&desired, *desired_pos);
 
   if(!rectangle_intersect(obstacle, &desired)) {
     return;
   }
 
   rectangle_move_to(&desired, *desired_pos);
 
   if(!rectangle_intersect(obstacle, &desired)) {
     return;
   }
 

-  fixed_point x = FIXED_POINT(1000, 0), y = FIXED_POINT(1000, 0);
+  fixed_point x = FIXED_INT(1000), y = FIXED_INT(1000);

   fixed_point dx = desired_pos->x, dy = desired_pos->y;
   bool bottom_collision = false;
 
   if(fixed_point_le(rectangle_top   ( obstacle), rectangle_top(&desired)) &&
      fixed_point_gt(rectangle_bottom( obstacle), rectangle_top(&desired)) &&
   fixed_point dx = desired_pos->x, dy = desired_pos->y;
   bool bottom_collision = false;
 
   if(fixed_point_le(rectangle_top   ( obstacle), rectangle_top(&desired)) &&
      fixed_point_gt(rectangle_bottom( obstacle), rectangle_top(&desired)) &&

-     fixed_point_lt(rectangle_top   (&desired ), rectangle_top( current))) {
+     fixed_point_lt(rectangle_top   (&desired ), rectangle_top(&current->current_box))) {

 
     y  = fixed_point_sub(rectangle_bottom(obstacle), rectangle_top(&desired));
     dy =                 rectangle_bottom(obstacle);
 
   } else if(fixed_point_gt(rectangle_bottom( obstacle), rectangle_bottom(&desired)) &&
            fixed_point_le(rectangle_top   ( obstacle), rectangle_bottom(&desired)) &&
 
     y  = fixed_point_sub(rectangle_bottom(obstacle), rectangle_top(&desired));
     dy =                 rectangle_bottom(obstacle);
 
   } else if(fixed_point_gt(rectangle_bottom( obstacle), rectangle_bottom(&desired)) &&
            fixed_point_le(rectangle_top   ( obstacle), rectangle_bottom(&desired)) &&

-           fixed_point_gt(rectangle_top   (&desired ), rectangle_top   ( current))) {
+           fixed_point_gt(rectangle_top   (&desired ), rectangle_top   (&current->current_box))) {

 
     y  = fixed_point_sub(rectangle_bottom(&desired ), rectangle_top   ( obstacle));
     dy = fixed_point_sub(rectangle_top   ( obstacle), rectangle_height(&desired ));
 
     y  = fixed_point_sub(rectangle_bottom(&desired ), rectangle_top   ( obstacle));
     dy = fixed_point_sub(rectangle_top   ( obstacle), rectangle_height(&desired ));


@@ -38,14 +35,14 @@ void collision_displace(vec2d           *desired_pos,
 
   if(fixed_point_le(rectangle_left ( obstacle), rectangle_left(&desired)) &&
      fixed_point_gt(rectangle_right( obstacle), rectangle_left(&desired)) &&
 
   if(fixed_point_le(rectangle_left ( obstacle), rectangle_left(&desired)) &&
      fixed_point_gt(rectangle_right( obstacle), rectangle_left(&desired)) &&

-     fixed_point_lt(rectangle_left (&desired ), rectangle_left( current))) {
+     fixed_point_lt(rectangle_left (&desired ), rectangle_left(&current->current_box))) {

 
     x  = fixed_point_sub(rectangle_right(obstacle), rectangle_left(&desired));
     dx =                 rectangle_right(obstacle);
 
   } else if(fixed_point_gt(rectangle_right( obstacle), rectangle_right(&desired)) &&
            fixed_point_le(rectangle_left ( obstacle), rectangle_right(&desired)) &&
 
     x  = fixed_point_sub(rectangle_right(obstacle), rectangle_left(&desired));
     dx =                 rectangle_right(obstacle);
 
   } else if(fixed_point_gt(rectangle_right( obstacle), rectangle_right(&desired)) &&
            fixed_point_le(rectangle_left ( obstacle), rectangle_right(&desired)) &&

-           fixed_point_gt(rectangle_left (&desired ), rectangle_left ( current))) {
+           fixed_point_gt(rectangle_left (&desired ), rectangle_left (&current->current_box))) {

 
     x  = fixed_point_sub(rectangle_right(&desired ), rectangle_left ( obstacle));
     dx = fixed_point_sub(rectangle_left ( obstacle), rectangle_width(&desired ));
 
     x  = fixed_point_sub(rectangle_right(&desired ), rectangle_left ( obstacle));
     dx = fixed_point_sub(rectangle_left ( obstacle), rectangle_width(&desired ));


@@ -57,23 +54,22 @@ void collision_displace(vec2d           *desired_pos,
     desired_pos->y = dy;
   } else if(fixed_point_gt(x, y)) {
     desired_pos->y = dy;
     desired_pos->y = dy;
   } else if(fixed_point_gt(x, y)) {
     desired_pos->y = dy;

-    inertia->y = FIXED_POINT(0, 0);
+    inertia_mod->y = FIXED_INT(0);

 
 

-    *touching_ground = bottom_collision;
+    current->touching_ground = bottom_collision;

   } else {
     desired_pos->x = dx;
   } else {
     desired_pos->x = dx;

-    inertia->x = FIXED_POINT(0, 0);
+    inertia_mod->x = FIXED_INT(0);

   }
 
   return;
 }
 
 void collisions_tiles_displace(vec2d                     *desired_position,
   }
 
   return;
 }
 
 void collisions_tiles_displace(vec2d                     *desired_position,

-                              rectangle           const *current,
+                              jumpnrun_moveable         *thing,

                               jumpnrun_level      const *lv,
                               jumpnrun_tile_range const *visible_tiles,
                               jumpnrun_level      const *lv,
                               jumpnrun_tile_range const *visible_tiles,

-                              vec2d                     *inertia,
-                              bool                      *touching_ground)
+                              vec2d                     *inertia_mod)

 {
   int collision_tile[] = { -1, -1, -1,
                           -1, -1, -1,
 {
   int collision_tile[] = { -1, -1, -1,
                           -1, -1, -1,


@@ -81,11 +77,11 @@ void collisions_tiles_displace(vec2d                     *desired_position,
   };
   static int const collision_order[] = { 7, 1, 3, 5, 6, 8, 0, 2 };
 
   };
   static int const collision_order[] = { 7, 1, 3, 5, 6, 8, 0, 2 };
 

-  vec2d midpoint = rectangle_mid(current);
+  vec2d midpoint = rectangle_mid(&thing->current_box);

 
   jumpnrun_tile_position midtile_pos = {
 
   jumpnrun_tile_position midtile_pos = {

-    fixed_point_cast_int(fixed_point_div(midpoint.x, FIXED_POINT(JUMPNRUN_TILE_PIXEL_WIDTH , 0))),
-    fixed_point_cast_int(fixed_point_div(midpoint.y, FIXED_POINT(JUMPNRUN_TILE_PIXEL_HEIGHT, 0)))
+    fixed_point_cast_int(fixed_point_div(midpoint.x, FIXED_INT(JUMPNRUN_TILE_PIXEL_WIDTH ))),
+    fixed_point_cast_int(fixed_point_div(midpoint.y, FIXED_INT(JUMPNRUN_TILE_PIXEL_HEIGHT)))

   };
 
   int tile;
   };
 
   int tile;


@@ -128,9 +124,8 @@ void collisions_tiles_displace(vec2d                     *desired_position,
   }
 
   /* collision: sort by priority (top/bottom, left/right, then diagonal) */
   }
 
   /* collision: sort by priority (top/bottom, left/right, then diagonal) */

-  *touching_ground = false;
+  thing->touching_ground = false;

 
 

-  //  printf("mid: %d, %d\n", midtile_pos.x, midtile_pos.y);

   for(size_t collision_index = 0; collision_index < ARRAY_SIZE(collision_order); ++collision_index) {
     if(collision_tile[collision_order[collision_index]] == -1) {
       continue;
   for(size_t collision_index = 0; collision_index < ARRAY_SIZE(collision_order); ++collision_index) {
     if(collision_tile[collision_order[collision_index]] == -1) {
       continue;


@@ -138,6 +133,8 @@ void collisions_tiles_displace(vec2d                     *desired_position,
           
     rectangle tile_rect = rect_from_tile(&lv->tiles[collision_tile[collision_order[collision_index]]]);
 
           
     rectangle tile_rect = rect_from_tile(&lv->tiles[collision_tile[collision_order[collision_index]]]);
 

-    collision_displace(desired_position, current, &tile_rect, inertia, touching_ground);
+    collision_displace(desired_position, thing, &tile_rect, inertia_mod);

   }
   }

+
+  rectangle_move_to(&thing->current_box, *desired_position);

 }
 }