X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcollision.h;h=d4f58825a5f3e2a0afdccc4a4f0170b35ab32c57;hb=1aa0de39a5f87bda1e74d0992848ad5142a850bc;hp=4a009e576da8965ec3f7013fcade52db2c118000;hpb=ddd864d8f63de465349cfb7b249b335a6b325066;p=supertux.git

diff --git a/src/collision.h b/src/collision.h
index 4a009e576..d4f58825a 100644
--- a/src/collision.h
+++ b/src/collision.h
@@ -1,7 +1,7 @@
 //  $Id$
 // 
 //  SuperTux
-//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -18,42 +18,29 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
-#ifndef SUPERTUX_COLLISION_H
-#define SUPERTUX_COLLISION_H
+#ifndef __COLLISION_H__
+#define __COLLISION_H__
 
-#include "type.h"
+class Vector;
+class Rect;
+class AATriangle;
+class CollisionHit;
 
-class Tile;
-class World;
-
-/* Collision objects */
-enum
+class Collision
 {
-  CO_BULLET,
-  CO_BADGUY,
-  CO_PLAYER
-};
-
-enum CollisionType {
-    COLLISION_NORMAL,
-    COLLISION_BUMP,
-    COLLISION_SQUISH
+public:
+  /** does collision detection between 2 rectangles. Returns true in case of
+   * collision and fills in the hit structure then.
+   */
+  static bool rectangle_rectangle(CollisionHit& hit, const Rect& r1,
+      const Vector& movement, const Rect& r2);
+
+  /** does collision detection between a rectangle and an axis aligned triangle
+   * Returns true in case of a collision and fills in the hit structure then.
+   */                                                                         
+  static bool rectangle_aatriangle(CollisionHit& hit, const Rect& rect,
+      const Vector& movement, const AATriangle& triangle);                                            
 };
 
-bool rectcollision(const base_type& one, const base_type& two);
-bool rectcollision_offset(const base_type& one, const base_type& two, float off_x, float off_y);
-
-void collision_swept_object_map(base_type* old, base_type* current);
-bool collision_object_map(const base_type& object);
-
-/** Return a pointer to the tile at the given x/y coordinates */
-Tile* gettile(float x, float y);
-
-// Some little helper function to check for tile properties
-bool  issolid(float x, float y);
-bool  isbrick(float x, float y);
-bool  isice(float x, float y);
-bool  isfullbox(float x, float y);
-
-#endif /*SUPERTUX_COLLISION_H*/
+#endif