// $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
// 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 Rectangle;
+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 Rectangle& r1,
+ const Vector& movement, const Rectangle& 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 Rectangle& rect,
+ const Vector& movement, const AATriangle& triangle);
};
-bool rectcollision(base_type* one, base_type* two);
-bool rectcollision_offset(base_type* one, base_type* two, float off_x, float off_y);
-
-void collision_swept_object_map(base_type* old, base_type* current);
-bool collision_object_map(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