Merge remote-tracking branch 'remotes/origin/pr/127'

Conflicts:
	include/llmr/map/map.hpp
	src/map/map.cpp
	src/platform/platform.cpp
This commit is contained in:
Konstantin Käfer
2014-04-15 12:46:19 -04:00
31 changed files with 874 additions and 467 deletions

View File

@@ -298,7 +298,7 @@ double Transform::getAngle() const {
return angle;
}
box Transform::mapCornersToBox(uint32_t z) const {
box Transform::cornersToBox(uint32_t z) const {
const double ref_scale = pow(2, z);
const double angle_sin = sin(-angle);