projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more hard-coded paths
[supertux.git]
/
src
/
collision.cpp
diff --git
a/src/collision.cpp
b/src/collision.cpp
index
aa0631a
..
cce522d
100644
(file)
--- a/
src/collision.cpp
+++ b/
src/collision.cpp
@@
-28,14
+28,14
@@
#include <math.h>
#include "math/vector.h"
#include "math/aatriangle.h"
#include <math.h>
#include "math/vector.h"
#include "math/aatriangle.h"
-#include "math/rect
angle
.h"
+#include "math/rect.h"
#include "collision_hit.h"
static const float DELTA = .0001;
bool
#include "collision_hit.h"
static const float DELTA = .0001;
bool
-Collision::rectangle_rectangle(CollisionHit& hit, const Rect
angle
& r1,
- const Vector& movement, const Rect
angle
& r2)
+Collision::rectangle_rectangle(CollisionHit& hit, const Rect& r1,
+ const Vector& movement, const Rect& r2)
{
if(r1.p2.x < r2.p1.x || r1.p1.x > r2.p2.x)
return false;
{
if(r1.p2.x < r2.p1.x || r1.p1.x > r2.p2.x)
return false;
@@
-98,10
+98,10
@@
static void makePlane(const Vector& p1, const Vector& p2, Vector& n, float& c)
}
bool
}
bool
-Collision::rectangle_aatriangle(CollisionHit& hit, const Rect
angle
& rect,
+Collision::rectangle_aatriangle(CollisionHit& hit, const Rect& rect,
const Vector& movement, const AATriangle& triangle)
{
const Vector& movement, const AATriangle& triangle)
{
- if(!rectangle_rectangle(hit, rect, movement, (const Rect
angle
&) triangle))
+ if(!rectangle_rectangle(hit, rect, movement, (const Rect&) triangle))
return false;
Vector normal;
return false;
Vector normal;