Merge branch 'master' into blur

Conflicts:
	src/shader/shaders_gl.cpp
	src/shader/shaders_gles2.cpp
This commit is contained in:
Konstantin Käfer
2014-05-26 17:30:31 +02:00
18 changed files with 240 additions and 145 deletions

View File

@@ -312,6 +312,14 @@ void Map::stopScaling() {
update();
}
double Map::getMinZoom() {
return transform.getMinZoom();
}
double Map::getMaxZoom() {
return transform.getMaxZoom();
}
#pragma mark - Rotation
@@ -356,6 +364,10 @@ void Map::stopRotating() {
update();
}
bool Map::canRotate() {
return transform.canRotate();
}
#pragma mark - Toggles