Commit Graph

249 Commits

Author SHA1 Message Date
Konstantin Käfer
3c656d2bf2 add debug markers for easier gl debugging 2014-04-15 14:30:05 -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
ab66ab39e6 make sure we trigger an update after resizing 2014-04-15 10:44:11 -04:00
Konstantin Käfer
c2f1f0c0df fix build on linux 2014-04-14 19:43:30 -04:00
Konstantin Käfer
9bb88711b8 always start animations with a common start time
fixes #134
2014-04-14 19:30:09 -04:00
Konstantin Käfer
f18aa61e33 derive from GLKViewController
this handles resizing the view/framebuffer much better

fixes #130, #131, #133, #118
2014-04-14 18:50:17 -04:00
Konstantin Käfer
305e688a3a clean up os x + ios request code
fixes #129
2014-04-14 11:47:57 -04:00
Konstantin Käfer
5f84bc7c29 fix initialization order
background: use_raster was of undefined value, so it would sometimes be true on app startup
2014-04-11 16:48:49 -04:00
Konstantin Käfer
06bcab9560 correctly update the map dimensions on rotate
refs #37
2014-04-10 14:07:36 -04:00
Konstantin Käfer
eb499e77c1 fix linejoin drawing on retina 2014-04-10 11:49:43 -04:00
Justin R. Miller
228ce33278 cleanup APIs a bit 2014-04-09 11:59:27 -07: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
Justin R. Miller
2eca1c419b add support for background opacity in style 2014-04-02 16:09:31 -07:00
Justin R. Miller
cf4875647d slight reorgs 2014-04-02 15:05:26 -07:00
Justin R. Miller
00e910c147 bring back toggleRaster() by way of layer enable toggling 2014-04-02 15:01:05 -07:00
Justin R. Miller
2e5fed2a7a abstract out zoom adjust 2014-04-02 15:00:48 -07:00
Justin R. Miller
f60a46229d refs #101: first cut of basic hacky data sources 2014-04-02 11:07:22 -07:00
Konstantin Käfer
0c6f993695 add min/max functions and refactor FunctionProperty
fixes #83
2014-03-26 12:21:33 +01:00
Konstantin Käfer
21f7b0f706 use unique_ptr for buckets rather than shared_ptrs 2014-03-25 13:49:55 +01:00
Konstantin Käfer
85f0d9392b do not use shared pointers for buffers 2014-03-25 13:41:20 +01:00
Konstantin Käfer
e427f51dd4 remove generated files 2014-03-25 13:25:35 +01:00
Konstantin Käfer
166305fb14 change hidden to enabled
refs #83
2014-03-25 13:23:51 +01:00
Konstantin Käfer
77f58960c4 build shaders for either desktop gl or gles2 2014-03-25 13:16:48 +01:00
Konstantin Käfer
d5b4c1162d add shader optimizer and reorder components 2014-03-25 12:10:19 +01: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
9621038d8a implement alwaysVisible 2014-03-24 17:38:10 +01:00
Konstantin Käfer
5c11bcf5c0 don't treat negative values as placement failure 2014-03-24 17:15:54 +01:00
Konstantin Käfer
8b573f9fa2 fix glyphs that have no pixels but an advance (e.g. spaces) 2014-03-24 15:19:39 +01:00
Konstantin Käfer
75cd64de58 add toString method for Value variant 2014-03-24 14:47:21 +01:00
Konstantin Käfer
c00ec64205 exponential functions 2014-03-24 14:45:33 +01:00
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