projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
auto detect aspect ratio of monitor, so that you don't have to know/use the cryptic...
[supertux.git]
/
src
/
collision.cpp
diff --git
a/src/collision.cpp
b/src/collision.cpp
index
e9c25fb
..
f96fdea
100644
(file)
--- a/
src/collision.cpp
+++ b/
src/collision.cpp
@@
-57,7
+57,7
@@
namespace {
c /= nval;
}
c /= nval;
}
- static const float DELTA = .0001;
+ static const float DELTA = .0001
f
;
}
bool rectangle_aatriangle(Constraints* constraints, const Rect& rect,
}
bool rectangle_aatriangle(Constraints* constraints, const Rect& rect,
@@
-128,7
+128,7
@@
bool rectangle_aatriangle(Constraints* constraints, const Rect& rect,
std::cout << "Norm: " << normal << " Depth: " << depth << "\n";
#endif
std::cout << "Norm: " << normal << " Depth: " << depth << "\n";
#endif
- Vector outvec = normal * (depth + 0.2);
+ Vector outvec = normal * (depth + 0.2
f
);
const float RDELTA = 3;
if(p1.x < area.p1.x - RDELTA || p1.x > area.p2.x + RDELTA
const float RDELTA = 3;
if(p1.x < area.p1.x - RDELTA || p1.x > area.p2.x + RDELTA