60 Commits

Author SHA1 Message Date
Hannes Janetzek
ecedccb265 fix possible invalid vbo reads
- make sure there is an additional vertex for interleaving
2013-10-09 01:55:54 +02:00
Hannes Janetzek
d91ad535a2 start to make line stipple themeable 2013-10-09 01:55:54 +02:00
Hannes Janetzek
4faaf25dfa use Layer.width 2013-10-09 01:55:54 +02:00
Hannes Janetzek
7cf4ca27f3 - add initial version of line stipple renderer
- 'vbo' moved to 'Layers'
2013-10-09 01:55:54 +02:00
Hannes Janetzek
5f0779bf86 when 'index' is null assume line has length of points array 2013-10-09 01:55:54 +02:00
Hannes Janetzek
c1643850ce no need to multiply extrusion scale factor in shader 2013-10-09 01:55:53 +02:00
Hannes Janetzek
45bb326258 update copyright 2013-10-09 01:55:53 +02:00
Hannes Janetzek
34bffcc15f labeling testing 2013-10-09 01:55:53 +02:00
Hannes Janetzek
99dafda4b9 move TriangleJNI 2013-10-09 01:55:53 +02:00
Hannes Janetzek
811ff6ed4a comments 2013-10-09 01:55:53 +02:00
Hannes Janetzek
c9d3a05f5c also copy segment length for temporary TextItem 2013-10-09 01:55:53 +02:00
Hannes Janetzek
e69bebb2c5 use OBBs for label collision detections 2013-10-09 01:55:53 +02:00
Hannes Janetzek
0aaca70a94 save some multiplications 2013-10-09 01:55:53 +02:00
Hannes Janetzek
344f4d7030 make final 2013-10-09 01:55:53 +02:00
Hannes Janetzek
32ba8bbae0 use faster Math.abs utility, cleanups, comments 2013-10-09 01:55:53 +02:00
Hannes Janetzek
fada95f380 cleanups + comments 2013-10-09 01:55:52 +02:00
Hannes Janetzek
f2b7a9fdf8 formatting 2013-10-09 01:55:52 +02:00
Hannes Janetzek
fc96e5f6e8 impprove labeling a bit by giving priority to labels that were labeled previously 2013-10-09 01:55:51 +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
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
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
3c990b3289 add more labels as they fit at current scale 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
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
5b3b299217 cleanup extrusion layer when it was not compiled 2013-10-09 01:55:48 +02:00
Hannes Janetzek
9e84a42177 improve guess for building height, now skylines look better 2013-10-09 01:55:47 +02:00
Hannes Janetzek
ec647fc4f5 cleanups 2013-10-09 01:55:47 +02:00
Hannes Janetzek
d0ad2f3bd4 - LineClipper added start(x0,y0), clipNext(x1,y1) 'state' clipping mode
- use vec4 array for extrusion colors -> set color only once for all tiles
- use full range for direction vector in extrusion vertex
2013-10-09 01:55:47 +02:00
Hannes Janetzek
05e6490d3a cleanups 2013-10-09 01:55:47 +02:00
Hannes Janetzek
a61d2d4804 refactor: use getColor() 2013-10-09 01:52:20 +02:00
Hannes Janetzek
ed39f9fe34 buildings: decrease contrast with z-distance 2013-10-09 01:52:20 +02:00
Hannes Janetzek
cb9cd645af allocate larger buffers for triangulation... 2013-10-09 01:52:20 +02:00
Hannes Janetzek
885eec73d5 cleanup, less bright buildings 2013-10-09 01:52:20 +02:00
Hannes Janetzek
0c023f9989 handle explicitly closed properly:
- make buildings work with vector-tile-server and old pbmap backend
2013-10-09 01:52:20 +02:00
Hannes Janetzek
35923938db use glCullFace GL_FRONT to avoid having to flip triangles
triangle-jni: some loop optimizations
2013-10-09 01:52:20 +02:00
Hannes Janetzek
3484110e08 avoid sqrt, just flip that vector 2013-10-09 01:52:19 +02:00
Hannes Janetzek
6681247215 add safety check...
jni => for the real segv!
2013-10-09 01:52:19 +02:00
Hannes Janetzek
c2f5755e64 clear Clipper when layer is compiled 2013-10-09 01:52:19 +02:00
Hannes Janetzek
d5ba228fe5 - add building roof outlines
- create extrusion vertices and indices in one loop
2013-10-09 01:52:19 +02:00
Hannes Janetzek
c01252f249 - fix roof triagulation for polygons with holes
- omit indices for outline outside tile boundaries
2013-10-09 01:52:19 +02:00
Hannes Janetzek
eb278585fa more work on building layer 2013-10-09 01:52:19 +02:00
Hannes Janetzek
ac63a4cae1 add beginnings of BuildingOverlay 2013-10-09 01:47:43 +02:00
Hannes Janetzek
45cf6620a9 - keep track of vertex array state in GLRenderer.enableVertexArrays
- use static imports for GL functions
2013-10-09 01:47:43 +02:00
Hannes Janetzek
c5663df198 close polygons implicitly when using OSciMap2 database 2013-10-09 01:47:43 +02:00