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
This commit is contained in:
@@ -1,4 +1,8 @@
|
||||
#include <llmr/platform/platform.hpp>
|
||||
|
||||
const char *llmr::kTileURL = "http://localhost:3333/v3/mapbox.mapbox-streets-v4/%d/%d/%d.gl.pbf";
|
||||
const char *llmr::kTileVectorURL = "http://localhost:3333/v3/mapbox.mapbox-streets-v4/%d/%d/%d.gl.pbf";
|
||||
const char *llmr::kTileRasterURL = "https://a.tiles.mapbox.com/v3/justin.map-pgygbwdm/%d/%d/%d%s.png256";
|
||||
const char *llmr::kSpriteURL = "http://localhost:3333/images/sprite";
|
||||
|
||||
const int32_t llmr::kTileVectorMaxZoom = 14;
|
||||
const int32_t llmr::kTileRasterMaxZoom = 21;
|
||||
|
||||
Reference in New Issue
Block a user