summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* merge with mbgl-configDane Springmeyer2014-10-2915-342/+323
|\
| * access member variables directly inside class methodsartemp2014-10-291-3/+2
| |
| * store uv::loop as unique_ptrartemp2014-10-291-1/+1
| |
| * simplify - remove before/afterParse and create Parser on stack in worker threadartemp2014-10-292-17/+5
| |
| * store spriteAtlas by value + make TileParser noncopyableartemp2014-10-292-11/+8
| |
| * remove commented out assertartemp2014-10-291-1/+0
| |
| * store glyphAtlas by value in Map object, pass by refartemp2014-10-296-18/+14
| | | | | | | | change hasData signiture to expect ```StyleLayer const&```
| * c++ - use const qualifierartemp2014-10-291-1/+1
| |
| * Fix variable shadowingJohn Firebaugh2014-10-292-5/+5
| |
| * Replace uv::rwlock with std::recursive_mutexJohn Firebaugh2014-10-291-29/+28
| | | | | | | | Fixes #491
| * Render map with a copy of TransformStateJohn Firebaugh2014-10-299-221/+229
| |
| * Hold internal reference to Sprite in SpriteAtlasJohn Firebaugh2014-10-295-33/+29
| |
| * fix text/icon rendering order (#470)artemp2014-10-281-15/+14
| |
| * fix 'flip' logic to take into account rotation_alignment and keep_upright (#470)artemp2014-10-281-7/+7
| |
* | gyp fixesKonstantin Käfer2014-10-283-12/+12
|/
* canonical move ctorartemp2014-10-271-3/+2
|
* add new line at the endartemp2014-10-271-1/+1
|
* c++ - don't test if pointer is nullptr before deletingartemp2014-10-271-4/+1
|
* c++ style memory allocations/deallocationsartemp2014-10-271-7/+4
|
* use prefix operator++artemp2014-10-271-1/+1
|
* make addGlyphsToAtlas static method of SymbolBucket + add addGlyphs method ↵artemp2014-10-272-14/+28
| | | | to minimise number of mutex locking
* prefer c++ style memory allocartemp2014-10-271-3/+4
|
* fix build with libuv 0.11Konstantin Käfer2014-10-271-15/+16
|
* gcc fixesKonstantin Käfer2014-10-2314-39/+43
|
* add missing headerKonstantin Käfer2014-10-221-0/+2
|
* fix variable shadowingKonstantin Käfer2014-10-2232-171/+168
|
* add missing include headerKonstantin Käfer2014-10-221-0/+2
|
* fixes for libuv 0.11Konstantin Käfer2014-10-222-2/+1
|
* Merge branch 'master' of github.com:mapbox/mapbox-gl-nativeKonstantin Käfer2014-10-225-15/+130
|\
| * New mason-based build systemKonstantin Käfer2014-10-2212-30/+72
| |\
| * | background-image supportJohn Firebaugh2014-10-175-15/+130
| | |
* | | Merge branch 'libuv-0.10-headless-display' into masonKonstantin Käfer2014-10-228-17/+62
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: common/http_request_baton_curl.cpp include/mbgl/map/map.hpp include/mbgl/util/uv_detail.hpp scripts/travis_before_install.sh setup-libraries.sh src/map/map.cpp src/storage/file_request_baton.cpp src/storage/http_request.cpp src/util/uv-messenger.c
| * | add int status arg to uv_messenger_callbackMike Morris2014-10-131-1/+1
| | |
| * | adjust file_request_baton and http_request for libuv 0.10 apiMike Morris2014-10-102-7/+8
| | |
| * | Merge branch 'master' into libuv-0.10-headless-displayMike Morris2014-10-1042-308/+2518
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: common/curl_request.cpp common/glfw_view.cpp common/glfw_view.hpp include/mbgl/platform/request.hpp ios/mapbox-gl-cocoa setup-libraries.sh src/map/map.cpp src/platform/request.cpp test/fixtures/fixture_request.cpp
| * | don't do concurrent access to a static member variableKonstantin Käfer2014-10-083-8/+30
| | | | | | | | | | | | | | | | | | in situations where the renderer is used from multiple threads, this causes memory corruption. fixes mapbox/node-mapbox-gl-native#7
| * | make view active/inactive around Map::setup, don't leave active after ↵Mike Morris2014-09-301-0/+2
| | | | | | | | | | | | view.resize()
| * | Merge branch 'libuv010' into libuv-0.10-fix-context-shutdownMike Morris2014-09-243-165/+158
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: common/headless_view.cpp test/headless.cpp
| | * \ Merge branch 'master' into libuv010Mike Morris2014-09-243-165/+158
| | |\ \
| * | | | bump mapnik-packaging, remove unnecessary view.make_active callsMike Morris2014-09-191-9/+4
| | | | |
| * | | | dont make_active when clearing buffers, call make_inactive at end of ↵Mike Morris2014-09-161-1/+2
| | | | | | | | | | | | | | | | | | | | Map::prepare()
| * | | | don't terminate after Map::runMike Morris2014-09-101-2/+0
| | | | |
| * | | | fix Map::terminate?Mike Morris2014-09-101-1/+2
| | | | |
| * | | | update Painter::deleteShadersMike Morris2014-09-101-2/+3
| | | | |
| * | | | Merge branch 'fix-context-shutdown-merge' into libuv-0.10-fix-context-shutdownMike Morris2014-09-102-0/+26
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: src/map/map.cpp
| | * | | Move notify_map_change() from a global callback, to a callback inLeith Bade2014-09-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | View. This allows for their to me more than one Map object alive at a time. Fixes mapbox/mapbox-gl-native#346 Conflicts: common/glfw_view.hpp include/llmr/map/view.hpp include/mbgl/map/transform.hpp src/map/map.cpp src/map/transform.cpp test/headless.cpp
| | * | | Adds the function Map::terminate() to allow all GL resources heldLeith Bade2014-09-102-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by the map to be released immediately. Map::terminate() will call any GL functions on the current thread without blocking or defering to the rendering thread. This function allows a GL context to be destroyed and recreated safely without having to delete the Map object. Fixes mapbox/mapbox-gl-native#341 Conflicts: include/llmr/renderer/painter.hpp test/headless.cpp
| | * | | Add View::make_inactive() to remove context from rendering threadLeith Bade2014-09-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | View::make_inactive() is called just before termination of the rendering thread. The implementation must clear the thread's GL context. This ensures there is no context still bound to a thread during GL shutdown. This is needed as GL will not actually delete a context until it is not active on any thread. Fixes mapbox/mapbox-gl-native#340 Conflicts: common/glfw_view.hpp include/llmr/map/view.hpp test/headless.cpp
| * | | | Merge branch 'master' into libuv010Mike Morris2014-09-0945-970/+690
| |\ \ \ \ | | |/ / /
| * | | | uv_async_init &completeMike Morris2014-09-031-1/+1
| | | | |
View Lorry Controller Status