8a5ec974a1
- reuse element Tag arrays - use previous elements' RenderInstructions when tags and zoom match
Hannes Janetzek
2013-02-01 01:37:46 +01:00
e99a4279bf
keep track of GL_BLEND state: GLState.blend(enable)
Hannes Janetzek
2013-01-31 07:36:32 +01:00
f442395a11
clear stencil after each tile
Hannes Janetzek
2013-01-31 05:43:08 +01:00
2b68d93891
check range in blendColors
Hannes Janetzek
2013-01-31 04:42:34 +01:00
4408a86a5b
update license headers, formatting
Hannes Janetzek
2013-01-31 02:25:50 +01:00
f93d0944a3
use 0x80 as stencil buffer CLIP_BIT
Hannes Janetzek
2013-01-30 15:25:31 +01:00
db93fbe4f6
make TileManager non static
Hannes Janetzek
2013-01-30 12:17:08 +01:00
45122270b1
simplify logic
Hannes Janetzek
2013-01-30 12:14:54 +01:00
249478216f
limit framerate
Hannes Janetzek
2013-01-30 12:14:06 +01:00
9fa87855fe
no need for synchronized in ExtrusionOverlay
Hannes Janetzek
2013-01-30 10:31:14 +01:00
4e19553f9e
move uploadOverlay to BasicOverlay
Hannes Janetzek
2013-01-30 09:15:35 +01:00
bb22ecd7e3
extract Layer drawing utilities from RenderOverlay into BasicOverlay
Hannes Janetzek
2013-01-30 09:08:23 +01:00
49508bf576
--dbg, whoops
Hannes Janetzek
2013-01-30 04:43:51 +01:00
ac4c3846ba
add point line distance utility functions
Hannes Janetzek
2013-01-30 08:11:21 +01:00
4be1e5dd4d
refactor to use less gl calls
Hannes Janetzek
2013-01-30 08:10:49 +01:00
dd74e1aa7b
start Custom RenderOverlay
Hannes Janetzek
2013-01-30 04:33:05 +01:00
55a181330d
some more labeling experiments
Hannes Janetzek
2013-01-30 04:18:50 +01:00
3b47915baa
use void pointers
Hannes Janetzek
2013-01-30 04:16:12 +01:00
bde5eff447
limit TextItem pool items
Hannes Janetzek
2013-01-30 04:14:24 +01:00
d61f85ef86
no need to buffer outputstream here
Hannes Janetzek
2013-01-30 04:13:10 +01:00
c81b417ea5
refactor loops
Hannes Janetzek
2013-01-30 04:12:30 +01:00
3d8f62ec4a
cleanups
Hannes Janetzek
2013-01-30 04:09:11 +01:00
8bcc3b6b3f
add field for checking if labels are joined with neighbours
Hannes Janetzek
2013-01-30 04:07:50 +01:00
be748138ac
- use Stencil instead of Depth for clipping test to avoid drawing everything with polygonOffset - add GLState.useProgram
Hannes Janetzek
2013-01-30 04:05:44 +01:00
5f03a33492
it probably makes no sense to cycle ByteBuffers for upload to GL
Hannes Janetzek
2013-01-30 04:00:18 +01:00
6f98e1542b
add null check
Hannes Janetzek
2013-01-30 03:59:18 +01:00
836f0ea82b
use separate locks for nodes/ways/areas render instructions cache
Hannes Janetzek
2013-01-30 03:56:02 +01:00
bb39069af2
theme tweaks
Hannes Janetzek
2013-01-30 03:54:24 +01:00
cdc2e7308f
cleanups
Hannes Janetzek
2013-01-30 03:53:57 +01:00
123284a1a5
prefetch parent tiles
Hannes Janetzek
2013-01-30 03:50:21 +01:00
d376d07c12
use short vertices, add docs
Hannes Janetzek
2013-01-28 00:44:07 +01:00
32d3eec036
some experiments
Hannes Janetzek
2013-01-27 07:36:48 +01:00
4990b827d9
rename osmarender theme to 'default'
Hannes Janetzek
2013-01-25 17:45:16 +01:00
bb7ca9be08
create res dir
Hannes Janetzek
2013-01-25 14:47:25 +01:00
b691c185f3
cleanup
Hannes Janetzek
2013-01-25 00:21:15 +01:00
5bcfafc7c7
clear static refs (at least on re-init)
Hannes Janetzek
2013-01-24 22:45:43 +01:00
5f6025206d
building color tweaks
Hannes Janetzek
2013-01-24 22:23:00 +01:00
2f3ae3e7c0
add static 'building' key to Tag
Hannes Janetzek
2013-01-24 22:14:20 +01:00
de88c33701
fling velocity is in pixel-per-second, so make it dpi-dependent
Hannes Janetzek
2013-01-24 22:13:00 +01:00
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
Hannes Janetzek
2013-01-24 22:11:48 +01:00
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
Hannes Janetzek
2013-01-24 22:04:39 +01:00
b50481653a
theme tweaks
Hannes Janetzek
2013-01-21 03:19:10 +01:00
04cf5e76aa
cleanups
Hannes Janetzek
2013-01-21 03:18:57 +01:00
ddc5466789
add landuse:urban tag
Hannes Janetzek
2013-01-21 03:17:50 +01:00
38e19a857c
more experimental dbs
Hannes Janetzek
2013-01-21 03:17:27 +01:00
54923d6bff
fix bug overlay lines causing short flashing lines when changing zoom-levels
Hannes Janetzek
2013-01-21 03:17:05 +01:00
07dcbde928
started polygon patter shader
Hannes Janetzek
2013-01-21 03:15:50 +01:00
1dd7e3c7a8
rename BaseLayer -> BaseMap
Hannes Janetzek
2013-01-21 03:15:02 +01:00
f5e0cce52f
increase line width a bit more each zoom-level
Hannes Janetzek
2013-01-21 03:14:28 +01:00
235e001a82
add 'min-size' option to line renderinstruction, when size is less no outline will be drawn
Hannes Janetzek
2013-01-21 03:13:47 +01:00
6a34e478f5
improve text placement a little
Hannes Janetzek
2013-01-21 03:11:53 +01:00
70e6266319
sanitize map scale input
Hannes Janetzek
2013-01-21 03:09:36 +01:00
e21831ceb9
more line shader experiments: use sqrt() lookup table in fragment shader
Hannes Janetzek
2013-01-18 12:50:44 +01:00
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
Hannes Janetzek
2013-01-17 14:31:20 +01:00
928c7e7328
comment
Hannes Janetzek
2013-01-17 12:09:34 +01:00
9705811f7b
fix way too much z-offset used for roof outline
Hannes Janetzek
2013-01-17 12:09:02 +01:00
38239cd615
dont add z-offset way labels
Hannes Janetzek
2013-01-17 12:08:27 +01:00
cafbdc31c1
fix drawing of tile bounding box
Hannes Janetzek
2013-01-17 12:08:02 +01:00
62bc122930
use smoothstep interpolation for simple line shader testing with one vertexAttribArray, this should be faster for switching polgon/line shaders
Hannes Janetzek
2013-01-17 12:07:27 +01:00
3c990b3289
add more labels as they fit at current scale
Hannes Janetzek
2013-01-17 12:03:04 +01:00
5c36b204ce
no timing required
Hannes Janetzek
2013-01-13 13:49:04 +01:00
21584637ed
cleanup
Hannes Janetzek
2013-01-13 13:48:48 +01:00
bdbe0c1527
handle explicitly closed polygons and those with touching inner/outer rings in one point. Bologna is a heavy case..
Hannes Janetzek
2013-01-13 13:48:13 +01:00
41810529af
fix: dont increment these pointers conditionally
Hannes Janetzek
2013-01-12 18:02:25 +01:00
dabfe680a9
one single light direction from north
Hannes Janetzek
2013-01-12 16:42:46 +01:00
3414915622
minus one useless iteration
Hannes Janetzek
2013-01-12 16:38:46 +01:00
7c2decdee4
Triangle does not like duplicate points in input: skip them TODO fix polygon holes that touch outer ring in input..
Hannes Janetzek
2013-01-12 15:04:36 +01:00
dcb6e11ee8
use debugview switch to enable depth test shader
Hannes Janetzek
2013-01-12 13:39:14 +01:00
2148e7564c
theme: same color for 3D and flat buildings
Hannes Janetzek
2013-01-12 13:38:21 +01:00
b8287f9ecf
move near plane back, fixes clipping issue with most large buildings
Hannes Janetzek
2013-01-12 13:37:34 +01:00
c462793b99
move shaders to repective renderer classes
Hannes Janetzek
2013-01-11 23:44:30 +01:00
007ab2e3bf
fix z-fighting on overlapping buildings: - modify projection matrix to add offset, glPolygonOffset is not that reliable
Hannes Janetzek
2013-01-11 22:27:16 +01:00
d1388660a1
fix screen rotation causing 'out of VBOs' issue
Hannes Janetzek
2013-01-11 20:09:53 +01:00
74cf517b15
cleanup
Hannes Janetzek
2013-01-11 20:08:16 +01:00
464e0b17ec
some optimizations
Hannes Janetzek
2013-01-11 20:07:55 +01:00
a9f97bfedb
fix depth shader
Hannes Janetzek
2013-01-11 20:07:24 +01:00
da64700613
decrease building height
Hannes Janetzek
2013-01-11 20:07:08 +01:00
9a86b6b134
add helper
Hannes Janetzek
2013-01-11 20:06:45 +01:00
a9f5525c50
trying to get polygon offset right...
Hannes Janetzek
2013-01-11 20:06:13 +01:00
a7790537f2
use matrix utilities
Hannes Janetzek
2013-01-11 20:05:30 +01:00
4acd9a492f
finally got that z-value for un-projection right (= - add more matrix utilities
Hannes Janetzek
2013-01-11 20:01:55 +01:00
a8bcc59e25
use special landuse=urban tag
Hannes Janetzek
2013-01-11 09:45:21 +01:00
bfe8cf2889
use setTileMatrix utility function
Hannes Janetzek
2013-01-11 09:44:46 +01:00
5b3b299217
cleanup extrusion layer when it was not compiled
Hannes Janetzek
2013-01-11 09:42:35 +01:00
2e8bcd865a
formatting
Hannes Janetzek
2013-01-11 08:01:24 +01:00
cb6a861f7f
add shader for depth buffer testing
Hannes Janetzek
2013-01-11 07:56:58 +01:00
bca4a24c38
increase read-buffer if necessary
Hannes Janetzek
2013-01-11 07:54:53 +01:00
82eb7e4973
more line intersection utilities
Hannes Janetzek
2013-01-10 06:57:42 +01:00
1c11cd1780
building shader experiments
Hannes Janetzek
2013-01-10 06:57:09 +01:00
80de20a423
reworking the gl projection/unprojection stuff
Hannes Janetzek
2013-01-10 06:56:25 +01:00
dd3c0a71c3
sort tiles to make labeling more deterministic
Hannes Janetzek
2013-01-10 06:50:19 +01:00
f266d61a35
fix wrap over date-line, again started on-hold mode to avoid relabeling while zoom gesture is active
Hannes Janetzek
2013-01-10 06:48:31 +01:00
c99ae9237e
make sure BLEND is enabled
Hannes Janetzek
2013-01-10 06:45:47 +01:00
088f3e2385
enable glDepthMask before clearing depth buffer: - fixes building rendering on nexus and asus tablet
Hannes Janetzek
2013-01-09 01:06:37 +01:00
4ac9fc3b95
less GL_DETPH_TEST switches
Hannes Janetzek
2013-01-07 22:31:08 +01:00
9e84a42177
improve guess for building height, now skylines look better
Hannes Janetzek
2013-01-07 22:30:13 +01:00
a03f81d306
only modify DEPTH_TEST through GLState
Hannes Janetzek
2013-01-07 15:23:14 +01:00
4f377cda46
theme tweaks, fix footway at z16
Hannes Janetzek
2013-01-07 15:19:20 +01:00
30fede04d2
magnetic-fling: move by screen size
Hannes Janetzek
2013-01-07 15:18:41 +01:00
70f2af2f33
set matrix manually
Hannes Janetzek
2013-01-07 15:17:38 +01:00