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
This commit is contained in:
Mike Morris
2014-07-10 16:29:49 -07:00
parent 356c9ce7e4
commit 4590adc115
12 changed files with 91 additions and 66 deletions

View File

@@ -108,7 +108,7 @@ void Painter::pushFramebuffer() {
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
glColorMask(false, false, false, false);
drawClippingMasks(map.getStyle()->getActiveSources());
drawClippingMasks(map.getActiveSources());
glColorMask(true, true, true, true);
fbo_depth_stencil_valid = true;