tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,376 Commits 3 Branches 22 Tags
b327a2cb34b0977f03f6d7bb2d7fca4537192539
Commit Graph

197 Commits

Author SHA1 Message Date
Mike Morris
f89de635ad Merge branch 'master' into stylesource 2014-07-10 17:21:20 -07:00
Mike Morris
4590adc115 break out StyleSource from Source, move getActiveSources and 
updateSources into Map::Map, move getAccessToken from Style to Map

Conflicts:
	include/llmr/style/style.hpp
	src/map/source.cpp
	src/style/style_layer.cpp
	src/style/style_parser.cpp
 2014-07-10 17:12:02 -07:00
Konstantin Käfer
0719ca73be remove duplicate setAppliedClasses function 2014-07-10 17:10:34 -07:00
Mike Morris
356c9ce7e4 move sprite class to map directory 2014-07-10 16:30:48 -07:00
Justin R. Miller
98a415416a move to per-map access token 2014-07-09 17:18:36 -07:00
Konstantin Käfer
59967fd709 make headless rendering work again by setting the correct fbo 2014-07-07 12:39:03 -07:00
Konstantin Käfer
c81780a9ca Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native 
Conflicts:
	src/style/style.cpp
 2014-07-07 09:30:00 -07:00
Justin R. Miller
3554a3736a re-add setAppliedClasses() to style 2014-07-03 14:59:06 -07:00
Konstantin Käfer
3e54c59656 add applied classes api 2014-07-03 19:39:45 +02:00
Konstantin Käfer
af87fb6c26 load glyphset url from stylesheet 2014-07-02 12:10:09 +02:00
Konstantin Käfer
93cd4c5c7b move StyleLayerGroup and PropertyTransition to their own files 2014-06-30 11:46:03 +02:00
Konstantin Käfer
d75f0075f3 even more refactoring 2014-06-27 16:42:44 +02:00
Konstantin Käfer
ad4497c909 reorganize properties 2014-06-27 16:19:43 +02:00
Konstantin Käfer
6d9de75732 rename time => timestamp to avoid naming conflicts 2014-06-27 15:52:45 +02:00
Konstantin Käfer
aff667d742 add filter expressions 2014-06-26 15:04:18 +02:00
Konstantin Käfer
7637b7f8c7 get applied classes 2014-06-24 16:47:11 +02:00
Konstantin Käfer
ba4294ae0c saving current state 2014-06-23 18:05:25 +02:00
Konstantin Käfer
7a4a833f39 Revert "background grid" 
This reverts commit 1dd3fdfba3.
 2014-06-03 17:29:27 +02:00
Konstantin Käfer
331b726db4 fix comparison order error 2014-06-03 00:00:15 +02:00
Konstantin Käfer
bd4da29a30 Merge branch 'master' into expressions 2014-06-02 23:10:50 +02:00
Justin R. Miller
1dd3fdfba3 background grid 2014-06-02 11:42:00 -07:00
Konstantin Käfer
3c26f53e63 generalize variant comparison and add more operators 2014-06-02 13:50:25 +02:00
Konstantin Käfer
dd4c8a67ba add explicit true type == "no filter" 2014-06-02 11:14:09 +02:00
Konstantin Käfer
99b6a700ef move both variant options to recursive_wrapper 2014-06-02 11:14:09 +02:00
Konstantin Käfer
1d3d0bd85c add missing files 2014-06-02 11:14:09 +02:00
Konstantin Käfer
606ad56220 implement nested expression parsing 2014-06-02 11:14:09 +02:00
Konstantin Käfer
3bc5e03253 simple expression support 2014-06-02 11:14:09 +02:00
Justin R. Miller
38dd25a85a fixes #279: remove forced rotation animations for now 2014-06-01 18:00:28 -07:00
Justin R. Miller
e5a78c931a make some more getter functions constant 2014-06-01 15:32:03 -07:00
Justin R. Miller
4d66a51d22 get rid of brittle hardcoded style toggling method 
Conflicts:
	ios/mapbox-gl-cocoa
 2014-06-01 11:20:55 -07:00
Justin R. Miller
a81a336638 programmatic styling API 2014-05-31 11:32:42 -07:00
Konstantin Käfer
d5e63cea21 retain the uv loop until all things deconstructed 
fixes #261
 2014-05-30 17:32:09 +02:00
Konstantin Käfer
78fda8bb62 make sure we retain shared state when destructing the map object 
refs #261
 2014-05-30 17:00:47 +02:00
Young Hahn
6e53a0328b Remove VectorTileGlyph, VectorTileFace, IndexedFaces, Faces and glyph related parts of vector_tile.proto. Refs #274. 2014-05-29 22:54:46 -04:00
Dane Springmeyer
f83f4a6d63 include <memory> / fix compile issues with g++-4.9 2014-05-29 12:16:25 -07:00
Young Hahn
86ae823306 Merge branch 'glyphrange-boost-locale' into glyphrange-yh-guesses 
Conflicts:
	src/map/tile_parser.cpp
	src/text/glyph_store.cpp
 2014-05-29 06:06:57 -04:00
Young Hahn
d82acee8c7 Stash. 2014-05-29 05:05:48 -04:00
Konstantin Käfer
ed7b86a134 add glyph store and load glyph pbfs 2014-05-28 20:51:13 +02:00
Konstantin Käfer
5b38927c5f use an unordered map for bucket name => bucket 2014-05-28 14:54:54 +02:00
Justin R. Miller
3c5a2c7935 disallow/undo rotation at low zooms and near world edge 2014-05-23 18:24:58 -07:00
Justin R. Miller
07e15927af remove unneeded headers 2014-05-23 11:29:58 -07:00
Justin R. Miller
1ff173a049 fixes #48: constrain min zoom/vertical pan to within world 2014-05-22 16:11:21 -07:00
Konstantin Käfer
6ae0b71bbb fix framebuffer drawing on ios 2014-05-22 14:15:51 +02:00
Konstantin Käfer
67ab9ff6f5 add cleanup call for destroying framebuffers 2014-05-22 12:41:17 +02:00
Konstantin Käfer
bb2cda34a7 make sure we're not calling functions that aren't threadsafe 2014-05-22 12:12:19 +02:00
Konstantin Käfer
53a6992728 fix alpha blending + add depth/stencil buffers 2014-05-21 18:34:41 +02:00
Konstantin Käfer
13939b26d9 first shot at composited blending 
still missing:
- stencil+depth mask
- alpha compositing
 2014-05-21 10:55:09 +02:00
Konstantin Käfer
238fe86571 partially revert 6136ab6d21 
background: we are doing separate opaque/translucent passes per composite layer
and then we're compositing them in the translucent phase
 2014-05-21 10:53:40 +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
13575330f7 use sprite atlas 2014-05-19 10:48:36 +02:00