Konstantin Käfer
fda64b67af
rename point => icon
2014-05-15 14:51:02 +02:00
Konstantin Käfer
a9d559fe51
return refs to avoid matrix allocation/deallocation for untranslated layers
...
refs #189
2014-05-14 17:21:51 +02:00
Konstantin Käfer
a27f8798ff
add translate-anchor: viewport to lines + points
...
refs #189
2014-05-14 17:17:47 +02:00
Konstantin Käfer
3514538719
make text layers respect the translate-anchor
...
you can now specify "translate-anchor": "viewport" to have the text translated
in screen coordinates rather than relative to the tile. The default value
remains "translate-anchor": "map"
refs #189
2014-05-14 10:31:57 +02:00
Konstantin Käfer
05a330f347
make translate property zoom independent
...
if you want a zoom-dependent translation, you can use a function
refs #189
2014-05-14 10:31:57 +02:00
Konstantin Käfer
6136ab6d21
draw by layer, not by tile
...
This is needed for correctly compositing raster imagery into the map
fixes #122
fixes #157
2014-05-12 17:13:26 +02:00
Konstantin Käfer
0bfd7b0f43
Calculate clip IDs with a huffman prefix tree
...
This changes the clip IDs from sequential to a huffman prefix tree, meaning that
parent tiles share the same prefix with child tiles (but are shorter). This allows
us to use the same checkerboard pattern to draw all tiles.
TODO:
- make sure we're not overflowing the 8 bit limit of the stencil buffer
- draw all checkerboard fields at the same time, with one draw call
- fix raster drawing (fading, clipping)
refs #132
2014-05-09 18:10:28 +02:00
Justin R. Miller
2b9fbb0731
squashed stylequest merge
...
* uses OSM Bright style
* adds dot shader
* adds layer translation
* adds dashed line support
* adds style array parsing
* improves background layer parsing
* improves style constant parsing
* fixes sprite JSON pixel ratio parsing
2014-05-07 10:37:25 -07:00
Konstantin Käfer
1216a061d3
move to libuv for the rendering loop
2014-04-30 12:01:26 +02:00
Konstantin Käfer
666f593803
use an event loop per map that is not the render thread
2014-04-25 14:26:59 +02:00
Konstantin Käfer
29d6f22e48
make sure we use a sufficiently large rect
...
using this on my 1920x1200 display shows the bottom cut off
2014-04-23 18:00:46 +02:00
Konstantin Käfer
b119aa92d8
remove Settings object from Painter
2014-04-16 16:45:09 -04:00
Konstantin Käfer
78c10c0701
Merge remote-tracking branch 'remotes/origin/pr/127'
...
Conflicts:
include/llmr/map/map.hpp
src/map/map.cpp
src/platform/platform.cpp
2014-04-15 12:46:19 -04:00
Konstantin Käfer
06bcab9560
correctly update the map dimensions on rotate
...
refs #37
2014-04-10 14:07:36 -04:00
Justin R. Miller
e5713f31a6
move to raster buckets & tile parser handling raster decoding
2014-04-09 11:38:42 -07:00
Justin R. Miller
1215f6f1fe
refs #101 : data sources with styling
...
* add second, satellite class to stylesheet
* get rid of tile clipping masks for now
* flesh out raster styling properties
2014-04-04 13:24:11 -07:00
Konstantin Käfer
afe27ed74c
only animate when we need to fade the text
2014-03-24 18:00:03 +01:00
Konstantin Käfer
ea6b24d02d
add text rendering code
2014-03-21 17:36:29 +01:00
Konstantin Käfer
a7b9b96d4d
add textshader
2014-03-21 14:26:25 +01:00
Konstantin Käfer
3413ee536d
Merge branch 'master' into sdf
...
Conflicts:
include/llmr/map/tile_data.hpp
include/llmr/shader/shaders.hpp
src/map/map.cpp
src/map/tile_data.cpp
src/platform/platform.cpp
src/shader/shaders.cpp
2014-03-21 13:36:32 +01:00
Justin R. Miller
00a3245ce8
fixes #70 : raster tile rendering as toggleable mode from vector
2014-03-18 16:57:17 -07:00
Konstantin Käfer
8171c7bb43
add empty classes for rendering glyphs
2014-03-14 11:36:10 +01:00
Konstantin Käfer
8fd4d855d5
move shader classes to separate folder
2014-03-12 15:25:39 +01:00
Konstantin Käfer
af3bae59d6
limit matte to full hd
2014-03-11 12:16:54 +01:00
Konstantin Käfer
978b714de8
two render passes
...
Conflicts:
resources/style.pbf
src/renderer/painter.cpp
src/style/resources.cpp
2014-03-11 12:15:06 +01:00
Konstantin Käfer
69a5c0e15f
better support for gles2
2014-03-05 16:58:46 +01:00
Konstantin Käfer
027c6f33b3
implement tile wrapping
...
fixes #14
2014-03-05 09:40:32 +01:00
Konstantin Käfer
b0ddabd6ac
rename Tile to TileData
2014-03-04 17:53:16 +01:00
Konstantin Käfer
e85304d510
use depth buffer to avoid writing to opaque fragments
2014-03-04 11:21:42 +01:00
Konstantin Käfer
8d68bd73e7
draw a checkerboard stencil clipping mask initially
2014-02-26 12:24:17 +01:00
Konstantin Käfer
f87e21b6e8
Merge branch 'tessellation' into nostencil
...
Conflicts:
include/llmr/renderer/fill_bucket.hpp
src/renderer/painter.cpp
2014-02-26 10:44:09 +01:00
Konstantin Käfer
ea80daa129
allow switching the vao if we switch the style from plain color to pattern fill
2014-02-18 15:56:23 +01:00
Justin R. Miller
828d8ba26f
refs #60 : first cut of POI rendering
...
* add basic marker style to stylesheet
* pass through marker style to PBF conversion
* marker/point tile parsing, bucket, buffer, shaders, etc.
* new sprite hosting for 1x/2x variants
* sprite load accepts screen scale argument
2014-02-14 18:13:12 -08:00
Konstantin Käfer
54454ed66a
optimizations + reorder vertex index
2014-02-13 14:10:04 +01:00
Konstantin Käfer
bec0ad10c4
drawing lines with triangles
2014-02-11 15:51:54 +01:00
artemp
d6654ccaed
c++
...
* fix typedef's
* fix virtual dtor's
* make ctor's with one argument explicit
* util::noncopyable utility class ( class my_object : private noncopyable {} )
* update kTileURL
2014-02-06 10:33:46 +00:00
Konstantin Käfer
cf31a80920
textured fills & enforce vao program with templates
2014-02-05 19:03:44 +01:00
Konstantin Käfer
e94cb1b00b
remove switchShader()
2014-02-05 18:35:19 +01:00
Konstantin Käfer
e30d8eb48f
move to vertex array objects
2014-02-05 18:06:16 +01:00
Konstantin Käfer
2df45d0c4a
refactor header includes
2014-02-04 14:07:56 +01:00
Konstantin Käfer
9ab9eeec13
textured fills
...
fixes #15
2014-02-03 22:51:21 +01:00
Konstantin Käfer
bc07cb4b26
don't pass the entire tile object to changeMatrix
2014-01-30 12:37:16 +01:00
Konstantin Käfer
2b59dfae63
move static global buffers to RAII
2014-01-29 15:31:22 +01:00
Konstantin Käfer
1233537713
float[16] => std::array<float, 16>
2014-01-29 15:09:00 +01:00
Konstantin Käfer
9fc749eade
add matte
2014-01-29 12:43:37 +01:00
Konstantin Käfer
e359d697fb
buggy line support
2014-01-28 18:40:17 +01:00
Konstantin Käfer
43ab6732d9
rename shader line -> plain
2014-01-28 17:37:36 +01:00
Konstantin Käfer
f19d5c95db
rename stroke=>line, add line painter classes
2014-01-28 14:09:07 +01:00
Konstantin Käfer
e2dbcc95b5
draw fills according to the style
2014-01-27 14:07:56 +01:00
Konstantin Käfer
2a6e4597e2
pass style into painter
2014-01-23 16:36:04 +01:00
