Commit Graph

2256 Commits

Author SHA1 Message Date
Ansis Brammanis
4d38e4eb15 fix rotation range check in text shader
fixes #215
2014-05-19 17:35:55 -04:00
Konstantin Käfer
3391b27591 Merge branch 'outdoors-style' of https://github.com/mapbox/llmr-native into outdoors-style 2014-05-19 17:37:42 +02:00
Eden Halperin
84ebbcd851 use mapbox streets v5 2014-05-19 07:27:09 -07:00
Konstantin Käfer
a33d334169 incorporate the color and draw circle dots if we don't have an icon
Conflicts:
	bin/style.js
2014-05-19 16:20:51 +02:00
Konstantin Käfer
7d73d158ba incorporate the color and draw circle dots if we don't have an icon 2014-05-19 16:19:51 +02:00
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
ee82986717 disable debug image 2014-05-19 14:21:57 +02:00
Konstantin Käfer
92706445d9 init glfw for debug images + actually copy images over 2014-05-19 14:21:15 +02:00
Konstantin Käfer
f848868c16 fix texture binding 2014-05-19 14:18:29 +02:00
Konstantin Käfer
898c6d6714 fix for retina screens 2014-05-19 11:13:22 +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
Ansis Brammanis
4b2b19ccd3 use separate trees for horizontal and curved labels
from e4186926ed38fc1dc232c70098154251a9019669
2014-05-16 16:06:24 -04:00
Ansis Brammanis
264bcd34d9 flush command buffers when done 2014-05-16 14:04:12 -04:00
Konstantin Käfer
01183a0a19 fix remaining cases of point => icon 2014-05-15 18:09:00 +02:00
Konstantin Käfer
4c99014a13 don't use fractional texture coordiantes in the shader 2014-05-15 15:16:34 +02:00
Konstantin Käfer
27b695b068 use explicit constructors 2014-05-15 14:56:06 +02:00
Konstantin Käfer
44f8c80d21 also clear text and raster styles 2014-05-15 14:51:11 +02:00
Konstantin Käfer
fda64b67af rename point => icon 2014-05-15 14:51:02 +02:00
Konstantin Käfer
aeae6248ad simplify point shader in preparation for #196 2014-05-15 14:27:49 +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
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
afc54b7956 add translate-anchor for fills 2014-05-14 16:51:27 +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
790b6cbdb3 add strokeBlur property (default 1.0, larger values blur more) to achieve a gradient effect
fixes #194
2014-05-14 15:27:49 +02:00
Konstantin Käfer
24617da3ff don't factor in the pixelratio to achieve the same look
refs #189
2014-05-14 15:06:31 +02:00
Konstantin Käfer
a812f37c60 make sure to premultiply the colors during stylesheet parsing
fixes #193
2014-05-14 15:05:59 +02:00
Konstantin Käfer
2d938f2ec2 make sure to premultiply the colors during stylesheet parsing
fixes #193
2014-05-14 15:04:33 +02:00
Konstantin Käfer
22f70f9569 don't factor in the pixelratio to achieve the same look
refs #189
2014-05-14 14:52:37 +02:00
Konstantin Käfer
d89df4042f Merge branch 'master' into outdoors-style 2014-05-14 13:01:26 +02:00
Konstantin Käfer
16ccb08f13 switch back to std::pair, tuples are breaking on travis 2014-05-14 12:38:57 +02:00
Konstantin Käfer
007b27088f add tuple include 2014-05-14 12:24:37 +02:00
Konstantin Käfer
6e0533a355 switch to r*tree and use tuples and bulk inserts 2014-05-14 12:18:51 +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
32b21b050f do not define variables until they're needed 2014-05-14 10:31:57 +02:00
Konstantin Käfer
d97e8899ae add translate-anchor property 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
Eden Halperin
ee230c1c98 revert pixel ratio multiplier 2014-05-13 16:11:45 -07:00
Eden Halperin
017cf45ee2 new tile endpoint, fix landcover 2014-05-13 16:04:47 -07:00
Will Snook
e2ee8abce1 use std::fabs instead of fabs 2014-05-13 13:53:30 -06:00
Justin R. Miller
3a7914261e fix erroneous abort of raster rendering 2014-05-13 12:28:54 -07:00
Will Snook
8d2627e5ef Fix for #195, native maxAngleDelta 2014-05-13 13:07:39 -06:00
Konstantin Käfer
c8a3b916b3 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-13 19:02:22 +02:00
Konstantin Käfer
2135f855d1 do not define variables until they're needed 2014-05-13 18:41:37 +02:00
Konstantin Käfer
b3a1e35f44 add translate-anchor property 2014-05-13 18:41:22 +02:00
Konstantin Käfer
632c5f982c make translate property zoom independent
if you want a zoom-dependent translation, you can use a function

refs #189
2014-05-13 16:48:23 +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
7bfcde4025 split up painter into multiple files 2014-05-13 15:37:45 +02:00
Konstantin Käfer
b096373b71 abort rendering early if the style is disabled
refs #184
2014-05-13 15:15:54 +02:00