X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcollision.cpp;h=716c05aa53beddcb56e8e3c443a3cdea47e74170;hb=935c2f6a2a27248de63fba86b74a724675761487;hp=1c96d91785eb2e44c2e71acb49471689a44f30e7;hpb=ddd864d8f63de465349cfb7b249b335a6b325066;p=supertux.git

diff --git a/src/collision.cpp b/src/collision.cpp
index 1c96d9178..716c05aa5 100644
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -18,14 +18,21 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
+#include <cmath>
 #include "defines.h"
 #include "collision.h"
 #include "bitmask.h"
 #include "scene.h"
-#include "world.h"
-#include "level.h"
+#include "sector.h"
+#include "tilemap.h"
 #include "tile.h"
 
+struct TileInfo
+{
+  Tile *tile;
+  int x, y;
+} tileinfo;
+
 bool rectcollision(const base_type& one, const base_type& two)
 {
   return (one.x >= two.x - one.width + 1  &&
@@ -42,43 +49,66 @@ bool rectcollision_offset(const base_type& one, const base_type& two, float off_
           one.y <= two.y + two.height + off_y - 1);
 }
 
-bool collision_object_map(const base_type& pbase)
+bool collision_object_map(const base_type& base)
 {
-  int v = (int)pbase.height / 16;
-  int h = (int)pbase.width / 16;
+  const TileMap& tilemap = *Sector::current()->solids;
 
-  if(issolid(pbase.x + 1, pbase.y + 1) ||
-     issolid(pbase.x + pbase.width -1, pbase.y + 1) ||
-     issolid(pbase.x +1, pbase.y + pbase.height -1) ||
-     issolid(pbase.x + pbase.width -1, pbase.y + pbase.height - 1))
-    return true;
+  // we make the collision rectangle 1 pixel smaller
+  int starttilex = int(base.x+1) / 32;
+  int starttiley = int(base.y+1) / 32;
+  int max_x = int(base.x + base.width);
+  int max_y = int(base.y + base.height);
 
-  for(int i = 1; i < h; ++i)
-    {
-      if(issolid(pbase.x + i*16,pbase.y + 1))
-        return true;
-    }
+  tileinfo.tile = NULL;
 
-  for(int i = 1; i < h; ++i)
-    {
-      if(  issolid(pbase.x + i*16,pbase.y + pbase.height - 1))
+  for(int x = starttilex; x*32 < max_x; ++x) {
+    for(int y = starttiley; y*32 < max_y; ++y) {
+      Tile* tile = tilemap.get_tile(x, y);
+      if(tile && tile->attributes & Tile::SOLID)
+        {
+        tileinfo.tile = tile;
+        tileinfo.x = x*32;
+        tileinfo.y = y*32;
         return true;
+        }
     }
+  }
 
-  for(int i = 1; i < v; ++i)
-    {
-      if(  issolid(pbase.x + 1, pbase.y + i*16))
-        return true;
-    }
-  for(int i = 1; i < v; ++i)
-    {
-      if(  issolid(pbase.x + pbase.width - 1, pbase.y + i*16))
-        return true;
+  return false;
+}
+
+void* collision_func(const base_type& base, tiletestfunction function)
+{
+  const TileMap& tilemap = *Sector::current()->solids;
+  
+  int starttilex = int(base.x) / 32;
+  int starttiley = int(base.y) / 32;
+  int max_x = int(base.x + base.width);
+  int max_y = int(base.y + base.height);
+
+  for(int x = starttilex; x*32 < max_x; ++x) {
+    for(int y = starttiley; y*32 < max_y; ++y) {
+      Tile* tile = tilemap.get_tile(x, y);
+      void* result = function(tile);
+      if(result != 0)
+        return result;
     }
+  }
 
-  return false;
+  return 0;
 }
 
+static void* test_goal_tile_function(Tile* tile)
+{
+  if(tile && (tile->attributes & Tile::GOAL))
+    return tile;
+  return 0;
+}
+
+Tile* collision_goal(const base_type& base)
+{
+  return (Tile*) collision_func(base, test_goal_tile_function);
+}
 
 void collision_swept_object_map(base_type* old, base_type* current)
 {
@@ -143,6 +173,8 @@ void collision_swept_object_map(base_type* old, base_type* current)
 
   steps = (int)(lpath / (float)16);
 
+  float orig_x = old->x;
+  float orig_y = old->y;
   old->x += xd;
   old->y += yd;
 
@@ -157,6 +189,21 @@ void collision_swept_object_map(base_type* old, base_type* current)
 
       if(collision_object_map(*old))
         {
+        if(tileinfo.tile->slope_angle != 0)
+          {  // in case this is a slope, set the right Y position
+          // left-right slope:
+          if(tileinfo.tile->slope_angle > 0 && tileinfo.tile->slope_angle < M_PI/2)
+            current->y = tileinfo.y - current->height +
+                         (tileinfo.x - current->x)*tan(M_PI/2 - tileinfo.tile->slope_angle)
+                         - 1;
+          // right-left slope:
+          if(tileinfo.tile->slope_angle > M_PI/2 && tileinfo.tile->slope_angle < M_PI)
+            current->y = tileinfo.y - current->height +
+                         (current->x - tileinfo.x)*tan(M_PI - tileinfo.tile->slope_angle)
+                         - 1;
+          }
+        else
+          {
           switch(h)
             {
             case 1:
@@ -207,45 +254,57 @@ void collision_swept_object_map(base_type* old, base_type* current)
             }
           break;
         }
+      }
     }
 
+  if((xd > 0 && current->x < orig_x) || (xd < 0 && current->x > orig_x))
+    current->x = orig_x;
+  if((yd > 0 && current->y < orig_y) || (yd < 0 && current->y > orig_y))
+    current->y = orig_y;
+
   *old = *current;
 }
 
-
 Tile* gettile(float x, float y)
 {
-  return TileManager::instance()->get(World::current()->get_level()->gettileid(x, y));
+  const TileMap& tilemap = *Sector::current()->solids;
+  return tilemap.get_tile_at(Vector(x, y));
 }
 
 bool issolid(float x, float y)
 {
   Tile* tile = gettile(x,y);
-  return tile && tile->solid;
+  return tile && (tile->attributes & Tile::SOLID);
 }
 
 bool isbrick(float x, float y)
 {
   Tile* tile = gettile(x,y);
-  return tile && tile->brick;
+  return tile && (tile->attributes & Tile::BRICK);
 }
 
 bool isice(float x, float y)
 {
   Tile* tile = gettile(x,y);
-  return tile && tile->ice;
+  return tile && (tile->attributes & Tile::ICE);
+}
+
+bool isspike(float x, float y)
+{
+  Tile* tile = gettile(x,y);
+  return tile && (tile->attributes & Tile::SPIKE);
 }
 
 bool isfullbox(float x, float y)
 {
   Tile* tile = gettile(x,y);
-  return tile && tile->fullbox;
+  return tile && (tile->attributes & Tile::FULLBOX);
 }
 
-bool isdistro(float x, float y)
+bool iscoin(float x, float y)
 {
   Tile* tile = gettile(x,y);
-  return tile && tile->distro;
+  return tile && (tile->attributes & Tile::COIN);
 }
 
 /* EOF */