two render passes

Conflicts:
	resources/style.pbf
	src/renderer/painter.cpp
	src/style/resources.cpp
This commit is contained in:
Konstantin Käfer
2014-03-10 13:48:06 +01:00
parent a1ebf3f264
commit 978b714de8
4 changed files with 144 additions and 130 deletions

View File

@@ -250,9 +250,6 @@ void Transform::matrixFor(mat4& matrix, const vec3<int32_t>& id) const {
// TODO: Get rid of the 8 (scaling from 4096 to tile size);
float factor = scale / tile_scale / (4096.0f / util::tileSize);
matrix::scale(matrix, matrix, factor, factor, 1);
// Clipping plane
matrix::translate(matrix, matrix, 0, 0, -1);
}
float Transform::getZoom() const {