Commit Graph

149 Commits

Author SHA1 Message Date
Konstantin Käfer
9bb0146875 Merge branch 'master' into outdoors-style
Conflicts:
	bin/style.js
2014-05-19 15:52:42 +02:00
Konstantin Käfer
13575330f7 use sprite atlas 2014-05-19 10:48:36 +02:00
Konstantin Käfer
27f8ed29e4 encode icon texture coordinate in buffer so we can render all pois with 1 draw call 2014-05-19 10:48:36 +02:00
Konstantin Käfer
fda64b67af rename point => icon 2014-05-15 14:51:02 +02:00
Konstantin Käfer
51f523ec14 Merge branch 'master' into outdoors-style
Conflicts:
	bin/style.js
	include/llmr/map/transform.hpp
	src/renderer/painter.cpp
	src/text/placement.cpp
2014-05-14 17:42:10 +02:00
Konstantin Käfer
b167a79c22 always use std:: namespace for math functions
fixes #201
2014-05-14 16:40:24 +02:00
Konstantin Käfer
5135c59b71 Merge branch 'master' into outdoors-style
Conflicts:
	bin/style.js
	src/map/map.cpp
2014-05-13 16:18:52 +02:00
Konstantin Käfer
ab71db336c move tiles to std::map for faster lookups 2014-05-13 12:20:59 +02:00
Konstantin Käfer
d8fa9aa322 move weak_ptr list of tile_data objects to a map for faster lookups 2014-05-13 12:01:29 +02:00
Konstantin Käfer
263c887777 don't try to render layers that do not produce anyting during the current render pass
refs #184
2014-05-12 19:53:06 +02:00
Konstantin Käfer
2b14579986 only paint layer if it has data
refs #184
2014-05-12 19:08:59 +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
Eden Halperin
db013095e9 update style with labels 2014-05-09 16:51:09 -07: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
Konstantin Käfer
6574f0d188 add setAngle() call with duration 2014-05-02 10:28:47 +02:00
Konstantin Käfer
485a9a40bc formatting 2014-05-02 10:25:58 +02:00
Konstantin Käfer
449f403e87 rename animation => transition 2014-04-30 14:46:28 +02:00
Konstantin Käfer
52cd9a6561 update framehistory to use nanosecond timestamps 2014-04-30 14:25:57 +02:00
Konstantin Käfer
4afe20776d move animation time api to use nanoseconds 2014-04-30 14:20:15 +02:00
Konstantin Käfer
9bbdba9eab remove concept of settings object from library 2014-04-30 13:47:03 +02:00
Konstantin Käfer
f683cbf02a hide atomic flags as implementation detail 2014-04-30 12:29:50 +02:00
Konstantin Käfer
1216a061d3 move to libuv for the rendering loop 2014-04-30 12:01:26 +02:00
Konstantin Käfer
3e92f36afc fix headless test case 2014-04-25 16:12:03 +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
797f590cfb cleanup + unused arguments 2014-04-16 10:55:06 -04:00
Konstantin Käfer
74cb7edb5b remove more unused variables 2014-04-16 10:47:09 -04:00
Konstantin Käfer
1b922e3a34 remove start_x/y variables, they're unused 2014-04-16 10:46:52 -04:00
Konstantin Käfer
05f8039981 Merge branch 'master' of github.com:mapbox/llmr-native 2014-04-15 18:47:59 -04:00
Konstantin Käfer
b414cbea44 automatically derive fb dimensions 2014-04-15 18:45:15 -04:00
Konstantin Käfer
df3bdccb34 don't force settings object to implement anything 2014-04-15 17:16:50 -04:00
Konstantin Käfer
0367dbe8c7 use unique_ptrs and fix compile on mapnik 2014-04-15 12:24:15 -07:00
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
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
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
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
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
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