Commit Graph

56 Commits

Author SHA1 Message Date
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
Konstantin Käfer
9ba8d5b7a6 pass through name when rendering 2014-01-23 15:52:59 +01:00
Konstantin Käfer
ac063ad90e make fillbucket members private 2014-01-23 15:45:48 +01:00
Konstantin Käfer
d153bdeff4 add style object 2014-01-23 15:33:00 +01:00
Konstantin Käfer
50021b730c move to layer system 2014-01-23 14:20:22 +01:00
Konstantin Käfer
b4a95be0b2 fix drawFill function 2014-01-23 10:15:02 +01:00
Konstantin Käfer
1ad5970a00 render shapes, but only the first one is drawn? 2014-01-22 18:07:30 +01:00
Konstantin Käfer
209dd913f9 tile => Tile 2014-01-20 12:03:36 +01:00
Konstantin Käfer
0922e71f98 transform => Transform 2014-01-20 11:57:24 +01:00
Konstantin Käfer
315efdb7f6 painter => Painter 2014-01-20 11:53:50 +01:00
Konstantin Käfer
22178d6832 rename settings => Settings 2014-01-20 11:50:45 +01:00
Konstantin Käfer
ef15a1d1dc make objects noncopyable 2014-01-20 11:43:03 +01:00
Konstantin Käfer
2e3b8ed071 renderer cleanup 2014-01-17 16:53:20 +01:00
Konstantin Käfer
8443687092 add antialiased line shader 2014-01-17 16:52:41 +01:00
Konstantin Käfer
7dcbb3f38a allow toggling debug mode with tab 2014-01-16 16:52:14 +01:00
Konstantin Käfer
f9b9e9d058 makefile cleanup + icon 2014-01-16 16:28:42 +01:00
Konstantin Käfer
2d008787fc add tile border (debug) 2014-01-16 10:54:16 +01:00