Hannes Janetzek
|
491e41becc
|
rename Tile.TILE_SIZE to Tile.SIZE, while I'm at refactoring
|
2013-10-09 01:55:58 +02:00 |
|
Hannes Janetzek
|
d3c31199f1
|
adapt building height to ground resolution
|
2013-10-09 01:55:58 +02:00 |
|
Hannes Janetzek
|
1d2fea48cc
|
5cm height step should suffice
|
2013-10-09 01:55:58 +02:00 |
|
Hannes Janetzek
|
118c74e810
|
use building heigh in cm. TODO need to match ground resolution
|
2013-10-09 01:55:58 +02:00 |
|
Hannes Janetzek
|
bac46ac6e2
|
make building height consistent, at least independent of aspect ratio
|
2013-10-09 01:55:58 +02:00 |
|
Hannes Janetzek
|
b7ca00ae8f
|
use WayData container to pass geometry and tags to TileGenerator
|
2013-10-09 01:55:58 +02:00 |
|
Hannes Janetzek
|
45b8bf75de
|
cleanups
|
2013-10-09 01:55:57 +02:00 |
|
Hannes Janetzek
|
f9be7f1cd8
|
rename libtriangle-jni.so -> libtriangle.so
|
2013-10-09 01:55:57 +02:00 |
|
Hannes Janetzek
|
f440920a4b
|
cleanups
|
2013-10-09 01:55:57 +02:00 |
|
Hannes Janetzek
|
b0c02e0c56
|
use same quad indices in Texture- and LineTexRenderer
|
2013-10-09 01:55:57 +02:00 |
|
Hannes Janetzek
|
22441bf527
|
avoid copy - pin coordinate buffer for triangulation
|
2013-10-09 01:55:57 +02:00 |
|
Hannes Janetzek
|
65e4845fef
|
grow ExtrusionLayer compiler buffer if necessary
|
2013-10-09 01:55:55 +02:00 |
|
Hannes Janetzek
|
c0a08c11c8
|
rename COORD_MULTIPLIER to COORD_SCALE
|
2013-10-09 01:55:55 +02:00 |
|
Hannes Janetzek
|
4d346ba2ae
|
set mCurLayer null on clear
|
2013-10-09 01:55:54 +02:00 |
|
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 |
|