tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into composite-layers

Browse Source 
Conflicts:
	src/shader/shaders_gl.cpp
	src/shader/shaders_gles2.cpp
This commit is contained in:
Konstantin Käfer
2014-05-22 14:49:27 +02:00
parent e1a59e0ae8 1cfa10753a
commit 04e70b240e
2 changed files with 372 additions and 1018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1388
bin/style.js
View File

File diff suppressed because it is too large Load Diff

2
src/text/placement.cpp
View File

@@ -13,7 +13,7 @@ using namespace llmr;
const int Placement::tileExtent = 4096;
const int Placement::glyphSize =
24; // size in pixels of this glyphs in the tile
const float Placement::minScale = 0.125; // underscale by 3 zoom levels
const float Placement::minScale = 0.5; // underscale by 1 zoom level
Placement::Placement(int8_t zoom)
: zoom(zoom),