diff options
author | Leith Bade <leith@mapbox.com> | 2014-12-23 11:33:26 +1300 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2014-12-23 11:33:26 +1300 |
commit | ff3ea3e20b74f35bbaaceafd482217a1f83423cc (patch) | |
tree | eae182ad6a8884a9251005af93a75f76f14f5f64 /src/mbgl/map | |
parent | b5483d3e8193c6bcc6527e31474dc4d878272a08 (diff) | |
parent | 7eaa4fabde5de99c8a0e8f8f3dc5362bc0887d24 (diff) | |
download | qtlocation-mapboxgl-ff3ea3e20b74f35bbaaceafd482217a1f83423cc.tar.gz |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
platform/default/glfw_view.cpp
platform/default/headless_view.cpp
src/mbgl/map/map.cpp
Diffstat (limited to 'src/mbgl/map')
-rw-r--r-- | src/mbgl/map/map.cpp | 12 | ||||
-rw-r--r-- | src/mbgl/map/transform.cpp | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index d1e938427c..36afadbc34 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -38,7 +38,7 @@ #endif // Check libuv library version. -const static bool uv_version_check = []() { +const static bool uvVersionCheck = []() { const unsigned int version = uv_version(); const unsigned int major = (version >> 16) & 0xFF; const unsigned int minor = (version >> 8) & 0xFF; @@ -60,7 +60,7 @@ const static bool uv_version_check = []() { #include <zlib.h> // Check zlib library version. -const static bool zlib_version_check = []() { +const static bool zlibVersionCheck = []() { const char *const version = zlibVersion(); if (version[0] != ZLIB_VERSION[0]) { throw std::runtime_error(mbgl::util::sprintf<96>( @@ -73,7 +73,7 @@ const static bool zlib_version_check = []() { #include <sqlite3.h> // Check sqlite3 library version. -const static bool sqlite_version_check = []() { +const static bool sqliteVersionCheck = []() { if (sqlite3_libversion_number() != SQLITE_VERSION_NUMBER) { throw std::runtime_error(mbgl::util::sprintf<96>( "sqlite3 libversion mismatch: headers report %d, but library reports %d", @@ -320,7 +320,7 @@ void Map::run() { void Map::checkForPause() { std::unique_lock<std::mutex> lockRun (mutexRun); while (pausing) { - view.make_inactive(); + view.deactivate(); mutexPause.lock(); isPaused = true; @@ -329,7 +329,7 @@ void Map::checkForPause() { condRun.wait(lockRun); - view.make_active(); + view.activate(); } mutexPause.lock(); @@ -372,7 +372,7 @@ void Map::terminate() { void Map::setup() { assert(std::this_thread::get_id() == mapThread); assert(painter); - view.make_active(); + view.activate(); painter->setup(); } diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp index d05d1f7446..bf79d24b5d 100644 --- a/src/mbgl/map/transform.cpp +++ b/src/mbgl/map/transform.cpp @@ -29,7 +29,7 @@ bool Transform::resize(const uint16_t w, const uint16_t h, const float ratio, if (final.width != w || final.height != h || final.pixelRatio != ratio || final.framebuffer[0] != fb_w || final.framebuffer[1] != fb_h) { - view.notify_map_change(MapChangeRegionWillChange); + view.notifyMapChange(MapChangeRegionWillChange); current.width = final.width = w; current.height = final.height = h; @@ -38,7 +38,7 @@ bool Transform::resize(const uint16_t w, const uint16_t h, const float ratio, current.framebuffer[1] = final.framebuffer[1] = fb_h; constrain(current.scale, current.y); - view.notify_map_change(MapChangeRegionDidChange); + view.notifyMapChange(MapChangeRegionDidChange); return true; } else { @@ -57,7 +57,7 @@ void Transform::moveBy(const double dx, const double dy, const timestamp duratio void Transform::_moveBy(const double dx, const double dy, const timestamp duration) { // This is only called internally, so we don't need a lock here. - view.notify_map_change(duration ? + view.notifyMapChange(duration ? MapChangeRegionWillChangeAnimated : MapChangeRegionWillChange); @@ -78,7 +78,7 @@ void Transform::_moveBy(const double dx, const double dy, const timestamp durati std::make_shared<util::ease_transition<double>>(current.y, final.y, current.y, start, duration)); } - view.notify_map_change(duration ? + view.notifyMapChange(duration ? MapChangeRegionDidChangeAnimated : MapChangeRegionDidChange, duration); @@ -268,7 +268,7 @@ void Transform::_setScaleXY(const double new_scale, const double xn, const doubl const timestamp duration) { // This is only called internally, so we don't need a lock here. - view.notify_map_change(duration ? + view.notifyMapChange(duration ? MapChangeRegionWillChangeAnimated : MapChangeRegionWillChange); @@ -297,7 +297,7 @@ void Transform::_setScaleXY(const double new_scale, const double xn, const doubl Bc = s / 360; Cc = s / (2 * M_PI); - view.notify_map_change(duration ? + view.notifyMapChange(duration ? MapChangeRegionDidChangeAnimated : MapChangeRegionDidChange, duration); @@ -376,7 +376,7 @@ void Transform::setAngle(const double new_angle, const double cx, const double c void Transform::_setAngle(double new_angle, const timestamp duration) { // This is only called internally, so we don't need a lock here. - view.notify_map_change(duration ? + view.notifyMapChange(duration ? MapChangeRegionWillChangeAnimated : MapChangeRegionWillChange); @@ -395,7 +395,7 @@ void Transform::_setAngle(double new_angle, const timestamp duration) { current.angle, final.angle, current.angle, start, duration)); } - view.notify_map_change(duration ? + view.notifyMapChange(duration ? MapChangeRegionDidChangeAnimated : MapChangeRegionDidChange, duration); |