157 Commits

Author SHA1 Message Date
Hannes Janetzek
55a181330d some more labeling experiments 2013-10-09 01:55:50 +02:00
Hannes Janetzek
bde5eff447 limit TextItem pool items 2013-10-09 01:55:50 +02:00
Hannes Janetzek
c81b417ea5 refactor loops 2013-10-09 01:55:50 +02:00
Hannes Janetzek
3d8f62ec4a cleanups 2013-10-09 01:55:50 +02:00
Hannes Janetzek
8bcc3b6b3f add field for checking if labels are joined with neighbours 2013-10-09 01:55:50 +02:00
Hannes Janetzek
be748138ac - use Stencil instead of Depth for clipping test
to avoid drawing everything with polygonOffset
- add GLState.useProgram
2013-10-09 01:55:50 +02:00
Hannes Janetzek
5f03a33492 it probably makes no sense to cycle ByteBuffers for upload to GL 2013-10-09 01:55:50 +02:00
Hannes Janetzek
6f98e1542b add null check 2013-10-09 01:55:50 +02:00
Hannes Janetzek
123284a1a5 prefetch parent tiles 2013-10-09 01:55:49 +02:00
Hannes Janetzek
d376d07c12 use short vertices, add docs 2013-10-09 01:55:49 +02:00
Hannes Janetzek
32d3eec036 some experiments 2013-10-09 01:55:49 +02:00
Hannes Janetzek
b691c185f3 cleanup 2013-10-09 01:55:49 +02:00
Hannes Janetzek
5bcfafc7c7 clear static refs (at least on re-init) 2013-10-09 01:55:49 +02:00
Hannes Janetzek
5f6025206d building color tweaks 2013-10-09 01:55:49 +02:00
Hannes Janetzek
42964861b8 - BufferObject.get(): try to return a BufferObject with matching size so that glSubBufferData is used more often
- use BufferObject in ExtrusionLayer - fixes also wrong call to glDeleteBuffer from non-glThread
2013-10-09 01:55:49 +02:00
Hannes Janetzek
54923d6bff fix bug overlay lines causing short flashing lines when changing zoom-levels 2013-10-09 01:55:49 +02:00
Hannes Janetzek
07dcbde928 started polygon patter shader 2013-10-09 01:55:49 +02:00
Hannes Janetzek
1dd7e3c7a8 rename BaseLayer -> BaseMap 2013-10-09 01:55:49 +02:00
Hannes Janetzek
235e001a82 add 'min-size' option to line renderinstruction, when size is less no outline will be drawn 2013-10-09 01:55:49 +02:00
Hannes Janetzek
6a34e478f5 improve text placement a little 2013-10-09 01:55:49 +02:00
Hannes Janetzek
e21831ceb9 more line shader experiments: use sqrt() lookup table in fragment shader 2013-10-09 01:55:49 +02:00
Hannes Janetzek
e1fb97ae30 draw text textures only once per string
- unify duplicate strings from different tiles (as side-effect save some bytes)
- fix 'advance by width' in texture drawing
2013-10-09 01:55:49 +02:00
Hannes Janetzek
928c7e7328 comment 2013-10-09 01:55:49 +02:00
Hannes Janetzek
9705811f7b fix way too much z-offset used for roof outline 2013-10-09 01:55:49 +02:00
Hannes Janetzek
38239cd615 dont add z-offset way labels 2013-10-09 01:55:48 +02:00
Hannes Janetzek
62bc122930 use smoothstep interpolation for simple line shader
testing with one vertexAttribArray, this should be faster for switching polgon/line shaders
2013-10-09 01:55:48 +02:00
Hannes Janetzek
3c990b3289 add more labels as they fit at current scale 2013-10-09 01:55:48 +02:00
Hannes Janetzek
21584637ed cleanup 2013-10-09 01:55:48 +02:00
Hannes Janetzek
bdbe0c1527 handle explicitly closed polygons and those with touching inner/outer rings in one point. Bologna is a heavy case.. 2013-10-09 01:55:48 +02:00
Hannes Janetzek
dabfe680a9 one single light direction from north 2013-10-09 01:55:48 +02:00
Hannes Janetzek
dcb6e11ee8 use debugview switch to enable depth test shader 2013-10-09 01:55:48 +02:00
Hannes Janetzek
b8287f9ecf move near plane back, fixes clipping issue with most large buildings 2013-10-09 01:55:48 +02:00
Hannes Janetzek
c462793b99 move shaders to repective renderer classes 2013-10-09 01:55:48 +02:00
Hannes Janetzek
007ab2e3bf fix z-fighting on overlapping buildings:
- modify projection matrix to add offset, glPolygonOffset is not that reliable
2013-10-09 01:55:48 +02:00
Hannes Janetzek
d1388660a1 fix screen rotation causing 'out of VBOs' issue 2013-10-09 01:55:48 +02:00
Hannes Janetzek
74cf517b15 cleanup 2013-10-09 01:55:48 +02:00
Hannes Janetzek
a9f97bfedb fix depth shader 2013-10-09 01:55:48 +02:00
Hannes Janetzek
da64700613 decrease building height 2013-10-09 01:55:48 +02:00
Hannes Janetzek
9a86b6b134 add helper 2013-10-09 01:55:48 +02:00
Hannes Janetzek
a9f5525c50 trying to get polygon offset right... 2013-10-09 01:55:48 +02:00
Hannes Janetzek
a7790537f2 use matrix utilities 2013-10-09 01:55:48 +02:00
Hannes Janetzek
bfe8cf2889 use setTileMatrix utility function 2013-10-09 01:55:48 +02:00
Hannes Janetzek
5b3b299217 cleanup extrusion layer when it was not compiled 2013-10-09 01:55:48 +02:00
Hannes Janetzek
cb6a861f7f add shader for depth buffer testing 2013-10-09 01:55:47 +02:00
Hannes Janetzek
1c11cd1780 building shader experiments 2013-10-09 01:55:47 +02:00
Hannes Janetzek
80de20a423 reworking the gl projection/unprojection stuff 2013-10-09 01:55:47 +02:00
Hannes Janetzek
dd3c0a71c3 sort tiles to make labeling more deterministic 2013-10-09 01:55:47 +02:00
Hannes Janetzek
f266d61a35 fix wrap over date-line, again
started on-hold mode to avoid relabeling while zoom gesture is active
2013-10-09 01:55:47 +02:00
Hannes Janetzek
c99ae9237e make sure BLEND is enabled 2013-10-09 01:55:47 +02:00
Hannes Janetzek
088f3e2385 enable glDepthMask before clearing depth buffer:
- fixes building rendering on nexus and asus tablet
2013-10-09 01:55:47 +02:00