Commit Graph

1168 Commits

Author SHA1 Message Date
Konstantin Käfer
5c613b5455 normalizedZoom() == zoom level of the visual appearance 2014-03-24 14:44:44 +01:00
Konstantin Käfer
67a8882457 use the correct glyphs 2014-03-24 11:13:20 +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
Konstantin Käfer
a4cda4ce20 fix Tile::parent() for negative x coords 2014-03-21 13:17:42 +01:00
Konstantin Käfer
4ee0cf1791 port remainder of the the placement algorithm 2014-03-19 18:58:50 +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
98bb797a4a explicit names 2014-03-18 17:57:51 +01:00
Konstantin Käfer
25ff0b253f merge vec2 and Coordinate 2014-03-18 17:57:09 +01:00
Konstantin Käfer
bed8de2ad6 force explicit types 2014-03-17 16:58:04 +01:00
Konstantin Käfer
bf6a6001f9 format fixes 2014-03-17 16:54:14 +01:00
Konstantin Käfer
1f2c71ec8b port of collision class 2014-03-17 16:53:40 +01:00
Konstantin Käfer
88af0b8b6c add interpolate function 2014-03-17 13:00:44 +01:00
Konstantin Käfer
e8db54367f add rotation range tests 2014-03-17 12:32:53 +01:00
Konstantin Käfer
168ee4659e rename text shader file 2014-03-17 12:31:13 +01:00
Konstantin Käfer
10c72f811d port rotationrange.js (still missing tests) 2014-03-14 18:23:38 +01:00
Konstantin Käfer
3c5bac0f6b add debug window showing the glyph atlas 2014-03-14 12:43:42 +01:00
Konstantin Käfer
99cef810ac move tile parsing to its own object 2014-03-14 11:36:10 +01:00
Konstantin Käfer
be44b6b31f add glyph atlas to map 2014-03-14 11:36:10 +01:00
Konstantin Käfer
d9589573bc extract label shaping 2014-03-14 11:36:10 +01:00
Konstantin Käfer
df56f9fbce they return bool values 2014-03-14 11:36:10 +01:00
Konstantin Käfer
a26ddf8bce parse feature objects so that we can access all tags 2014-03-14 11:36:10 +01:00
Konstantin Käfer
117078270d add text buffer code 2014-03-14 11:36:10 +01:00
Konstantin Käfer
a37dcedc41 parse label shaping 2014-03-14 11:36:10 +01:00
Konstantin Käfer
31d3c6339c parse faces 2014-03-14 11:36:10 +01:00
Konstantin Käfer
9f1a53743a fix binpack compile 2014-03-14 11:36:10 +01:00
Konstantin Käfer
8171c7bb43 add empty classes for rendering glyphs 2014-03-14 11:36:10 +01:00
Konstantin Käfer
f8a096a4fa use templated function to reduce code 2014-03-14 11:36:10 +01:00
Konstantin Käfer
f0b821dff9 add glyph atlas class 2014-03-14 11:36:09 +01:00
Konstantin Käfer
bdfa761c39 remove code duplication between osx/glfw and linux/glfw programs 2014-03-14 11:33:45 +01:00
Konstantin Käfer
86e6e6bed8 use a custom struct for Tile IDs 2014-03-12 16:42:37 +01:00
Konstantin Käfer
8fd4d855d5 move shader classes to separate folder 2014-03-12 15:25:39 +01:00
Konstantin Käfer
277bc1586d add constants and move style parser to its own class 2014-03-12 13:26:24 +01:00
Konstantin Käfer
72ac0c9c31 use external library 2014-03-12 12:43:18 +01:00
Konstantin Käfer
c44d056c24 respect style background color 2014-03-12 11:42:17 +01:00
Konstantin Käfer
91d42911fb parse the json stylesheet 2014-03-12 11:23:01 +01:00
Konstantin Käfer
60229ed7db add color parser 2014-03-11 18:42:01 +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
a1ebf3f264 move tile size to a cpp file 2014-03-11 12:12:05 +01:00
Konstantin Käfer
420cb58a5d fix pedantic warnings 2014-03-11 12:10:07 +01:00
Konstantin Käfer
b7b2812d30 remove debug uniform 2014-03-11 12:09:39 +01:00
Konstantin Käfer
4de8674f20 Merge branch 'variant' 2014-03-11 11:55:00 +01:00
Konstantin Käfer
09731cfa19 define GL_ARB_vertex_array_object 2014-03-11 11:53:57 +01:00
Konstantin Käfer
69a5c0e15f better support for gles2 2014-03-05 16:58:46 +01:00
Konstantin Käfer
b97a9778ea move tile urls to static consts rather than macros 2014-03-05 16:51:38 +01:00
Konstantin Käfer
e9981f0c15 properly include gl includes 2014-03-05 16:50:30 +01:00
Konstantin Käfer
b0cb2b85b1 return meaningful error codes 2014-03-05 16:46:27 +01:00
Konstantin Käfer
fc53caf99a use proper initializers 2014-03-05 16:45:47 +01:00