xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
282 Commits 1 Branch 24 Tags
8046081b423806650401f571de40dd8f881af524
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Hannes Janetzek 8046081b42 reorganize stencil buffer clipping 2013-10-09 01:55:51 +02:00
Hannes Janetzek 3da48e1ab9 --dbg 2013-10-09 01:55:51 +02:00
Hannes Janetzek c21b5b629b building color tweaks 2013-10-09 01:55:51 +02:00
Hannes Janetzek e9f135b3ab update of Tile- and OverlayManager need to be done async for this 2013-10-09 01:55:51 +02:00
Hannes Janetzek 0d87aabd3d add function to get visible tiles only 2013-10-09 01:55:51 +02:00
Hannes Janetzek f3f1c4ae54 repack 'current tiles' array before reallocating it 2013-10-09 01:55:51 +02:00
Hannes Janetzek f7b00b9692 custom renderer, draw quad 2013-10-09 01:55:51 +02:00
Hannes Janetzek 373d45e008 building color 2013-10-09 01:55:51 +02:00
Hannes Janetzek 76a4e529ae keep alpha enabled 2013-10-09 01:55:51 +02:00
Hannes Janetzek 7124d07bbd show how to fix triangle on map 2013-10-09 01:55:51 +02:00
Hannes Janetzek bc9f517cb1 extend CustomOverlay example to draw a triangle 2013-10-09 01:55:51 +02:00
Hannes Janetzek e2be4b5359 cleanups 2013-10-09 01:55:51 +02:00
Hannes Janetzek be67647bdd clear ItemizedOverlay 2013-10-09 01:55:51 +02:00
Hannes Janetzek 019c39d8b8 start render early 2013-10-09 01:55:51 +02:00
Hannes Janetzek a8c2f72a35 simplify fillPolygons 2013-10-09 01:55:51 +02:00
Hannes Janetzek 8a5ec974a1 - reuse element Tag arrays 
- use previous elements' RenderInstructions when tags and zoom match
 2013-10-09 01:55:51 +02:00
Hannes Janetzek e99a4279bf keep track of GL_BLEND state: GLState.blend(enable) 2013-10-09 01:55:51 +02:00
Hannes Janetzek f442395a11 clear stencil after each tile 2013-10-09 01:55:51 +02:00
Hannes Janetzek 2b68d93891 check range in blendColors 2013-10-09 01:55:51 +02:00
Hannes Janetzek 4408a86a5b update license headers, formatting 2013-10-09 01:55:50 +02:00
Hannes Janetzek f93d0944a3 use 0x80 as stencil buffer CLIP_BIT 2013-10-09 01:55:50 +02:00
Hannes Janetzek db93fbe4f6 make TileManager non static 2013-10-09 01:55:50 +02:00
Hannes Janetzek 45122270b1 simplify logic 2013-10-09 01:55:50 +02:00
Hannes Janetzek 249478216f limit framerate 2013-10-09 01:55:50 +02:00
Hannes Janetzek 9fa87855fe no need for synchronized in ExtrusionOverlay 2013-10-09 01:55:50 +02:00
Hannes Janetzek 4e19553f9e move uploadOverlay to BasicOverlay 2013-10-09 01:55:50 +02:00
Hannes Janetzek bb22ecd7e3 extract Layer drawing utilities from RenderOverlay into BasicOverlay 2013-10-09 01:55:50 +02:00
Hannes Janetzek 49508bf576 --dbg, whoops 2013-10-09 01:55:50 +02:00
Hannes Janetzek ac4c3846ba add point line distance utility functions 2013-10-09 01:55:50 +02:00
Hannes Janetzek 4be1e5dd4d refactor to use less gl calls 2013-10-09 01:55:50 +02:00
Hannes Janetzek dd74e1aa7b start Custom RenderOverlay 2013-10-09 01:55:50 +02:00
Hannes Janetzek 55a181330d some more labeling experiments 2013-10-09 01:55:50 +02:00
Hannes Janetzek 3b47915baa use void pointers 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 d61f85ef86 no need to buffer outputstream here 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 836f0ea82b use separate locks for nodes/ways/areas render instructions cache 2013-10-09 01:55:50 +02:00
Hannes Janetzek bb39069af2 theme tweaks 2013-10-09 01:55:50 +02:00
Hannes Janetzek cdc2e7308f cleanups 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 4990b827d9 rename osmarender theme to 'default' 2013-10-09 01:55:49 +02:00
Hannes Janetzek bb7ca9be08 create res dir 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 2f3ae3e7c0 add static 'building' key to Tag 2013-10-09 01:55:49 +02:00
Hannes Janetzek de88c33701 fling velocity is in pixel-per-second, so make it dpi-dependent 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 bf75d3bead - use only one RenderInstruction cache item when instructions are the same for multiple zoom-level 
- do common checks in Rule instead of calling interface methods
 2013-10-09 01:55:49 +02:00
Hannes Janetzek b50481653a theme tweaks 2013-10-09 01:55:49 +02:00
Hannes Janetzek 04cf5e76aa cleanups 2013-10-09 01:55:49 +02:00
Hannes Janetzek ddc5466789 add landuse:urban tag 2013-10-09 01:55:49 +02:00
Hannes Janetzek 38e19a857c more experimental dbs 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 f5e0cce52f increase line width a bit more each zoom-level 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 70e6266319 sanitize map scale input 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 cafbdc31c1 fix drawing of tile bounding box 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 5c36b204ce no timing required 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 41810529af fix: dont increment these pointers conditionally 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 3414915622 minus one useless iteration 2013-10-09 01:55:48 +02:00
Hannes Janetzek 7c2decdee4 Triangle does not like duplicate points in input: skip them 
TODO fix polygon holes that touch outer ring in input..
 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 2148e7564c theme: same color for 3D and flat buildings 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 464e0b17ec some optimizations 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 4acd9a492f finally got that z-value for un-projection right (= 
- add more matrix utilities
 2013-10-09 01:55:48 +02:00
Hannes Janetzek a8bcc59e25 use special landuse=urban tag 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 2e8bcd865a formatting 2013-10-09 01:55:48 +02:00