diff options
130 files changed, 1885 insertions, 7720 deletions
diff --git a/.travis.yml b/.travis.yml index 391520319f..256e6a2aaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,20 +5,20 @@ git: addons: apt: sources: - - &common_sources [ 'ubuntu-toolchain-r-test', 'george-edison55-precise-backports' ] + - &common_sources [ 'ubuntu-toolchain-r-test', 'george-edison55-precise-backports', 'llvm-toolchain-trusty-3.9' ] packages: - &common_packages [ 'libllvm3.8v4', 'cmake', 'cmake-data' ] - - &clang38_packages [ 'clang-3.8', 'libstdc++-5-dev', 'libstdc++6' ] + - &clang39_packages [ 'clang-3.9', 'libstdc++-5-dev', 'libstdc++6' ] - &gcc5_packages [ 'gcc-5', 'g++-5' ] - &glfw_packages [ 'libxrandr-dev', 'libxcursor-dev', 'libxinerama-dev' ] addons_shortcuts: - addons_clang38: &clang38 + addons_clang39: &clang39 apt: sources: *common_sources packages: - *common_packages - - *clang38_packages + - *clang39_packages - *glfw_packages addons_gcc5: &gcc5 apt: @@ -81,14 +81,14 @@ matrix: - git fetch origin master:refs/remotes/origin/master - make check - # EGL - Node - Clang 3.8 - Debug + # EGL - Node - Clang 3.9 - Debug - os: linux sudo: required dist: trusty language: node - compiler: "egl-node4-clang38-debug" - env: BUILDTYPE=Debug _CXX=clang++-3.8 _CC=clang-3.8 WITH_EGL=1 - addons: *clang38 + compiler: "egl-node4-clang39-debug" + env: BUILDTYPE=Debug _CXX=clang++-3.9 _CC=clang-3.9 WITH_EGL=1 + addons: *clang39 before_script: - mapbox_install_logbt - mapbox_start_xvfb @@ -104,14 +104,14 @@ matrix: after_failure: - aws s3 cp . s3://mapbox/mapbox-gl-native/render-tests/$TRAVIS_JOB_NUMBER --recursive --exclude "*" --include "*.trace" - # EGL - Node - Clang 3.8 - Release + # EGL - Node - Clang 3.9 - Release - os: linux sudo: required dist: trusty language: node - compiler: "egl-node4-clang38-release" - env: BUILDTYPE=Release _CXX=clang++-3.8 _CC=clang-3.8 WITH_EGL=1 - addons: *clang38 + compiler: "egl-node4-clang39-release" + env: BUILDTYPE=Release _CXX=clang++-3.9 _CC=clang-3.9 WITH_EGL=1 + addons: *clang39 before_script: # fglrx causes the GLX extension to be unavailable - sudo apt-get purge -qq fglrx @@ -148,14 +148,14 @@ matrix: - ccache --show-stats - ./platform/linux/scripts/coveralls.sh - # EGL - Clang 3.8 - Debug + # EGL - Clang 3.9 - Debug - os: linux sudo: required dist: trusty language: cpp - compiler: "egl-clang38-debug" - env: BUILDTYPE=Debug _CXX=clang++-3.8 _CC=clang-3.8 WITH_EGL=1 - addons: *clang38 + compiler: "egl-clang39-debug" + env: BUILDTYPE=Debug _CXX=clang++-3.9 _CC=clang-3.9 WITH_EGL=1 + addons: *clang39 before_script: - mapbox_start_xvfb - mapbox_export_mesa_library_path diff --git a/CMakeLists.txt b/CMakeLists.txt index 123158e2eb..49f3443d9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,7 @@ mason_use(protozero VERSION 1.4.2 HEADER_ONLY) mason_use(pixelmatch VERSION 0.10.0 HEADER_ONLY) mason_use(geojson VERSION 0.4.0 HEADER_ONLY) mason_use(polylabel VERSION 1.0.2 HEADER_ONLY) +mason_use(wagyu VERSION 0.4.1 HEADER_ONLY) add_definitions(-DRAPIDJSON_HAS_STDSTRING=1) @@ -6,6 +6,8 @@ else $(error BUILDTYPE must be Debug or Release) endif +buildtype := $(shell echo "$(BUILDTYPE)" | tr "[A-Z]" "[a-z]") + ifeq ($(shell uname -s), Darwin) HOST_PLATFORM = macos HOST_PLATFORM_VERSION = $(shell uname -m) @@ -212,8 +214,7 @@ $(IOS_PROJ_PATH): $(IOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings $(BUILD_DEP (cd $(IOS_OUTPUT_PATH) && cmake -G Xcode ../.. \ -DCMAKE_TOOLCHAIN_FILE=../../platform/ios/toolchain.cmake \ -DMBGL_PLATFORM=ios \ - -DMASON_PLATFORM=ios \ - -DMASON_PLATFORM_VERSION=8.0) + -DMASON_PLATFORM=ios) $(IOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings: platform/ios/WorkspaceSettings.xcsettings mkdir -p "$(IOS_USER_DATA_PATH)" @@ -451,39 +452,36 @@ test-node: node #### Android targets ########################################################### -MBGL_ANDROID_ABIS = arm-v5;armeabi;9 -MBGL_ANDROID_ABIS += arm-v7;armeabi-v7a;9 -MBGL_ANDROID_ABIS += arm-v8;arm64-v8a;21 -MBGL_ANDROID_ABIS += x86;x86;9 -MBGL_ANDROID_ABIS += x86-64;x86_64;21 -MBGL_ANDROID_ABIS += mips;mips;9 +MBGL_ANDROID_ABIS = arm-v5;armeabi +MBGL_ANDROID_ABIS += arm-v7;armeabi-v7a +MBGL_ANDROID_ABIS += arm-v8;arm64-v8a +MBGL_ANDROID_ABIS += x86;x86 +MBGL_ANDROID_ABIS += x86-64;x86_64 +MBGL_ANDROID_ABIS += mips;mips -MBGL_ANDROID_BUILD_DIR = build/android-$1-$3/$(BUILDTYPE) MBGL_ANDROID_LOCAL_WORK_DIR = /data/local/tmp/core-tests MBGL_ANDROID_LIBDIR = lib$(if $(filter arm-v8 x86-64,$1),64) MBGL_ANDROID_DALVIKVM = dalvikvm$(if $(filter arm-v8 x86-64,$1),64,32) MBGL_ANDROID_APK_SUFFIX = $(if $(filter Release,$(BUILDTYPE)),release-unsigned,debug) -MBGL_ANDROID_CORE_TEST_DIR = $(MBGL_ANDROID_BUILD_DIR)/core-tests +MBGL_ANDROID_CORE_TEST_DIR = platform/android/MapboxGLAndroidSDK/.externalNativeBuild/cmake/$(buildtype)/$2/core-tests +MBGL_ANDROID_GRADLE = ./gradlew --parallel --max-workers=$(JOBS) -Pmapbox.buildtype=$(buildtype) + +# Lists all devices, and extracts the identifiers, then obtains the ABI for every one. +# Some devices return \r\n, so we'll have to remove the carriage return before concatenating. +MBGL_ANDROID_ACTIVE_ARCHS = $(shell adb devices | sed '1d;/^\*/d;s/[[:space:]].*//' | xargs -n 1 -I DEV `type -P adb` -s DEV shell getprop ro.product.cpu.abi | tr -d '\r') .PHONY: android-help android-help: @echo @echo "Available Android architecture targets:" @echo - @echo " make android-arm-v5-9" - @echo " (android-arm-v5)" - @echo " make android-arm-v7-9" - @echo " (android, android-arm-v7)" - @echo " make android-arm-v8-21" - @echo " (android-arm-v8)" - @echo " make android-mips-9" - @echo " (android-mips)" - @echo " make android-mips-64-21" - @echo " (android-mips-64)" - @echo " make android-x86-9" - @echo " (android-x86)" - @echo " make android-x86-64-21" - @echo " (android-x86-64)" + @echo " make android-arm-v5" + @echo " make android-arm-v7, make android" + @echo " make android-arm-v8" + @echo " make android-mips" + @echo " make android-mips-64" + @echo " make android-x86" + @echo " make android-x86-64" @echo " make apackage" @echo @@ -492,51 +490,30 @@ android-style-code: node platform/android/scripts/generate-style-code.js style-code: android-style-code +# Configuration file for running CMake from Gradle within Android Studio. +platform/android/configuration.gradle: + @echo "ext {\n node = '`which node`'\n npm = '`which npm`'\n ccache = '`which ccache`'\n}" > $@ + define ANDROID_RULES # $1 = arm-v7 (short arch) # $2 = armeabi-v7a (internal arch) -# $3 = 9 (platform version) - -$(MBGL_ANDROID_BUILD_DIR)/env.sh: $(BUILD_DEPS) platform/android/scripts/ndk.sh - @mkdir -p $(MBGL_ANDROID_BUILD_DIR) - platform/android/scripts/ndk.sh $1 $2 $3 > $(MBGL_ANDROID_BUILD_DIR)/env.sh.tmp && \ - mv $(MBGL_ANDROID_BUILD_DIR)/env.sh.tmp $(MBGL_ANDROID_BUILD_DIR)/env.sh - -$(MBGL_ANDROID_BUILD_DIR)/build.ninja: $(MBGL_ANDROID_BUILD_DIR)/env.sh platform/android/config.cmake - # Invoke CMake twice to fix issues from double inclusion of toolchain.cmake on the first run. - . $(MBGL_ANDROID_BUILD_DIR)/env.sh && \ - ([ -f $(MBGL_ANDROID_BUILD_DIR)/build.ninja ] || $$$${CMAKE} \ - -H. \ - -B"$(MBGL_ANDROID_BUILD_DIR)" \ - -G"$$$${CMAKE_GENERATOR}" \ - $$$${CMAKE_ARGS} \ - -DCMAKE_BUILD_TYPE=$(BUILDTYPE) \ - -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ - -DMBGL_PLATFORM=android \ - -DMASON_PLATFORM=android \ - -DMASON_PLATFORM_VERSION=$1-$3) && \ - $$$${CMAKE} \ - -H. \ - -B"$(MBGL_ANDROID_BUILD_DIR)" .PHONY: android-test-lib-$1 -android-test-lib-$1: $(MBGL_ANDROID_BUILD_DIR)/build.ninja - . $(MBGL_ANDROID_BUILD_DIR)/env.sh && $$$${CMAKE} --build $(MBGL_ANDROID_BUILD_DIR) -- $(NINJA_ARGS) -j$(JOBS) mbgl-test +android-test-lib-$1: platform/android/configuration.gradle + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 -Pmapbox.with_test=true :MapboxGLAndroidSDKTestApp:assemble$(BUILDTYPE) .PHONY: android-lib-$1 -android-lib-$1: $(MBGL_ANDROID_BUILD_DIR)/build.ninja - . $(MBGL_ANDROID_BUILD_DIR)/env.sh && $$$${CMAKE} --build $(MBGL_ANDROID_BUILD_DIR) -- $(NINJA_ARGS) -j$(JOBS) mapbox-gl example-custom-layer +android-lib-$1: platform/android/configuration.gradle + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDK:assemble$(BUILDTYPE) .PHONY: android-$1 -android-$1: android-lib-$1 - cd platform/android && ./gradlew --parallel --max-workers=$(JOBS) :MapboxGLAndroidSDKTestApp:assemble$(BUILDTYPE) +android-$1: platform/android/configuration.gradle + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:assemble$(BUILDTYPE) .PHONY: android-core-test-$1 android-core-test-$1: android-test-lib-$1 - mkdir -p $(MBGL_ANDROID_CORE_TEST_DIR) - # Compile main sources and extract the classes (using the test app to get all transitive dependencies in one place) - cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:assemble$(BUILDTYPE) + mkdir -p $(MBGL_ANDROID_CORE_TEST_DIR) unzip -o platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-$(MBGL_ANDROID_APK_SUFFIX).apk classes.dex -d $(MBGL_ANDROID_CORE_TEST_DIR) # Compile Test runner @@ -557,8 +534,8 @@ run-android-core-test-$1-%: android-core-test-$1 # Push all needed files to the device adb push $(MBGL_ANDROID_CORE_TEST_DIR)/test.jar $(MBGL_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 adb push test/fixtures $(MBGL_ANDROID_LOCAL_WORK_DIR)/test > /dev/null 2>&1 - adb push $(MBGL_ANDROID_BUILD_DIR)/stripped/libmapbox-gl.so $(MBGL_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 - adb push $(MBGL_ANDROID_BUILD_DIR)/stripped/libmbgl-test.so $(MBGL_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 + adb push platform/android/MapboxGLAndroidSDK/build/intermediates/bundles/default/jni/$2/libmapbox-gl.so $(MBGL_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 + adb push platform/android/MapboxGLAndroidSDK/build/intermediates/bundles/default/jni/$2/libmbgl-test.so $(MBGL_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 # Kick off the tests adb shell "export LD_LIBRARY_PATH=/system/$(MBGL_ANDROID_LIBDIR):$(MBGL_ANDROID_LOCAL_WORK_DIR) && cd $(MBGL_ANDROID_LOCAL_WORK_DIR) && $(MBGL_ANDROID_DALVIKVM) -cp $(MBGL_ANDROID_LOCAL_WORK_DIR)/test.jar Main --gtest_filter=$$*" @@ -573,16 +550,29 @@ run-android-core-test-$1-%: android-core-test-$1 run-android-core-test-$1: run-android-core-test-$1-* .PHONY: run-android-$1 -run-android-$1: android-$1 +run-android-$1: platform/android/configuration.gradle adb uninstall com.mapbox.mapboxsdk.testapp > /dev/null - cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:install$(BUILDTYPE) && adb shell am start -n com.mapbox.mapboxsdk.testapp/.activity.FeatureOverviewActivity + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:install$(BUILDTYPE) && adb shell am start -n com.mapbox.mapboxsdk.testapp/.activity.FeatureOverviewActivity + +.PHONY: android-ui-test-$1 +android-ui-test-$1: platform/android/configuration.gradle + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:assembleDebug :MapboxGLAndroidSDKTestApp:assembleAndroidTest + +# This test assumes that you have Android Simulator started locally. +.PHONY: run-android-ui-test-$1 +run-android-ui-test-$1: platform/android/configuration.gradle + adb uninstall com.mapbox.mapboxsdk.testapp > /dev/null + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:connectedAndroidTest + +run-android-ui-test-$1-%: platform/android/configuration.gradle + adb uninstall com.mapbox.mapboxsdk.testapp > /dev/null + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class="$*" -apackage: android-lib-$1 endef # Explodes the arguments into individual variables define ANDROID_RULES_INVOKER -$(call ANDROID_RULES,$(word 1,$1),$(word 2,$1),$(word 3,$1)) +$(call ANDROID_RULES,$(word 1,$1),$(word 2,$1)) endef $(foreach abi,$(MBGL_ANDROID_ABIS),$(eval $(call ANDROID_RULES_INVOKER,$(subst ;, ,$(abi))))) @@ -590,60 +580,69 @@ $(foreach abi,$(MBGL_ANDROID_ABIS),$(eval $(call ANDROID_RULES_INVOKER,$(subst ; .PHONY: android android: android-arm-v7 +.PHONY: android-lib +android-lib: android-lib-arm-v7 + .PHONY: run-android run-android: run-android-arm-v7 -.PHONY: run-android-unit-test -run-android-unit-test: - cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:testDebugUnitTest --continue +.PHONY: run-android-ui-test +run-android-ui-test: run-android-ui-test-arm-v7 +run-android-ui-test-%: run-android-ui-test-arm-v7-% -run-android-unit-test-%: - cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:testDebugUnitTest --tests "$*" +# Java-only test +.PHONY: run-android-unit-test +run-android-unit-test: platform/android/configuration.gradle + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDKTestApp:testDebugUnitTest +run-android-unit-test-%: platform/android/configuration.gradle + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDKTestApp:testDebugUnitTest --tests "$*" +# Java-only test .PHONY: run-android-wear-unit-test -run-android-wear-unit-test: - cd platform/android && ./gradlew :MapboxGLAndroidSDKWearTestApp:testDebugUnitTest --continue +run-android-wear-unit-test: platform/android/configuration.gradle + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDKWearTestApp:testDebugUnitTest +run-android-wear-unit-test-%: platform/android/configuration.gradle + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDKWearTestApp:testDebugUnitTest --tests "$*" -.PHONY: android-ui-test -android-ui-test: - cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:assembleDebug --continue && ./gradlew :MapboxGLAndroidSDKTestApp:assembleAndroidTest --continue - -.PHONY: run-android-ui-test -run-android-ui-test: - adb uninstall com.mapbox.mapboxsdk.testapp > /dev/null - cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:connectedAndroidTest -i +.PHONY: run-android-ui-test-aws +run-android-ui-test-aws: platform/android/configuration.gradle + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=all devicefarmUpload -run-android-ui-test-%: - adb uninstall com.mapbox.mapboxsdk.testapp > /dev/null - cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class="$*" +.PHONY: apackage +apackage: platform/android/configuration.gradle + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=all assemble$(BUILDTYPE) -.PHONY: run-android-ui-test-aws -run-android-ui-test-aws: - cd platform/android && ./gradlew devicefarmUpload +# Uploads the compiled Android SDK to Maven +.PHONY: run-android-upload-archives +run-android-upload-archives: platform/android/configuration.gradle + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=all :MapboxGLAndroidSDK:uploadArchives +# Runs Android UI tests on all connected devices using Spoon .PHONY: run-android-ui-test-spoon -run-android-ui-test-spoon: - cd platform/android && ./gradlew spoon - -.PHONY: apackage -apackage: - cd platform/android && ./gradlew --parallel --max-workers=$(JOBS) assemble$(BUILDTYPE) +run-android-ui-test-spoon: platform/android/configuration.gradle + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis="$(MBGL_ANDROID_ACTIVE_ARCHS)" spoon .PHONY: test-code-android test-code-android: node platform/android/scripts/generate-test-code.js -.PHONY: android-ndk-stack -android-ndk-stack: - adb logcat | ndk-stack -sym build/android-arm-v7-9/Debug - .PHONY: android-checkstyle -android-checkstyle: - cd platform/android && ./gradlew checkstyle +android-checkstyle: platform/android/configuration.gradle + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none checkstyle .PHONY: android-javadoc -android-javadoc: - cd platform/android && ./gradlew :MapboxGLAndroidSDK:javadocrelease +android-javadoc: platform/android/configuration.gradle + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:javadocrelease + +ifeq ($(HOST_PLATFORM), macos) +.PHONY: aproj +aproj: platform/android/configuration.gradle + open -b com.google.android.studio platform/android +endif + +.PHONY: android-configuration +android-configuration: platform/android/configuration.gradle + cat platform/android/configuration.gradle #### Miscellaneous targets ##################################################### @@ -659,12 +658,12 @@ codestyle: .PHONY: clean clean: -rm -rf ./build \ + ./platform/android/configuration.gradle \ ./platform/android/MapboxGLAndroidSDK/build \ + ./platform/android/MapboxGLAndroidSDK/.externalNativeBuild \ ./platform/android/MapboxGLAndroidSDKTestApp/build \ ./platform/android/MapboxGLAndroidSDKWearTestApp/build \ ./platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/gen \ - ./platform/android/MapboxGLAndroidSDK/src/main/jniLibs \ - ./platform/android/MapboxGLAndroidSDKTestApp/src/main/jniLibs \ ./platform/android/MapboxGLAndroidSDK/src/main/assets .PHONY: distclean diff --git a/benchmark/parse/filter.benchmark.cpp b/benchmark/parse/filter.benchmark.cpp index 5214f682d6..3918f03539 100644 --- a/benchmark/parse/filter.benchmark.cpp +++ b/benchmark/parse/filter.benchmark.cpp @@ -14,7 +14,7 @@ using namespace mbgl; style::Filter parse(const char* expression) { rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> doc; doc.Parse<0>(expression); - return *style::conversion::convert<style::Filter>(doc); + return *style::conversion::convert<style::Filter, JSValue>(doc); } static void Parse_Filter(benchmark::State& state) { diff --git a/cloudformation/travis.template b/cloudformation/travis.template index e6b404d9a4..29f2402b20 100644 --- a/cloudformation/travis.template +++ b/cloudformation/travis.template @@ -199,6 +199,26 @@ } ] } + }, + { + "PolicyName": "publish-nightlies", + "PolicyDocument": { + "Statement": [ + { + "Action": [ + "s3:DeleteObject", + "s3:GetObject", + "s3:GetObjectAcl", + "s3:PutObject", + "s3:PutObjectAcl" + ], + "Effect": "Allow", + "Resource": [ + "arn:aws:s3:::mapbox/mapbox-gl-native/ios/builds/*" + ] + } + ] + } } ] } diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index d2a77aa3aa..9b5ddc97d6 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -35,10 +35,6 @@ set(MBGL_CORE_FILES src/mbgl/annotation/symbol_annotation_impl.cpp src/mbgl/annotation/symbol_annotation_impl.hpp - # clipper - src/clipper/clipper.cpp - src/clipper/clipper.hpp - # csscolorparser src/csscolorparser/csscolorparser.cpp src/csscolorparser/csscolorparser.hpp @@ -70,7 +66,6 @@ set(MBGL_CORE_FILES src/mbgl/gl/framebuffer.hpp src/mbgl/gl/gl.cpp src/mbgl/gl/index_buffer.hpp - src/mbgl/gl/normalization.hpp src/mbgl/gl/object.cpp src/mbgl/gl/object.hpp src/mbgl/gl/primitives.hpp @@ -107,6 +102,7 @@ set(MBGL_CORE_FILES include/mbgl/map/backend_scope.hpp include/mbgl/map/camera.hpp include/mbgl/map/map.hpp + include/mbgl/map/map_observer.hpp include/mbgl/map/mode.hpp include/mbgl/map/query.hpp include/mbgl/map/view.hpp @@ -209,6 +205,8 @@ set(MBGL_CORE_FILES src/mbgl/shaders/preludes.hpp src/mbgl/shaders/raster.cpp src/mbgl/shaders/raster.hpp + src/mbgl/shaders/shaders.cpp + src/mbgl/shaders/shaders.hpp src/mbgl/shaders/symbol_icon.cpp src/mbgl/shaders/symbol_icon.hpp src/mbgl/shaders/symbol_sdf.cpp diff --git a/cmake/core.cmake b/cmake/core.cmake index 59de7708b6..723139e368 100644 --- a/cmake/core.cmake +++ b/cmake/core.cmake @@ -24,6 +24,7 @@ target_add_mason_package(mbgl-core PRIVATE kdbush) target_add_mason_package(mbgl-core PRIVATE earcut) target_add_mason_package(mbgl-core PRIVATE protozero) target_add_mason_package(mbgl-core PRIVATE polylabel) +target_add_mason_package(mbgl-core PRIVATE wagyu) mbgl_platform_core() diff --git a/cmake/mason.cmake b/cmake/mason.cmake index 4e4e46b619..bc31feeb5f 100644 --- a/cmake/mason.cmake +++ b/cmake/mason.cmake @@ -21,11 +21,34 @@ function(mason_detect_platform) # Determine platform version string if(NOT MASON_PLATFORM_VERSION) - execute_process( - COMMAND uname -m - OUTPUT_VARIABLE MASON_PLATFORM_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) - set(MASON_PLATFORM_VERSION "${MASON_PLATFORM_VERSION}" PARENT_SCOPE) + # Android Studio only passes ANDROID_ABI, but we need to adjust that to the Mason + if(MASON_PLATFORM STREQUAL "android" AND NOT MASON_PLATFORM_VERSION) + if (ANDROID_ABI STREQUAL "armeabi") + set(MASON_PLATFORM_VERSION "arm-v5-9" PARENT_SCOPE) + elseif (ANDROID_ABI STREQUAL "armeabi-v7a") + set(MASON_PLATFORM_VERSION "arm-v7-9" PARENT_SCOPE) + elseif (ANDROID_ABI STREQUAL "arm64-v8a") + set(MASON_PLATFORM_VERSION "arm-v8-21" PARENT_SCOPE) + elseif (ANDROID_ABI STREQUAL "x86") + set(MASON_PLATFORM_VERSION "x86-9" PARENT_SCOPE) + elseif (ANDROID_ABI STREQUAL "x86_64") + set(MASON_PLATFORM_VERSION "x86-64-21" PARENT_SCOPE) + elseif (ANDROID_ABI STREQUAL "mips") + set(MASON_PLATFORM_VERSION "mips-9" PARENT_SCOPE) + elseif (ANDROID_ABI STREQUAL "mips64") + set(MASON_PLATFORM_VERSION "mips-64-9" PARENT_SCOPE) + else() + message(FATAL_ERROR "Unknown ANDROID_ABI '${ANDROID_ABI}'.") + endif() + elseif(MASON_PLATFORM STREQUAL "ios") + set(MASON_PLATFORM_VERSION "8.0" PARENT_SCOPE) + else() + execute_process( + COMMAND uname -m + OUTPUT_VARIABLE MASON_PLATFORM_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) + set(MASON_PLATFORM_VERSION "${MASON_PLATFORM_VERSION}" PARENT_SCOPE) + endif() endif() endfunction() diff --git a/include/mbgl/map/backend.hpp b/include/mbgl/map/backend.hpp index 4a43921c0b..cd756abe43 100644 --- a/include/mbgl/map/backend.hpp +++ b/include/mbgl/map/backend.hpp @@ -1,6 +1,6 @@ #pragma once -#include <mbgl/map/change.hpp> +#include <mbgl/map/map_observer.hpp> #include <memory> @@ -12,7 +12,7 @@ class Context; class BackendScope; -class Backend { +class Backend : public MapObserver { public: Backend(); virtual ~Backend(); @@ -24,9 +24,6 @@ public: // in the near future. (Not called for Map::renderStill() mode.) virtual void invalidate() = 0; - // Notifies a watcher of map x/y/scale/rotation changes. - virtual void notifyMapChange(MapChange change); - protected: // Called when the backend's GL context needs to be made active or inactive. These are called, // as a matched pair, in four situations: diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 02e14bea4e..79fcd34d9b 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -2,6 +2,7 @@ #include <mbgl/util/optional.hpp> #include <mbgl/util/chrono.hpp> +#include <mbgl/map/map_observer.hpp> #include <mbgl/map/mode.hpp> #include <mbgl/util/geo.hpp> #include <mbgl/util/feature.hpp> diff --git a/include/mbgl/map/map_observer.hpp b/include/mbgl/map/map_observer.hpp new file mode 100644 index 0000000000..4fefb79121 --- /dev/null +++ b/include/mbgl/map/map_observer.hpp @@ -0,0 +1,42 @@ +#pragma once + +#include <mbgl/style/source.hpp> + +#include <cstdint> +#include <exception> +#include <string> + +namespace mbgl { + +class MapObserver { +public: + static MapObserver& nullObserver() { + static MapObserver mapObserver; + return mapObserver; + } + + enum class CameraChangeMode : uint32_t { + Immediate, + Animated + }; + + enum class RenderMode : uint32_t { + Partial, + Full + }; + + virtual void onCameraWillChange(CameraChangeMode) {} + virtual void onCameraIsChanging() {} + virtual void onCameraDidChange(CameraChangeMode) {} + virtual void onWillStartLoadingMap() {} + virtual void onDidFinishLoadingMap() {} + virtual void onDidFailLoadingMap(std::exception_ptr) {} + virtual void onWillStartRenderingFrame() {} + virtual void onDidFinishRenderingFrame(RenderMode) {} + virtual void onWillStartRenderingMap() {} + virtual void onDidFinishRenderingMap(RenderMode) {} + virtual void onDidFinishLoadingStyle() {} + virtual void onSourceChanged(style::Source&) {} +}; + +} // namespace mbgl diff --git a/include/mbgl/style/layers/custom_layer.hpp b/include/mbgl/style/layers/custom_layer.hpp index 6bde087820..edc8d43f89 100644 --- a/include/mbgl/style/layers/custom_layer.hpp +++ b/include/mbgl/style/layers/custom_layer.hpp @@ -65,9 +65,7 @@ public: }; template <> -inline bool Layer::is<CustomLayer>() const { - return type == Type::Custom; -} +bool Layer::is<CustomLayer>() const; } // namespace style } // namespace mbgl diff --git a/include/mbgl/style/source.hpp b/include/mbgl/style/source.hpp index 0901bb1954..0e6e32b112 100644 --- a/include/mbgl/style/source.hpp +++ b/include/mbgl/style/source.hpp @@ -3,6 +3,7 @@ #include <mbgl/util/feature.hpp> #include <mbgl/util/noncopyable.hpp> #include <mbgl/util/optional.hpp> +#include <mbgl/util/range.hpp> #include <mbgl/style/types.hpp> #include <mbgl/style/query.hpp> @@ -55,7 +56,8 @@ public: std::unique_ptr<Source> copy(const std::string& id) const; optional<std::string> getAttribution() const; - + optional<Range<uint8_t>> getZoomRange() const; + std::vector<Feature> querySourceFeatures(const SourceQueryOptions& options = {}); // Private implementation diff --git a/include/mbgl/util/enum.hpp b/include/mbgl/util/enum.hpp index 48ffda463e..369ca86bfd 100644 --- a/include/mbgl/util/enum.hpp +++ b/include/mbgl/util/enum.hpp @@ -11,26 +11,26 @@ namespace mbgl { template <typename T> class Enum { public: - using Value = std::pair<const T, const char *>; - - static const char * toString(T t) { - auto it = std::find_if(begin, end, [&] (const auto& v) { return t == v.first; }); - assert(it != end); return it->second; - } - - static optional<T> toEnum(const std::string& s) { - auto it = std::find_if(begin, end, [&] (const auto& v) { return s == v.second; }); - return it == end ? optional<T>() : it->first; - } - -private: - static const Value* begin; - static const Value* end; + static const char * toString(T); + static optional<T> toEnum(const std::string&); }; -#define MBGL_DEFINE_ENUM(type, strings...) \ -const constexpr Enum<type>::Value type##_names[] = strings; \ -template <> const Enum<type>::Value* Enum<type>::begin = std::begin(type##_names); \ -template <> const Enum<type>::Value* Enum<type>::end = std::end(type##_names) +#define MBGL_DEFINE_ENUM(T, values...) \ + \ +static const constexpr std::pair<const T, const char *> T##_names[] = values; \ + \ +template <> \ +const char * Enum<T>::toString(T t) { \ + auto it = std::find_if(std::begin(T##_names), std::end(T##_names), \ + [&] (const auto& v) { return t == v.first; }); \ + assert(it != std::end(T##_names)); return it->second; \ +} \ + \ +template <> \ +optional<T> Enum<T>::toEnum(const std::string& s) { \ + auto it = std::find_if(std::begin(T##_names), std::end(T##_names), \ + [&] (const auto& v) { return s == v.second; }); \ + return it == std::end(T##_names) ? optional<T>() : it->first; \ +} } // namespace mbgl diff --git a/include/mbgl/util/exception.hpp b/include/mbgl/util/exception.hpp index 46de8528c7..a9804e96c5 100644 --- a/include/mbgl/util/exception.hpp +++ b/include/mbgl/util/exception.hpp @@ -20,5 +20,20 @@ struct MisuseException : Exception { MisuseException(const std::string &msg) : Exception(msg) {} }; +struct StyleParseException : Exception { + StyleParseException(const char *msg) : Exception(msg) {} + StyleParseException(const std::string &msg) : Exception(msg) {} +}; + +struct StyleLoadException : Exception { + StyleLoadException(const char *msg) : Exception(msg) {} + StyleLoadException(const std::string &msg) : Exception(msg) {} +}; + +struct NotFoundException : Exception { + NotFoundException(const char *msg) : Exception(msg) {} + NotFoundException(const std::string &msg) : Exception(msg) {} +}; + } // namespace util } // namespace mbgl diff --git a/mapbox-gl-js b/mapbox-gl-js -Subproject 69bb05cef27c99722f6616867032d64b5f12ee5 +Subproject f07f5a5a3fbc3bf976548d11acfc5fd24768b1a diff --git a/package.json b/package.json index d389b06514..bba2facdaf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mapbox/mapbox-gl-native", - "version": "3.4.4", + "version": "3.4.7", "description": "Renders map tiles with Mapbox GL", "keywords": [ "mapbox", @@ -39,7 +39,7 @@ }, "gypfile": true, "binary": { - "module_name": "mapbox-gl-native", + "module_name": "mapbox_gl_native", "module_path": "./lib/", "host": "https://mapbox-node-binary.s3.amazonaws.com", "remote_path": "./{name}/v{version}", diff --git a/platform/android/.gitignore b/platform/android/.gitignore index 81eeaad167..7a3db0aafd 100644 --- a/platform/android/.gitignore +++ b/platform/android/.gitignore @@ -7,17 +7,16 @@ # Build files build/ +.externalNativeBuild *.so *.apk -# JNI -MapboxGLAndroidSDK/src/main/jniLibs/ - # Lib assets MapboxGLAndroidSDK/src/main/assets/ # Local settings local.properties +/configuration.gradle # Token file MapboxGLAndroidSDKTestApp/src/main/res/values/developer-config.xml diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index 2ce3780421..f2d28e53d1 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -31,6 +31,66 @@ android { buildConfigField "String", "MAPBOX_EVENTS_USER_AGENT", String.format("\"MapboxEventsAndroid/%s\"", project.VERSION_NAME) } + defaultPublishConfig project.hasProperty("mapbox.buildtype") ? project.getProperty("mapbox.buildtype") : "debug" + + // We sometimes want to invoke Gradle without building a native dependency, e.g. when we just want + // to invoke the Java tests. When we explicitly specify an ABI of 'none', no native dependencies are + // added. When another ABI is specified explicitly, we're just going to build that ABI. In all other + // cases, all ABIs are built. + // When invoking from the command line, set `-Pmapbox.abis=...` to only build the desired architectures. + // When building from Android Studio, gradle.properties sets `android.buildOnlyTargetAbi=true` so that + // only the architecture for the device you're running on gets built. + def abi = 'all' + if (!project.hasProperty('android.injected.invoked.from.ide')) { + // Errors when the user invokes Gradle from the command line and didn't set mapbox.abis + abi = project.getProperty("mapbox.abis") + } + + if (abi != 'none') { + externalNativeBuild { + cmake { + path "../../../CMakeLists.txt" + } + } + } + + defaultConfig { + if (abi != 'none') { + externalNativeBuild { + cmake { + arguments "-DANDROID_TOOLCHAIN=clang" + arguments "-DANDROID_STL=c++_static" + arguments "-DANDROID_CPP_FEATURES=rtti;exceptions" + arguments "-DMBGL_PLATFORM=android" + arguments "-DMASON_PLATFORM=android" + arguments "-DNodeJS_EXECUTABLE=" + rootProject.ext.node + arguments "-Dnpm_EXECUTABLE=" + rootProject.ext.npm + + // Enable ccache if the user has installed it. + if (rootProject.ext.ccache?.trim()) { + arguments "-DANDROID_CCACHE=" + rootProject.ext.ccache + // ccache splits up the compile command until multiple invocations and uses -E + // with one of them, and clang doesn't like unused arguments in that case. + cFlags "-Qunused-arguments" + cppFlags "-Qunused-arguments" + } + + targets "mapbox-gl" + targets "example-custom-layer" + if (project.hasProperty("mapbox.with_test")) { + targets "mbgl-test" + } + + if (abi != 'all') { + abiFilters abi.split(' ') + } else { + abiFilters "armeabi", "armeabi-v7a", "mips", "x86", "arm64-v8a", "x86_64" + } + } + } + } + } + // avoid naming conflicts, force usage of prefix resourcePrefix 'mapbox_' diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties index 7a6f777a3b..9f555da5f8 100644 --- a/platform/android/MapboxGLAndroidSDK/gradle.properties +++ b/platform/android/MapboxGLAndroidSDK/gradle.properties @@ -14,3 +14,7 @@ POM_DEVELOPER_NAME=Mapbox POM_NAME=Mapbox Android SDK POM_ARTIFACT_ID=mapbox-android-sdk POM_PACKAGING=aar + +# Only build native dependencies for the current ABI +# See https://code.google.com/p/android/issues/detail?id=221098#c20 +android.buildOnlyTargetAbi=true diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java index 0bd9523f4f..9adefa3221 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java @@ -121,6 +121,7 @@ public class MapboxConstants { public static final String STATE_COMPASS_MARGIN_RIGHT = "mapbox_compassMarginRight"; public static final String STATE_COMPASS_MARGIN_BOTTOM = "mapbox_compassMarginBottom"; public static final String STATE_COMPASS_FADE_WHEN_FACING_NORTH = "mapbox_compassFade"; + public static final String STATE_COMPASS_IMAGE_BITMAP = "mapbox_compassImage"; public static final String STATE_LOGO_GRAVITY = "mapbox_logoGravity"; public static final String STATE_LOGO_MARGIN_LEFT = "mapbox_logoMarginLeft"; public static final String STATE_LOGO_MARGIN_TOP = "mapbox_logoMarginTop"; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java index 6467033ead..2fd02c76e5 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java @@ -47,6 +47,7 @@ public class MapboxMapOptions implements Parcelable { private boolean fadeCompassFacingNorth = true; private int compassGravity = Gravity.TOP | Gravity.END; private int[] compassMargins; + private Drawable compassImage; private boolean logoEnabled = true; private int logoGravity = Gravity.BOTTOM | Gravity.START; @@ -100,6 +101,11 @@ public class MapboxMapOptions implements Parcelable { compassMargins = in.createIntArray(); fadeCompassFacingNorth = in.readByte() != 0; + Bitmap compassBitmap = in.readParcelable(getClass().getClassLoader()); + if (compassBitmap != null) { + compassImage = new BitmapDrawable(compassBitmap); + } + logoEnabled = in.readByte() != 0; logoGravity = in.readInt(); logoMargins = in.createIntArray(); @@ -147,7 +153,7 @@ public class MapboxMapOptions implements Parcelable { textureMode = in.readByte() != 0; } - public static Bitmap getBitmapFromDrawable(Drawable drawable) { + static Bitmap getBitmapFromDrawable(Drawable drawable) { if (drawable instanceof BitmapDrawable) { return ((BitmapDrawable) drawable).getBitmap(); } else { @@ -208,6 +214,12 @@ public class MapboxMapOptions implements Parcelable { DIMENSION_TEN_DP * pxlRatio))}); mapboxMapOptions.compassFadesWhenFacingNorth(typedArray.getBoolean( R.styleable.mapbox_MapView_mapbox_uiCompassFadeFacingNorth, true)); + Drawable compassDrawable = typedArray.getDrawable( + R.styleable.mapbox_MapView_mapbox_uiCompassDrawable); + if (compassDrawable == null) { + compassDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_compass_icon); + } + mapboxMapOptions.compassImage(compassDrawable); mapboxMapOptions.logoEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiLogo, true)); mapboxMapOptions.logoGravity(typedArray.getInt(R.styleable.mapbox_MapView_mapbox_uiLogoGravity, @@ -401,6 +413,20 @@ public class MapboxMapOptions implements Parcelable { } /** + * Specifies the image of the CompassView. + * <p> + * By default this value is R.drawable.mapbox_compass_icon. + * </p> + * + * @param compass the drawable to show as image compass + * @return This + */ + public MapboxMapOptions compassImage(Drawable compass) { + this.compassImage = compass; + return this; + } + + /** * Specifies the visibility state of a logo for a map view. * * @param enabled True and logo is shown @@ -743,6 +769,15 @@ public class MapboxMapOptions implements Parcelable { } /** + * Get the current configured CompassView image. + * + * @return the drawable used as compass image + */ + public Drawable getCompassImage() { + return compassImage; + } + + /** * Get the current configured visibility state for mapbox_compass_icon for a map view. * * @return Visibility state of the mapbox_compass_icon @@ -993,6 +1028,8 @@ public class MapboxMapOptions implements Parcelable { dest.writeInt(compassGravity); dest.writeIntArray(compassMargins); dest.writeByte((byte) (fadeCompassFacingNorth ? 1 : 0)); + dest.writeParcelable(compassImage != null + ? getBitmapFromDrawable(compassImage) : null, flags); dest.writeByte((byte) (logoEnabled ? 1 : 0)); dest.writeInt(logoGravity); @@ -1052,6 +1089,11 @@ public class MapboxMapOptions implements Parcelable { if (fadeCompassFacingNorth != options.fadeCompassFacingNorth) { return false; } + if (compassImage != null + ? !compassImage.equals(options.compassImage) + : options.compassImage != null) { + return false; + } if (compassGravity != options.compassGravity) { return false; } @@ -1157,6 +1199,7 @@ public class MapboxMapOptions implements Parcelable { result = 31 * result + (compassEnabled ? 1 : 0); result = 31 * result + (fadeCompassFacingNorth ? 1 : 0); result = 31 * result + compassGravity; + result = 31 * result + (compassImage != null ? compassImage.hashCode() : 0); result = 31 * result + Arrays.hashCode(compassMargins); result = 31 * result + (logoEnabled ? 1 : 0); result = 31 * result + logoGravity; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java index 1460f08e10..c5eaf2deb9 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java @@ -938,7 +938,11 @@ final class NativeMapView { protected void onMapChanged(int rawChange) { if (onMapChangedListeners != null) { for (MapView.OnMapChangedListener onMapChangedListener : onMapChangedListeners) { - onMapChangedListener.onMapChanged(rawChange); + try { + onMapChangedListener.onMapChanged(rawChange); + } catch (RuntimeException err) { + Timber.e("Exception (%s) in MapView.OnMapChangedListener: %s", err.getClass(), err.getMessage()); + } } } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java index 8a3ae1e4f3..bcb4ca4afc 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java @@ -3,8 +3,12 @@ package com.mapbox.mapboxsdk.maps; import android.content.Context; import android.content.pm.PackageManager; import android.content.res.Resources; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.graphics.Color; import android.graphics.PointF; +import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.annotation.ColorInt; import android.support.annotation.NonNull; @@ -22,6 +26,8 @@ import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.maps.widgets.CompassView; import com.mapbox.mapboxsdk.utils.ColorUtils; +import java.io.ByteArrayOutputStream; + /** * Settings for the user interface of a MapboxMap. To obtain this interface, call getUiSettings(). */ @@ -143,6 +149,7 @@ public final class UiSettings { setCompassMargins(tenDp, tenDp, tenDp, tenDp); } setCompassFadeFacingNorth(options.getCompassFadeFacingNorth()); + setCompassImage(options.getCompassImage()); } private void saveCompass(Bundle outState) { @@ -153,6 +160,16 @@ public final class UiSettings { outState.putInt(MapboxConstants.STATE_COMPASS_MARGIN_BOTTOM, getCompassMarginBottom()); outState.putInt(MapboxConstants.STATE_COMPASS_MARGIN_RIGHT, getCompassMarginRight()); outState.putBoolean(MapboxConstants.STATE_COMPASS_FADE_WHEN_FACING_NORTH, isCompassFadeWhenFacingNorth()); + outState.putByteArray(MapboxConstants.STATE_COMPASS_IMAGE_BITMAP, + convert(MapboxMapOptions.getBitmapFromDrawable(getCompassImage()))); + } + + private byte[] convert(Bitmap resource) { + ByteArrayOutputStream stream = new ByteArrayOutputStream(); + resource.compress(Bitmap.CompressFormat.PNG, 100, stream); + byte[] byteArray = stream.toByteArray(); + + return byteArray; } private void restoreCompass(Bundle savedInstanceState) { @@ -163,6 +180,15 @@ public final class UiSettings { savedInstanceState.getInt(MapboxConstants.STATE_COMPASS_MARGIN_RIGHT), savedInstanceState.getInt(MapboxConstants.STATE_COMPASS_MARGIN_BOTTOM)); setCompassFadeFacingNorth(savedInstanceState.getBoolean(MapboxConstants.STATE_COMPASS_FADE_WHEN_FACING_NORTH)); + setCompassImage(decode(savedInstanceState.getByteArray(MapboxConstants.STATE_COMPASS_IMAGE_BITMAP))); + } + + private Drawable decode(byte[] bitmap) { + Bitmap compass = BitmapFactory.decodeByteArray(bitmap, 0, bitmap.length); + + Drawable compassImage = new BitmapDrawable(compassView.getResources(), compass); + + return compassImage; } private void initialiseLogo(MapboxMapOptions options, Resources resources) { @@ -297,6 +323,18 @@ public final class UiSettings { } /** + * Specifies the CompassView image. + * <p> + * By default this value is R.drawable.mapbox_compass_icon. + * </p> + * + * @param compass the drawable to show as image compass + */ + public void setCompassImage(Drawable compass) { + compassView.setCompassImage(compass); + } + + /** * Returns whether the compass performs a fading animation out when facing north. * * @return True if the compass will fade, false if it remains visible @@ -364,6 +402,15 @@ public final class UiSettings { return ((FrameLayout.LayoutParams) compassView.getLayoutParams()).bottomMargin; } + /** + * Get the current configured CompassView image. + * + * @return the drawable used as compass image + */ + public Drawable getCompassImage() { + return compassView.getCompassImage(); + } + void update(@NonNull CameraPosition cameraPosition) { if (!isCompassEnabled()) { return; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java index 5c9cf93ebc..48bfae4a6e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java @@ -2,9 +2,9 @@ package com.mapbox.mapboxsdk.maps.widgets; import android.content.Context; import android.graphics.PointF; +import android.graphics.drawable.Drawable; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; import android.support.v4.view.ViewCompat; import android.support.v4.view.ViewPropertyAnimatorCompat; import android.support.v4.view.ViewPropertyAnimatorListenerAdapter; @@ -13,7 +13,6 @@ import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; -import com.mapbox.mapboxsdk.R; import com.mapbox.mapboxsdk.maps.FocalPointChangeListener; import com.mapbox.mapboxsdk.maps.MapboxMap; @@ -55,7 +54,6 @@ public final class CompassView extends AppCompatImageView implements Runnable, F } private void initialize(Context context) { - setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.mapbox_compass_icon)); setEnabled(false); // Layout params @@ -140,6 +138,24 @@ public final class CompassView extends AppCompatImageView implements Runnable, F return fadeCompassViewFacingNorth; } + /** + * Set the CompassView image. + * + * @param compass the drawable to use as compass image + */ + public void setCompassImage(Drawable compass) { + setImageDrawable(compass); + } + + /** + * Get the current configured CompassView image. + * + * @return the drawable used as compass image + */ + public Drawable getCompassImage() { + return getDrawable(); + } + @Override public void run() { if (isFacingNorth() && fadeCompassViewFacingNorth) { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml index 641020906a..7283aced5f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml @@ -54,6 +54,7 @@ <public name="mapbox_uiCompassMarginRight" type="attr" /> <public name="mapbox_uiCompassMarginBottom" type="attr" /> <public name="mapbox_uiCompassFadeFacingNorth" type="attr" /> + <public name="mapbox_uiCompassDrawable" type="attr" /> <!--Logo--> <public name="mapbox_uiLogo" type="attr" /> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml index 738cae07be..e17f01d075 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml @@ -64,6 +64,7 @@ <attr name="mapbox_uiCompassMarginRight" format="dimension"/> <attr name="mapbox_uiCompassMarginBottom" format="dimension"/> <attr name="mapbox_uiCompassFadeFacingNorth" format="boolean"/> + <attr name="mapbox_uiCompassDrawable" format="reference"/> <!--Logo--> <attr name="mapbox_uiLogo" format="boolean"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/README.md b/platform/android/MapboxGLAndroidSDKTestApp/README.md index 0acb509b3e..c7a918cd48 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/README.md +++ b/platform/android/MapboxGLAndroidSDKTestApp/README.md @@ -1,5 +1,15 @@ # Mapbox GL Test App +## Building + +To be able to run any Gradle commands, you'll need to create the configuration file by running + +``` +$ make android-configuration +``` + +from the root folder. + ## Testing ### Running Espresso tests on a device @@ -28,7 +38,7 @@ On a terminal, within `mapbox-gl-native/android/java`, run the tests (`cC` stands for `connectedCheck`): ``` -$ ./gradlew cC -p MapboxGLAndroidSDKTestApp +$ ./gradlew -Pmapbox.abis=all cC -p MapboxGLAndroidSDKTestApp ``` Then: @@ -63,7 +73,7 @@ You can also have a run configuration: You can also run the tests from the command line with: ``` -$ ./gradlew test --continue -p MapboxGLAndroidSDKTestApp +$ ./gradlew -Pmapbox.abis=none test -p MapboxGLAndroidSDKTestApp ``` ### Running the UI/Application Exerciser Monkey diff --git a/platform/android/bitrise.yml b/platform/android/bitrise.yml index de1095409e..53637fd498 100644 --- a/platform/android/bitrise.yml +++ b/platform/android/bitrise.yml @@ -14,30 +14,7 @@ workflows: primary: steps: - script: - title: Check for skipping CI - inputs: - - content: |- - #!/bin/bash - - if [[ -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_SUBJECT | sed -n '/\[skip ci\]/p')" || - -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_SUBJECT | sed -n '/\[ci skip\]/p')" || - -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_BODY | sed -n 's/\[skip ci\]/p')" || - -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_BODY | sed -n 's/\[ci skip\]/p')" ]]; then - envman add --key SKIPCI --value true - else - envman add --key SKIPCI --value false - fi - - script: - title: Run Checkstyle - run_if: '{{enveq "SKIPCI" "false"}}' - inputs: - - content: |- - #!/bin/bash - # Run checkstyle gradle task on all modules - cd platform/android && ./gradlew checkstyle - - script: title: Configure Google Cloud SDK - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - content: |- #!/bin/bash @@ -58,16 +35,17 @@ workflows: wget -O secret.json "$BITRISEIO_GCLOUD_SERVICE_ACCOUNT_JSON_URL" - script: title: Build libmapbox-gl.so for armeabi-v7a - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - content: |- #!/bin/bash + # Accept Android SDK license + echo "Accepting Android SDK license..." + mkdir -p "${ANDROID_HOME}/licenses" + echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "${ANDROID_HOME}/licenses/android-sdk-license" echo "Compile libmapbox-gl.so for armeabi-v7a abi:" - export BUILDTYPE=Debug - make android-lib-arm-v7 + BUILDTYPE=Debug make android-lib-arm-v7 - script: title: Compile Core tests - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - content: |- #!/bin/bash @@ -75,7 +53,6 @@ workflows: BUILDTYPE=Debug make android-test-lib-arm-v7 - script: title: Run local JVM Unit tests on phone module - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - content: |- #!/bin/bash @@ -83,7 +60,6 @@ workflows: make run-android-unit-test - script: title: Run local JVM Unit tests on wear module - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - content: |- #!/bin/bash @@ -91,15 +67,20 @@ workflows: make run-android-wear-unit-test - script: title: Generate Espresso sanity tests - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - content: |- #!/bin/bash echo "Generate these test locally by executing:" make test-code-android - script: + title: Run Checkstyle + inputs: + - content: |- + #!/bin/bash + # Run checkstyle gradle task on all modules + make android-checkstyle + - script: title: Run Firebase instrumentation tests - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - content: |- #!/bin/bash @@ -107,7 +88,7 @@ workflows: wget -O platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/developer-config.xml "$BITRISEIO_TEST_ACCESS_TOKEN_UI_TEST_URL" echo "Build seperate test apk:" - make android-ui-test + make android-ui-test-arm-v7 echo "Run tests on firebase:" gcloud auth activate-service-account --key-file secret.json --project android-gl-native @@ -115,7 +96,6 @@ workflows: gcloud beta test android run --type instrumentation --app platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-debug.apk --test platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-debug-androidTest.apk --device-ids shamu --os-version-ids 22 --locales en --orientations portrait --timeout 15m --test-targets "class com.mapbox.mapboxsdk.testapp.maps.widgets.AttributionTest" - script: title: Download Firebase results - run_if: '{{enveq "SKIPCI" "false"}}' is_always_run: true inputs: - content: |- @@ -131,13 +111,11 @@ workflows: find platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk -type f -name "logcat" -print0 | xargs -0 -Imylogcat mv -i mylogcat ./ cat logcat | ndk-stack -sym build/android-arm-v7/Debug - deploy-to-bitrise-io: - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - deploy_path: platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk - is_compress: 'true' - notify_user_groups: none - slack: - run_if: '{{enveq "SKIPCI" "false"}}' title: Post to Slack inputs: - webhook_url: "$SLACK_HOOK_URL" @@ -181,15 +159,19 @@ workflows: inputs: - content: |- #!/bin/bash - echo "Compile libmapbox-gl.so for all supported abi's and create an aar file:" - BUILDTYPE=Release make apackage + # Accept Android SDK license + echo "Accepting Android SDK license..." + mkdir -p "${ANDROID_HOME}/licenses" + echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "${ANDROID_HOME}/licenses/android-sdk-license" + echo "Compile libmapbox-gl.so for all supportd abi's:" + export BUILDTYPE=Release make apackage - script: title: Publish to maven inputs: - content: |- #!/bin/bash echo "Upload aar file to maven:" - cd platform/android && ./gradlew :MapboxGLAndroidSDK:uploadArchives + make run-android-upload-archives - slack: title: Post to Slack inputs: @@ -208,6 +190,10 @@ workflows: inputs: - content: |- #!/bin/bash + # Accept Android SDK license + echo "Accepting Android SDK license..." + mkdir -p "${ANDROID_HOME}/licenses" + echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "${ANDROID_HOME}/licenses/android-sdk-license" echo "Compile libmapbox-gl.so for all supportd abi's:" export BUILDTYPE=Release make apackage @@ -231,7 +217,7 @@ workflows: - content: |- #!/bin/bash echo "Run tests on device farm:" - cd platform/android && ./gradlew devicefarmUpload + make run-android-ui-test-aws - slack: title: Post to Slack inputs: @@ -257,10 +243,13 @@ workflows: inputs: - content: |- #!/bin/bash + # Accept Android SDK license + echo "Accepting Android SDK license..." + mkdir -p "${ANDROID_HOME}/licenses" + echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "${ANDROID_HOME}/licenses/android-sdk-license" echo "Compile libmapbox-gl.so for all supportd abi's:" export BUILDTYPE=Release make apackage - cd platform/android && ./gradlew :MapboxGLAndroidSDK:assembleRelease - script: title: Log metrics inputs: diff --git a/platform/android/build.gradle b/platform/android/build.gradle index 4219f2bdee..5e45232716 100644 --- a/platform/android/build.gradle +++ b/platform/android/build.gradle @@ -21,3 +21,6 @@ task wrapper(type: Wrapper) { apply from: rootProject.file('dependencies.gradle') +// Load build system information. If this file does not exist, run +// `make platform/android/configuration.gradle` +apply from: rootProject.file('configuration.gradle') diff --git a/platform/android/config.cmake b/platform/android/config.cmake index fdf03b4ec8..1a68ee065d 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -22,15 +22,6 @@ mason_use(sqlite VERSION 3.14.2) mason_use(gtest VERSION 1.8.0) mason_use(icu VERSION 58.1-min-size) -set(ANDROID_SDK_PROJECT_DIR ${CMAKE_SOURCE_DIR}/platform/android/MapboxGLAndroidSDK) -set(ANDROID_JNI_TARGET_DIR ${ANDROID_SDK_PROJECT_DIR}/src/main/jniLibs/${ANDROID_ABI}) -set(ANDROID_ASSETS_TARGET_DIR ${ANDROID_SDK_PROJECT_DIR}/src/main/assets) -set(ANDROID_TEST_APP_JNI_TARGET_DIR ${CMAKE_SOURCE_DIR}/platform/android/MapboxGLAndroidSDKTestApp/src/main/jniLibs/${ANDROID_ABI}) - -if (NOT DEFINED ANDROID_TOOLCHAIN_PREFIX) - set(ANDROID_TOOLCHAIN_PREFIX "${MASON_XC_ROOT}/bin/${ANDROID_TOOLCHAIN}-") -endif() - ## mbgl core ## macro(mbgl_platform_core) @@ -251,11 +242,6 @@ target_link_libraries(mapbox-gl PUBLIC -Wl,--version-script=${CMAKE_SOURCE_DIR}/platform/android/version-script ) -# Create a stripped version of the library and copy it to the JNIDIR. -add_custom_command(TARGET mapbox-gl POST_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory ${ANDROID_JNI_TARGET_DIR} - COMMAND ${ANDROID_TOOLCHAIN_PREFIX}strip $<TARGET_FILE:mapbox-gl> -o ${ANDROID_JNI_TARGET_DIR}/$<TARGET_FILE_NAME:mapbox-gl>) - ## Test library ## add_library(mbgl-test SHARED @@ -312,11 +298,6 @@ target_add_mason_package(mbgl-test PRIVATE boost) target_add_mason_package(mbgl-test PRIVATE geojson) target_add_mason_package(mbgl-test PRIVATE geojsonvt) -add_custom_command(TARGET mbgl-test POST_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/stripped - COMMAND ${ANDROID_TOOLCHAIN_PREFIX}strip $<TARGET_FILE:mapbox-gl> -o ${CMAKE_CURRENT_BINARY_DIR}/stripped/$<TARGET_FILE_NAME:mapbox-gl> - COMMAND ${ANDROID_TOOLCHAIN_PREFIX}strip $<TARGET_FILE:mbgl-test> -o ${CMAKE_CURRENT_BINARY_DIR}/stripped/$<TARGET_FILE_NAME:mbgl-test>) - ## Custom layer example ## add_library(example-custom-layer SHARED @@ -334,7 +315,3 @@ target_link_libraries(example-custom-layer PUBLIC -Wl,--gc-sections PUBLIC -Wl,--version-script=${CMAKE_SOURCE_DIR}/platform/android/version-script ) - -add_custom_command(TARGET example-custom-layer POST_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory ${ANDROID_TEST_APP_JNI_TARGET_DIR} - COMMAND ${ANDROID_TOOLCHAIN_PREFIX}strip $<TARGET_FILE:example-custom-layer> -o ${ANDROID_TEST_APP_JNI_TARGET_DIR}/$<TARGET_FILE_NAME:example-custom-layer>) diff --git a/platform/android/scripts/debug.sh b/platform/android/scripts/debug.sh deleted file mode 100755 index c3390b4ce1..0000000000 --- a/platform/android/scripts/debug.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -# Automation of https://github.com/mapbox/mapbox-gl-native/wiki/Android-debugging-with-remote-GDB - -export MASON_ANDROID_ARCH=x86 -export MASON_ANDROID_PLATFORM=9 -export MASON_ANDROID_NDK_VERSION=r13b - -export MASON_XC_ROOT=`scripts/mason.sh PREFIX android-ndk VERSION ${MASON_ANDROID_ARCH}-${MASON_ANDROID_PLATFORM}-${MASON_ANDROID_NDK_VERSION}` -source ${MASON_XC_ROOT}/toolchain.sh - -if [[ $1 == '--prepare' ]]; then - mkdir -p ~/.android/debugging/{vendor,system}_lib - adb pull /system/lib ~/.android/debugging/system_lib - adb pull /vendor/lib ~/.android/debugging/vendor_lib - adb pull /system/bin/app_process ~/.android/debugging - adb pull /system/bin/app_process32 ~/.android/debugging - adb pull /system/bin/linker ~/.android/debugging - - if [[ ${MASON_ANDROID_ARCH} == 'arm-v8' || ${MASON_ANDROID_ARCH} == 'x86-64' || ${MASON_ANDROID_ARCH} == 'mips-64' ]]; then - adb pull /system/bin/app_process64 ~/.android/debugging - adb pull /system/bin/linker64 ~/.android/debugging - fi - - cp ${MASON_XC_ROOT}/prebuilt/gdbserver/gdbserver \ - platform/android/MapboxGLAndroidSDK/src/main/jniLibs/${ANDROID_ABI}/gdbserver.so -fi - -adb install -r -t -d -g platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-debug.apk -adb shell am start -n "com.mapbox.mapboxsdk.testapp/com.mapbox.mapboxsdk.testapp.activity.FeatureOverviewActivity" \ - -a android.intent.action.MAIN -c android.intent.category.LAUNCHER - -adb forward tcp:5039 tcp:5039 -adb shell run-as com.mapbox.mapboxsdk.testapp '/data/data/com.mapbox.mapboxsdk.testapp/lib/gdbserver.so \ - --attach :5039 `pgrep com.mapbox.mapboxsdk.testapp`' & - -${MASON_XC_ROOT}/bin/gdb \ - -ex "target remote :5039" \ - -ex "set solib-search-path ~/.android/debugging:~/.android/debugging/system_lib:~/.android/debugging/vendor_lib:~/.android/debugging/vendor_lib/egl:./build/android-${MASON_ANDROID_ARCH}-${MASON_ANDROID_PLATFORM}/Debug/lib.target/" diff --git a/platform/android/scripts/metrics.sh b/platform/android/scripts/metrics.sh index 37d8c1de65..974ee5e8db 100755 --- a/platform/android/scripts/metrics.sh +++ b/platform/android/scripts/metrics.sh @@ -4,12 +4,12 @@ set -e set -o pipefail # Track individual architectures -scripts/log_binary_size.sh "platform/android/MapboxGLAndroidSDK/src/main/jniLibs/armeabi/libmapbox-gl.so" "Platform=Android,Arch=arm-v5" -scripts/log_binary_size.sh "platform/android/MapboxGLAndroidSDK/src/main/jniLibs/armeabi-v7a/libmapbox-gl.so" "Platform=Android,Arch=arm-v7" -scripts/log_binary_size.sh "platform/android/MapboxGLAndroidSDK/src/main/jniLibs/arm64-v8a/libmapbox-gl.so" "Platform=Android,Arch=arm-v8" -scripts/log_binary_size.sh "platform/android/MapboxGLAndroidSDK/src/main/jniLibs/x86/libmapbox-gl.so" "Platform=Android,Arch=x86" -scripts/log_binary_size.sh "platform/android/MapboxGLAndroidSDK/src/main/jniLibs/x86_64/libmapbox-gl.so" "Platform=Android,Arch=x86_64" -scripts/log_binary_size.sh "platform/android/MapboxGLAndroidSDK/src/main/jniLibs/mips/libmapbox-gl.so" "Platform=Android,Arch=mips" +scripts/log_binary_size.sh "platform/android/MapboxGLAndroidSDK/build/intermediates/bundles/default/jni/armeabi/libmapbox-gl.so" "Platform=Android,Arch=arm-v5" +scripts/log_binary_size.sh "platform/android/MapboxGLAndroidSDK/build/intermediates/bundles/default/jni/armeabi-v7a/libmapbox-gl.so" "Platform=Android,Arch=arm-v7" +scripts/log_binary_size.sh "platform/android/MapboxGLAndroidSDK/build/intermediates/bundles/default/jni/arm64-v8a/libmapbox-gl.so" "Platform=Android,Arch=arm-v8" +scripts/log_binary_size.sh "platform/android/MapboxGLAndroidSDK/build/intermediates/bundles/default/jni/x86/libmapbox-gl.so" "Platform=Android,Arch=x86" +scripts/log_binary_size.sh "platform/android/MapboxGLAndroidSDK/build/intermediates/bundles/default/jni/x86_64/libmapbox-gl.so" "Platform=Android,Arch=x86_64" +scripts/log_binary_size.sh "platform/android/MapboxGLAndroidSDK/build/intermediates/bundles/default/jni/mips/libmapbox-gl.so" "Platform=Android,Arch=mips" # Track overall library size -scripts/log_binary_size.sh "platform/android/MapboxGLAndroidSDK/build/outputs/aar/MapboxGLAndroidSDK-release.aar" "Platform=Android,Arch=Archive" +scripts/log_binary_size.sh "platform/android/MapboxGLAndroidSDK/build/outputs/aar/MapboxGLAndroidSDK-release.aar" "Platform=Android,Arch=Archive" diff --git a/platform/android/scripts/ndk.sh b/platform/android/scripts/ndk.sh deleted file mode 100755 index 96a314a3c2..0000000000 --- a/platform/android/scripts/ndk.sh +++ /dev/null @@ -1,111 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail -set -u - -# This script produces an env.sh file, which contains the paths to CMake, and the flags required to -# create a build. It first tries to use the Android NDK, but falls back to installing it via Mason. - -function error { >&2 echo -e "\033[1m\033[31m$@\033[0m"; } -function warning { >&2 echo -e "\033[1m\033[33m$@\033[0m"; } -function status { >&2 echo -e "\033[1m\033[36m$@\033[0m"; } -function info { >&2 echo -e "\033[1m\033[32m$@\033[0m"; } - -if [ "$#" -ne 3 ]; then - error "Usage: $0 <short arch> <long arch> <api level>" -fi - -NDK_ANDROID_VERSION=$1-$3 -ANDROID_NATIVE_API_LEVEL=$3 -ANDROID_ABI=$2 - -function mason_ndk { - local CMAKE=${CMAKE:-cmake} - MASON_XC_ROOT="`${CMAKE} -P cmake/mason.cmake PREFIX android-ndk VERSION ${NDK_ANDROID_VERSION}-r13b`" - - local TOOLCHAIN="${MASON_XC_ROOT}/toolchain.cmake" - if [ ! -f "${TOOLCHAIN}" ]; then - error "Can't find CMake toolchain file at ${TOOLCHAIN}." - exit 1 - fi - - info "Using Mason-provided Android NDK at ${MASON_XC_ROOT}" - echo CMAKE=\"${CMAKE}\" - echo CMAKE_GENERATOR=\"Ninja\" - echo CMAKE_ARGS=\" \ - -DCMAKE_MAKE_PROGRAM=`pwd`/${NINJA} \ - -DMASON_XC_ROOT=${MASON_XC_ROOT} \ - -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN} \ - \" -} - -function system_ndk { - if [[ ${USE_MASON_NDK:-} ]]; then - return 1 - fi - - if [ -f platform/android/local.properties ]; then - local SDK_DIR=$(sed -n -e 's/^sdk.dir=\(.*\)$/\1/p' platform/android/local.properties) - fi - - if [ ! -d "${SDK_DIR:-}" ]; then - if [ ! -z "${ANDROID_HOME:-}" ]; then - local SDK_DIR="${ANDROID_HOME}" - else - error "Can't find the Android SDK. Set \$ANDROID_HOME to the SDK path." - exit 1 - fi - fi - - local NDK_DIR="${ANDROID_NDK_HOME:-${SDK_DIR}/ndk-bundle}" - if [ ! -d "${NDK_DIR}" ]; then - warning "Can't find the Android NDK. If it is installed, set \$ANDROID_NDK_HOME to the NDK path." - return 1 - fi - - # Try to install CMake if it's not installed yet. - mkdir -p "${SDK_DIR}/cmake" - local CMAKE_VERSION=/$(ls "${SDK_DIR}/cmake" | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -n 1) - local CMAKE="${SDK_DIR}/cmake${CMAKE_VERSION:-}/bin/cmake" - if [ ! -f "${CMAKE}" ]; then - status "Trying to install CMake..." - mkdir -p "${SDK_DIR}/licenses" - echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "${SDK_DIR}/licenses/android-sdk-license" - "${SDK_DIR}/tools/bin/sdkmanager" --list | grep cmake | tail -n 1 | cut -d \| -f 1 | xargs "${SDK_DIR}/tools/bin/sdkmanager" >&2 - CMAKE_VERSION=/$(ls "${SDK_DIR}/cmake" | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -n 1) - CMAKE="${SDK_DIR}/cmake${CMAKE_VERSION:-}/bin/cmake" - if [ ! -f "${CMAKE}" ]; then - error "Can't find CMake at ${CMAKE}." - return 1 - fi - fi - - local NINJA="${SDK_DIR}/cmake${CMAKE_VERSION:-}/bin/ninja" - if [ ! -f "${NINJA}" ]; then - error "Can't find Ninja at ${NINJA}." - return 1 - fi - - local TOOLCHAIN="${NDK_DIR}/build/cmake/android.toolchain.cmake" - if [ ! -f "${TOOLCHAIN}" ]; then - error "Can't find CMake toolchain file at ${TOOLCHAIN}." - return 1 - fi - - info "Using system-provided Android NDK at ${NDK_DIR}" - echo CMAKE=\"${CMAKE}\" - echo CMAKE_GENERATOR=\"Android Gradle - Ninja\" - echo CMAKE_ARGS=\" \ - -DANDROID_ABI=${ANDROID_ABI} \ - -DANDROID_NDK=${NDK_DIR} \ - -DCMAKE_MAKE_PROGRAM=${NINJA} \ - -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN} \ - -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} \ - -DANDROID_TOOLCHAIN=clang \ - -DANDROID_STL=c++_static \ - -DANDROID_CPP_FEATURES=rtti\;exceptions \ - \" -} - -system_ndk || mason_ndk diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp index 696849b11b..af8ae16bf6 100755 --- a/platform/android/src/native_map_view.cpp +++ b/platform/android/src/native_map_view.cpp @@ -181,6 +181,70 @@ void NativeMapView::notifyMapChange(mbgl::MapChange change) { javaPeer->Call(*_env, onMapChanged, (int) change); } +void NativeMapView::onCameraWillChange(MapObserver::CameraChangeMode mode) { + if (mode == MapObserver::CameraChangeMode::Immediate) { + notifyMapChange(MapChange::MapChangeRegionWillChange); + } else { + notifyMapChange(MapChange::MapChangeRegionWillChangeAnimated); + } +} + +void NativeMapView::onCameraIsChanging() { + notifyMapChange(MapChange::MapChangeRegionIsChanging); +} + +void NativeMapView::onCameraDidChange(MapObserver::CameraChangeMode mode) { + if (mode == MapObserver::CameraChangeMode::Immediate) { + notifyMapChange(MapChange::MapChangeRegionDidChange); + } else { + notifyMapChange(MapChange::MapChangeRegionDidChangeAnimated); + } +} + +void NativeMapView::onWillStartLoadingMap() { + notifyMapChange(MapChange::MapChangeWillStartLoadingMap); +} + +void NativeMapView::onDidFinishLoadingMap() { + notifyMapChange(MapChange::MapChangeDidFinishLoadingMap); +} + +void NativeMapView::onDidFailLoadingMap(std::exception_ptr) { + notifyMapChange(MapChange::MapChangeDidFailLoadingMap); +} + +void NativeMapView::onWillStartRenderingFrame() { + notifyMapChange(MapChange::MapChangeWillStartRenderingFrame); +} + +void NativeMapView::onDidFinishRenderingFrame(MapObserver::RenderMode mode) { + if (mode == MapObserver::RenderMode::Partial) { + notifyMapChange(MapChange::MapChangeDidFinishRenderingFrame); + } else { + notifyMapChange(MapChange::MapChangeDidFinishRenderingFrameFullyRendered); + } +} + +void NativeMapView::onWillStartRenderingMap() { + notifyMapChange(MapChange::MapChangeWillStartRenderingMap); +} + +void NativeMapView::onDidFinishRenderingMap(MapObserver::RenderMode mode) { + if (mode == MapObserver::RenderMode::Partial) { + notifyMapChange(MapChange::MapChangeDidFinishRenderingMap); + } else { + notifyMapChange(MapChange::MapChangeDidFinishRenderingMapFullyRendered); + } +} + +void NativeMapView::onDidFinishLoadingStyle() { + notifyMapChange(MapChange::MapChangeDidFinishLoadingStyle); +} + +void NativeMapView::onSourceChanged(mbgl::style::Source&) { + notifyMapChange(MapChange::MapChangeSourceDidChange); +} + // JNI Methods // void NativeMapView::initializeDisplay(jni::JNIEnv&) { diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp index 4afea036bf..fbfe69040e 100755 --- a/platform/android/src/native_map_view.hpp +++ b/platform/android/src/native_map_view.hpp @@ -1,6 +1,7 @@ #pragma once #include <mbgl/map/backend.hpp> +#include <mbgl/map/change.hpp> #include <mbgl/map/camera.hpp> #include <mbgl/map/map.hpp> #include <mbgl/map/view.hpp> @@ -22,6 +23,7 @@ #include "style/layers/layers.hpp" #include "style/sources/sources.hpp" +#include <exception> #include <string> #include <jni.h> #include <android/native_window.h> @@ -51,7 +53,23 @@ public: // mbgl::Backend // void invalidate() override; - void notifyMapChange(mbgl::MapChange) override; + + // Deprecated // + void notifyMapChange(mbgl::MapChange); + + // mbgl::Backend (mbgl::MapObserver) // + void onCameraWillChange(MapObserver::CameraChangeMode) override; + void onCameraIsChanging() override; + void onCameraDidChange(MapObserver::CameraChangeMode) override; + void onWillStartLoadingMap() override; + void onDidFinishLoadingMap() override; + void onDidFailLoadingMap(std::exception_ptr) override; + void onWillStartRenderingFrame() override; + void onDidFinishRenderingFrame(MapObserver::RenderMode) override; + void onWillStartRenderingMap() override; + void onDidFinishRenderingMap(MapObserver::RenderMode) override; + void onDidFinishLoadingStyle() override; + void onSourceChanged(mbgl::style::Source&) override; // JNI // diff --git a/platform/android/tests/docs/UI_TESTS.md b/platform/android/tests/docs/UI_TESTS.md index 9341cf1e1e..6d8541a406 100644 --- a/platform/android/tests/docs/UI_TESTS.md +++ b/platform/android/tests/docs/UI_TESTS.md @@ -25,7 +25,7 @@ On a terminal, within `mapbox-gl-native/android/java`, run the tests (`cC` stands for `connectedCheck`): ``` -$ ./gradlew cC -p MapboxGLAndroidSDKTestApp +$ ./gradlew -Pmapbox.abis=all cC -p MapboxGLAndroidSDKTestApp ``` Then: @@ -59,7 +59,7 @@ You can generate JaCoCo reports from espresso tests by - running the gradle task `createMockDebugCoverageReport` when executing tests. ## Running Espresso test automatically on AWS Device Farm -To run tests on AWS device farm you need to execute `./gradlew devicefarmUpload`. +To run tests on AWS device farm you need to execute `./gradlew -Pmapbox.abis=none devicefarmUpload`. You can configure the different steps in the testapp `build.gradle`. AWS credentials are found in bitrise. diff --git a/platform/android/tests/docs/UNIT_TESTS.md b/platform/android/tests/docs/UNIT_TESTS.md index e32a36ef78..fefb435684 100644 --- a/platform/android/tests/docs/UNIT_TESTS.md +++ b/platform/android/tests/docs/UNIT_TESTS.md @@ -69,7 +69,7 @@ If you like, you can also run with test coverage enabled. This will show you the You can also run the tests from the command line with: ``` -$ ./gradlew test --continue -p MapboxGLAndroidSDKTestApp +$ ./gradlew -Pmapbox.abis=none test -p MapboxGLAndroidSDKTestApp ``` ## Running Unit tests on CI @@ -80,7 +80,7 @@ fails, this will fail and stop the build. You can find this gradle command in our [buildscript](https://github.com/mapbox/mapbox-gl-native/blob/master/platform/android/bitrise.yml#L48): ``` -$ ./gradlew testReleaseUnitTest --continue +$ ./gradlew -Pmapbox.abis=none testReleaseUnitTest ``` diff --git a/platform/darwin/src/MGLTypes.h b/platform/darwin/src/MGLTypes.h index 5216e921f1..c06fd8b0e7 100644 --- a/platform/darwin/src/MGLTypes.h +++ b/platform/darwin/src/MGLTypes.h @@ -42,6 +42,10 @@ typedef NS_ENUM(NSInteger, MGLErrorCode) { MGLErrorCodeBadServerResponse = 2, /** An attempt to establish a connection failed. */ MGLErrorCodeConnectionFailed = 3, + /** A style parse error occurred while attempting to load the map. */ + MGLErrorCodeParseStyleFailed = 4, + /** An attempt to load the style failed. */ + MGLErrorCodeLoadStyleFailed = 5, }; /** Options for enabling debugging features in an `MGLMapView` instance. */ diff --git a/platform/default/async_task.cpp b/platform/default/async_task.cpp index 05cf759863..5fa9db8d33 100644 --- a/platform/default/async_task.cpp +++ b/platform/default/async_task.cpp @@ -7,12 +7,6 @@ #include <uv.h> -#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10 -#define UV_ASYNC_PARAMS(handle) uv_async_t *handle, int -#else -#define UV_ASYNC_PARAMS(handle) uv_async_t *handle -#endif - namespace mbgl { namespace util { @@ -45,7 +39,7 @@ public: } private: - static void asyncCallback(UV_ASYNC_PARAMS(handle)) { + static void asyncCallback(uv_async_t* handle) { reinterpret_cast<Impl*>(handle->data)->task(); } diff --git a/platform/default/mbgl/gl/headless_backend.cpp b/platform/default/mbgl/gl/headless_backend.cpp index c105fd6b84..6ae19356fb 100644 --- a/platform/default/mbgl/gl/headless_backend.cpp +++ b/platform/default/mbgl/gl/headless_backend.cpp @@ -50,10 +50,4 @@ void HeadlessBackend::invalidate() { assert(false); } -void HeadlessBackend::notifyMapChange(MapChange change) { - if (mapChangeCallback) { - mapChangeCallback(change); - } -} - } // namespace mbgl diff --git a/platform/default/mbgl/gl/headless_backend.hpp b/platform/default/mbgl/gl/headless_backend.hpp index e632d0feb6..63e3cec9ee 100644 --- a/platform/default/mbgl/gl/headless_backend.hpp +++ b/platform/default/mbgl/gl/headless_backend.hpp @@ -18,9 +18,6 @@ public: ~HeadlessBackend() override; void invalidate() override; - void notifyMapChange(MapChange) override; - - void setMapChangeCallback(std::function<void(MapChange)>&& cb) { mapChangeCallback = std::move(cb); } struct Impl { virtual ~Impl() {} @@ -45,8 +42,6 @@ private: bool extensionsLoaded = false; bool active = false; - - std::function<void(MapChange)> mapChangeCallback; }; } // namespace mbgl diff --git a/platform/default/run_loop.cpp b/platform/default/run_loop.cpp index 1ebbade7ab..98d1badcb5 100644 --- a/platform/default/run_loop.cpp +++ b/platform/default/run_loop.cpp @@ -13,11 +13,7 @@ namespace { using namespace mbgl::util; static ThreadLocal<RunLoop>& current = *new ThreadLocal<RunLoop>; -#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10 -void dummyCallback(uv_async_t*, int) {} -#else void dummyCallback(uv_async_t*) {} -#endif } // namespace @@ -84,13 +80,8 @@ public: RunLoop::RunLoop(Type type) : impl(std::make_unique<Impl>()) { switch (type) { case Type::New: -#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10 - impl->loop = uv_loop_new(); - if (impl->loop == nullptr) { -#else impl->loop = new uv_loop_t; if (uv_loop_init(impl->loop) != 0) { -#endif throw std::runtime_error("Failed to initialize loop."); } break; @@ -129,14 +120,10 @@ RunLoop::~RunLoop() { impl->async.reset(); runOnce(); -#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10 - uv_loop_delete(impl->loop); -#else if (uv_loop_close(impl->loop) == UV_EBUSY) { - throw std::runtime_error("Failed to close loop."); + assert(false && "Failed to close loop."); } delete impl->loop; -#endif } LOOP_HANDLE RunLoop::getLoopHandle() { diff --git a/platform/default/timer.cpp b/platform/default/timer.cpp index 473f059133..cd0e6da6aa 100644 --- a/platform/default/timer.cpp +++ b/platform/default/timer.cpp @@ -4,12 +4,6 @@ #include <uv.h> -#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10 -#define UV_TIMER_PARAMS(timer) uv_timer_t *timer, int -#else -#define UV_TIMER_PARAMS(timer) uv_timer_t *timer -#endif - namespace mbgl { namespace util { @@ -46,7 +40,7 @@ public: } private: - static void timerCallback(UV_TIMER_PARAMS(handle)) { + static void timerCallback(uv_timer_t* handle) { reinterpret_cast<Impl*>(handle->data)->cb(); } diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp index 4070a0fe9b..39dca8080b 100644 --- a/platform/glfw/glfw_view.cpp +++ b/platform/glfw/glfw_view.cpp @@ -538,16 +538,6 @@ void GLFWView::setWindowTitle(const std::string& title) { glfwSetWindowTitle(window, (std::string { "Mapbox GL: " } + title).c_str()); } -void GLFWView::setMapChangeCallback(std::function<void(mbgl::MapChange)> callback) { - this->mapChangeCallback = callback; -} - -void GLFWView::notifyMapChange(mbgl::MapChange change) { - if (mapChangeCallback) { - mapChangeCallback(change); - } -} - namespace mbgl { namespace platform { diff --git a/platform/glfw/glfw_view.hpp b/platform/glfw/glfw_view.hpp index a426e58a94..bfabf6cc68 100644 --- a/platform/glfw/glfw_view.hpp +++ b/platform/glfw/glfw_view.hpp @@ -60,9 +60,6 @@ private: // Internal void report(float duration); - void setMapChangeCallback(std::function<void(mbgl::MapChange)> callback); - void notifyMapChange(mbgl::MapChange change) override; - mbgl::Color makeRandomColor() const; mbgl::Point<double> makeRandomPoint() const; static std::shared_ptr<const mbgl::SpriteImage> @@ -81,8 +78,6 @@ private: mbgl::AnnotationIDs annotationIDs; std::vector<std::string> spriteIDs; - std::function<void(mbgl::MapChange)> mapChangeCallback; - private: mbgl::Map* map = nullptr; diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index 40795a2aef..e75f90dd5d 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -2,6 +2,10 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONTRIBUTING.md](../../CONTRIBUTING.md) to get started. +## master + +* The error passed into `-[MGLMapViewDelegate mapViewDidFailLoadingMap:withError:]` now includes a more specific description and failure reason. ([#8418](https://github.com/mapbox/mapbox-gl-native/pull/8418)) + ## 3.5.0 ### Packaging @@ -68,6 +72,8 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT * Fixed an issue that sometimes caused crashes when the SDK interacted with the file system in the background. ([#8125](https://github.com/mapbox/mapbox-gl-native/pull/8125)) * Added a `MGLDistanceFormatter` class for formatting geographic distances. ([#7888](https://github.com/mapbox/mapbox-gl-native/pull/7888)) * Fixed an issue that was causing the system location indicator to stay on in background after telemetry was disabled. ([#7833](https://github.com/mapbox/mapbox-gl-native/pull/7833)) +* Added support for predicates in rendered feature querying [8256](https://github.com/mapbox/mapbox-gl-native/pull/8246) +* Added a nightly build of the dynamic framework. ([#8337](https://github.com/mapbox/mapbox-gl-native/pull/8337)) ## 3.4.2 - February 21, 2017 @@ -117,7 +123,7 @@ This is the final scheduled version of the Mapbox iOS SDK that supports iOS 7. ( * A source’s tiles are no longer rendered when the map is outside the source’s supported zoom levels. ([#6345](https://github.com/mapbox/mapbox-gl-native/pull/6345)) * Improved style parsing performance. ([#6170](https://github.com/mapbox/mapbox-gl-native/pull/6170)) * Improved feature querying performance. ([#6514](https://github.com/mapbox/mapbox-gl-native/pull/6514)) -* Fixed an issue where shapes that cannot currently be visually represented as annotations were still shown on the map as point annotations. ([#6764](https://github.com/mapbox/mapbox-gl-native/issues/6764)) +* Fixed an issue where shapes that cannot currently be visually represented as annotations were still shown on the map as point annotations. ([#6764](https://github.com/mapbox/mapbox-gl-native/issues/6764)) ### User location diff --git a/platform/ios/INSTALL.md b/platform/ios/INSTALL.md index c93ab6b698..e0df7c48f6 100644 --- a/platform/ios/INSTALL.md +++ b/platform/ios/INSTALL.md @@ -50,6 +50,10 @@ bash "${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mapbox.framework/strip-fra (The last step, courtesy of [Realm](https://github.com/realm/realm-cocoa/), is required for working around an [iOS App Store bug](http://www.openradar.me/radar?id=6409498411401216) when archiving universal binaries.) +##### Nightly builds + +A nightly build of the dynamic framework, based on the master branch, is available for download [here](https://mapbox.s3.amazonaws.com/mapbox-gl-native/ios/builds/mapbox-ios-sdk-nightly-dynamic.zip). + #### Static framework You can alternatively install the SDK as a static framework: @@ -82,7 +86,15 @@ You can alternatively install the SDK as a static framework: To test pre-releases and/or betas, you can reference the pre-release like so in your Podfile: ```rb -pod 'Mapbox-iOS-SDK', podspec: 'https://raw.githubusercontent.com/mapbox/mapbox-gl-native/<insert branch or tag>/ios/Mapbox-iOS-SDK.podspec' +pod 'Mapbox-iOS-SDK', podspec: 'https://raw.githubusercontent.com/mapbox/mapbox-gl-native/<insert branch or tag>/platform/ios/Mapbox-iOS-SDK.podspec' +``` + +##### Testing nightly releases with CocoaPods + +To test a nightly dynamic framework build, update your app’s `Podfile` to point to: + +```rb +pod 'Mapbox-iOS-SDK-nightly-dynamic', podspec: 'https://raw.githubusercontent.com/mapbox/mapbox-gl-native/master/platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec' ``` ##### Using your own build with CocoaPods diff --git a/platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec b/platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec new file mode 100644 index 0000000000..62d76d4897 --- /dev/null +++ b/platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec @@ -0,0 +1,30 @@ +Pod::Spec.new do |m| + + version = '3.5.0-beta.2' + + m.name = 'Mapbox-iOS-SDK-nightly-dynamic' + m.version = "#{version}-nightly" + + m.summary = 'Open source vector map solution for iOS with full styling capabilities.' + m.description = 'Open source, OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa Touch APIs.' + m.homepage = 'https://www.mapbox.com/ios-sdk/' + m.license = { :type => 'BSD', :file => 'LICENSE.md' } + m.author = { 'Mapbox' => 'mobile@mapbox.com' } + m.screenshot = "https://www.mapbox.com/ios-sdk/api/#{version}/img/screenshot.png" + m.social_media_url = 'https://twitter.com/mapbox' + m.documentation_url = 'https://www.mapbox.com/ios-sdk/api/' + + m.source = { + :http => "https://mapbox.s3.amazonaws.com/mapbox-gl-native/ios/builds/mapbox-ios-sdk-nightly-dynamic.zip", + :flatten => true + } + + m.platform = :ios + m.ios.deployment_target = '8.0' + + m.requires_arc = true + + m.vendored_frameworks = 'dynamic/Mapbox.framework' + m.module_name = 'Mapbox' + +end diff --git a/platform/ios/bitrise.yml b/platform/ios/bitrise.yml index 93d1d4afd8..53287ec06d 100644 --- a/platform/ios/bitrise.yml +++ b/platform/ios/bitrise.yml @@ -11,22 +11,7 @@ workflows: primary: steps: - script: - title: Check for skipping CI - inputs: - - content: |- - #!/bin/bash - - if [[ -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_SUBJECT | sed -n '/\[skip ci\]/p')" || - -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_SUBJECT | sed -n '/\[ci skip\]/p')" || - -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_BODY | sed -n 's/\[skip ci\]/p')" || - -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_BODY | sed -n 's/\[ci skip\]/p')" ]]; then - envman add --key SKIPCI --value true - else - envman add --key SKIPCI --value false - fi - - script: title: Install Dependencies - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - content: |- #!/bin/bash @@ -37,7 +22,6 @@ workflows: - is_debug: 'yes' - script: title: Generate Workspace - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - content: |- #!/bin/bash @@ -47,18 +31,15 @@ workflows: - is_debug: 'yes' - xcode-test: title: Run SDK Unit Tests - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - project_path: platform/ios/ios.xcworkspace - scheme: CI - deploy-to-bitrise-io: title: Deploy to Bitrise.io - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - notify_user_groups: none - slack: title: Post to Slack - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - webhook_url: "$SLACK_HOOK_URL" - channel: "#gl-bots" @@ -102,4 +83,20 @@ workflows: export FORMAT=dynamic make ipackage-strip CLOUDWATCH=true platform/ios/scripts/metrics.sh + platform/ios/scripts/deploy-nightly.sh - is_debug: 'yes' + - slack: + title: Post to Slack + inputs: + - webhook_url: "$SLACK_HOOK_URL" + - channel: "#gl-bots" + - from_username: 'Bitrise iOS Nightly \U0001F31D' + - from_username_on_error: 'Bitrise iOS Nightly \U0001F31D' + - message: '<${BITRISE_BUILD_URL}|Build #${BITRISE_BUILD_NUMBER}> + for <https://github.com/mapbox/mapbox-gl-native/compare/${BITRISE_GIT_BRANCH}@%7B1day%7D...${BITRISE_GIT_BRANCH}|mapbox/mapbox-gl-native@${BITRISE_GIT_BRANCH}> + completed successfully.' + - message_on_error: '<${BITRISE_BUILD_URL}|Build #${BITRISE_BUILD_NUMBER}> + for <https://github.com/mapbox/mapbox-gl-native/compare/${BITRISE_GIT_BRANCH}@%7B1day%7D...${BITRISE_GIT_BRANCH}|mapbox/mapbox-gl-native@${BITRISE_GIT_BRANCH}> + failed.' + - icon_url: https://bitrise-public-content-production.s3.amazonaws.com/slack/bitrise-slack-icon-128.png + - icon_url_on_error: https://bitrise-public-content-production.s3.amazonaws.com/slack/bitrise-slack-error-icon-128.png diff --git a/platform/ios/resources/Base.lproj/Localizable.strings b/platform/ios/resources/Base.lproj/Localizable.strings index ab071a4505..fc2e8c8fec 100644 --- a/platform/ios/resources/Base.lproj/Localizable.strings +++ b/platform/ios/resources/Base.lproj/Localizable.strings @@ -31,6 +31,12 @@ /* Accessibility label */ "INFO_A11Y_LABEL" = "About this map"; +/* User-friendly error description */ +"LOAD_MAP_FAILED_DESC" = "The map failed to load because an unknown error occurred."; + +/* User-friendly error description */ +"LOAD_STYLE_FAILED_DESC" = "The map failed to load because the style can't be loaded."; + /* Accessibility label */ "LOGO_A11Y_LABEL" = "Mapbox"; @@ -40,9 +46,16 @@ /* Map accessibility value */ "MAP_A11Y_VALUE" = "Zoom %1$dx\n%2$ld annotation(s) visible"; +/* User-friendly error description */ +"PARSE_STYLE_FAILED_DESC" = "The map failed to load because the style is corrupted."; + /* Action sheet title */ "SDK_NAME" = "Mapbox iOS SDK"; + +/* User-friendly error description */ +"STYLE_NOT_FOUND_DESC" = "The map failed to load because the style can’t be found or is incompatible."; + /* Developer-only SDK update notification; {latest version, in format x.x.x} */ "SDK_UPDATE_AVAILABLE" = "Mapbox iOS SDK version %@ is now available:"; diff --git a/platform/ios/scripts/deploy-nightly.sh b/platform/ios/scripts/deploy-nightly.sh new file mode 100755 index 0000000000..9fec4df58a --- /dev/null +++ b/platform/ios/scripts/deploy-nightly.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail +set -u + +function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; } +function finish { >&2 echo -en "\033[0m"; } +trap finish EXIT + +export TRAVIS_REPO_SLUG=mapbox-gl-native + +DATE=`date +%Y-%m-%d` +NIGHTLY_TYPE="nightly-dynamic" + +step "Uploading ${NIGHTLY_TYPE} build for ${DATE} to s3…" + +./platform/ios/scripts/publish.sh "${NIGHTLY_TYPE}" "${DATE}" + +step "Finished deploying ${NIGHTLY_TYPE} build in $(($SECONDS / 60)) minutes and $(($SECONDS % 60)) seconds" diff --git a/platform/ios/scripts/publish.sh b/platform/ios/scripts/publish.sh index e080ee825c..2934e10217 100755 --- a/platform/ios/scripts/publish.sh +++ b/platform/ios/scripts/publish.sh @@ -24,7 +24,7 @@ fi # zip # cd build/ios/pkg -ZIP=mapbox-ios-sdk-${PUBLISH_VERSION}${PUBLISH_STYLE}.zip +ZIP="mapbox-ios-sdk-${PUBLISH_VERSION}${PUBLISH_STYLE}.zip" step "Compressing ${ZIP}…" rm -f ../${ZIP} zip -r ../${ZIP} * @@ -35,4 +35,15 @@ zip -r ../${ZIP} * step "Uploading ${ZIP} to s3…" REPO_NAME=$(basename $TRAVIS_REPO_SLUG) aws s3 cp ../${ZIP} s3://mapbox/$REPO_NAME/ios/builds/ --acl public-read -echo http://mapbox.s3.amazonaws.com/$REPO_NAME/ios/builds/${ZIP} +echo "URL: https://mapbox.s3.amazonaws.com/$REPO_NAME/ios/builds/${ZIP}" + +# +# update nightly +# +if [[ ${PUBLISH_VERSION} =~ "nightly" ]]; then + step "Updating ${PUBLISH_VERSION} to ${PUBLISH_STYLE}…" + GENERIC_NIGHTLY_FILENAME="mapbox-ios-sdk-${PUBLISH_VERSION}.zip" + aws s3 cp \ + s3://mapbox/$REPO_NAME/ios/builds/${ZIP} \ + s3://mapbox/$REPO_NAME/ios/builds/${GENERIC_NIGHTLY_FILENAME} --acl public-read +fi diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 1baebf60bc..1ccd5ce355 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -22,6 +22,7 @@ #include <mbgl/style/layers/custom_layer.hpp> #include <mbgl/map/backend.hpp> #include <mbgl/math/wrap.hpp> +#include <mbgl/util/exception.hpp> #include <mbgl/util/geo.hpp> #include <mbgl/util/constants.hpp> #include <mbgl/util/image.hpp> @@ -30,6 +31,7 @@ #include <mbgl/util/chrono.hpp> #include <mbgl/util/run_loop.hpp> #include <mbgl/util/shared_thread_pool.hpp> +#include <mbgl/util/string.hpp> #import "Mapbox.h" #import "MGLFeature_Private.h" @@ -1173,7 +1175,8 @@ public: } - (void)notifyGestureDidBegin { - [self notifyMapChange:mbgl::MapChangeRegionWillChange]; + BOOL animated = NO; + [self cameraWillChangeAnimated:animated]; _mbglMap->setGestureInProgress(true); _changeDelimiterSuppressionDepth++; } @@ -1187,7 +1190,8 @@ public: } if ( ! drift) { - [self notifyMapChange:mbgl::MapChangeRegionDidChange]; + BOOL animated = NO; + [self cameraDidChangeAnimated:animated]; } } @@ -1224,7 +1228,7 @@ public: [pan setTranslation:CGPointZero inView:pan.view]; } - [self notifyMapChange:mbgl::MapChangeRegionIsChanging]; + [self cameraIsChanging]; } else if (pan.state == UIGestureRecognizerStateEnded || pan.state == UIGestureRecognizerStateCancelled) { @@ -1307,7 +1311,7 @@ public: _mbglMap->setLatLng(MGLLatLngFromLocationCoordinate2D(centerCoordinate), mbgl::ScreenCoordinate { centerPoint.x, centerPoint.y }); } - [self notifyMapChange:mbgl::MapChangeRegionIsChanging]; + [self cameraIsChanging]; } else if (pinch.state == UIGestureRecognizerStateEnded || pinch.state == UIGestureRecognizerStateCancelled) { @@ -1406,9 +1410,8 @@ public: { _mbglMap->setBearing(newDegrees, mbgl::ScreenCoordinate { centerPoint.x, centerPoint.y }); } - - [self notifyMapChange:mbgl::MapChangeRegionIsChanging]; - + + [self cameraIsChanging]; } else if (rotate.state == UIGestureRecognizerStateEnded || rotate.state == UIGestureRecognizerStateCancelled) { @@ -1661,7 +1664,7 @@ public: _mbglMap->scaleBy(scale, mbgl::ScreenCoordinate { centerPoint.x, centerPoint.y }); } - [self notifyMapChange:mbgl::MapChangeRegionIsChanging]; + [self cameraIsChanging]; } else if (quickZoom.state == UIGestureRecognizerStateEnded || quickZoom.state == UIGestureRecognizerStateCancelled) { @@ -1700,7 +1703,7 @@ public: _mbglMap->setPitch(pitchNew, mbgl::ScreenCoordinate { centerPoint.x, centerPoint.y }); } - [self notifyMapChange:mbgl::MapChangeRegionIsChanging]; + [self cameraIsChanging]; } else if (twoFingerDrag.state == UIGestureRecognizerStateEnded || twoFingerDrag.state == UIGestureRecognizerStateCancelled) { @@ -4737,150 +4740,160 @@ public: } } -- (void)notifyMapChange:(mbgl::MapChange)change -{ - // Ignore map updates when the Map object isn't set. +- (void)cameraWillChangeAnimated:(BOOL)animated { if (!_mbglMap) { return; } - switch (change) + if ( ! _userLocationAnnotationIsSelected + || self.userTrackingMode == MGLUserTrackingModeNone + || self.userTrackingState != MGLUserTrackingStateChanged) { - case mbgl::MapChangeRegionWillChange: - case mbgl::MapChangeRegionWillChangeAnimated: + UIView<MGLCalloutView> *calloutView = self.calloutViewForSelectedAnnotation; + BOOL dismissesAutomatically = (calloutView + && [calloutView respondsToSelector:@selector(dismissesAutomatically)] + && calloutView.dismissesAutomatically); + // dismissesAutomatically is an optional property and we want to dismiss + // the callout view if it's unimplemented. + if (dismissesAutomatically || (calloutView && ![calloutView respondsToSelector:@selector(dismissesAutomatically)])) { - if ( ! _userLocationAnnotationIsSelected - || self.userTrackingMode == MGLUserTrackingModeNone - || self.userTrackingState != MGLUserTrackingStateChanged) - { - UIView<MGLCalloutView> *calloutView = self.calloutViewForSelectedAnnotation; - BOOL dismissesAutomatically = (calloutView - && [calloutView respondsToSelector:@selector(dismissesAutomatically)] - && calloutView.dismissesAutomatically); - // dismissesAutomatically is an optional property and we want to dismiss - // the callout view if it's unimplemented. - if (dismissesAutomatically || (calloutView && ![calloutView respondsToSelector:@selector(dismissesAutomatically)])) - { - [self deselectAnnotation:self.selectedAnnotation animated:NO]; - } - } - - if ( ! [self isSuppressingChangeDelimiters] && [self.delegate respondsToSelector:@selector(mapView:regionWillChangeAnimated:)]) - { - BOOL animated = change == mbgl::MapChangeRegionWillChangeAnimated; - [self.delegate mapView:self regionWillChangeAnimated:animated]; - } - break; + [self deselectAnnotation:self.selectedAnnotation animated:NO]; } - case mbgl::MapChangeRegionIsChanging: - { - [self updateCompass]; + } - if ([self.delegate respondsToSelector:@selector(mapViewRegionIsChanging:)]) - { - [self.delegate mapViewRegionIsChanging:self]; - } - break; - } - case mbgl::MapChangeRegionDidChange: - case mbgl::MapChangeRegionDidChangeAnimated: - { - [self updateCompass]; + if ( ! [self isSuppressingChangeDelimiters] && [self.delegate respondsToSelector:@selector(mapView:regionWillChangeAnimated:)]) + { + [self.delegate mapView:self regionWillChangeAnimated:animated]; + } +} - if ( ! [self isSuppressingChangeDelimiters] && [self.delegate respondsToSelector:@selector(mapView:regionDidChangeAnimated:)]) - { - if ([UIApplication sharedApplication].applicationState == UIApplicationStateActive) - { - UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, nil); - } - BOOL animated = change == mbgl::MapChangeRegionDidChangeAnimated; - [self.delegate mapView:self regionDidChangeAnimated:animated]; - } - break; - } - case mbgl::MapChangeWillStartLoadingMap: - { - if ([self.delegate respondsToSelector:@selector(mapViewWillStartLoadingMap:)]) - { - [self.delegate mapViewWillStartLoadingMap:self]; - } - break; - } - case mbgl::MapChangeDidFinishLoadingMap: - { - [self.style willChangeValueForKey:@"sources"]; - [self.style didChangeValueForKey:@"sources"]; - [self.style willChangeValueForKey:@"layers"]; - [self.style didChangeValueForKey:@"layers"]; - if ([self.delegate respondsToSelector:@selector(mapViewDidFinishLoadingMap:)]) - { - [self.delegate mapViewDidFinishLoadingMap:self]; - } - break; - } - case mbgl::MapChangeDidFailLoadingMap: - { - if ([self.delegate respondsToSelector:@selector(mapViewDidFailLoadingMap:withError:)]) - { - NSError *error = [NSError errorWithDomain:MGLErrorDomain code:0 userInfo:nil]; - [self.delegate mapViewDidFailLoadingMap:self withError:error]; - } - break; - } - case mbgl::MapChangeWillStartRenderingMap: - { - if ([self.delegate respondsToSelector:@selector(mapViewWillStartRenderingMap:)]) - { - [self.delegate mapViewWillStartRenderingMap:self]; - } - break; - } - case mbgl::MapChangeDidFinishRenderingMap: - case mbgl::MapChangeDidFinishRenderingMapFullyRendered: - { - if ([self.delegate respondsToSelector:@selector(mapViewDidFinishRenderingMap:fullyRendered:)]) - { - [self.delegate mapViewDidFinishRenderingMap:self fullyRendered:(change == mbgl::MapChangeDidFinishRenderingMapFullyRendered)]; - } - break; - } - case mbgl::MapChangeWillStartRenderingFrame: - { - if ([self.delegate respondsToSelector:@selector(mapViewWillStartRenderingFrame:)]) - { - [self.delegate mapViewWillStartRenderingFrame:self]; - } - break; - } - case mbgl::MapChangeDidFinishRenderingFrame: - case mbgl::MapChangeDidFinishRenderingFrameFullyRendered: - { - if (_isChangingAnnotationLayers) - { - _isChangingAnnotationLayers = NO; - [self.style didChangeValueForKey:@"layers"]; - } - [self updateAnnotationViews]; - [self updateCalloutView]; - if ([self.delegate respondsToSelector:@selector(mapViewDidFinishRenderingFrame:fullyRendered:)]) - { - [self.delegate mapViewDidFinishRenderingFrame:self fullyRendered:(change == mbgl::MapChangeDidFinishRenderingFrameFullyRendered)]; - } - break; - } - case mbgl::MapChangeDidFinishLoadingStyle: - { - self.style = [[MGLStyle alloc] initWithMapView:self]; - if ([self.delegate respondsToSelector:@selector(mapView:didFinishLoadingStyle:)]) - { - [self.delegate mapView:self didFinishLoadingStyle:self.style]; - } - break; - } - case mbgl::MapChangeSourceDidChange: +- (void)cameraIsChanging { + if (!_mbglMap) { + return; + } + + [self updateCompass]; + + if ([self.delegate respondsToSelector:@selector(mapViewRegionIsChanging:)]) + { + [self.delegate mapViewRegionIsChanging:self]; + } +} + +- (void)cameraDidChangeAnimated:(BOOL)animated { + if (!_mbglMap) { + return; + } + + [self updateCompass]; + + if ( ! [self isSuppressingChangeDelimiters] && [self.delegate respondsToSelector:@selector(mapView:regionDidChangeAnimated:)]) + { + if ([UIApplication sharedApplication].applicationState == UIApplicationStateActive) { - break; + UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, nil); } + [self.delegate mapView:self regionDidChangeAnimated:animated]; + } +} + +- (void)mapViewWillStartLoadingMap { + if (!_mbglMap) { + return; + } + + if ([self.delegate respondsToSelector:@selector(mapViewWillStartLoadingMap:)]) + { + [self.delegate mapViewWillStartLoadingMap:self]; + } +} + +- (void)mapViewDidFinishLoadingMap { + if (!_mbglMap) { + return; + } + + [self.style willChangeValueForKey:@"sources"]; + [self.style didChangeValueForKey:@"sources"]; + [self.style willChangeValueForKey:@"layers"]; + [self.style didChangeValueForKey:@"layers"]; + if ([self.delegate respondsToSelector:@selector(mapViewDidFinishLoadingMap:)]) + { + [self.delegate mapViewDidFinishLoadingMap:self]; + } +} + +- (void)mapViewDidFailLoadingMapWithError:(NSError *)error { + if (!_mbglMap) { + return; + } + + if ([self.delegate respondsToSelector:@selector(mapViewDidFailLoadingMap:withError:)]) + { + [self.delegate mapViewDidFailLoadingMap:self withError:error]; + } +} + +- (void)mapViewWillStartRenderingFrame { + if (!_mbglMap) { + return; + } + + if ([self.delegate respondsToSelector:@selector(mapViewWillStartRenderingFrame:)]) + { + [self.delegate mapViewWillStartRenderingFrame:self]; + } +} + +- (void)mapViewDidFinishRenderingFrameFullyRendered:(BOOL)fullyRendered { + if (!_mbglMap) { + return; + } + + if (_isChangingAnnotationLayers) + { + _isChangingAnnotationLayers = NO; + [self.style didChangeValueForKey:@"layers"]; + } + [self updateAnnotationViews]; + [self updateCalloutView]; + if ([self.delegate respondsToSelector:@selector(mapViewDidFinishRenderingFrame:fullyRendered:)]) + { + [self.delegate mapViewDidFinishRenderingFrame:self fullyRendered:fullyRendered]; + } +} + +- (void)mapViewWillStartRenderingMap { + if (!_mbglMap) { + return; + } + + if ([self.delegate respondsToSelector:@selector(mapViewWillStartRenderingMap:)]) + { + [self.delegate mapViewWillStartRenderingMap:self]; + } +} + +- (void)mapViewDidFinishRenderingMapFullyRendered:(BOOL)fullyRendered { + if (!_mbglMap) { + return; + } + + if ([self.delegate respondsToSelector:@selector(mapViewDidFinishRenderingMap:fullyRendered:)]) + { + [self.delegate mapViewDidFinishRenderingMap:self fullyRendered:fullyRendered]; + } +} + +- (void)didFinishLoadingStyle { + if (!_mbglMap) { + return; + } + + self.style = [[MGLStyle alloc] initWithMapView:self]; + if ([self.delegate respondsToSelector:@selector(mapView:didFinishLoadingStyle:)]) + { + [self.delegate mapView:self didFinishLoadingStyle:self.style]; } } @@ -5349,9 +5362,74 @@ public: } } - void notifyMapChange(mbgl::MapChange change) override - { - [nativeView notifyMapChange:change]; + void onCameraWillChange(mbgl::MapObserver::CameraChangeMode mode) override { + bool animated = mode == mbgl::MapObserver::CameraChangeMode::Animated; + [nativeView cameraWillChangeAnimated:animated]; + } + + void onCameraIsChanging() override { + [nativeView cameraIsChanging]; + } + + void onCameraDidChange(mbgl::MapObserver::CameraChangeMode mode) override { + bool animated = mode == mbgl::MapObserver::CameraChangeMode::Animated; + [nativeView cameraDidChangeAnimated:animated]; + } + + void onWillStartLoadingMap() override { + [nativeView mapViewWillStartLoadingMap]; + } + + void onDidFinishLoadingMap() override { + [nativeView mapViewDidFinishLoadingMap]; + } + + void onDidFailLoadingMap(std::exception_ptr exception) override { + NSString *description; + MGLErrorCode code; + try { + std::rethrow_exception(exception); + } catch (const mbgl::util::StyleParseException&) { + code = MGLErrorCodeParseStyleFailed; + description = NSLocalizedStringWithDefaultValue(@"PARSE_STYLE_FAILED_DESC", nil, nil, @"The map failed to load because the style is corrupted.", @"User-friendly error description"); + } catch (const mbgl::util::StyleLoadException&) { + code = MGLErrorCodeLoadStyleFailed; + description = NSLocalizedStringWithDefaultValue(@"LOAD_STYLE_FAILED_DESC", nil, nil, @"The map failed to load because the style can't be loaded.", @"User-friendly error description"); + } catch (const mbgl::util::NotFoundException&) { + code = MGLErrorCodeNotFound; + description = NSLocalizedStringWithDefaultValue(@"STYLE_NOT_FOUND_DESC", nil, nil, @"The map failed to load because the style can’t be found or is incompatible.", @"User-friendly error description"); + } catch (...) { + code = MGLErrorCodeUnknown; + description = NSLocalizedStringWithDefaultValue(@"LOAD_MAP_FAILED_DESC", nil, nil, @"The map failed to load because an unknown error occurred.", @"User-friendly error description"); + } + NSDictionary *userInfo = @{ + NSLocalizedDescriptionKey: description, + NSLocalizedFailureReasonErrorKey: @(mbgl::util::toString(exception).c_str()), + }; + NSError *error = [NSError errorWithDomain:MGLErrorDomain code:code userInfo:userInfo]; + [nativeView mapViewDidFailLoadingMapWithError:error]; + } + + void onWillStartRenderingFrame() override { + [nativeView mapViewWillStartRenderingFrame]; + } + + void onDidFinishRenderingFrame(mbgl::MapObserver::RenderMode mode) override { + bool fullyRendered = mode == mbgl::MapObserver::RenderMode::Full; + [nativeView mapViewDidFinishRenderingFrameFullyRendered:fullyRendered]; + } + + void onWillStartRenderingMap() override { + [nativeView mapViewWillStartRenderingMap]; + } + + void onDidFinishRenderingMap(mbgl::MapObserver::RenderMode mode) override { + bool fullyRendered = mode == mbgl::MapObserver::RenderMode::Full; + [nativeView mapViewDidFinishRenderingMapFullyRendered:fullyRendered]; + } + + void onDidFinishLoadingStyle() override { + [nativeView didFinishLoadingStyle]; } void invalidate() override diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md index 7e3eac9877..152fdc382b 100644 --- a/platform/macos/CHANGELOG.md +++ b/platform/macos/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog for Mapbox macOS SDK +## master + +* The error passed into `-[MGLMapViewDelegate mapViewDidFailLoadingMap:withError:]` now includes a more specific description and failure reason. ([#8418](https://github.com/mapbox/mapbox-gl-native/pull/8418)) + ## 0.4.0 ### Internationalization diff --git a/platform/macos/bitrise.yml b/platform/macos/bitrise.yml index 2de6bce1fc..1f2495dab2 100644 --- a/platform/macos/bitrise.yml +++ b/platform/macos/bitrise.yml @@ -12,59 +12,24 @@ workflows: primary: steps: - script: - title: Check for skipping CI - inputs: - - content: |- - #!/bin/bash - if [[ -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_SUBJECT | sed -n '/\[skip ci\]/p')" || - -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_SUBJECT | sed -n '/\[ci skip\]/p')" || - -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_BODY | sed -n 's/\[skip ci\]/p')" || - -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_BODY | sed -n 's/\[ci skip\]/p')" ]]; then - envman add --key SKIPCI --value true - else - envman add --key SKIPCI --value false - fi - - script: - title: Install Dependencies - run_if: '{{enveq "SKIPCI" "false"}}' + title: Build inputs: - content: |- #!/bin/bash set -eu -o pipefail brew install cmake gem install xcpretty --no-rdoc --no-ri - - is_debug: 'yes' - - script: - title: Generate Workspace - run_if: '{{enveq "SKIPCI" "false"}}' - inputs: - - content: |- - #!/bin/bash - set -eu -o pipefail - export BUILDTYPE=Debug - make xproj - - is_debug: 'yes' - - script: - title: Run Core and SDK Unit Tests - run_if: '{{enveq "SKIPCI" "false"}}' - inputs: - - content: |- - #!/bin/bash - set -eu -o pipefail export BUILDTYPE=Debug export XCPRETTY="| tee ${BITRISE_DEPLOY_DIR}/raw-xcodebuild-output.txt | xcpretty --color --report html --output ${BITRISE_DEPLOY_DIR}/xcode-test-results.html" make run-test - - is_debug: 'yes' - deploy-to-bitrise-io: title: Deploy to Bitrise.io - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - deploy_path: "test/fixtures" - notify_user_groups: none - is_compress: 'true' - slack: title: Post to Slack - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - webhook_url: "$SLACK_HOOK_URL" - channel: "#gl-bots" @@ -83,28 +48,13 @@ workflows: nightly-release: steps: - script: - title: Install Dependencies + title: Build inputs: - content: |- #!/bin/bash set -eu -o pipefail brew install cmake - - is_debug: 'yes' - - script: - title: Configure AWS-CLI - inputs: - - content: |- - #!/bin/bash - apt-get install -y python-pip python-dev build-essential pip install awscli - - script: - title: Build package - inputs: - - content: |- - #!/bin/bash - set -eu -o pipefail - export BUILDTYPE=Release - export SYMBOLS=NO - make xpackage + gem install xcpretty --no-rdoc --no-ri + BUILDTYPE=Release SYMBOLS=NO make xpackage CLOUDWATCH=true platform/macos/scripts/metrics.sh - - is_debug: 'yes' diff --git a/platform/macos/sdk/Base.lproj/Localizable.strings b/platform/macos/sdk/Base.lproj/Localizable.strings index b7a4a21173..68360320eb 100644 --- a/platform/macos/sdk/Base.lproj/Localizable.strings +++ b/platform/macos/sdk/Base.lproj/Localizable.strings @@ -1,6 +1,18 @@ +/* User-friendly error description */ +"LOAD_MAP_FAILED_DESC" = "The map failed to load because an unknown error occurred."; + +/* User-friendly error description */ +"LOAD_STYLE_FAILED_DESC" = "The map failed to load because the style can't be loaded."; + /* Accessibility title */ "MAP_A11Y_TITLE" = "Mapbox"; +/* User-friendly error description */ +"PARSE_STYLE_FAILED_DESC" = "The map failed to load because the style is corrupted."; + +/* User-friendly error description */ +"STYLE_NOT_FOUND_DESC" = "The map failed to load because the style can’t be found or is incompatible."; + /* Label of Zoom In button */ "ZOOM_IN_LABEL" = "+"; diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm index 8711950554..028d41ceda 100644 --- a/platform/macos/src/MGLMapView.mm +++ b/platform/macos/src/MGLMapView.mm @@ -35,8 +35,10 @@ #import <mbgl/math/wrap.hpp> #import <mbgl/util/constants.hpp> #import <mbgl/util/chrono.hpp> +#import <mbgl/util/exception.hpp> #import <mbgl/util/run_loop.hpp> #import <mbgl/util/shared_thread_pool.hpp> +#import <mbgl/util/string.hpp> #import <map> #import <unordered_map> @@ -813,133 +815,150 @@ public: [self.layer setNeedsDisplay]; } -- (void)notifyMapChange:(mbgl::MapChange)change { - // Ignore map updates when the Map object isn't set. +- (void)cameraWillChangeAnimated:(BOOL)animated { if (!_mbglMap) { return; } - switch (change) { - case mbgl::MapChangeRegionWillChange: - case mbgl::MapChangeRegionWillChangeAnimated: - { - if ([self.delegate respondsToSelector:@selector(mapView:cameraWillChangeAnimated:)]) { - BOOL animated = change == mbgl::MapChangeRegionWillChangeAnimated; - [self.delegate mapView:self cameraWillChangeAnimated:animated]; - } - break; - } - case mbgl::MapChangeRegionIsChanging: - { - // Update a minimum of UI that needs to stay attached to the map - // while animating. - [self updateCompass]; - [self updateAnnotationCallouts]; + if ([self.delegate respondsToSelector:@selector(mapView:cameraWillChangeAnimated:)]) { + [self.delegate mapView:self cameraWillChangeAnimated:animated]; + } +} - if ([self.delegate respondsToSelector:@selector(mapViewCameraIsChanging:)]) { - [self.delegate mapViewCameraIsChanging:self]; - } - break; - } - case mbgl::MapChangeRegionDidChange: - case mbgl::MapChangeRegionDidChangeAnimated: - { - // Update all UI at the end of an animation or atomic change to the - // viewport. More expensive updates can happen here, but care should - // still be taken to minimize the work done here because scroll - // gesture recognition and momentum scrolling is performed as a - // series of atomic changes, not an animation. - [self updateZoomControls]; - [self updateCompass]; - [self updateAnnotationCallouts]; - [self updateAnnotationTrackingAreas]; +- (void)cameraIsChanging { + if (!_mbglMap) { + return; + } - if ([self.delegate respondsToSelector:@selector(mapView:cameraDidChangeAnimated:)]) { - BOOL animated = change == mbgl::MapChangeRegionDidChangeAnimated; - [self.delegate mapView:self cameraDidChangeAnimated:animated]; - } - break; - } - case mbgl::MapChangeWillStartLoadingMap: - { - if ([self.delegate respondsToSelector:@selector(mapViewWillStartLoadingMap:)]) { - [self.delegate mapViewWillStartLoadingMap:self]; - } - break; - } - case mbgl::MapChangeDidFinishLoadingMap: - { - [self.style willChangeValueForKey:@"sources"]; - [self.style didChangeValueForKey:@"sources"]; - [self.style willChangeValueForKey:@"layers"]; - [self.style didChangeValueForKey:@"layers"]; - if ([self.delegate respondsToSelector:@selector(mapViewDidFinishLoadingMap:)]) { - [self.delegate mapViewDidFinishLoadingMap:self]; - } - break; - } - case mbgl::MapChangeDidFailLoadingMap: - { - if ([self.delegate respondsToSelector:@selector(mapViewDidFailLoadingMap:withError:)]) { - NSError *error = [NSError errorWithDomain:MGLErrorDomain code:0 userInfo:nil]; - [self.delegate mapViewDidFailLoadingMap:self withError:error]; - } - break; - } - case mbgl::MapChangeWillStartRenderingMap: - { - if ([self.delegate respondsToSelector:@selector(mapViewWillStartRenderingMap:)]) { - [self.delegate mapViewWillStartRenderingMap:self]; - } - break; - } - case mbgl::MapChangeDidFinishRenderingMap: - case mbgl::MapChangeDidFinishRenderingMapFullyRendered: - { - if ([self.delegate respondsToSelector:@selector(mapViewDidFinishRenderingMap:fullyRendered:)]) { - BOOL fullyRendered = change == mbgl::MapChangeDidFinishRenderingMapFullyRendered; - [self.delegate mapViewDidFinishRenderingMap:self fullyRendered:fullyRendered]; - } - break; - } - case mbgl::MapChangeWillStartRenderingFrame: - { - if ([self.delegate respondsToSelector:@selector(mapViewWillStartRenderingFrame:)]) { - [self.delegate mapViewWillStartRenderingFrame:self]; - } - break; - } - case mbgl::MapChangeDidFinishRenderingFrame: - case mbgl::MapChangeDidFinishRenderingFrameFullyRendered: - { - if (_isChangingAnnotationLayers) { - _isChangingAnnotationLayers = NO; - [self.style didChangeValueForKey:@"layers"]; - } - if ([self.delegate respondsToSelector:@selector(mapViewDidFinishRenderingFrame:fullyRendered:)]) { - BOOL fullyRendered = change == mbgl::MapChangeDidFinishRenderingFrameFullyRendered; - [self.delegate mapViewDidFinishRenderingFrame:self fullyRendered:fullyRendered]; - } - break; - } - case mbgl::MapChangeDidFinishLoadingStyle: - { - self.style = [[MGLStyle alloc] initWithMapView:self]; - if ([self.delegate respondsToSelector:@selector(mapView:didFinishLoadingStyle:)]) - { - [self.delegate mapView:self didFinishLoadingStyle:self.style]; - } - break; - } - case mbgl::MapChangeSourceDidChange: - { - [self installAttributionView]; - self.needsUpdateConstraints = YES; - break; - } + // Update a minimum of UI that needs to stay attached to the map + // while animating. + [self updateCompass]; + [self updateAnnotationCallouts]; + + if ([self.delegate respondsToSelector:@selector(mapViewCameraIsChanging:)]) { + [self.delegate mapViewCameraIsChanging:self]; + } +} + +- (void)cameraDidChangeAnimated:(BOOL)animated { + if (!_mbglMap) { + return; + } + + // Update all UI at the end of an animation or atomic change to the + // viewport. More expensive updates can happen here, but care should + // still be taken to minimize the work done here because scroll + // gesture recognition and momentum scrolling is performed as a + // series of atomic changes, not an animation. + [self updateZoomControls]; + [self updateCompass]; + [self updateAnnotationCallouts]; + [self updateAnnotationTrackingAreas]; + + if ([self.delegate respondsToSelector:@selector(mapView:cameraDidChangeAnimated:)]) { + [self.delegate mapView:self cameraDidChangeAnimated:animated]; + } +} + +- (void)mapViewWillStartLoadingMap { + if (!_mbglMap) { + return; + } + + if ([self.delegate respondsToSelector:@selector(mapViewWillStartLoadingMap:)]) { + [self.delegate mapViewWillStartLoadingMap:self]; + } +} + +- (void)mapViewDidFinishLoadingMap { + if (!_mbglMap) { + return; + } + + [self.style willChangeValueForKey:@"sources"]; + [self.style didChangeValueForKey:@"sources"]; + [self.style willChangeValueForKey:@"layers"]; + [self.style didChangeValueForKey:@"layers"]; + if ([self.delegate respondsToSelector:@selector(mapViewDidFinishLoadingMap:)]) { + [self.delegate mapViewDidFinishLoadingMap:self]; + } +} + +- (void)mapViewDidFailLoadingMapWithError:(NSError *)error { + if (!_mbglMap) { + return; + } + + if ([self.delegate respondsToSelector:@selector(mapViewDidFailLoadingMap:withError:)]) { + [self.delegate mapViewDidFailLoadingMap:self withError:error]; + } +} + +- (void)mapViewWillStartRenderingFrame { + if (!_mbglMap) { + return; + } + + if ([self.delegate respondsToSelector:@selector(mapViewWillStartRenderingFrame:)]) { + [self.delegate mapViewWillStartRenderingFrame:self]; + } +} + +- (void)mapViewDidFinishRenderingFrameFullyRendered:(BOOL)fullyRendered { + if (!_mbglMap) { + return; + } + + if (_isChangingAnnotationLayers) { + _isChangingAnnotationLayers = NO; + [self.style didChangeValueForKey:@"layers"]; + } + if ([self.delegate respondsToSelector:@selector(mapViewDidFinishRenderingFrame:fullyRendered:)]) { + [self.delegate mapViewDidFinishRenderingFrame:self fullyRendered:fullyRendered]; + } +} + +- (void)mapViewWillStartRenderingMap { + if (!_mbglMap) { + return; + } + + if ([self.delegate respondsToSelector:@selector(mapViewWillStartRenderingMap:)]) { + [self.delegate mapViewWillStartRenderingMap:self]; + } +} + +- (void)mapViewDidFinishRenderingMapFullyRendered:(BOOL)fullyRendered { + if (!_mbglMap) { + return; + } + + if ([self.delegate respondsToSelector:@selector(mapViewDidFinishRenderingMap:fullyRendered:)]) { + [self.delegate mapViewDidFinishRenderingMap:self fullyRendered:fullyRendered]; } } +- (void)mapViewDidFinishLoadingStyle { + if (!_mbglMap) { + return; + } + + self.style = [[MGLStyle alloc] initWithMapView:self]; + if ([self.delegate respondsToSelector:@selector(mapView:didFinishLoadingStyle:)]) + { + [self.delegate mapView:self didFinishLoadingStyle:self.style]; + } +} + +- (void)sourceDidChange { + if (!_mbglMap) { + return; + } + + [self installAttributionView]; + self.needsUpdateConstraints = YES; +} + #pragma mark Printing - (void)print:(__unused id)sender { @@ -2750,8 +2769,78 @@ public: MGLMapViewImpl(MGLMapView *nativeView_) : nativeView(nativeView_) {} - void notifyMapChange(mbgl::MapChange change) override { - [nativeView notifyMapChange:change]; + void onCameraWillChange(mbgl::MapObserver::CameraChangeMode mode) override { + bool animated = mode == mbgl::MapObserver::CameraChangeMode::Animated; + [nativeView cameraWillChangeAnimated:animated]; + } + + void onCameraIsChanging() override { + [nativeView cameraIsChanging]; + } + + void onCameraDidChange(mbgl::MapObserver::CameraChangeMode mode) override { + bool animated = mode == mbgl::MapObserver::CameraChangeMode::Animated; + [nativeView cameraDidChangeAnimated:animated]; + } + + void onWillStartLoadingMap() override { + [nativeView mapViewWillStartLoadingMap]; + } + + void onDidFinishLoadingMap() override { + [nativeView mapViewDidFinishLoadingMap]; + } + + void onDidFailLoadingMap(std::exception_ptr exception) override { + NSString *description; + MGLErrorCode code; + try { + std::rethrow_exception(exception); + } catch (const mbgl::util::StyleParseException&) { + code = MGLErrorCodeParseStyleFailed; + description = NSLocalizedStringWithDefaultValue(@"PARSE_STYLE_FAILED_DESC", nil, nil, @"The map failed to load because the style is corrupted.", @"User-friendly error description"); + } catch (const mbgl::util::StyleLoadException&) { + code = MGLErrorCodeLoadStyleFailed; + description = NSLocalizedStringWithDefaultValue(@"LOAD_STYLE_FAILED_DESC", nil, nil, @"The map failed to load because the style can't be loaded.", @"User-friendly error description"); + } catch (const mbgl::util::NotFoundException&) { + code = MGLErrorCodeNotFound; + description = NSLocalizedStringWithDefaultValue(@"STYLE_NOT_FOUND_DESC", nil, nil, @"The map failed to load because the style can’t be found or is incompatible.", @"User-friendly error description"); + } catch (...) { + code = MGLErrorCodeUnknown; + description = NSLocalizedStringWithDefaultValue(@"LOAD_MAP_FAILED_DESC", nil, nil, @"The map failed to load because an unknown error occurred.", @"User-friendly error description"); + } + NSDictionary *userInfo = @{ + NSLocalizedDescriptionKey: description, + NSLocalizedFailureReasonErrorKey: @(mbgl::util::toString(exception).c_str()), + }; + NSError *error = [NSError errorWithDomain:MGLErrorDomain code:code userInfo:userInfo]; + [nativeView mapViewDidFailLoadingMapWithError:error]; + } + + void onWillStartRenderingFrame() override { + [nativeView mapViewWillStartRenderingFrame]; + } + + void onDidFinishRenderingFrame(mbgl::MapObserver::RenderMode mode) override { + bool fullyRendered = mode == mbgl::MapObserver::RenderMode::Full; + [nativeView mapViewDidFinishRenderingFrameFullyRendered:fullyRendered]; + } + + void onWillStartRenderingMap() override { + [nativeView mapViewWillStartRenderingMap]; + } + + void onDidFinishRenderingMap(mbgl::MapObserver::RenderMode mode) override { + bool fullyRendered = mode == mbgl::MapObserver::RenderMode::Full; + [nativeView mapViewDidFinishRenderingMapFullyRendered:fullyRendered]; + } + + void onDidFinishLoadingStyle() override { + [nativeView mapViewDidFinishLoadingStyle]; + } + + void onSourceChanged(mbgl::style::Source&) override { + [nativeView sourceDidChange]; } void invalidate() override { diff --git a/platform/node/CHANGELOG.md b/platform/node/CHANGELOG.md index 6f5afbbd6c..12032b4037 100644 --- a/platform/node/CHANGELOG.md +++ b/platform/node/CHANGELOG.md @@ -1,3 +1,16 @@ +# 3.4.7 - March 15, 2017 + +- Fixed MacOS Release builds ([8409](https://github.com/mapbox/mapbox-gl-native/pull/8409)) + +# 3.4.6 - March 14, 2017 + +- Publishes `Release` build on Mac ([#8407](https://github.com/mapbox/mapbox-gl-native/pull/8407)) +- Fixes the publish binary build process ([#8406](https://github.com/mapbox/mapbox-gl-native/pull/8406)) + +# 3.4.5 - March 14, 2017 + +- Fixed a memory hang issue after GlyphAtlas was refactored ([#8394](https://github.com/mapbox/mapbox-gl-native/pull/8394)) + # 3.4.4 - January 10, 2017 - Updates the node binary publish location on s3 to reflect new package name ([#7653](https://github.com/mapbox/mapbox-gl-native/pull/7653)) diff --git a/platform/node/bitrise.yml b/platform/node/bitrise.yml index 20dcfb1908..68829d966e 100644 --- a/platform/node/bitrise.yml +++ b/platform/node/bitrise.yml @@ -3,85 +3,65 @@ default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git trigger_map: - tag: "node-v*" - workflow: primary + workflow: publish - push_branch: "*" workflow: primary - pull_request_target_branch: "*" workflow: primary +shortcuts: + slack: &slack + title: Post to Slack + inputs: + - webhook_url: "$SLACK_HOOK_URL" + - channel: "#gl-bots" + - from_username: 'Bitrise Node macOS' + - from_username_on_error: 'Bitrise Node macOS' + - message: '<${BITRISE_BUILD_URL}|Build #${BITRISE_BUILD_NUMBER}> + for <https://github.com/mapbox/mapbox-gl-native/compare/${BITRISE_GIT_BRANCH}|mapbox/mapbox-gl-native@${BITRISE_GIT_BRANCH}> + by ${GIT_CLONE_COMMIT_COMMITER_NAME} + passed' + - message_on_error: '<${BITRISE_BUILD_URL}|Build #${BITRISE_BUILD_NUMBER}> + for <https://github.com/mapbox/mapbox-gl-native/compare/${BITRISE_GIT_BRANCH}|mapbox/mapbox-gl-native@${BITRISE_GIT_BRANCH}> + by ${GIT_CLONE_COMMIT_COMMITER_NAME} + failed' + - icon_url: https://bitrise-public-content-production.s3.amazonaws.com/slack/bitrise-slack-icon-128.png + - icon_url_on_error: https://bitrise-public-content-production.s3.amazonaws.com/slack/bitrise-slack-error-icon-128.png + workflows: primary: steps: - script: - title: Check for skipping CI - inputs: - - content: |- - #!/bin/bash - if [[ -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_SUBJECT | sed -n '/\[skip ci\]/p')" || - -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_SUBJECT | sed -n '/\[ci skip\]/p')" || - -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_BODY | sed -n 's/\[skip ci\]/p')" || - -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_BODY | sed -n 's/\[ci skip\]/p')" ]]; then - envman add --key SKIPCI --value true - else - envman add --key SKIPCI --value false - fi - - script: - title: Check for publishing - run_if: '{{enveq "SKIPCI" "false"}}' - inputs: - - content: |- - #!/bin/bash - PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)") - if [[ "${BITRISE_GIT_TAG:-}" == "node-v${PACKAGE_JSON_VERSION}" ]]; then - envman add --key PUBLISH --value true - fi - - script: - title: Run build script - run_if: '{{enveq "SKIPCI" "false"}}' + title: Test inputs: - content: |- #!/bin/bash set -eu -o pipefail brew update - brew install cmake brew unlink node - brew install awscli node@4 + brew install cmake awscli node@4 brew link node@4 --force gem install xcpretty --no-rdoc --no-ri - make node - - script: - title: Run test script - run_if: '{{and (enveq "SKIPCI" "false") (enveq "PUBLISH" "")}}' - inputs: - - content: |- - #!/bin/bash - set -eu -o pipefail - make test-node || envman add --key RESULT --value $? + make test-node || RESULT=$? ./platform/node/scripts/after_script.sh ${BITRISE_BUILD_NUMBER} + exit ${RESULT:-0} + - slack: *slack + + publish: + steps: - script: - title: Run publish script - run_if: '{{enveq "SKIPCI" "false"}}' + title: Publish inputs: - content: |- #!/bin/bash set -eu -o pipefail + brew update + brew unlink node + brew install cmake awscli node@4 + brew link node@4 --force + gem install xcpretty --no-rdoc --no-ri + export BUILDTYPE=Release + export PUBLISH=true + make test-node ./platform/node/scripts/after_success.sh - exit ${RESULT:-0} - - slack: - title: Post to Slack - run_if: '{{enveq "SKIPCI" "false"}}' - inputs: - - webhook_url: "$SLACK_HOOK_URL" - - channel: "#gl-bots" - - from_username: 'Bitrise Node macOS' - - from_username_on_error: 'Bitrise Node macOS' - - message: '<${BITRISE_BUILD_URL}|Build #${BITRISE_BUILD_NUMBER}> - for <https://github.com/mapbox/mapbox-gl-native/compare/${BITRISE_GIT_BRANCH}|mapbox/mapbox-gl-native@${BITRISE_GIT_BRANCH}> - by ${GIT_CLONE_COMMIT_COMMITER_NAME} - passed' - - message_on_error: '<${BITRISE_BUILD_URL}|Build #${BITRISE_BUILD_NUMBER}> - for <https://github.com/mapbox/mapbox-gl-native/compare/${BITRISE_GIT_BRANCH}|mapbox/mapbox-gl-native@${BITRISE_GIT_BRANCH}> - by ${GIT_CLONE_COMMIT_COMMITER_NAME} - failed' - - icon_url: https://bitrise-public-content-production.s3.amazonaws.com/slack/bitrise-slack-icon-128.png - - icon_url_on_error: https://bitrise-public-content-production.s3.amazonaws.com/slack/bitrise-slack-error-icon-128.png + - slack: *slack diff --git a/platform/node/scripts/after_success.sh b/platform/node/scripts/after_success.sh index 7ef8f53545..95921a42c2 100755 --- a/platform/node/scripts/after_success.sh +++ b/platform/node/scripts/after_success.sh @@ -4,7 +4,7 @@ set -e set -o pipefail if [[ -n ${PUBLISH:-} ]]; then - if [[ "${BUILDTYPE}" == "Debug" ]]; then + if [[ "${BUILDTYPE}" != "Release" ]]; then echo "Please run this script in release mode (BUILDTYPE=Release)." exit 1 else diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp index f6b672efee..a3a11a1907 100644 --- a/platform/node/src/node_map.cpp +++ b/platform/node/src/node_map.cpp @@ -14,12 +14,6 @@ #include <unistd.h> -#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10 -#define UV_ASYNC_PARAMS(handle) uv_async_t *handle, int -#else -#define UV_ASYNC_PARAMS(handle) uv_async_t *handle -#endif - namespace node_mbgl { struct NodeMap::RenderOptions { @@ -45,6 +39,13 @@ static const char* releasedMessage() { return "Map resources have already been released"; } +NodeBackend::NodeBackend() + : HeadlessBackend(sharedDisplay()) {} + +void NodeBackend::onDidFailLoadingMap(std::exception_ptr error) { + std::rethrow_exception(error); +} + void NodeMap::Init(v8::Local<v8::Object> target) { v8::Local<v8::FunctionTemplate> tpl = Nan::New<v8::FunctionTemplate>(New); @@ -959,7 +960,6 @@ NodeMap::NodeMap(v8::Local<v8::Object> options) ->NumberValue() : 1.0; }()), - backend(sharedDisplay()), map(std::make_unique<mbgl::Map>(backend, mbgl::Size{ 256, 256 }, pixelRatio, @@ -968,14 +968,8 @@ NodeMap::NodeMap(v8::Local<v8::Object> options) mbgl::MapMode::Still)), async(new uv_async_t) { - backend.setMapChangeCallback([&](mbgl::MapChange change) { - if (change == mbgl::MapChangeDidFailLoadingMap) { - throw std::runtime_error("Requires a map style to be a valid style JSON"); - } - }); - async->data = this; - uv_async_init(uv_default_loop(), async, [](UV_ASYNC_PARAMS(h)) { + uv_async_init(uv_default_loop(), async, [](uv_async_t* h) { reinterpret_cast<NodeMap *>(h->data)->renderFinished(); }); diff --git a/platform/node/src/node_map.hpp b/platform/node/src/node_map.hpp index 47a5385ad6..bfc0a7eab6 100644 --- a/platform/node/src/node_map.hpp +++ b/platform/node/src/node_map.hpp @@ -7,6 +7,8 @@ #include <mbgl/gl/headless_backend.hpp> #include <mbgl/gl/offscreen_view.hpp> +#include <exception> + #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wshadow" @@ -15,6 +17,12 @@ namespace node_mbgl { +class NodeBackend : public mbgl::HeadlessBackend { +public: + NodeBackend(); + void onDidFailLoadingMap(std::exception_ptr) final; +}; + class NodeMap : public Nan::ObjectWrap, public mbgl::FileSource { public: @@ -59,7 +67,7 @@ public: std::unique_ptr<mbgl::AsyncRequest> request(const mbgl::Resource&, mbgl::FileSource::Callback); const float pixelRatio; - mbgl::HeadlessBackend backend; + NodeBackend backend; std::unique_ptr<mbgl::OffscreenView> view; NodeThreadPool threadpool; std::unique_ptr<mbgl::Map> map; diff --git a/platform/node/src/node_request.cpp b/platform/node/src/node_request.cpp index de16710f78..09373b1779 100644 --- a/platform/node/src/node_request.cpp +++ b/platform/node/src/node_request.cpp @@ -122,9 +122,19 @@ void NodeRequest::HandleCallback(const Nan::FunctionCallbackInfo<v8::Value>& inf } void NodeRequest::Execute() { + asyncExecute = std::make_unique<mbgl::util::AsyncTask>([this] { doExecute(); Unref(); }); + asyncExecute->send(); + + Ref(); +} + +void NodeRequest::doExecute() { + Nan::HandleScope scope; + v8::Local<v8::Value> argv[] = { handle() }; Nan::MakeCallback(Nan::To<v8::Object>(target->handle()->GetInternalField(1)).ToLocalChecked(), "request", 1, argv); + asyncExecute.reset(); } NodeRequest::NodeAsyncRequest::NodeAsyncRequest(NodeRequest* request_) : request(request_) { diff --git a/platform/node/src/node_request.hpp b/platform/node/src/node_request.hpp index 7d7679a3c7..356566132b 100644 --- a/platform/node/src/node_request.hpp +++ b/platform/node/src/node_request.hpp @@ -8,6 +8,9 @@ #include <mbgl/storage/resource.hpp> #include <mbgl/storage/file_source.hpp> +#include <mbgl/util/async_task.hpp> + +#include <memory> namespace node_mbgl { @@ -35,9 +38,12 @@ public: void Execute(); private: + void doExecute(); + NodeMap* target; mbgl::FileSource::Callback callback; NodeAsyncRequest* asyncRequest = nullptr; + std::unique_ptr<mbgl::util::AsyncTask> asyncExecute; }; } diff --git a/platform/node/src/util/async_queue.hpp b/platform/node/src/util/async_queue.hpp index 87737437c3..a084b866ae 100644 --- a/platform/node/src/util/async_queue.hpp +++ b/platform/node/src/util/async_queue.hpp @@ -8,12 +8,6 @@ #include <queue> #include <string> -#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10 -#define UV_ASYNC_PARAMS(handle) uv_async_t *handle, int -#else -#define UV_ASYNC_PARAMS(handle) uv_async_t *handle -#endif - namespace node_mbgl { namespace util { @@ -23,7 +17,7 @@ public: AsyncQueue(uv_loop_t *loop, std::function<void(T &)> fn) : callback(fn) { async.data = this; - uv_async_init(loop, &async, [](UV_ASYNC_PARAMS(handle)) { + uv_async_init(loop, &async, [](uv_async_t* handle) { auto q = reinterpret_cast<AsyncQueue *>(handle->data); q->process(); }); diff --git a/platform/node/test/js/map.test.js b/platform/node/test/js/map.test.js index 145f62ef5f..e5c756adb6 100644 --- a/platform/node/test/js/map.test.js +++ b/platform/node/test/js/map.test.js @@ -311,11 +311,11 @@ test('Map', function(t) { t.throws(function() { map.load('foo bar'); - }, /Requires a map style to be a valid style JSON/); + }, /Failed to parse style: 1 - Invalid value./); t.throws(function() { map.load('""'); - }, /Requires a map style to be a valid style JSON/); + }, /Failed to parse style: style must be an object/); map.release(); t.end(); @@ -335,7 +335,7 @@ test('Map', function(t) { t.throws(function() { map.load('invalid'); - }, /Requires a map style to be a valid style JSON/); + }, /Failed to parse style: 0 - Invalid value./); }); t.test('accepts an empty stylesheet string', function(t) { diff --git a/platform/node/test/memory.test.js b/platform/node/test/memory.test.js index e23cb60f89..997ccdbbe1 100644 --- a/platform/node/test/memory.test.js +++ b/platform/node/test/memory.test.js @@ -1,8 +1,7 @@ 'use strict'; -var fs = require('fs'); +var mockfs = require('./mockfs'); var mbgl = require('../index'); -var path = require('path'); var test = require('tape'); var testParams = { @@ -12,20 +11,6 @@ var testParams = { ratio: 2 }; -function readFixture(file) { - return fs.readFileSync(path.join('test/fixtures/resources', file)); -} - -var style_raster = readFixture('style_raster.json').toString('utf8'); -var style_vector = readFixture('style_vector.json').toString('utf8'); -var sprite_json = readFixture('sprite.json'); -var sprite_png = readFixture('sprite.png'); -var glyph = readFixture('glyphs.pbf'); -var source_raster = readFixture('source_raster.json'); -var source_vector = readFixture('source_vector.json'); -var tile_raster = readFixture('raster.tile'); -var tile_vector = readFixture('vector.tile'); - test('Memory', function(t) { // Trigger garbage collection before starting test, then initialize // heap size @@ -34,25 +19,7 @@ test('Memory', function(t) { var options = { request: function(req, callback) { - if (req.url == null) { - t.fail('invalid file request'); - } else if (req.url.indexOf('sprite') > -1 && req.url.endsWith('json')) { - callback(null, { data: sprite_json }); - } else if (req.url.indexOf('sprite') > -1 && req.url.endsWith('png')) { - callback(null, { data: sprite_png }); - } else if (req.url.indexOf('fonts') > -1 && req.url.endsWith('pbf')) { - callback(null, { data: glyph }); - } else if (req.url.endsWith('mapbox.satellite')) { - callback(null, { data: source_raster }); - } else if (req.url.indexOf('satellite') > -1 && (req.url.endsWith('png') || req.url.endsWith('webp'))) { - callback(null, { data: tile_raster }); - } else if (req.url.endsWith('mapbox.mapbox-streets-v7')) { - callback(null, { data: source_vector }); - } else if (req.url.indexOf('streets') > -1 && req.url.endsWith('pbf')) { - callback(null, { data: tile_vector }); - } else { - t.fail('unhandled file request: ' + req.url); - } + callback(null, { data: mockfs.dataForRequest(req) }); }, ratio: testParams.ratio, }; @@ -75,9 +42,9 @@ test('Memory', function(t) { var map = mapPool.shift(); if (Math.floor(Math.random() * 2)) { - map.load(style_raster); + map.load(mockfs.style_raster); } else { - map.load(style_vector); + map.load(mockfs.style_vector); } map.render({ zoom: 16 }, function(err, pixels) { diff --git a/platform/node/test/mockfs.js b/platform/node/test/mockfs.js new file mode 100644 index 0000000000..dfa5a425e3 --- /dev/null +++ b/platform/node/test/mockfs.js @@ -0,0 +1,53 @@ +"use strict"; + +var fs = require('fs'); +var path = require('path'); + +function readFixture(file) { + return fs.readFileSync(path.join('test/fixtures/resources', file)); +}; + +var style_raster = readFixture('style_raster.json').toString('utf8'); +var style_vector = readFixture('style_vector.json').toString('utf8'); +var sprite_json = readFixture('sprite.json'); +var sprite_png = readFixture('sprite.png'); +var glyph = readFixture('glyphs.pbf'); +var source_raster = readFixture('source_raster.json'); +var source_vector = readFixture('source_vector.json'); +var tile_raster = readFixture('raster.tile'); +var tile_vector = readFixture('vector.tile'); + +function dataForRequest(req) { + if (req.url == null) { + return null; + } else if (req.url.indexOf('sprite') > -1 && req.url.endsWith('json')) { + return sprite_json; + } else if (req.url.indexOf('sprite') > -1 && req.url.endsWith('png')) { + return sprite_png; + } else if (req.url.indexOf('fonts') > -1 && req.url.endsWith('pbf')) { + return glyph; + } else if (req.url.endsWith('mapbox.satellite')) { + return source_raster; + } else if (req.url.indexOf('satellite') > -1 && (req.url.endsWith('png') || req.url.endsWith('webp'))) { + return tile_raster; + } else if (req.url.endsWith('mapbox.mapbox-streets-v7')) { + return source_vector; + } else if (req.url.indexOf('streets') > -1 && req.url.endsWith('pbf')) { + return tile_vector; + } else { + return null; + } +}; + +module.exports = { + dataForRequest: dataForRequest, + style_raster: style_raster, + style_vector: style_vector, + sprite_json: sprite_json, + sprite_png: sprite_png, + glyph: glyph, + source_raster: source_raster, + source_vector: source_vector, + tile_raster: tile_raster, + tile_vector: tile_vector +}; diff --git a/platform/qt/bitrise-qt4.yml b/platform/qt/bitrise-qt4.yml index 8b327d0974..0a08d684fc 100644 --- a/platform/qt/bitrise-qt4.yml +++ b/platform/qt/bitrise-qt4.yml @@ -9,22 +9,7 @@ workflows: primary: steps: - script: - title: Check for skipping CI - inputs: - - content: |- - #!/bin/bash - - if [[ -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_SUBJECT | sed -n '/\[skip ci\]/p')" || - -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_SUBJECT | sed -n '/\[ci skip\]/p')" || - -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_BODY | sed -n 's/\[skip ci\]/p')" || - -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_BODY | sed -n 's/\[ci skip\]/p')" ]]; then - envman add --key SKIPCI --value true - else - envman add --key SKIPCI --value false - fi - - script: title: Run build - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - content: |- #!/bin/bash @@ -40,7 +25,6 @@ workflows: - is_debug: 'yes' - slack: title: Post to Slack - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - webhook_url: "$SLACK_HOOK_URL" - channel: "#gl-bots" diff --git a/platform/qt/bitrise-qt5.yml b/platform/qt/bitrise-qt5.yml index 036ec044c5..4438b50a8f 100644 --- a/platform/qt/bitrise-qt5.yml +++ b/platform/qt/bitrise-qt5.yml @@ -9,22 +9,7 @@ workflows: primary: steps: - script: - title: Check for skipping CI - inputs: - - content: |- - #!/bin/bash - - if [[ -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_SUBJECT | sed -n '/\[skip ci\]/p')" || - -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_SUBJECT | sed -n '/\[ci skip\]/p')" || - -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_BODY | sed -n 's/\[skip ci\]/p')" || - -n "$(echo $GIT_CLONE_COMMIT_MESSAGE_BODY | sed -n 's/\[ci skip\]/p')" ]]; then - envman add --key SKIPCI --value true - else - envman add --key SKIPCI --value false - fi - - script: title: Run build - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - content: |- #!/bin/bash @@ -43,14 +28,12 @@ workflows: - is_debug: 'yes' - deploy-to-bitrise-io: title: Deploy to Bitrise.io - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - deploy_path: "test/fixtures" - notify_user_groups: none - is_compress: 'true' - slack: title: Post to Slack - run_if: '{{enveq "SKIPCI" "false"}}' inputs: - webhook_url: "$SLACK_HOOK_URL" - channel: "#gl-bots" diff --git a/platform/qt/include/qmapboxgl.hpp b/platform/qt/include/qmapboxgl.hpp index af7ed6275f..117fce515c 100644 --- a/platform/qt/include/qmapboxgl.hpp +++ b/platform/qt/include/qmapboxgl.hpp @@ -94,7 +94,6 @@ class Q_DECL_EXPORT QMapboxGL : public QObject Q_PROPERTY(QMargins margins READ margins WRITE setMargins) public: - // Reflects mbgl::MapChange. enum MapChange { MapChangeRegionWillChange = 0, MapChangeRegionWillChangeAnimated, diff --git a/platform/qt/src/qmapbox.cpp b/platform/qt/src/qmapbox.cpp index 62bfde4fa8..126ece1efa 100644 --- a/platform/qt/src/qmapbox.cpp +++ b/platform/qt/src/qmapbox.cpp @@ -1,7 +1,6 @@ #include "qmapbox.hpp" #include <mbgl/gl/extension.hpp> -#include <mbgl/map/change.hpp> #include <mbgl/storage/network_status.hpp> #include <mbgl/util/default_styles.hpp> #include <mbgl/util/geometry.hpp> diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index 55470a65e1..ab727a62e7 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -57,24 +57,6 @@ static_assert(mbgl::underlying_type(QMapboxGLSettings::ConstrainWidthAndHeight) static_assert(mbgl::underlying_type(QMapboxGLSettings::DefaultViewport) == mbgl::underlying_type(mbgl::ViewportMode::Default), "error"); static_assert(mbgl::underlying_type(QMapboxGLSettings::FlippedYViewport) == mbgl::underlying_type(mbgl::ViewportMode::FlippedY), "error"); -// mbgl::MapChange -static_assert(mbgl::underlying_type(QMapboxGL::MapChangeRegionWillChange) == mbgl::underlying_type(mbgl::MapChangeRegionWillChange), "error"); -static_assert(mbgl::underlying_type(QMapboxGL::MapChangeRegionWillChangeAnimated) == mbgl::underlying_type(mbgl::MapChangeRegionWillChangeAnimated), "error"); -static_assert(mbgl::underlying_type(QMapboxGL::MapChangeRegionIsChanging) == mbgl::underlying_type(mbgl::MapChangeRegionIsChanging), "error"); -static_assert(mbgl::underlying_type(QMapboxGL::MapChangeRegionDidChange) == mbgl::underlying_type(mbgl::MapChangeRegionDidChange), "error"); -static_assert(mbgl::underlying_type(QMapboxGL::MapChangeRegionDidChangeAnimated) == mbgl::underlying_type(mbgl::MapChangeRegionDidChangeAnimated), "error"); -static_assert(mbgl::underlying_type(QMapboxGL::MapChangeWillStartLoadingMap) == mbgl::underlying_type(mbgl::MapChangeWillStartLoadingMap), "error"); -static_assert(mbgl::underlying_type(QMapboxGL::MapChangeDidFinishLoadingMap) == mbgl::underlying_type(mbgl::MapChangeDidFinishLoadingMap), "error"); -static_assert(mbgl::underlying_type(QMapboxGL::MapChangeDidFailLoadingMap) == mbgl::underlying_type(mbgl::MapChangeDidFailLoadingMap), "error"); -static_assert(mbgl::underlying_type(QMapboxGL::MapChangeWillStartRenderingFrame) == mbgl::underlying_type(mbgl::MapChangeWillStartRenderingFrame), "error"); -static_assert(mbgl::underlying_type(QMapboxGL::MapChangeDidFinishRenderingFrame) == mbgl::underlying_type(mbgl::MapChangeDidFinishRenderingFrame), "error"); -static_assert(mbgl::underlying_type(QMapboxGL::MapChangeDidFinishRenderingFrameFullyRendered) == mbgl::underlying_type(mbgl::MapChangeDidFinishRenderingFrameFullyRendered), "error"); -static_assert(mbgl::underlying_type(QMapboxGL::MapChangeWillStartRenderingMap) == mbgl::underlying_type(mbgl::MapChangeWillStartRenderingMap), "error"); -static_assert(mbgl::underlying_type(QMapboxGL::MapChangeDidFinishRenderingMap) == mbgl::underlying_type(mbgl::MapChangeDidFinishRenderingMap), "error"); -static_assert(mbgl::underlying_type(QMapboxGL::MapChangeDidFinishRenderingMapFullyRendered) == mbgl::underlying_type(mbgl::MapChangeDidFinishRenderingMapFullyRendered), "error"); -static_assert(mbgl::underlying_type(QMapboxGL::MapChangeDidFinishLoadingStyle) == mbgl::underlying_type(mbgl::MapChangeDidFinishLoadingStyle), "error"); -static_assert(mbgl::underlying_type(QMapboxGL::MapChangeSourceDidChange) == mbgl::underlying_type(mbgl::MapChangeSourceDidChange), "error"); - // mbgl::NorthOrientation static_assert(mbgl::underlying_type(QMapboxGL::NorthUpwards) == mbgl::underlying_type(mbgl::NorthOrientation::Upwards), "error"); static_assert(mbgl::underlying_type(QMapboxGL::NorthRightwards) == mbgl::underlying_type(mbgl::NorthOrientation::Rightwards), "error"); @@ -1587,19 +1569,87 @@ void QMapboxGLPrivate::invalidate() } } -void QMapboxGLPrivate::notifyMapChange(mbgl::MapChange change) +void QMapboxGLPrivate::onCameraWillChange(mbgl::MapObserver::CameraChangeMode mode) { - if (change == mbgl::MapChangeSourceDidChange) { - std::string attribution; - for (const auto& source : mapObj->getSources()) { - // Avoid duplicates by using the most complete attribution HTML snippet. - if (source->getAttribution() && (attribution.size() < source->getAttribution()->size())) - attribution = *source->getAttribution(); - } - emit copyrightsChanged(QString::fromStdString(attribution)); + if (mode == mbgl::MapObserver::CameraChangeMode::Immediate) { + emit mapChanged(QMapboxGL::MapChangeRegionWillChange); + } else { + emit mapChanged(QMapboxGL::MapChangeRegionWillChangeAnimated); + } +} + +void QMapboxGLPrivate::onCameraIsChanging() +{ + emit mapChanged(QMapboxGL::MapChangeRegionIsChanging); +} + +void QMapboxGLPrivate::onCameraDidChange(mbgl::MapObserver::CameraChangeMode mode) +{ + if (mode == mbgl::MapObserver::CameraChangeMode::Immediate) { + emit mapChanged(QMapboxGL::MapChangeRegionDidChange); + } else { + emit mapChanged(QMapboxGL::MapChangeRegionDidChangeAnimated); + } +} + +void QMapboxGLPrivate::onWillStartLoadingMap() +{ + emit mapChanged(QMapboxGL::MapChangeWillStartLoadingMap); +} + +void QMapboxGLPrivate::onDidFinishLoadingMap() +{ + emit mapChanged(QMapboxGL::MapChangeDidFinishLoadingMap); +} + +void QMapboxGLPrivate::onDidFailLoadingMap(std::exception_ptr) +{ + emit mapChanged(QMapboxGL::MapChangeDidFailLoadingMap); +} + +void QMapboxGLPrivate::onWillStartRenderingFrame() +{ + emit mapChanged(QMapboxGL::MapChangeWillStartRenderingFrame); +} + +void QMapboxGLPrivate::onDidFinishRenderingFrame(mbgl::MapObserver::RenderMode mode) +{ + if (mode == mbgl::MapObserver::RenderMode::Partial) { + emit mapChanged(QMapboxGL::MapChangeDidFinishRenderingFrame); + } else { + emit mapChanged(QMapboxGL::MapChangeDidFinishRenderingFrameFullyRendered); } +} + +void QMapboxGLPrivate::onWillStartRenderingMap() +{ + emit mapChanged(QMapboxGL::MapChangeWillStartLoadingMap); +} - emit mapChanged(static_cast<QMapboxGL::MapChange>(change)); +void QMapboxGLPrivate::onDidFinishRenderingMap(mbgl::MapObserver::RenderMode mode) +{ + if (mode == mbgl::MapObserver::RenderMode::Partial) { + emit mapChanged(QMapboxGL::MapChangeDidFinishRenderingMap); + } else { + emit mapChanged(QMapboxGL::MapChangeDidFinishRenderingMapFullyRendered); + } +} + +void QMapboxGLPrivate::onDidFinishLoadingStyle() +{ + emit mapChanged(QMapboxGL::MapChangeDidFinishLoadingStyle); +} + +void QMapboxGLPrivate::onSourceChanged(mbgl::style::Source&) +{ + std::string attribution; + for (const auto& source : mapObj->getSources()) { + // Avoid duplicates by using the most complete attribution HTML snippet. + if (source->getAttribution() && (attribution.size() < source->getAttribution()->size())) + attribution = *source->getAttribution(); + } + emit copyrightsChanged(QString::fromStdString(attribution)); + emit mapChanged(QMapboxGL::MapChangeSourceDidChange); } void QMapboxGLPrivate::connectionEstablished() diff --git a/platform/qt/src/qmapboxgl_p.hpp b/platform/qt/src/qmapboxgl_p.hpp index ee7bff0872..2d8bfaaf53 100644 --- a/platform/qt/src/qmapboxgl_p.hpp +++ b/platform/qt/src/qmapboxgl_p.hpp @@ -29,7 +29,20 @@ public: void activate() final {} void deactivate() final {} void invalidate() final; - void notifyMapChange(mbgl::MapChange) final; + + // mbgl::Backend (mbgl::MapObserver) implementation. + void onCameraWillChange(mbgl::MapObserver::CameraChangeMode) final; + void onCameraIsChanging() final; + void onCameraDidChange(mbgl::MapObserver::CameraChangeMode) final; + void onWillStartLoadingMap() final; + void onDidFinishLoadingMap() final; + void onDidFailLoadingMap(std::exception_ptr) final; + void onWillStartRenderingFrame() final; + void onDidFinishRenderingFrame(mbgl::MapObserver::RenderMode) final; + void onWillStartRenderingMap() final; + void onDidFinishRenderingMap(mbgl::MapObserver::RenderMode) final; + void onDidFinishLoadingStyle() final; + void onSourceChanged(mbgl::style::Source&) final; mbgl::EdgeInsets margins; QSize size { 0, 0 }; diff --git a/src/clipper/clipper.cpp b/src/clipper/clipper.cpp deleted file mode 100644 index 5f4ac4d481..0000000000 --- a/src/clipper/clipper.cpp +++ /dev/null @@ -1,5687 +0,0 @@ -/*******************************************************************************
-* *
-* Author : Angus Johnson *
-* Version : 6.4.0 *
-* Date : 2 July 2015 *
-* Website : http://www.angusj.com *
-* Copyright : Angus Johnson 2010-2015 *
-* *
-* License: *
-* Use, modification & distribution is subject to Boost Software License Ver 1. *
-* http://www.boost.org/LICENSE_1_0.txt *
-* *
-* Attributions: *
-* The code in this library is an extension of Bala Vatti's clipping algorithm: *
-* "A generic solution to polygon clipping" *
-* Communications of the ACM, Vol 35, Issue 7 (July 1992) pp 56-63. *
-* http://portal.acm.org/citation.cfm?id=129906 *
-* *
-* Computer graphics and geometric modeling: implementation and algorithms *
-* By Max K. Agoston *
-* Springer; 1 edition (January 4, 2005) *
-* http://books.google.com/books?q=vatti+clipping+agoston *
-* *
-* See also: *
-* "Polygon Offsetting by Computing Winding Numbers" *
-* Paper no. DETC2005-85513 pp. 565-575 *
-* ASME 2005 International Design Engineering Technical Conferences *
-* and Computers and Information in Engineering Conference (IDETC/CIE2005) *
-* September 24-28, 2005 , Long Beach, California, USA *
-* http://www.me.berkeley.edu/~mcmains/pubs/DAC05OffsetPolygon.pdf *
-* *
-*******************************************************************************/
-
-/*******************************************************************************
-* *
-* This is a translation of the Delphi Clipper library and the naming style *
-* used has retained a Delphi flavour. *
-* *
-*******************************************************************************/
-
-#include "clipper.hpp"
-#include <cmath>
-#include <vector>
-#include <algorithm>
-#include <stdexcept>
-#include <cstring>
-#include <cstdlib>
-#include <ostream>
-#include <functional>
-#include <sstream>
-
-namespace ClipperLib {
-
-static double const pi = 3.141592653589793238;
-static double const two_pi = pi *2;
-static double const def_arc_tolerance = 0.25;
-
-enum Direction { dRightToLeft, dLeftToRight };
-
-static int const Unassigned = -1; //edge not currently 'owning' a solution
-static int const Skip = -2; //edge that would otherwise close a path
-
-#define HORIZONTAL (-1.0E+40)
-#define TOLERANCE (1.0e-20)
-#define NEAR_ZERO(val) (((val) > -TOLERANCE) && ((val) < TOLERANCE))
-
-struct TEdge {
- IntPoint Bot;
- IntPoint Curr; //current (updated for every new scanbeam)
- IntPoint Top;
- double Dx;
- PolyType PolyTyp;
- EdgeSide Side; //side only refers to current side of solution poly
- int WindDelta; //1 or -1 depending on winding direction
- int WindCnt;
- int WindCnt2; //winding count of the opposite polytype
- int OutIdx;
- TEdge *Next;
- TEdge *Prev;
- TEdge *NextInLML;
- TEdge *NextInAEL;
- TEdge *PrevInAEL;
- TEdge *NextInSEL;
- TEdge *PrevInSEL;
-};
-
-struct IntersectNode {
- TEdge *Edge1;
- TEdge *Edge2;
- IntPoint Pt;
-};
-
-struct LocalMinimum {
- cInt y;
- TEdge *LeftBound;
- TEdge *RightBound;
-};
-
-struct OutPt;
-
-//OutRec: contains a path in the clipping solution. Edges in the AEL will
-//carry a pointer to an OutRec when they are part of the clipping solution.
-struct OutRec {
- int Idx;
- bool IsHole;
- bool IsOpen;
- OutRec *FirstLeft; //see comments in clipper.pas
- PolyNode *PolyNd;
- OutPt *Pts;
- OutPt *BottomPt;
-};
-
-struct OutPt {
- int Idx;
- IntPoint Pt;
- OutPt *Next;
- OutPt *Prev;
-};
-
-struct Join {
- OutPt *OutPt1;
- OutPt *OutPt2;
- IntPoint OffPt;
-};
-
-struct LocMinSorter
-{
- inline bool operator()(const LocalMinimum& locMin1, const LocalMinimum& locMin2)
- {
- return locMin2.y < locMin1.y;
- }
-};
-
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-
-inline cInt Round(double val)
-{
- if ((val < 0)) return static_cast<cInt>(val - 0.5);
- else return static_cast<cInt>(val + 0.5);
-}
-//------------------------------------------------------------------------------
-
-inline cInt Abs(cInt val)
-{
- return val < 0 ? -val : val;
-}
-
-//------------------------------------------------------------------------------
-// PolyTree methods ...
-//------------------------------------------------------------------------------
-
-void PolyTree::Clear()
-{
- for (PolyNodes::size_type i = 0; i < AllNodes.size(); ++i)
- delete AllNodes[i];
- AllNodes.resize(0);
- Childs.resize(0);
-}
-//------------------------------------------------------------------------------
-
-PolyNode* PolyTree::GetFirst() const
-{
- if (!Childs.empty())
- return Childs[0];
- else
- return 0;
-}
-//------------------------------------------------------------------------------
-
-int PolyTree::Total() const
-{
- int result = (int)AllNodes.size();
- //with negative offsets, ignore the hidden outer polygon ...
- if (result > 0 && Childs[0] != AllNodes[0]) result--;
- return result;
-}
-
-//------------------------------------------------------------------------------
-// PolyNode methods ...
-//------------------------------------------------------------------------------
-
-PolyNode::PolyNode(): Childs(), Parent(0), Index(0), m_IsOpen(false)
-{
-}
-//------------------------------------------------------------------------------
-
-int PolyNode::ChildCount() const
-{
- return (int)Childs.size();
-}
-//------------------------------------------------------------------------------
-
-void PolyNode::AddChild(PolyNode& child)
-{
- unsigned cnt = (unsigned)Childs.size();
- Childs.push_back(&child);
- child.Parent = this;
- child.Index = cnt;
-}
-//------------------------------------------------------------------------------
-
-PolyNode* PolyNode::GetNext() const
-{
- if (!Childs.empty())
- return Childs[0];
- else
- return GetNextSiblingUp();
-}
-//------------------------------------------------------------------------------
-
-PolyNode* PolyNode::GetNextSiblingUp() const
-{
- if (!Parent) //protects against PolyTree.GetNextSiblingUp()
- return 0;
- else if (Index == Parent->Childs.size() - 1)
- return Parent->GetNextSiblingUp();
- else
- return Parent->Childs[Index + 1];
-}
-//------------------------------------------------------------------------------
-
-bool PolyNode::IsHole() const
-{
- bool result = true;
- PolyNode* node = Parent;
- while (node)
- {
- result = !result;
- node = node->Parent;
- }
- return result;
-}
-//------------------------------------------------------------------------------
-
-bool PolyNode::IsOpen() const
-{
- return m_IsOpen;
-}
-//------------------------------------------------------------------------------
-
-#ifndef use_int32
-
-//------------------------------------------------------------------------------
-// Int128 class (enables safe math on signed 64bit integers)
-// eg Int128 val1((long64)9223372036854775807); //ie 2^63 -1
-// Int128 val2((long64)9223372036854775807);
-// Int128 val3 = val1 * val2;
-// val3.AsString => "85070591730234615847396907784232501249" (8.5e+37)
-//------------------------------------------------------------------------------
-
-class Int128
-{
- public:
- ulong64 lo;
- long64 hi;
-
- Int128(long64 _lo = 0)
- {
- lo = (ulong64)_lo;
- if (_lo < 0) hi = -1; else hi = 0;
- }
-
-
- Int128(const Int128 &val): lo(val.lo), hi(val.hi){}
-
- Int128(const long64& _hi, const ulong64& _lo): lo(_lo), hi(_hi){}
-
- Int128& operator = (const long64 &val)
- {
- lo = (ulong64)val;
- if (val < 0) hi = -1; else hi = 0;
- return *this;
- }
-
- bool operator == (const Int128 &val) const
- {return (hi == val.hi && lo == val.lo);}
-
- bool operator != (const Int128 &val) const
- { return !(*this == val);}
-
- bool operator > (const Int128 &val) const
- {
- if (hi != val.hi)
- return hi > val.hi;
- else
- return lo > val.lo;
- }
-
- bool operator < (const Int128 &val) const
- {
- if (hi != val.hi)
- return hi < val.hi;
- else
- return lo < val.lo;
- }
-
- bool operator >= (const Int128 &val) const
- { return !(*this < val);}
-
- bool operator <= (const Int128 &val) const
- { return !(*this > val);}
-
- Int128& operator += (const Int128 &rhs)
- {
- hi += rhs.hi;
- lo += rhs.lo;
- if (lo < rhs.lo) hi++;
- return *this;
- }
-
- Int128 operator + (const Int128 &rhs) const
- {
- Int128 result(*this);
- result+= rhs;
- return result;
- }
-
- Int128& operator -= (const Int128 &rhs)
- {
- *this += -rhs;
- return *this;
- }
-
- Int128 operator - (const Int128 &rhs) const
- {
- Int128 result(*this);
- result -= rhs;
- return result;
- }
-
- Int128 operator-() const //unary negation
- {
- if (lo == 0)
- return Int128(-hi, 0);
- else
- return Int128(~hi, ~lo + 1);
- }
-
- operator double() const
- {
- const double shift64 = 18446744073709551616.0; //2^64
- if (hi < 0)
- {
- if (lo == 0) return (double)hi * shift64;
- else return -(double)(~lo + ~hi * shift64);
- }
- else
- return (double)(lo + hi * shift64);
- }
-
-};
-//------------------------------------------------------------------------------
-
-Int128 Int128Mul (long64 lhs, long64 rhs)
-{
- bool negate = (lhs < 0) != (rhs < 0);
-
- if (lhs < 0) lhs = -lhs;
- ulong64 int1Hi = ulong64(lhs) >> 32;
- ulong64 int1Lo = ulong64(lhs & 0xFFFFFFFF);
-
- if (rhs < 0) rhs = -rhs;
- ulong64 int2Hi = ulong64(rhs) >> 32;
- ulong64 int2Lo = ulong64(rhs & 0xFFFFFFFF);
-
- //nb: see comments in clipper.pas
- ulong64 a = int1Hi * int2Hi;
- ulong64 b = int1Lo * int2Lo;
- ulong64 c = int1Hi * int2Lo + int1Lo * int2Hi;
-
- Int128 tmp;
- tmp.hi = long64(a + (c >> 32));
- tmp.lo = long64(c << 32);
- tmp.lo += long64(b);
- if (tmp.lo < b) tmp.hi++;
- if (negate) tmp = -tmp;
- return tmp;
-};
-#endif
-
-//------------------------------------------------------------------------------
-// Miscellaneous global functions
-//------------------------------------------------------------------------------
-
-bool Orientation(const Path &poly)
-{
- return Area(poly) >= 0;
-}
-//------------------------------------------------------------------------------
-
-double Area(const Path &poly)
-{
- int size = (int)poly.size();
- if (size < 3) return 0;
-
- double a = 0;
- for (int i = 0, j = size -1; i < size; ++i)
- {
- a += ((double)poly[j].x + poly[i].x) * ((double)poly[j].y - poly[i].y);
- j = i;
- }
- return -a * 0.5;
-}
-//------------------------------------------------------------------------------
-
-double Area(const OutPt *op)
-{
- const OutPt *startOp = op;
- if (!op) return 0;
- double a = 0;
- do {
- a += (double)(op->Prev->Pt.x + op->Pt.x) * (double)(op->Prev->Pt.y - op->Pt.y);
- op = op->Next;
- } while (op != startOp);
- return a * 0.5;
-}
-//------------------------------------------------------------------------------
-
-double Area(const OutRec &outRec)
-{
- return Area(outRec.Pts);
-}
-//------------------------------------------------------------------------------
-
-bool PointIsVertex(const IntPoint &Pt, OutPt *pp)
-{
- OutPt *pp2 = pp;
- do
- {
- if (pp2->Pt == Pt) return true;
- pp2 = pp2->Next;
- }
- while (pp2 != pp);
- return false;
-}
-//------------------------------------------------------------------------------
-
-//See "The Point in Polygon Problem for Arbitrary Polygons" by Hormann & Agathos
-//http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.88.5498&rep=rep1&type=pdf
-int PointInPolygon(const IntPoint &pt, const Path &path)
-{
- //returns 0 if false, +1 if true, -1 if pt ON polygon boundary
- int result = 0;
- size_t cnt = path.size();
- if (cnt < 3) return 0;
- IntPoint ip = path[0];
- for(size_t i = 1; i <= cnt; ++i)
- {
- IntPoint ipNext = (i == cnt ? path[0] : path[i]);
- if (ipNext.y == pt.y)
- {
- if ((ipNext.x == pt.x) || (ip.y == pt.y &&
- ((ipNext.x > pt.x) == (ip.x < pt.x)))) return -1;
- }
- if ((ip.y < pt.y) != (ipNext.y < pt.y))
- {
- if (ip.x >= pt.x)
- {
- if (ipNext.x > pt.x) result = 1 - result;
- else
- {
- double d = (double)(ip.x - pt.x) * (ipNext.y - pt.y) -
- (double)(ipNext.x - pt.x) * (ip.y - pt.y);
- if (!d) return -1;
- if ((d > 0) == (ipNext.y > ip.y)) result = 1 - result;
- }
- } else
- {
- if (ipNext.x > pt.x)
- {
- double d = (double)(ip.x - pt.x) * (ipNext.y - pt.y) -
- (double)(ipNext.x - pt.x) * (ip.y - pt.y);
- if (!d) return -1;
- if ((d > 0) == (ipNext.y > ip.y)) result = 1 - result;
- }
- }
- }
- ip = ipNext;
- }
- return result;
-}
-//------------------------------------------------------------------------------
-
-int PointInPolygon (const IntPoint &pt, OutPt *op)
-{
- //returns 0 if false, +1 if true, -1 if pt ON polygon boundary
- int result = 0;
- OutPt* startOp = op;
- for(;;)
- {
- if (op->Next->Pt.y == pt.y)
- {
- if ((op->Next->Pt.x == pt.x) || (op->Pt.y == pt.y &&
- ((op->Next->Pt.x > pt.x) == (op->Pt.x < pt.x)))) return -1;
- }
- if ((op->Pt.y < pt.y) != (op->Next->Pt.y < pt.y))
- {
- if (op->Pt.x >= pt.x)
- {
- if (op->Next->Pt.x > pt.x) result = 1 - result;
- else
- {
- double d = (double)(op->Pt.x - pt.x) * (op->Next->Pt.y - pt.y) -
- (double)(op->Next->Pt.x - pt.x) * (op->Pt.y - pt.y);
- if (!d) return -1;
- if ((d > 0) == (op->Next->Pt.y > op->Pt.y)) result = 1 - result;
- }
- } else
- {
- if (op->Next->Pt.x > pt.x)
- {
- double d = (double)(op->Pt.x - pt.x) * (op->Next->Pt.y - pt.y) -
- (double)(op->Next->Pt.x - pt.x) * (op->Pt.y - pt.y);
- if (!d) return -1;
- if ((d > 0) == (op->Next->Pt.y > op->Pt.y)) result = 1 - result;
- }
- }
- }
- op = op->Next;
- if (startOp == op) break;
- }
- return result;
-}
-//------------------------------------------------------------------------------
-
-bool Poly2ContainsPoly1(OutPt *OutPt1, OutPt *OutPt2)
-{
- OutPt* op = OutPt1;
- do
- {
- //nb: PointInPolygon returns 0 if false, +1 if true, -1 if pt on polygon
- int res = PointInPolygon(op->Pt, OutPt2);
- if (res >= 0) return res > 0;
- op = op->Next;
- }
- while (op != OutPt1);
- return true;
-}
-//----------------------------------------------------------------------
-
-bool SlopesEqual(const TEdge &e1, const TEdge &e2, bool UseFullInt64Range)
-{
-#ifndef use_int32
- if (UseFullInt64Range)
- return Int128Mul(e1.Top.y - e1.Bot.y, e2.Top.x - e2.Bot.x) ==
- Int128Mul(e1.Top.x - e1.Bot.x, e2.Top.y - e2.Bot.y);
- else
-#endif
- return (e1.Top.y - e1.Bot.y) * (e2.Top.x - e2.Bot.x) ==
- (e1.Top.x - e1.Bot.x) * (e2.Top.y - e2.Bot.y);
-}
-//------------------------------------------------------------------------------
-
-bool SlopesEqual(const IntPoint pt1, const IntPoint pt2,
- const IntPoint pt3, bool UseFullInt64Range)
-{
-#ifndef use_int32
- if (UseFullInt64Range)
- return Int128Mul(pt1.y-pt2.y, pt2.x-pt3.x) == Int128Mul(pt1.x-pt2.x, pt2.y-pt3.y);
- else
-#endif
- return (pt1.y-pt2.y)*(pt2.x-pt3.x) == (pt1.x-pt2.x)*(pt2.y-pt3.y);
-}
-//------------------------------------------------------------------------------
-
-bool SlopesEqual(const IntPoint pt1, const IntPoint pt2,
- const IntPoint pt3, const IntPoint pt4, bool UseFullInt64Range)
-{
-#ifndef use_int32
- if (UseFullInt64Range)
- return Int128Mul(pt1.y-pt2.y, pt3.x-pt4.x) == Int128Mul(pt1.x-pt2.x, pt3.y-pt4.y);
- else
-#endif
- return (pt1.y-pt2.y)*(pt3.x-pt4.x) == (pt1.x-pt2.x)*(pt3.y-pt4.y);
-}
-//------------------------------------------------------------------------------
-
-inline bool IsHorizontal(TEdge &e)
-{
- return e.Dx == HORIZONTAL;
-}
-//------------------------------------------------------------------------------
-
-inline double GetDx(const IntPoint pt1, const IntPoint pt2)
-{
- return (pt1.y == pt2.y) ?
- HORIZONTAL : (double)(pt2.x - pt1.x) / (pt2.y - pt1.y);
-}
-//---------------------------------------------------------------------------
-
-inline void SetDx(TEdge &e)
-{
- cInt dy = (e.Top.y - e.Bot.y);
- if (dy == 0) e.Dx = HORIZONTAL;
- else e.Dx = (double)(e.Top.x - e.Bot.x) / dy;
-}
-//---------------------------------------------------------------------------
-
-inline void SwapSides(TEdge &Edge1, TEdge &Edge2)
-{
- EdgeSide Side = Edge1.Side;
- Edge1.Side = Edge2.Side;
- Edge2.Side = Side;
-}
-//------------------------------------------------------------------------------
-
-inline void SwapPolyIndexes(TEdge &Edge1, TEdge &Edge2)
-{
- int OutIdx = Edge1.OutIdx;
- Edge1.OutIdx = Edge2.OutIdx;
- Edge2.OutIdx = OutIdx;
-}
-//------------------------------------------------------------------------------
-
-inline cInt TopX(TEdge &edge, const cInt currentY)
-{
- return ( currentY == edge.Top.y ) ?
- edge.Top.x : edge.Bot.x + Round(edge.Dx *(currentY - edge.Bot.y));
-}
-//------------------------------------------------------------------------------
-
-void IntersectPoint(TEdge &Edge1, TEdge &Edge2, IntPoint &ip)
-{
-#ifdef use_xyz
- ip.Z = 0;
-#endif
-
- double b1, b2;
- if (Edge1.Dx == Edge2.Dx)
- {
- ip.y = Edge1.Curr.y;
- ip.x = TopX(Edge1, ip.y);
- return;
- }
- else if (Edge1.Dx == 0.0)
- {
- ip.x = Edge1.Bot.x;
- if (IsHorizontal(Edge2))
- ip.y = Edge2.Bot.y;
- else
- {
- b2 = Edge2.Bot.y - (Edge2.Bot.x / Edge2.Dx);
- if (Edge2.Bot.x == Edge1.Bot.x) ip.y = Round(ip.x / Edge2.Dx + b2);
- else if (Edge2.Bot.x < Edge1.Bot.x) ip.y = Round((ip.x - 0.5) / Edge2.Dx + b2);
- else ip.y = Round((ip.x + 0.5) / Edge2.Dx + b2);
- }
- }
- else if (Edge2.Dx == 0.0)
- {
- ip.x = Edge2.Bot.x;
- if (IsHorizontal(Edge1))
- ip.y = Edge1.Bot.y;
- else
- {
- b1 = Edge1.Bot.y - (Edge1.Bot.x / Edge1.Dx);
- if (Edge1.Bot.x == Edge2.Bot.x) ip.y = Round(ip.x / Edge1.Dx + b1);
- else if (Edge1.Bot.x < Edge2.Bot.x) ip.y = Round((ip.x - 0.5) / Edge1.Dx + b1);
- else ip.y = Round((ip.x + 0.5) / Edge1.Dx + b1);
- }
- }
- else
- {
- b1 = Edge1.Bot.x - Edge1.Bot.y * Edge1.Dx;
- b2 = Edge2.Bot.x - Edge2.Bot.y * Edge2.Dx;
- double q = (b2-b1) / (Edge1.Dx - Edge2.Dx);
- ip.y = Round(q);
- if (std::fabs(Edge1.Dx) < std::fabs(Edge2.Dx))
- ip.x = Round(Edge1.Dx * q + b1);
- else
- ip.x = Round(Edge2.Dx * q + b2);
- // the idea is simply to looking closer
- // towards the origins of the lines (Edge1.Bot and Edge2.Bot)
- // until we do not find pixels that both lines travel through
- bool keep_searching = false;
- double by1 = Edge1.Bot.y - (Edge1.Bot.x / Edge1.Dx);
- double by2 = Edge2.Bot.y - (Edge2.Bot.x / Edge2.Dx);
- double bx1 = Edge1.Bot.x - (Edge1.Bot.y * Edge1.Dx);
- double bx2 = Edge2.Bot.x - (Edge2.Bot.y * Edge2.Dx);
- do
- {
- keep_searching = false;
- cInt y1 = ip.y;
- cInt y2 = ip.y;
- if (Edge1.Bot.x > ip.x)
- {
- if (Edge1.Bot.y >= ip.y)
- {
- y1 = std::floor(((ip.x + 0.5) / Edge1.Dx + by1) + 0.5);
- }
- else
- {
- y1 = std::ceil(((ip.x + 0.5) / Edge1.Dx + by1) - 0.5);
- }
- }
- else if (Edge1.Bot.x < ip.x)
- {
- if (Edge1.Bot.y >= ip.y)
- {
- y1 = std::floor(((ip.x - 0.5) / Edge1.Dx + by1) + 0.5);
- }
- else
- {
- y1 = std::ceil(((ip.x - 0.5) / Edge1.Dx + by1) - 0.5);
- }
- }
- else if (Edge1.Bot.y > ip.y)
- {
- if (Edge2.Bot.y >= Edge1.Bot.y)
- {
- y1 = Edge1.Bot.y;
- }
- else
- {
- y1 = Edge2.Bot.y;
- }
- }
- else if (Edge1.Bot.y < ip.y)
- {
- if (Edge2.Bot.y <= Edge1.Bot.y)
- {
- y1 = Edge1.Bot.y;
- }
- else
- {
- y1 = Edge2.Bot.y;
- }
- }
- if (ip.y >= Edge1.Bot.y && y1 < Edge1.Bot.y) y1 = Edge1.Bot.y;
- else if (ip.y <= Edge1.Bot.y && y1 > Edge1.Bot.y) y1 = Edge1.Bot.y;
- if (Edge2.Bot.x > ip.x)
- {
- if (Edge2.Bot.y >= ip.y)
- {
- y2 = std::floor(((ip.x + 0.5) / Edge2.Dx + by2) + 0.5);
- }
- else
- {
- y2 = std::ceil(((ip.x + 0.5) / Edge2.Dx + by2) - 0.5);
- }
- }
- else if (Edge2.Bot.x < ip.x)
- {
- if (Edge2.Bot.y >= ip.y)
- {
- y2 = std::floor(((ip.x - 0.5) / Edge2.Dx + by2) + 0.5);
- }
- else
- {
- y2 = std::ceil(((ip.x - 0.5) / Edge2.Dx + by2) - 0.5);
- }
- }
- else if (Edge2.Bot.y > ip.y)
- {
- if (Edge1.Bot.y >= Edge2.Bot.y)
- {
- y2 = Edge2.Bot.y;
- }
- else
- {
- y2 = Edge1.Bot.y;
- }
- }
- else if (Edge2.Bot.y < ip.y)
- {
- if (Edge1.Bot.y <= Edge2.Bot.y)
- {
- y2 = Edge2.Bot.y;
- }
- else
- {
- y2 = Edge1.Bot.y;
- }
- }
- if (ip.y >= Edge2.Bot.y && y2 < Edge2.Bot.y) y2 = Edge2.Bot.y;
- else if (ip.y <= Edge2.Bot.y && y2 > Edge2.Bot.y) y2 = Edge2.Bot.y;
- cInt x1 = ip.x;
- cInt x2 = ip.x;
- if (Edge1.Bot.y > ip.y)
- {
- if (Edge1.Bot.x >= ip.x)
- {
- x1 = std::floor(((ip.y + 0.5) * Edge1.Dx + bx1) + 0.5);
- }
- else
- {
- x1 = std::ceil(((ip.y + 0.5) * Edge1.Dx + bx1) - 0.5);
- }
- }
- else if (Edge1.Bot.y < ip.y)
- {
- if (Edge1.Bot.x >= ip.x)
- {
- x1 = std::floor(((ip.y - 0.5) * Edge1.Dx + bx1) + 0.5);
- }
- else
- {
- x1 = std::ceil(((ip.y - 0.5) * Edge1.Dx + bx1) - 0.5);
- }
- }
- else if (Edge1.Bot.x > ip.x)
- {
- if (Edge2.Bot.x >= Edge1.Bot.x)
- {
- x1 = Edge1.Bot.x;
- }
- else
- {
- x1 = Edge2.Bot.x;
- }
- }
- else if (Edge1.Bot.x < ip.x)
- {
- if (Edge2.Bot.x <= Edge1.Bot.x)
- {
- x1 = Edge1.Bot.x;
- }
- else
- {
- x1 = Edge2.Bot.x;
- }
- }
- if (ip.x >= Edge1.Bot.x && x1 < Edge1.Bot.x) x1 = Edge1.Bot.x;
- else if (ip.x <= Edge1.Bot.x && x1 > Edge1.Bot.x) x1 = Edge1.Bot.x;
- if (Edge2.Bot.y > ip.y)
- {
- if (Edge2.Bot.x >= ip.x)
- {
- x2 = std::floor(((ip.y + 0.5) * Edge2.Dx + bx2) + 0.5);
- }
- else
- {
- x2 = std::ceil(((ip.y + 0.5) * Edge2.Dx + bx2) - 0.5);
- }
- }
- else if (Edge2.Bot.y < ip.y)
- {
- if (Edge2.Bot.x >= ip.x)
- {
- x2 = std::floor(((ip.y - 0.5) * Edge2.Dx + bx2) + 0.5);
- }
- else
- {
- x2 = std::ceil(((ip.y - 0.5) * Edge2.Dx + bx2) - 0.5);
- }
- }
- else if (Edge2.Bot.x > ip.x)
- {
- if (Edge1.Bot.x >= Edge2.Bot.x)
- {
- x2 = Edge2.Bot.x;
- }
- else
- {
- x2 = Edge1.Bot.x;
- }
- }
- else if (Edge2.Bot.x < ip.x)
- {
- if (Edge1.Bot.x <= Edge2.Bot.x)
- {
- x2 = Edge2.Bot.x;
- }
- else
- {
- x2 = Edge1.Bot.x;
- }
- }
- if (ip.x >= Edge2.Bot.x && x2 < Edge2.Bot.x) x2 = Edge2.Bot.x;
- else if (ip.x <= Edge2.Bot.x && x2 > Edge2.Bot.x) x2 = Edge2.Bot.x;
- if (y1 > ip.y && y2 > ip.y)
- {
- ip.y = std::min(y1,y2);
- keep_searching = true;
- }
- else if (y1 < ip.y && y2 < ip.y)
- {
- ip.y = std::max(y1,y2);
- keep_searching = true;
- }
- if (x1 > ip.x && x2 > ip.x)
- {
- ip.x = std::min(x1,x2);
- keep_searching = true;
- }
- else if (x1 < ip.x && x2 < ip.x)
- {
- ip.x = std::max(x1,x2);
- keep_searching = true;
- }
- }
- while (keep_searching);
- }
-
- if (ip.y < Edge1.Top.y || ip.y < Edge2.Top.y)
- {
- if (Edge1.Top.y > Edge2.Top.y)
- ip.y = Edge1.Top.y;
- else
- ip.y = Edge2.Top.y;
- if (std::fabs(Edge1.Dx) < std::fabs(Edge2.Dx))
- ip.x = TopX(Edge1, ip.y);
- else
- ip.x = TopX(Edge2, ip.y);
- }
- //finally, don't allow 'ip' to be BELOW curr.y (ie bottom of scanbeam) ...
- if (ip.y > Edge1.Curr.y)
- {
- ip.y = Edge1.Curr.y;
- //use the more vertical edge to derive X ...
- if (std::fabs(Edge1.Dx) > std::fabs(Edge2.Dx))
- ip.x = TopX(Edge2, ip.y); else
- ip.x = TopX(Edge1, ip.y);
- }
-}
-//------------------------------------------------------------------------------
-
-void ReversePolyPtLinks(OutPt *pp)
-{
- if (!pp) return;
- OutPt *pp1, *pp2;
- pp1 = pp;
- do {
- pp2 = pp1->Next;
- pp1->Next = pp1->Prev;
- pp1->Prev = pp2;
- pp1 = pp2;
- } while( pp1 != pp );
-}
-//------------------------------------------------------------------------------
-
-void DisposeOutPts(OutPt*& pp)
-{
- if (pp == 0) return;
- pp->Prev->Next = 0;
- while( pp )
- {
- OutPt *tmpPp = pp;
- pp = pp->Next;
- delete tmpPp;
- }
-}
-//------------------------------------------------------------------------------
-
-inline void InitEdge(TEdge* e, TEdge* eNext, TEdge* ePrev, const IntPoint& Pt)
-{
- std::memset(e, 0, sizeof(TEdge));
- e->Next = eNext;
- e->Prev = ePrev;
- e->Curr = Pt;
- e->OutIdx = Unassigned;
-}
-//------------------------------------------------------------------------------
-
-void InitEdge2(TEdge& e, PolyType Pt)
-{
- if (e.Curr.y >= e.Next->Curr.y)
- {
- e.Bot = e.Curr;
- e.Top = e.Next->Curr;
- } else
- {
- e.Top = e.Curr;
- e.Bot = e.Next->Curr;
- }
- SetDx(e);
- e.PolyTyp = Pt;
-}
-//------------------------------------------------------------------------------
-
-TEdge* RemoveEdge(TEdge* e)
-{
- //removes e from double_linked_list (but without removing from memory)
- e->Prev->Next = e->Next;
- e->Next->Prev = e->Prev;
- TEdge* result = e->Next;
- e->Prev = 0; //flag as removed (see ClipperBase.Clear)
- return result;
-}
-//------------------------------------------------------------------------------
-
-inline void ReverseHorizontal(TEdge &e)
-{
- //swap horizontal edges' Top and Bottom x's so they follow the natural
- //progression of the bounds - ie so their xbots will align with the
- //adjoining lower edge. [Helpful in the ProcessHorizontal() method.]
- std::swap(e.Top.x, e.Bot.x);
-#ifdef use_xyz
- std::swap(e.Top.Z, e.Bot.Z);
-#endif
-}
-//------------------------------------------------------------------------------
-
-void SwapPoints(IntPoint &pt1, IntPoint &pt2)
-{
- IntPoint tmp = pt1;
- pt1 = pt2;
- pt2 = tmp;
-}
-//------------------------------------------------------------------------------
-
-bool GetOverlapSegment(IntPoint pt1a, IntPoint pt1b, IntPoint pt2a,
- IntPoint pt2b, IntPoint &pt1, IntPoint &pt2)
-{
- //precondition: segments are Collinear.
- if (Abs(pt1a.x - pt1b.x) > Abs(pt1a.y - pt1b.y))
- {
- if (pt1a.x > pt1b.x) SwapPoints(pt1a, pt1b);
- if (pt2a.x > pt2b.x) SwapPoints(pt2a, pt2b);
- if (pt1a.x > pt2a.x) pt1 = pt1a; else pt1 = pt2a;
- if (pt1b.x < pt2b.x) pt2 = pt1b; else pt2 = pt2b;
- return pt1.x < pt2.x;
- } else
- {
- if (pt1a.y < pt1b.y) SwapPoints(pt1a, pt1b);
- if (pt2a.y < pt2b.y) SwapPoints(pt2a, pt2b);
- if (pt1a.y < pt2a.y) pt1 = pt1a; else pt1 = pt2a;
- if (pt1b.y > pt2b.y) pt2 = pt1b; else pt2 = pt2b;
- return pt1.y > pt2.y;
- }
-}
-//------------------------------------------------------------------------------
-
-bool FirstIsBottomPt(const OutPt* btmPt1, const OutPt* btmPt2)
-{
- OutPt *p = btmPt1->Prev;
- while ((p->Pt == btmPt1->Pt) && (p != btmPt1)) p = p->Prev;
- double dx1p = std::fabs(GetDx(btmPt1->Pt, p->Pt));
- p = btmPt1->Next;
- while ((p->Pt == btmPt1->Pt) && (p != btmPt1)) p = p->Next;
- double dx1n = std::fabs(GetDx(btmPt1->Pt, p->Pt));
-
- p = btmPt2->Prev;
- while ((p->Pt == btmPt2->Pt) && (p != btmPt2)) p = p->Prev;
- double dx2p = std::fabs(GetDx(btmPt2->Pt, p->Pt));
- p = btmPt2->Next;
- while ((p->Pt == btmPt2->Pt) && (p != btmPt2)) p = p->Next;
- double dx2n = std::fabs(GetDx(btmPt2->Pt, p->Pt));
-
- if (std::max(dx1p, dx1n) == std::max(dx2p, dx2n) &&
- std::min(dx1p, dx1n) == std::min(dx2p, dx2n))
- return Area(btmPt1) > 0; //if otherwise identical use orientation
- else
- return (dx1p >= dx2p && dx1p >= dx2n) || (dx1n >= dx2p && dx1n >= dx2n);
-}
-//------------------------------------------------------------------------------
-
-OutPt* GetBottomPt(OutPt *pp)
-{
- OutPt* dups = 0;
- OutPt* p = pp->Next;
- while (p != pp)
- {
- if (p->Pt.y > pp->Pt.y)
- {
- pp = p;
- dups = 0;
- }
- else if (p->Pt.y == pp->Pt.y && p->Pt.x <= pp->Pt.x)
- {
- if (p->Pt.x < pp->Pt.x)
- {
- dups = 0;
- pp = p;
- } else
- {
- if (p->Next != pp && p->Prev != pp) dups = p;
- }
- }
- p = p->Next;
- }
- if (dups)
- {
- //there appears to be at least 2 vertices at BottomPt so ...
- while (dups != p)
- {
- if (!FirstIsBottomPt(p, dups)) pp = dups;
- dups = dups->Next;
- while (dups->Pt != pp->Pt) dups = dups->Next;
- }
- }
- return pp;
-}
-//------------------------------------------------------------------------------
-
-bool Pt2IsBetweenPt1AndPt3(const IntPoint pt1,
- const IntPoint pt2, const IntPoint pt3)
-{
- if ((pt1 == pt3) || (pt1 == pt2) || (pt3 == pt2))
- return false;
- else if (pt1.x != pt3.x)
- return (pt2.x > pt1.x) == (pt2.x < pt3.x);
- else
- return (pt2.y > pt1.y) == (pt2.y < pt3.y);
-}
-//------------------------------------------------------------------------------
-
-bool HorzSegmentsOverlap(cInt seg1a, cInt seg1b, cInt seg2a, cInt seg2b)
-{
- if (seg1a > seg1b) std::swap(seg1a, seg1b);
- if (seg2a > seg2b) std::swap(seg2a, seg2b);
- return (seg1a < seg2b) && (seg2a < seg1b);
-}
-
-//------------------------------------------------------------------------------
-// ClipperBase class methods ...
-//------------------------------------------------------------------------------
-
-ClipperBase::ClipperBase() //constructor
-{
- m_CurrentLM = m_MinimaList.begin(); //begin() == end() here
- m_UseFullRange = false;
-}
-//------------------------------------------------------------------------------
-
-ClipperBase::~ClipperBase() //destructor
-{
- Clear();
-}
-//------------------------------------------------------------------------------
-
-void RangeTest(const IntPoint& Pt, bool& useFullRange)
-{
- if (useFullRange)
- {
- if (Pt.x > hiRange || Pt.y > hiRange || -Pt.x > hiRange || -Pt.y > hiRange)
- {
- std::stringstream s;
- s << "Coordinate outside allowed range: ";
- s << std::fixed << Pt.x << " " << Pt.y << " " << -Pt.x << " " << -Pt.y;
- throw clipperException(s.str().c_str());
- }
- }
- else if (Pt.x > loRange|| Pt.y > loRange || -Pt.x > loRange || -Pt.y > loRange)
- {
- useFullRange = true;
- RangeTest(Pt, useFullRange);
- }
-}
-//------------------------------------------------------------------------------
-
-TEdge* FindNextLocMin(TEdge* E)
-{
- for (;;)
- {
- while (E->Bot != E->Prev->Bot || E->Curr == E->Top) E = E->Next;
- if (!IsHorizontal(*E) && !IsHorizontal(*E->Prev)) break;
- while (IsHorizontal(*E->Prev)) E = E->Prev;
- TEdge* E2 = E;
- while (IsHorizontal(*E)) E = E->Next;
- if (E->Top.y == E->Prev->Bot.y) continue; //ie just an intermediate horz.
- if (E2->Prev->Bot.x < E->Bot.x) E = E2;
- break;
- }
- return E;
-}
-//------------------------------------------------------------------------------
-
-TEdge* ClipperBase::ProcessBound(TEdge* E, bool NextIsForward)
-{
- TEdge *Result = E;
- TEdge *Horz = 0;
-
- if (E->OutIdx == Skip)
- {
- //if edges still remain in the current bound beyond the skip edge then
- //create another LocMin and call ProcessBound once more
- if (NextIsForward)
- {
- while (E->Top.y == E->Next->Bot.y) E = E->Next;
- //don't include top horizontals when parsing a bound a second time,
- //they will be contained in the opposite bound ...
- while (E != Result && IsHorizontal(*E)) E = E->Prev;
- }
- else
- {
- while (E->Top.y == E->Prev->Bot.y) E = E->Prev;
- while (E != Result && IsHorizontal(*E)) E = E->Next;
- }
-
- if (E == Result)
- {
- if (NextIsForward) Result = E->Next;
- else Result = E->Prev;
- }
- else
- {
- //there are more edges in the bound beyond result starting with E
- if (NextIsForward)
- E = Result->Next;
- else
- E = Result->Prev;
- MinimaList::value_type locMin;
- locMin.y = E->Bot.y;
- locMin.LeftBound = 0;
- locMin.RightBound = E;
- E->WindDelta = 0;
- Result = ProcessBound(E, NextIsForward);
- m_MinimaList.push_back(locMin);
- }
- return Result;
- }
-
- TEdge *EStart;
-
- if (IsHorizontal(*E))
- {
- //We need to be careful with open paths because this may not be a
- //true local minima (ie E may be following a skip edge).
- //Also, consecutive horz. edges may start heading left before going right.
- if (NextIsForward)
- EStart = E->Prev;
- else
- EStart = E->Next;
- if (IsHorizontal(*EStart)) //ie an adjoining horizontal skip edge
- {
- if (EStart->Bot.x != E->Bot.x && EStart->Top.x != E->Bot.x)
- ReverseHorizontal(*E);
- }
- else if (EStart->Bot.x != E->Bot.x)
- ReverseHorizontal(*E);
- }
-
- EStart = E;
- if (NextIsForward)
- {
- while (Result->Top.y == Result->Next->Bot.y && Result->Next->OutIdx != Skip)
- Result = Result->Next;
- if (IsHorizontal(*Result) && Result->Next->OutIdx != Skip)
- {
- //nb: at the top of a bound, horizontals are added to the bound
- //only when the preceding edge attaches to the horizontal's left vertex
- //unless a Skip edge is encountered when that becomes the top divide
- Horz = Result;
- while (IsHorizontal(*Horz->Prev)) Horz = Horz->Prev;
- if (Horz->Prev->Top.x > Result->Next->Top.x) Result = Horz->Prev;
- }
- while (E != Result)
- {
- E->NextInLML = E->Next;
- if (IsHorizontal(*E) && E != EStart &&
- E->Bot.x != E->Prev->Top.x) ReverseHorizontal(*E);
- E = E->Next;
- }
- if (IsHorizontal(*E) && E != EStart && E->Bot.x != E->Prev->Top.x)
- ReverseHorizontal(*E);
- Result = Result->Next; //move to the edge just beyond current bound
- } else
- {
- while (Result->Top.y == Result->Prev->Bot.y && Result->Prev->OutIdx != Skip)
- Result = Result->Prev;
- if (IsHorizontal(*Result) && Result->Prev->OutIdx != Skip)
- {
- Horz = Result;
- while (IsHorizontal(*Horz->Next)) Horz = Horz->Next;
- if (Horz->Next->Top.x == Result->Prev->Top.x ||
- Horz->Next->Top.x > Result->Prev->Top.x) Result = Horz->Next;
- }
-
- while (E != Result)
- {
- E->NextInLML = E->Prev;
- if (IsHorizontal(*E) && E != EStart && E->Bot.x != E->Next->Top.x)
- ReverseHorizontal(*E);
- E = E->Prev;
- }
- if (IsHorizontal(*E) && E != EStart && E->Bot.x != E->Next->Top.x)
- ReverseHorizontal(*E);
- Result = Result->Prev; //move to the edge just beyond current bound
- }
-
- return Result;
-}
-//------------------------------------------------------------------------------
-
-bool ClipperBase::AddPath(const Path &pg, PolyType PolyTyp, bool Closed)
-{
-#ifdef use_lines
- if (!Closed && PolyTyp == ptClip)
- throw clipperException("AddPath: Open paths must be subject.");
-#else
- if (!Closed)
- throw clipperException("AddPath: Open paths have been disabled.");
-#endif
-
- int highI = (int)pg.size() -1;
- if (Closed) while (highI > 0 && (pg[highI] == pg[0])) --highI;
- while (highI > 0 && (pg[highI] == pg[highI -1])) --highI;
- if ((Closed && highI < 2) || (!Closed && highI < 1)) return false;
-
- //create a new edge array ...
- TEdge *edges = new TEdge [highI +1];
-
- bool IsFlat = true;
- //1. Basic (first) edge initialization ...
- try
- {
- edges[1].Curr = pg[1];
- RangeTest(pg[0], m_UseFullRange);
- RangeTest(pg[highI], m_UseFullRange);
- InitEdge(&edges[0], &edges[1], &edges[highI], pg[0]);
- InitEdge(&edges[highI], &edges[0], &edges[highI-1], pg[highI]);
- for (int i = highI - 1; i >= 1; --i)
- {
- RangeTest(pg[i], m_UseFullRange);
- InitEdge(&edges[i], &edges[i+1], &edges[i-1], pg[i]);
- }
- }
- catch(std::exception const&)
- {
- delete [] edges;
- throw; //range test fails
- }
- TEdge *eStart = &edges[0];
-
- //2. Remove duplicate vertices, and (when closed) collinear edges ...
- TEdge *E = eStart, *eLoopStop = eStart;
- for (;;)
- {
- //nb: allows matching start and end points when not Closed ...
- if (E->Curr == E->Next->Curr && (Closed || E->Next != eStart))
- {
- if (E == E->Next) break;
- if (E == eStart) eStart = E->Next;
- E = RemoveEdge(E);
- eLoopStop = E;
- continue;
- }
- if (E->Prev == E->Next)
- break; //only two vertices
- else if (Closed &&
- SlopesEqual(E->Prev->Curr, E->Curr, E->Next->Curr, m_UseFullRange) &&
- (!m_PreserveCollinear ||
- !Pt2IsBetweenPt1AndPt3(E->Prev->Curr, E->Curr, E->Next->Curr)))
- {
- //Collinear edges are allowed for open paths but in closed paths
- //the default is to merge adjacent collinear edges into a single edge.
- //However, if the PreserveCollinear property is enabled, only overlapping
- //collinear edges (ie spikes) will be removed from closed paths.
- if (E == eStart) eStart = E->Next;
- E = RemoveEdge(E);
- E = E->Prev;
- eLoopStop = E;
- continue;
- }
- E = E->Next;
- if ((E == eLoopStop) || (!Closed && E->Next == eStart)) break;
- }
-
- if ((!Closed && (E == E->Next)) || (Closed && (E->Prev == E->Next)))
- {
- delete [] edges;
- return false;
- }
-
- if (!Closed)
- {
- m_HasOpenPaths = true;
- eStart->Prev->OutIdx = Skip;
- }
-
- //3. Do second stage of edge initialization ...
- E = eStart;
- do
- {
- InitEdge2(*E, PolyTyp);
- E = E->Next;
- if (IsFlat && E->Curr.y != eStart->Curr.y) IsFlat = false;
- }
- while (E != eStart);
-
- //4. Finally, add edge bounds to LocalMinima list ...
-
- //Totally flat paths must be handled differently when adding them
- //to LocalMinima list to avoid endless loops etc ...
- if (IsFlat)
- {
- if (Closed)
- {
- delete [] edges;
- return false;
- }
- E->Prev->OutIdx = Skip;
- MinimaList::value_type locMin;
- locMin.y = E->Bot.y;
- locMin.LeftBound = 0;
- locMin.RightBound = E;
- locMin.RightBound->Side = esRight;
- locMin.RightBound->WindDelta = 0;
- for (;;)
- {
- if (E->Bot.x != E->Prev->Top.x) ReverseHorizontal(*E);
- if (E->Next->OutIdx == Skip) break;
- E->NextInLML = E->Next;
- E = E->Next;
- }
- m_MinimaList.push_back(locMin);
- m_edges.push_back(edges);
- return true;
- }
-
- m_edges.push_back(edges);
- bool leftBoundIsForward;
- TEdge* EMin = 0;
-
- //workaround to avoid an endless loop in the while loop below when
- //open paths have matching start and end points ...
- if (E->Prev->Bot == E->Prev->Top) E = E->Next;
-
- for (;;)
- {
- E = FindNextLocMin(E);
- if (E == EMin) break;
- else if (!EMin) EMin = E;
-
- //E and E.Prev now share a local minima (left aligned if horizontal).
- //Compare their slopes to find which starts which bound ...
- MinimaList::value_type locMin;
- locMin.y = E->Bot.y;
- if (E->Dx < E->Prev->Dx)
- {
- locMin.LeftBound = E->Prev;
- locMin.RightBound = E;
- leftBoundIsForward = false; //Q.nextInLML = Q.prev
- } else
- {
- locMin.LeftBound = E;
- locMin.RightBound = E->Prev;
- leftBoundIsForward = true; //Q.nextInLML = Q.next
- }
-
- if (!Closed) locMin.LeftBound->WindDelta = 0;
- else if (locMin.LeftBound->Next == locMin.RightBound)
- locMin.LeftBound->WindDelta = -1;
- else locMin.LeftBound->WindDelta = 1;
- locMin.RightBound->WindDelta = -locMin.LeftBound->WindDelta;
-
- E = ProcessBound(locMin.LeftBound, leftBoundIsForward);
- if (E->OutIdx == Skip) E = ProcessBound(E, leftBoundIsForward);
-
- TEdge* E2 = ProcessBound(locMin.RightBound, !leftBoundIsForward);
- if (E2->OutIdx == Skip) E2 = ProcessBound(E2, !leftBoundIsForward);
-
- if (locMin.LeftBound->OutIdx == Skip)
- locMin.LeftBound = 0;
- else if (locMin.RightBound->OutIdx == Skip)
- locMin.RightBound = 0;
- m_MinimaList.push_back(locMin);
- if (!leftBoundIsForward) E = E2;
- }
- return true;
-}
-//------------------------------------------------------------------------------
-
-bool ClipperBase::AddPaths(const Paths &ppg, PolyType PolyTyp, bool Closed)
-{
- bool result = false;
- for (Paths::size_type i = 0; i < ppg.size(); ++i)
- if (AddPath(ppg[i], PolyTyp, Closed)) result = true;
- return result;
-}
-//------------------------------------------------------------------------------
-
-void ClipperBase::Clear()
-{
- DisposeLocalMinimaList();
- for (EdgeList::size_type i = 0; i < m_edges.size(); ++i)
- {
- TEdge* edges = m_edges[i];
- delete [] edges;
- }
- m_edges.clear();
- m_UseFullRange = false;
- m_HasOpenPaths = false;
-}
-//------------------------------------------------------------------------------
-
-void ClipperBase::Reset()
-{
- m_CurrentLM = m_MinimaList.begin();
- if (m_CurrentLM == m_MinimaList.end()) return; //ie nothing to process
- std::stable_sort(m_MinimaList.begin(), m_MinimaList.end(), LocMinSorter());
-
- m_Scanbeam = ScanbeamList(); //clears/resets priority_queue
- //reset all edges ...
- for (MinimaList::iterator lm = m_MinimaList.begin(); lm != m_MinimaList.end(); ++lm)
- {
- InsertScanbeam(lm->y);
- TEdge* e = lm->LeftBound;
- if (e)
- {
- e->Curr = e->Bot;
- e->Side = esLeft;
- e->OutIdx = Unassigned;
- }
-
- e = lm->RightBound;
- if (e)
- {
- e->Curr = e->Bot;
- e->Side = esRight;
- e->OutIdx = Unassigned;
- }
- }
- m_ActiveEdges = 0;
- m_CurrentLM = m_MinimaList.begin();
-}
-//------------------------------------------------------------------------------
-
-void ClipperBase::DisposeLocalMinimaList()
-{
- m_MinimaList.clear();
- m_CurrentLM = m_MinimaList.begin();
-}
-//------------------------------------------------------------------------------
-
-bool ClipperBase::PopLocalMinima(cInt Y, const LocalMinimum *&locMin)
-{
- if (m_CurrentLM == m_MinimaList.end() || (*m_CurrentLM).y != Y) return false;
- locMin = &(*m_CurrentLM);
- ++m_CurrentLM;
- return true;
-}
-//------------------------------------------------------------------------------
-
-IntRect ClipperBase::GetBounds()
-{
- IntRect result;
- MinimaList::iterator lm = m_MinimaList.begin();
- if (lm == m_MinimaList.end())
- {
- result.left = result.top = result.right = result.bottom = 0;
- return result;
- }
- result.left = lm->LeftBound->Bot.x;
- result.top = lm->LeftBound->Bot.y;
- result.right = lm->LeftBound->Bot.x;
- result.bottom = lm->LeftBound->Bot.y;
- while (lm != m_MinimaList.end())
- {
- //todo - needs fixing for open paths
- result.bottom = std::max(result.bottom, lm->LeftBound->Bot.y);
- TEdge* e = lm->LeftBound;
- for (;;) {
- TEdge* bottomE = e;
- while (e->NextInLML)
- {
- if (e->Bot.x < result.left) result.left = e->Bot.x;
- if (e->Bot.x > result.right) result.right = e->Bot.x;
- e = e->NextInLML;
- }
- result.left = std::min(result.left, e->Bot.x);
- result.right = std::max(result.right, e->Bot.x);
- result.left = std::min(result.left, e->Top.x);
- result.right = std::max(result.right, e->Top.x);
- result.top = std::min(result.top, e->Top.y);
- if (bottomE == lm->LeftBound) e = lm->RightBound;
- else break;
- }
- ++lm;
- }
- return result;
-}
-//------------------------------------------------------------------------------
-
-void ClipperBase::InsertScanbeam(const cInt Y)
-{
- m_Scanbeam.push(Y);
-}
-//------------------------------------------------------------------------------
-
-bool ClipperBase::PopScanbeam(cInt &Y)
-{
- if (m_Scanbeam.empty()) return false;
- Y = m_Scanbeam.top();
- m_Scanbeam.pop();
- while (!m_Scanbeam.empty() && Y == m_Scanbeam.top()) { m_Scanbeam.pop(); } // Pop duplicates.
- return true;
-}
-//------------------------------------------------------------------------------
-
-void ClipperBase::DisposeAllOutRecs(){
- for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i)
- DisposeOutRec(i);
- m_PolyOuts.clear();
-}
-//------------------------------------------------------------------------------
-
-void ClipperBase::DisposeOutRec(PolyOutList::size_type index)
-{
- OutRec *outRec = m_PolyOuts[index];
- if (outRec->Pts) DisposeOutPts(outRec->Pts);
- delete outRec;
- m_PolyOuts[index] = 0;
-}
-//------------------------------------------------------------------------------
-
-void ClipperBase::DeleteFromAEL(TEdge *e)
-{
- TEdge* AelPrev = e->PrevInAEL;
- TEdge* AelNext = e->NextInAEL;
- if (!AelPrev && !AelNext && (e != m_ActiveEdges)) return; //already deleted
- if (AelPrev) AelPrev->NextInAEL = AelNext;
- else m_ActiveEdges = AelNext;
- if (AelNext) AelNext->PrevInAEL = AelPrev;
- e->NextInAEL = 0;
- e->PrevInAEL = 0;
-}
-//------------------------------------------------------------------------------
-
-OutRec* ClipperBase::CreateOutRec()
-{
- OutRec* result = new OutRec;
- result->IsHole = false;
- result->IsOpen = false;
- result->FirstLeft = 0;
- result->Pts = 0;
- result->BottomPt = 0;
- result->PolyNd = 0;
- m_PolyOuts.push_back(result);
- result->Idx = (int)m_PolyOuts.size() - 1;
- return result;
-}
-//------------------------------------------------------------------------------
-
-void ClipperBase::SwapPositionsInAEL(TEdge *Edge1, TEdge *Edge2)
-{
- //check that one or other edge hasn't already been removed from AEL ...
- if (Edge1->NextInAEL == Edge1->PrevInAEL ||
- Edge2->NextInAEL == Edge2->PrevInAEL) return;
-
- if (Edge1->NextInAEL == Edge2)
- {
- TEdge* Next = Edge2->NextInAEL;
- if (Next) Next->PrevInAEL = Edge1;
- TEdge* Prev = Edge1->PrevInAEL;
- if (Prev) Prev->NextInAEL = Edge2;
- Edge2->PrevInAEL = Prev;
- Edge2->NextInAEL = Edge1;
- Edge1->PrevInAEL = Edge2;
- Edge1->NextInAEL = Next;
- }
- else if (Edge2->NextInAEL == Edge1)
- {
- TEdge* Next = Edge1->NextInAEL;
- if (Next) Next->PrevInAEL = Edge2;
- TEdge* Prev = Edge2->PrevInAEL;
- if (Prev) Prev->NextInAEL = Edge1;
- Edge1->PrevInAEL = Prev;
- Edge1->NextInAEL = Edge2;
- Edge2->PrevInAEL = Edge1;
- Edge2->NextInAEL = Next;
- }
- else
- {
- TEdge* Next = Edge1->NextInAEL;
- TEdge* Prev = Edge1->PrevInAEL;
- Edge1->NextInAEL = Edge2->NextInAEL;
- if (Edge1->NextInAEL) Edge1->NextInAEL->PrevInAEL = Edge1;
- Edge1->PrevInAEL = Edge2->PrevInAEL;
- if (Edge1->PrevInAEL) Edge1->PrevInAEL->NextInAEL = Edge1;
- Edge2->NextInAEL = Next;
- if (Edge2->NextInAEL) Edge2->NextInAEL->PrevInAEL = Edge2;
- Edge2->PrevInAEL = Prev;
- if (Edge2->PrevInAEL) Edge2->PrevInAEL->NextInAEL = Edge2;
- }
-
- if (!Edge1->PrevInAEL) m_ActiveEdges = Edge1;
- else if (!Edge2->PrevInAEL) m_ActiveEdges = Edge2;
-}
-//------------------------------------------------------------------------------
-
-void ClipperBase::UpdateEdgeIntoAEL(TEdge *&e)
-{
- if (!e->NextInLML)
- throw clipperException("UpdateEdgeIntoAEL: invalid call");
-
- e->NextInLML->OutIdx = e->OutIdx;
- TEdge* AelPrev = e->PrevInAEL;
- TEdge* AelNext = e->NextInAEL;
- if (AelPrev) AelPrev->NextInAEL = e->NextInLML;
- else m_ActiveEdges = e->NextInLML;
- if (AelNext) AelNext->PrevInAEL = e->NextInLML;
- e->NextInLML->Side = e->Side;
- e->NextInLML->WindDelta = e->WindDelta;
- e->NextInLML->WindCnt = e->WindCnt;
- e->NextInLML->WindCnt2 = e->WindCnt2;
- e = e->NextInLML;
- e->Curr = e->Bot;
- e->PrevInAEL = AelPrev;
- e->NextInAEL = AelNext;
- if (!IsHorizontal(*e)) InsertScanbeam(e->Top.y);
-}
-//------------------------------------------------------------------------------
-
-bool ClipperBase::LocalMinimaPending()
-{
- return (m_CurrentLM != m_MinimaList.end());
-}
-
-//------------------------------------------------------------------------------
-// TClipper methods ...
-//------------------------------------------------------------------------------
-
-Clipper::Clipper(int initOptions) : ClipperBase() //constructor
-{
- m_ExecuteLocked = false;
- m_UseFullRange = false;
- m_ReverseOutput = ((initOptions & ioReverseSolution) != 0);
- m_StrictSimple = ((initOptions & ioStrictlySimple) != 0);
- m_PreserveCollinear = ((initOptions & ioPreserveCollinear) != 0);
- m_HasOpenPaths = false;
-#ifdef use_xyz
- m_ZFill = 0;
-#endif
-}
-//------------------------------------------------------------------------------
-
-#ifdef use_xyz
-void Clipper::ZFillFunction(ZFillCallback zFillFunc)
-{
- m_ZFill = zFillFunc;
-}
-//------------------------------------------------------------------------------
-#endif
-
-bool Clipper::Execute(ClipType clipType, Paths &solution, PolyFillType fillType)
-{
- return Execute(clipType, solution, fillType, fillType);
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::Execute(ClipType clipType, PolyTree &polytree, PolyFillType fillType)
-{
- return Execute(clipType, polytree, fillType, fillType);
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::Execute(ClipType clipType, Paths &solution,
- PolyFillType subjFillType, PolyFillType clipFillType)
-{
- if( m_ExecuteLocked ) return false;
- if (m_HasOpenPaths)
- throw clipperException("Error: PolyTree struct is needed for open path clipping.");
- m_ExecuteLocked = true;
- solution.resize(0);
- m_SubjFillType = subjFillType;
- m_ClipFillType = clipFillType;
- m_ClipType = clipType;
- m_UsingPolyTree = false;
- bool succeeded = ExecuteInternal();
- if (succeeded) BuildResult(solution);
- DisposeAllOutRecs();
- m_ExecuteLocked = false;
- return succeeded;
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::Execute(ClipType clipType, PolyTree& polytree,
- PolyFillType subjFillType, PolyFillType clipFillType)
-{
- if( m_ExecuteLocked ) return false;
- m_ExecuteLocked = true;
- m_SubjFillType = subjFillType;
- m_ClipFillType = clipFillType;
- m_ClipType = clipType;
- m_UsingPolyTree = true;
- bool succeeded = ExecuteInternal();
- if (succeeded) BuildResult2(polytree);
- DisposeAllOutRecs();
- m_ExecuteLocked = false;
- return succeeded;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::FixHoleLinkage(OutRec &outrec)
-{
- //skip OutRecs that (a) contain outermost polygons or
- //(b) already have the correct owner/child linkage ...
- if (!outrec.FirstLeft ||
- (outrec.IsHole != outrec.FirstLeft->IsHole &&
- outrec.FirstLeft->Pts)) return;
-
- OutRec* orfl = outrec.FirstLeft;
- while (orfl && ((orfl->IsHole == outrec.IsHole) || !orfl->Pts))
- orfl = orfl->FirstLeft;
- outrec.FirstLeft = orfl;
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::ExecuteInternal()
-{
- bool succeeded = true;
- try {
- Reset();
- m_Maxima = MaximaList();
- m_SortedEdges = 0;
-
- succeeded = true;
- cInt botY, topY;
- if (!PopScanbeam(botY)) return false;
- InsertLocalMinimaIntoAEL(botY);
- while (PopScanbeam(topY) || LocalMinimaPending())
- {
- ProcessHorizontals();
- ClearGhostJoins();
- if (!ProcessIntersections(topY))
- {
- succeeded = false;
- break;
- }
- ProcessEdgesAtTopOfScanbeam(topY);
- botY = topY;
- InsertLocalMinimaIntoAEL(botY);
- }
- }
- catch(std::exception const&)
- {
- succeeded = false;
- }
-
- if (succeeded)
- {
- //fix orientations ...
- for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i)
- {
- OutRec *outRec = m_PolyOuts[i];
- if (!outRec->Pts || outRec->IsOpen) continue;
- if ((outRec->IsHole ^ m_ReverseOutput) == (Area(*outRec) > 0))
- ReversePolyPtLinks(outRec->Pts);
- }
-
- if (!m_Joins.empty()) JoinCommonEdges();
-
- //unfortunately FixupOutPolygon() must be done after JoinCommonEdges()
- for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i)
- {
- OutRec *outRec = m_PolyOuts[i];
- if (!outRec->Pts) continue;
- if (outRec->IsOpen)
- FixupOutPolyline(*outRec);
- else
- FixupOutPolygon(*outRec);
- }
-
- if (m_StrictSimple)
- {
- DoSimplePolygons();
- m_StrictSimple = false;
- for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i)
- {
- OutRec *outRec = m_PolyOuts[i];
- if (!outRec->Pts || outRec->IsOpen)
- {
- continue;
- }
- FixupOutPolygon(*outRec);
- }
- m_StrictSimple = true;
- }
- }
-
- ClearJoins();
- ClearGhostJoins();
- return succeeded;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::SetWindingCount(TEdge &edge)
-{
- TEdge *e = edge.PrevInAEL;
- //find the edge of the same polytype that immediately preceeds 'edge' in AEL
- while (e && ((e->PolyTyp != edge.PolyTyp) || (e->WindDelta == 0))) e = e->PrevInAEL;
- if (!e)
- {
- if (edge.WindDelta == 0)
- {
- PolyFillType pft = (edge.PolyTyp == ptSubject ? m_SubjFillType : m_ClipFillType);
- edge.WindCnt = (pft == pftNegative ? -1 : 1);
- }
- else
- edge.WindCnt = edge.WindDelta;
- edge.WindCnt2 = 0;
- e = m_ActiveEdges; //ie get ready to calc WindCnt2
- }
- else if (edge.WindDelta == 0 && m_ClipType != ctUnion)
- {
- edge.WindCnt = 1;
- edge.WindCnt2 = e->WindCnt2;
- e = e->NextInAEL; //ie get ready to calc WindCnt2
- }
- else if (IsEvenOddFillType(edge))
- {
- //EvenOdd filling ...
- if (edge.WindDelta == 0)
- {
- //are we inside a subj polygon ...
- bool Inside = true;
- TEdge *e2 = e->PrevInAEL;
- while (e2)
- {
- if (e2->PolyTyp == e->PolyTyp && e2->WindDelta != 0)
- Inside = !Inside;
- e2 = e2->PrevInAEL;
- }
- edge.WindCnt = (Inside ? 0 : 1);
- }
- else
- {
- edge.WindCnt = edge.WindDelta;
- }
- edge.WindCnt2 = e->WindCnt2;
- e = e->NextInAEL; //ie get ready to calc WindCnt2
- }
- else
- {
- //nonZero, Positive or Negative filling ...
- if (e->WindCnt * e->WindDelta < 0)
- {
- //prev edge is 'decreasing' WindCount (WC) toward zero
- //so we're outside the previous polygon ...
- if (Abs(e->WindCnt) > 1)
- {
- //outside prev poly but still inside another.
- //when reversing direction of prev poly use the same WC
- if (e->WindDelta * edge.WindDelta < 0) edge.WindCnt = e->WindCnt;
- //otherwise continue to 'decrease' WC ...
- else edge.WindCnt = e->WindCnt + edge.WindDelta;
- }
- else
- //now outside all polys of same polytype so set own WC ...
- edge.WindCnt = (edge.WindDelta == 0 ? 1 : edge.WindDelta);
- } else
- {
- //prev edge is 'increasing' WindCount (WC) away from zero
- //so we're inside the previous polygon ...
- if (edge.WindDelta == 0)
- edge.WindCnt = (e->WindCnt < 0 ? e->WindCnt - 1 : e->WindCnt + 1);
- //if wind direction is reversing prev then use same WC
- else if (e->WindDelta * edge.WindDelta < 0) edge.WindCnt = e->WindCnt;
- //otherwise add to WC ...
- else edge.WindCnt = e->WindCnt + edge.WindDelta;
- }
- edge.WindCnt2 = e->WindCnt2;
- e = e->NextInAEL; //ie get ready to calc WindCnt2
- }
-
- //update WindCnt2 ...
- if (IsEvenOddAltFillType(edge))
- {
- //EvenOdd filling ...
- while (e != &edge)
- {
- if (e->WindDelta != 0)
- edge.WindCnt2 = (edge.WindCnt2 == 0 ? 1 : 0);
- e = e->NextInAEL;
- }
- } else
- {
- //nonZero, Positive or Negative filling ...
- while ( e != &edge )
- {
- edge.WindCnt2 += e->WindDelta;
- e = e->NextInAEL;
- }
- }
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::IsEvenOddFillType(const TEdge& edge) const
-{
- if (edge.PolyTyp == ptSubject)
- return m_SubjFillType == pftEvenOdd; else
- return m_ClipFillType == pftEvenOdd;
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::IsEvenOddAltFillType(const TEdge& edge) const
-{
- if (edge.PolyTyp == ptSubject)
- return m_ClipFillType == pftEvenOdd; else
- return m_SubjFillType == pftEvenOdd;
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::IsContributing(const TEdge& edge) const
-{
- PolyFillType pft, pft2;
- if (edge.PolyTyp == ptSubject)
- {
- pft = m_SubjFillType;
- pft2 = m_ClipFillType;
- } else
- {
- pft = m_ClipFillType;
- pft2 = m_SubjFillType;
- }
-
- switch(pft)
- {
- case pftEvenOdd:
- //return false if a subj line has been flagged as inside a subj polygon
- if (edge.WindDelta == 0 && edge.WindCnt != 1) return false;
- break;
- case pftNonZero:
- if (Abs(edge.WindCnt) != 1) return false;
- break;
- case pftPositive:
- if (edge.WindCnt != 1) return false;
- break;
- default: //pftNegative
- if (edge.WindCnt != -1) return false;
- }
-
- switch(m_ClipType)
- {
- case ctIntersection:
- switch(pft2)
- {
- case pftEvenOdd:
- case pftNonZero:
- return (edge.WindCnt2 != 0);
- case pftPositive:
- return (edge.WindCnt2 > 0);
- default:
- return (edge.WindCnt2 < 0);
- }
- break;
- case ctUnion:
- switch(pft2)
- {
- case pftEvenOdd:
- case pftNonZero:
- return (edge.WindCnt2 == 0);
- case pftPositive:
- return (edge.WindCnt2 <= 0);
- default:
- return (edge.WindCnt2 >= 0);
- }
- break;
- case ctDifference:
- if (edge.PolyTyp == ptSubject)
- switch(pft2)
- {
- case pftEvenOdd:
- case pftNonZero:
- return (edge.WindCnt2 == 0);
- case pftPositive:
- return (edge.WindCnt2 <= 0);
- default:
- return (edge.WindCnt2 >= 0);
- }
- else
- switch(pft2)
- {
- case pftEvenOdd:
- case pftNonZero:
- return (edge.WindCnt2 != 0);
- case pftPositive:
- return (edge.WindCnt2 > 0);
- default:
- return (edge.WindCnt2 < 0);
- }
- break;
- case ctXor:
- if (edge.WindDelta == 0) //XOr always contributing unless open
- switch(pft2)
- {
- case pftEvenOdd:
- case pftNonZero:
- return (edge.WindCnt2 == 0);
- case pftPositive:
- return (edge.WindCnt2 <= 0);
- default:
- return (edge.WindCnt2 >= 0);
- }
- else
- return true;
- break;
- default:
- return true;
- }
-}
-//------------------------------------------------------------------------------
-
-OutPt* Clipper::AddLocalMinPoly(TEdge *e1, TEdge *e2, const IntPoint &Pt)
-{
- OutPt* result;
- TEdge *e, *prevE;
- if (IsHorizontal(*e2) || ( e1->Dx > e2->Dx ))
- {
- result = AddOutPt(e1, Pt);
- e2->OutIdx = e1->OutIdx;
- e1->Side = esLeft;
- e2->Side = esRight;
- e = e1;
- if (e->PrevInAEL == e2)
- prevE = e2->PrevInAEL;
- else
- prevE = e->PrevInAEL;
- } else
- {
- result = AddOutPt(e2, Pt);
- e1->OutIdx = e2->OutIdx;
- e1->Side = esRight;
- e2->Side = esLeft;
- e = e2;
- if (e->PrevInAEL == e1)
- prevE = e1->PrevInAEL;
- else
- prevE = e->PrevInAEL;
- }
-
- if (prevE && prevE->OutIdx >= 0)
- {
- cInt xPrev = TopX(*prevE, Pt.y);
- cInt xE = TopX(*e, Pt.y);
- if (xPrev == xE && (e->WindDelta != 0) && (prevE->WindDelta != 0) &&
- SlopesEqual(IntPoint(xPrev, Pt.y), prevE->Top, IntPoint(xE, Pt.y), e->Top, m_UseFullRange))
- {
- OutPt* outPt = AddOutPt(prevE, Pt);
- AddJoin(result, outPt, e->Top);
- }
- }
- return result;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::AddLocalMaxPoly(TEdge *e1, TEdge *e2, const IntPoint &Pt)
-{
- AddOutPt( e1, Pt );
- if (e2->WindDelta == 0) AddOutPt(e2, Pt);
- if( e1->OutIdx == e2->OutIdx )
- {
- e1->OutIdx = Unassigned;
- e2->OutIdx = Unassigned;
- }
- else if (e1->OutIdx < e2->OutIdx)
- AppendPolygon(e1, e2);
- else
- AppendPolygon(e2, e1);
-}
-//------------------------------------------------------------------------------
-
-void Clipper::AddEdgeToSEL(TEdge *edge)
-{
- //SEL pointers in PEdge are reused to build a list of horizontal edges.
- //However, we don't need to worry about order with horizontal edge processing.
- if( !m_SortedEdges )
- {
- m_SortedEdges = edge;
- edge->PrevInSEL = 0;
- edge->NextInSEL = 0;
- }
- else
- {
- edge->NextInSEL = m_SortedEdges;
- edge->PrevInSEL = 0;
- m_SortedEdges->PrevInSEL = edge;
- m_SortedEdges = edge;
- }
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::PopEdgeFromSEL(TEdge *&edge)
-{
- if (!m_SortedEdges) return false;
- edge = m_SortedEdges;
- DeleteFromSEL(m_SortedEdges);
- return true;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::CopyAELToSEL()
-{
- TEdge* e = m_ActiveEdges;
- m_SortedEdges = e;
- while ( e )
- {
- e->PrevInSEL = e->PrevInAEL;
- e->NextInSEL = e->NextInAEL;
- e = e->NextInAEL;
- }
-}
-//------------------------------------------------------------------------------
-
-void Clipper::AddJoin(OutPt *op1, OutPt *op2, const IntPoint OffPt)
-{
- Join* j = new Join;
- j->OutPt1 = op1;
- j->OutPt2 = op2;
- j->OffPt = OffPt;
- m_Joins.push_back(j);
-}
-//------------------------------------------------------------------------------
-
-void Clipper::ClearJoins()
-{
- for (JoinList::size_type i = 0; i < m_Joins.size(); i++)
- delete m_Joins[i];
- m_Joins.resize(0);
-}
-//------------------------------------------------------------------------------
-
-void Clipper::ClearGhostJoins()
-{
- for (JoinList::size_type i = 0; i < m_GhostJoins.size(); i++)
- delete m_GhostJoins[i];
- m_GhostJoins.resize(0);
-}
-//------------------------------------------------------------------------------
-
-void Clipper::AddGhostJoin(OutPt *op, const IntPoint OffPt)
-{
- Join* j = new Join;
- j->OutPt1 = op;
- j->OutPt2 = 0;
- j->OffPt = OffPt;
- m_GhostJoins.push_back(j);
-}
-//------------------------------------------------------------------------------
-
-void Clipper::InsertLocalMinimaIntoAEL(const cInt botY)
-{
- const LocalMinimum *lm;
- while (PopLocalMinima(botY, lm))
- {
- TEdge* lb = lm->LeftBound;
- TEdge* rb = lm->RightBound;
-
- OutPt *Op1 = 0;
- if (!lb)
- {
- //nb: don't insert LB into either AEL or SEL
- InsertEdgeIntoAEL(rb, 0);
- SetWindingCount(*rb);
- if (IsContributing(*rb))
- {
- Op1 = AddOutPt(rb, rb->Bot);
- TEdge* ePrev = rb->PrevInAEL;
- if ((rb->OutIdx >= 0) && (rb->WindDelta != 0) && ePrev && (ePrev->OutIdx >= 0) &&
- (ePrev->Curr.x == rb->Curr.x) && (ePrev->WindDelta != 0))
- {
- IntPoint pt = rb->Curr;
- AddOutPt(ePrev, pt);
- }
- TEdge* eNext = rb->NextInAEL;
- if ((rb->OutIdx >= 0) && (rb->WindDelta != 0) && eNext && (eNext->OutIdx >= 0) &&
- (eNext->Curr.x == rb->Curr.x) && (eNext->WindDelta != 0))
- {
- IntPoint pt = rb->Curr;
- AddOutPt(eNext, pt);
- }
- }
- }
- else if (!rb)
- {
- InsertEdgeIntoAEL(lb, 0);
- SetWindingCount(*lb);
- if (IsContributing(*lb))
- {
- Op1 = AddOutPt(lb, lb->Bot);
- TEdge* ePrev = lb->PrevInAEL;
- if ((lb->OutIdx >= 0) && (lb->WindDelta != 0) && ePrev && (ePrev->OutIdx >= 0) &&
- (ePrev->Curr.x == lb->Curr.x) && (ePrev->WindDelta != 0))
- {
- IntPoint pt = lb->Curr;
- AddOutPt(ePrev, pt);
- }
- TEdge* eNext = lb->NextInAEL;
- if ((lb->OutIdx >= 0) && (lb->WindDelta != 0) && eNext && (eNext->OutIdx >= 0) &&
- (eNext->Curr.x == lb->Curr.x) && (eNext->WindDelta != 0))
- {
- IntPoint pt = lb->Curr;
- AddOutPt(eNext, pt);
- }
- }
- InsertScanbeam(lb->Top.y);
- }
- else
- {
- InsertEdgeIntoAEL(lb, 0);
- InsertEdgeIntoAEL(rb, lb);
- SetWindingCount( *lb );
- rb->WindCnt = lb->WindCnt;
- rb->WindCnt2 = lb->WindCnt2;
- if (IsContributing(*lb))
- {
- Op1 = AddLocalMinPoly(lb, rb, lb->Bot);
- TEdge* ePrev = lb->PrevInAEL;
- if ((lb->OutIdx >= 0) && (lb->WindDelta != 0) && ePrev && (ePrev->OutIdx >= 0) &&
- (ePrev->Curr.x == lb->Curr.x) && (ePrev->WindDelta != 0))
- {
- IntPoint pt = lb->Curr;
- AddOutPt(ePrev, pt);
- }
- TEdge* eNext = rb->NextInAEL;
- if ((rb->OutIdx >= 0) && (rb->WindDelta != 0) && eNext && (eNext->OutIdx >= 0) &&
- (eNext->Curr.x == rb->Curr.x) && (eNext->WindDelta != 0))
- {
- IntPoint pt = rb->Curr;
- AddOutPt(eNext, pt);
- }
- }
- InsertScanbeam(lb->Top.y);
- }
-
- if (rb)
- {
- if (IsHorizontal(*rb))
- {
- AddEdgeToSEL(rb);
- if (rb->NextInLML)
- InsertScanbeam(rb->NextInLML->Top.y);
- }
- else InsertScanbeam( rb->Top.y );
- }
-
- if (!lb || !rb) continue;
-
- //if any output polygons share an edge, they'll need joining later ...
- if (Op1 && IsHorizontal(*rb) &&
- !m_GhostJoins.empty() && (rb->WindDelta != 0))
- {
- for (JoinList::size_type i = 0; i < m_GhostJoins.size(); ++i)
- {
- Join* jr = m_GhostJoins[i];
- //if the horizontal Rb and a 'ghost' horizontal overlap, then convert
- //the 'ghost' join to a real join ready for later ...
- if (HorzSegmentsOverlap(jr->OutPt1->Pt.x, jr->OffPt.x, rb->Bot.x, rb->Top.x))
- AddJoin(jr->OutPt1, Op1, jr->OffPt);
- }
- }
-
- if (lb->OutIdx >= 0 && lb->PrevInAEL &&
- lb->PrevInAEL->Curr.x == lb->Bot.x &&
- lb->PrevInAEL->OutIdx >= 0 &&
- SlopesEqual(lb->PrevInAEL->Bot, lb->PrevInAEL->Top, lb->Curr, lb->Top, m_UseFullRange) &&
- (lb->WindDelta != 0) && (lb->PrevInAEL->WindDelta != 0))
- {
- OutPt *Op2 = AddOutPt(lb->PrevInAEL, lb->Bot);
- AddJoin(Op1, Op2, lb->Top);
- }
-
- if(lb->NextInAEL != rb)
- {
-
- if (rb->OutIdx >= 0 && rb->PrevInAEL->OutIdx >= 0 &&
- SlopesEqual(rb->PrevInAEL->Curr, rb->PrevInAEL->Top, rb->Curr, rb->Top, m_UseFullRange) &&
- (rb->WindDelta != 0) && (rb->PrevInAEL->WindDelta != 0))
- {
- OutPt *Op2 = AddOutPt(rb->PrevInAEL, rb->Bot);
- AddJoin(Op1, Op2, rb->Top);
- }
-
- TEdge* e = lb->NextInAEL;
- if (e)
- {
- while( e != rb )
- {
- //nb: For calculating winding counts etc, IntersectEdges() assumes
- //that param1 will be to the Right of param2 ABOVE the intersection ...
- IntersectEdges(rb , e , lb->Curr); //order important here
- e = e->NextInAEL;
- }
- }
- }
-
- }
-}
-//------------------------------------------------------------------------------
-
-void Clipper::DeleteFromSEL(TEdge *e)
-{
- TEdge* SelPrev = e->PrevInSEL;
- TEdge* SelNext = e->NextInSEL;
- if( !SelPrev && !SelNext && (e != m_SortedEdges) ) return; //already deleted
- if( SelPrev ) SelPrev->NextInSEL = SelNext;
- else m_SortedEdges = SelNext;
- if( SelNext ) SelNext->PrevInSEL = SelPrev;
- e->NextInSEL = 0;
- e->PrevInSEL = 0;
-}
-//------------------------------------------------------------------------------
-
-#ifdef use_xyz
-void Clipper::SetZ(IntPoint& pt, TEdge& e1, TEdge& e2)
-{
- if (pt.Z != 0 || !m_ZFill) return;
- else if (pt == e1.Bot) pt.Z = e1.Bot.Z;
- else if (pt == e1.Top) pt.Z = e1.Top.Z;
- else if (pt == e2.Bot) pt.Z = e2.Bot.Z;
- else if (pt == e2.Top) pt.Z = e2.Top.Z;
- else (*m_ZFill)(e1.Bot, e1.Top, e2.Bot, e2.Top, pt);
-}
-//------------------------------------------------------------------------------
-#endif
-
-void Clipper::IntersectEdges(TEdge *e1, TEdge *e2, IntPoint &Pt)
-{
- bool e1Contributing = ( e1->OutIdx >= 0 );
- bool e2Contributing = ( e2->OutIdx >= 0 );
-
-#ifdef use_xyz
- SetZ(Pt, *e1, *e2);
-#endif
-
-#ifdef use_lines
- //if either edge is on an OPEN path ...
- if (e1->WindDelta == 0 || e2->WindDelta == 0)
- {
- //ignore subject-subject open path intersections UNLESS they
- //are both open paths, AND they are both 'contributing maximas' ...
- if (e1->WindDelta == 0 && e2->WindDelta == 0) return;
-
- //if intersecting a subj line with a subj poly ...
- else if (e1->PolyTyp == e2->PolyTyp &&
- e1->WindDelta != e2->WindDelta && m_ClipType == ctUnion)
- {
- if (e1->WindDelta == 0)
- {
- if (e2Contributing)
- {
- AddOutPt(e1, Pt);
- if (e1Contributing) e1->OutIdx = Unassigned;
- }
- }
- else
- {
- if (e1Contributing)
- {
- AddOutPt(e2, Pt);
- if (e2Contributing) e2->OutIdx = Unassigned;
- }
- }
- }
- else if (e1->PolyTyp != e2->PolyTyp)
- {
- //toggle subj open path OutIdx on/off when Abs(clip.WndCnt) == 1 ...
- if ((e1->WindDelta == 0) && abs(e2->WindCnt) == 1 &&
- (m_ClipType != ctUnion || e2->WindCnt2 == 0))
- {
- AddOutPt(e1, Pt);
- if (e1Contributing) e1->OutIdx = Unassigned;
- }
- else if ((e2->WindDelta == 0) && (abs(e1->WindCnt) == 1) &&
- (m_ClipType != ctUnion || e1->WindCnt2 == 0))
- {
- AddOutPt(e2, Pt);
- if (e2Contributing) e2->OutIdx = Unassigned;
- }
- }
- return;
- }
-#endif
-
- //update winding counts...
- //assumes that e1 will be to the Right of e2 ABOVE the intersection
- if ( e1->PolyTyp == e2->PolyTyp )
- {
- if ( IsEvenOddFillType( *e1) )
- {
- int oldE1WindCnt = e1->WindCnt;
- e1->WindCnt = e2->WindCnt;
- e2->WindCnt = oldE1WindCnt;
- } else
- {
- if (e1->WindCnt + e2->WindDelta == 0 ) e1->WindCnt = -e1->WindCnt;
- else e1->WindCnt += e2->WindDelta;
- if ( e2->WindCnt - e1->WindDelta == 0 ) e2->WindCnt = -e2->WindCnt;
- else e2->WindCnt -= e1->WindDelta;
- }
- } else
- {
- if (!IsEvenOddFillType(*e2)) e1->WindCnt2 += e2->WindDelta;
- else e1->WindCnt2 = ( e1->WindCnt2 == 0 ) ? 1 : 0;
- if (!IsEvenOddFillType(*e1)) e2->WindCnt2 -= e1->WindDelta;
- else e2->WindCnt2 = ( e2->WindCnt2 == 0 ) ? 1 : 0;
- }
-
- PolyFillType e1FillType, e2FillType, e1FillType2, e2FillType2;
- if (e1->PolyTyp == ptSubject)
- {
- e1FillType = m_SubjFillType;
- e1FillType2 = m_ClipFillType;
- } else
- {
- e1FillType = m_ClipFillType;
- e1FillType2 = m_SubjFillType;
- }
- if (e2->PolyTyp == ptSubject)
- {
- e2FillType = m_SubjFillType;
- e2FillType2 = m_ClipFillType;
- } else
- {
- e2FillType = m_ClipFillType;
- e2FillType2 = m_SubjFillType;
- }
-
- cInt e1Wc, e2Wc;
- switch (e1FillType)
- {
- case pftPositive: e1Wc = e1->WindCnt; break;
- case pftNegative: e1Wc = -e1->WindCnt; break;
- default: e1Wc = Abs(e1->WindCnt);
- }
- switch(e2FillType)
- {
- case pftPositive: e2Wc = e2->WindCnt; break;
- case pftNegative: e2Wc = -e2->WindCnt; break;
- default: e2Wc = Abs(e2->WindCnt);
- }
-
- if ( e1Contributing && e2Contributing )
- {
- if ((e1Wc != 0 && e1Wc != 1) || (e2Wc != 0 && e2Wc != 1) ||
- (e1->PolyTyp != e2->PolyTyp && m_ClipType != ctXor) )
- {
- AddLocalMaxPoly(e1, e2, Pt);
- }
- else
- {
- AddOutPt(e1, Pt);
- AddOutPt(e2, Pt);
- SwapSides( *e1 , *e2 );
- SwapPolyIndexes( *e1 , *e2 );
- }
- }
- else if ( e1Contributing )
- {
- if (e2Wc == 0 || e2Wc == 1)
- {
- AddOutPt(e1, Pt);
- SwapSides(*e1, *e2);
- SwapPolyIndexes(*e1, *e2);
- }
- }
- else if ( e2Contributing )
- {
- if (e1Wc == 0 || e1Wc == 1)
- {
- AddOutPt(e2, Pt);
- SwapSides(*e1, *e2);
- SwapPolyIndexes(*e1, *e2);
- }
- }
- else if ( (e1Wc == 0 || e1Wc == 1) && (e2Wc == 0 || e2Wc == 1))
- {
- //neither edge is currently contributing ...
-
- cInt e1Wc2, e2Wc2;
- switch (e1FillType2)
- {
- case pftPositive: e1Wc2 = e1->WindCnt2; break;
- case pftNegative : e1Wc2 = -e1->WindCnt2; break;
- default: e1Wc2 = Abs(e1->WindCnt2);
- }
- switch (e2FillType2)
- {
- case pftPositive: e2Wc2 = e2->WindCnt2; break;
- case pftNegative: e2Wc2 = -e2->WindCnt2; break;
- default: e2Wc2 = Abs(e2->WindCnt2);
- }
-
- if (e1->PolyTyp != e2->PolyTyp)
- {
- AddLocalMinPoly(e1, e2, Pt);
- }
- else if (e1Wc == 1 && e2Wc == 1)
- switch( m_ClipType ) {
- case ctIntersection:
- if (e1Wc2 > 0 && e2Wc2 > 0)
- AddLocalMinPoly(e1, e2, Pt);
- break;
- case ctUnion:
- if ( e1Wc2 <= 0 && e2Wc2 <= 0 )
- AddLocalMinPoly(e1, e2, Pt);
- break;
- case ctDifference:
- if (((e1->PolyTyp == ptClip) && (e1Wc2 > 0) && (e2Wc2 > 0)) ||
- ((e1->PolyTyp == ptSubject) && (e1Wc2 <= 0) && (e2Wc2 <= 0)))
- AddLocalMinPoly(e1, e2, Pt);
- break;
- case ctXor:
- AddLocalMinPoly(e1, e2, Pt);
- }
- else
- SwapSides( *e1, *e2 );
- }
-}
-//------------------------------------------------------------------------------
-
-void Clipper::SetHoleState(TEdge *e, OutRec *outrec)
-{
- TEdge *e2 = e->PrevInAEL;
- TEdge *eTmp = 0;
- while (e2)
- {
- if (e2->OutIdx >= 0 && e2->WindDelta != 0)
- {
- if (!eTmp) eTmp = e2;
- else if (eTmp->OutIdx == e2->OutIdx) eTmp = 0;
- }
- e2 = e2->PrevInAEL;
- }
- if (!eTmp)
- {
- outrec->FirstLeft = 0;
- outrec->IsHole = false;
- }
- else
- {
- outrec->FirstLeft = m_PolyOuts[eTmp->OutIdx];
- outrec->IsHole = !outrec->FirstLeft->IsHole;
- }
-}
-//------------------------------------------------------------------------------
-
-OutRec* GetLowermostRec(OutRec *outRec1, OutRec *outRec2)
-{
- //work out which polygon fragment has the correct hole state ...
- if (!outRec1->BottomPt)
- outRec1->BottomPt = GetBottomPt(outRec1->Pts);
- if (!outRec2->BottomPt)
- outRec2->BottomPt = GetBottomPt(outRec2->Pts);
- OutPt *OutPt1 = outRec1->BottomPt;
- OutPt *OutPt2 = outRec2->BottomPt;
- if (OutPt1->Pt.y > OutPt2->Pt.y) return outRec1;
- else if (OutPt1->Pt.y < OutPt2->Pt.y) return outRec2;
- else if (OutPt1->Pt.x < OutPt2->Pt.x) return outRec1;
- else if (OutPt1->Pt.x > OutPt2->Pt.x) return outRec2;
- else if (OutPt1->Next == OutPt1) return outRec2;
- else if (OutPt2->Next == OutPt2) return outRec1;
- else if (FirstIsBottomPt(OutPt1, OutPt2)) return outRec1;
- else return outRec2;
-}
-//------------------------------------------------------------------------------
-
-bool OutRec1RightOfOutRec2(OutRec* outRec1, OutRec* outRec2)
-{
- do
- {
- outRec1 = outRec1->FirstLeft;
- if (outRec1 == outRec2) return true;
- } while (outRec1);
- return false;
-}
-//------------------------------------------------------------------------------
-
-OutRec* Clipper::GetOutRec(int Idx)
-{
- OutRec* outrec = m_PolyOuts[Idx];
- while (outrec != m_PolyOuts[outrec->Idx])
- outrec = m_PolyOuts[outrec->Idx];
- return outrec;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::AppendPolygon(TEdge *e1, TEdge *e2)
-{
- //get the start and ends of both output polygons ...
- OutRec *outRec1 = m_PolyOuts[e1->OutIdx];
- OutRec *outRec2 = m_PolyOuts[e2->OutIdx];
-
- OutRec *holeStateRec;
- if (OutRec1RightOfOutRec2(outRec1, outRec2))
- holeStateRec = outRec2;
- else if (OutRec1RightOfOutRec2(outRec2, outRec1))
- holeStateRec = outRec1;
- else
- holeStateRec = GetLowermostRec(outRec1, outRec2);
-
- //get the start and ends of both output polygons and
- //join e2 poly onto e1 poly and delete pointers to e2 ...
-
- OutPt* p1_lft = outRec1->Pts;
- OutPt* p1_rt = p1_lft->Prev;
- OutPt* p2_lft = outRec2->Pts;
- OutPt* p2_rt = p2_lft->Prev;
-
- //join e2 poly onto e1 poly and delete pointers to e2 ...
- if( e1->Side == esLeft )
- {
- if( e2->Side == esLeft )
- {
- //z y x a b c
- ReversePolyPtLinks(p2_lft);
- p2_lft->Next = p1_lft;
- p1_lft->Prev = p2_lft;
- p1_rt->Next = p2_rt;
- p2_rt->Prev = p1_rt;
- outRec1->Pts = p2_rt;
- } else
- {
- //x y z a b c
- p2_rt->Next = p1_lft;
- p1_lft->Prev = p2_rt;
- p2_lft->Prev = p1_rt;
- p1_rt->Next = p2_lft;
- outRec1->Pts = p2_lft;
- }
- } else
- {
- if( e2->Side == esRight )
- {
- //a b c z y x
- ReversePolyPtLinks(p2_lft);
- p1_rt->Next = p2_rt;
- p2_rt->Prev = p1_rt;
- p2_lft->Next = p1_lft;
- p1_lft->Prev = p2_lft;
- } else
- {
- //a b c x y z
- p1_rt->Next = p2_lft;
- p2_lft->Prev = p1_rt;
- p1_lft->Prev = p2_rt;
- p2_rt->Next = p1_lft;
- }
- }
-
- outRec1->BottomPt = 0;
- if (holeStateRec == outRec2)
- {
- if (outRec2->FirstLeft != outRec1)
- outRec1->FirstLeft = outRec2->FirstLeft;
- outRec1->IsHole = outRec2->IsHole;
- }
- outRec2->Pts = 0;
- outRec2->BottomPt = 0;
- outRec2->FirstLeft = outRec1;
-
- int OKIdx = e1->OutIdx;
- int ObsoleteIdx = e2->OutIdx;
-
- e1->OutIdx = Unassigned; //nb: safe because we only get here via AddLocalMaxPoly
- e2->OutIdx = Unassigned;
-
- TEdge* e = m_ActiveEdges;
- while( e )
- {
- if( e->OutIdx == ObsoleteIdx )
- {
- e->OutIdx = OKIdx;
- e->Side = e1->Side;
- break;
- }
- e = e->NextInAEL;
- }
-
- outRec2->Idx = outRec1->Idx;
-}
-//------------------------------------------------------------------------------
-
-OutPt* Clipper::AddOutPt(TEdge *e, const IntPoint &pt)
-{
- if( e->OutIdx < 0 )
- {
- OutRec *outRec = CreateOutRec();
- outRec->IsOpen = (e->WindDelta == 0);
- OutPt* newOp = new OutPt;
- outRec->Pts = newOp;
- newOp->Idx = outRec->Idx;
- newOp->Pt = pt;
- newOp->Next = newOp;
- newOp->Prev = newOp;
- if (!outRec->IsOpen)
- SetHoleState(e, outRec);
- e->OutIdx = outRec->Idx;
- return newOp;
- } else
- {
- OutRec *outRec = m_PolyOuts[e->OutIdx];
- //OutRec.Pts is the 'Left-most' point & OutRec.Pts.Prev is the 'Right-most'
- OutPt* op = outRec->Pts;
-
- bool ToFront = (e->Side == esLeft);
- if (ToFront && (pt == op->Pt)) return op;
- else if (!ToFront && (pt == op->Prev->Pt)) return op->Prev;
-
- OutPt* newOp = new OutPt;
- newOp->Idx = outRec->Idx;
- newOp->Pt = pt;
- newOp->Next = op;
- newOp->Prev = op->Prev;
- newOp->Prev->Next = newOp;
- op->Prev = newOp;
- if (ToFront) outRec->Pts = newOp;
- return newOp;
- }
-}
-//------------------------------------------------------------------------------
-
-OutPt* Clipper::GetLastOutPt(TEdge *e)
-{
- OutRec *outRec = m_PolyOuts[e->OutIdx];
- if (e->Side == esLeft)
- return outRec->Pts;
- else
- return outRec->Pts->Prev;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::ProcessHorizontals()
-{
- m_Maxima.sort();
- TEdge* horzEdge;
- while (PopEdgeFromSEL(horzEdge))
- {
- ProcessHorizontal(horzEdge);
- }
- m_Maxima.clear();
-}
-//------------------------------------------------------------------------------
-
-inline bool IsMinima(TEdge *e)
-{
- return e && (e->Prev->NextInLML != e) && (e->Next->NextInLML != e);
-}
-//------------------------------------------------------------------------------
-
-inline bool IsMaxima(TEdge *e, const cInt Y)
-{
- return e && e->Top.y == Y && !e->NextInLML;
-}
-//------------------------------------------------------------------------------
-
-inline bool IsIntermediate(TEdge *e, const cInt Y)
-{
- return e->Top.y == Y && e->NextInLML;
-}
-//------------------------------------------------------------------------------
-
-TEdge *GetMaximaPair(TEdge *e)
-{
- if ((e->Next->Top == e->Top) && !e->Next->NextInLML)
- return e->Next;
- else if ((e->Prev->Top == e->Top) && !e->Prev->NextInLML)
- return e->Prev;
- else return 0;
-}
-//------------------------------------------------------------------------------
-
-TEdge *GetMaximaPairEx(TEdge *e)
-{
- //as GetMaximaPair() but returns 0 if MaxPair isn't in AEL (unless it's horizontal)
- TEdge* result = GetMaximaPair(e);
- if (result && (result->OutIdx == Skip ||
- (result->NextInAEL == result->PrevInAEL && !IsHorizontal(*result)))) return 0;
- return result;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::SwapPositionsInSEL(TEdge *Edge1, TEdge *Edge2)
-{
- if( !( Edge1->NextInSEL ) && !( Edge1->PrevInSEL ) ) return;
- if( !( Edge2->NextInSEL ) && !( Edge2->PrevInSEL ) ) return;
-
- if( Edge1->NextInSEL == Edge2 )
- {
- TEdge* Next = Edge2->NextInSEL;
- if( Next ) Next->PrevInSEL = Edge1;
- TEdge* Prev = Edge1->PrevInSEL;
- if( Prev ) Prev->NextInSEL = Edge2;
- Edge2->PrevInSEL = Prev;
- Edge2->NextInSEL = Edge1;
- Edge1->PrevInSEL = Edge2;
- Edge1->NextInSEL = Next;
- }
- else if( Edge2->NextInSEL == Edge1 )
- {
- TEdge* Next = Edge1->NextInSEL;
- if( Next ) Next->PrevInSEL = Edge2;
- TEdge* Prev = Edge2->PrevInSEL;
- if( Prev ) Prev->NextInSEL = Edge1;
- Edge1->PrevInSEL = Prev;
- Edge1->NextInSEL = Edge2;
- Edge2->PrevInSEL = Edge1;
- Edge2->NextInSEL = Next;
- }
- else
- {
- TEdge* Next = Edge1->NextInSEL;
- TEdge* Prev = Edge1->PrevInSEL;
- Edge1->NextInSEL = Edge2->NextInSEL;
- if( Edge1->NextInSEL ) Edge1->NextInSEL->PrevInSEL = Edge1;
- Edge1->PrevInSEL = Edge2->PrevInSEL;
- if( Edge1->PrevInSEL ) Edge1->PrevInSEL->NextInSEL = Edge1;
- Edge2->NextInSEL = Next;
- if( Edge2->NextInSEL ) Edge2->NextInSEL->PrevInSEL = Edge2;
- Edge2->PrevInSEL = Prev;
- if( Edge2->PrevInSEL ) Edge2->PrevInSEL->NextInSEL = Edge2;
- }
-
- if( !Edge1->PrevInSEL ) m_SortedEdges = Edge1;
- else if( !Edge2->PrevInSEL ) m_SortedEdges = Edge2;
-}
-//------------------------------------------------------------------------------
-
-TEdge* GetNextInAEL(TEdge *e, Direction dir)
-{
- return dir == dLeftToRight ? e->NextInAEL : e->PrevInAEL;
-}
-//------------------------------------------------------------------------------
-
-void GetHorzDirection(TEdge& HorzEdge, Direction& Dir, cInt& Left, cInt& Right)
-{
- if (HorzEdge.Bot.x < HorzEdge.Top.x)
- {
- Left = HorzEdge.Bot.x;
- Right = HorzEdge.Top.x;
- Dir = dLeftToRight;
- } else
- {
- Left = HorzEdge.Top.x;
- Right = HorzEdge.Bot.x;
- Dir = dRightToLeft;
- }
-}
-//------------------------------------------------------------------------
-
-/*******************************************************************************
-* Notes: Horizontal edges (HEs) at scanline intersections (ie at the Top or *
-* Bottom of a scanbeam) are processed as if layered. The order in which HEs *
-* are processed doesn't matter. HEs intersect with other HE Bot.xs only [#] *
-* (or they could intersect with Top.xs only, ie EITHER Bot.xs OR Top.xs), *
-* and with other non-horizontal edges [*]. Once these intersections are *
-* processed, intermediate HEs then 'promote' the Edge above (NextInLML) into *
-* the AEL. These 'promoted' edges may in turn intersect [%] with other HEs. *
-*******************************************************************************/
-
-void Clipper::ProcessHorizontal(TEdge *horzEdge)
-{
- Direction dir;
- cInt horzLeft, horzRight;
- bool IsOpen = (horzEdge->WindDelta == 0);
-
- GetHorzDirection(*horzEdge, dir, horzLeft, horzRight);
-
- TEdge* eLastHorz = horzEdge, *eMaxPair = 0;
- while (eLastHorz->NextInLML && IsHorizontal(*eLastHorz->NextInLML))
- eLastHorz = eLastHorz->NextInLML;
- if (!eLastHorz->NextInLML)
- eMaxPair = GetMaximaPair(eLastHorz);
-
- MaximaList::const_iterator maxIt;
- MaximaList::const_reverse_iterator maxRit;
- if (!m_Maxima.empty())
- {
- //get the first maxima in range (X) ...
- if (dir == dLeftToRight)
- {
- maxIt = m_Maxima.begin();
- while (maxIt != m_Maxima.end() && *maxIt <= horzEdge->Bot.x) maxIt++;
- if (maxIt != m_Maxima.end() && *maxIt >= eLastHorz->Top.x)
- maxIt = m_Maxima.end();
- }
- else
- {
- maxRit = m_Maxima.rbegin();
- while (maxRit != m_Maxima.rend() && *maxRit > horzEdge->Bot.x) maxRit++;
- if (maxRit != m_Maxima.rend() && *maxRit <= eLastHorz->Top.x)
- maxRit = m_Maxima.rend();
- }
- }
-
- OutPt* op1 = 0;
-
- for (;;) //loop through consec. horizontal edges
- {
-
- bool IsLastHorz = (horzEdge == eLastHorz);
- TEdge* e = GetNextInAEL(horzEdge, dir);
- while(e)
- {
-
- //this code block inserts extra coords into horizontal edges (in output
- //polygons) whereever maxima touch these horizontal edges. This helps
- //'simplifying' polygons (ie if the Simplify property is set).
- if (!m_Maxima.empty())
- {
- if (dir == dLeftToRight)
- {
- while (maxIt != m_Maxima.end() && *maxIt < e->Curr.x)
- {
- if (horzEdge->OutIdx >= 0 && !IsOpen)
- AddOutPt(horzEdge, IntPoint(*maxIt, horzEdge->Bot.y));
- maxIt++;
- }
- }
- else
- {
- while (maxRit != m_Maxima.rend() && *maxRit > e->Curr.x)
- {
- if (horzEdge->OutIdx >= 0 && !IsOpen)
- AddOutPt(horzEdge, IntPoint(*maxRit, horzEdge->Bot.y));
- maxRit++;
- }
- }
- };
-
- if ((dir == dLeftToRight && e->Curr.x > horzRight) ||
- (dir == dRightToLeft && e->Curr.x < horzLeft)) break;
-
- //Also break if we've got to the end of an intermediate horizontal edge ...
- //nb: Smaller Dx's are to the right of larger Dx's ABOVE the horizontal.
- if (e->Curr.x == horzEdge->Top.x && horzEdge->NextInLML &&
- e->Dx < horzEdge->NextInLML->Dx) break;
-
- if (horzEdge->OutIdx >= 0 && !IsOpen) //note: may be done multiple times
- {
- op1 = AddOutPt(horzEdge, e->Curr);
- TEdge* eNextHorz = m_SortedEdges;
- while (eNextHorz)
- {
- if (eNextHorz->OutIdx >= 0 &&
- HorzSegmentsOverlap(horzEdge->Bot.x,
- horzEdge->Top.x, eNextHorz->Bot.x, eNextHorz->Top.x))
- {
- OutPt* op2 = GetLastOutPt(eNextHorz);
- AddJoin(op2, op1, eNextHorz->Top);
- }
- eNextHorz = eNextHorz->NextInSEL;
- }
- AddGhostJoin(op1, horzEdge->Bot);
- }
-
- //OK, so far we're still in range of the horizontal Edge but make sure
- //we're at the last of consec. horizontals when matching with eMaxPair
- if(e == eMaxPair && IsLastHorz)
- {
- if (horzEdge->OutIdx >= 0)
- AddLocalMaxPoly(horzEdge, eMaxPair, horzEdge->Top);
- DeleteFromAEL(horzEdge);
- DeleteFromAEL(eMaxPair);
- return;
- }
-
- if(dir == dLeftToRight)
- {
- IntPoint Pt = IntPoint(e->Curr.x, horzEdge->Curr.y);
- IntersectEdges(horzEdge, e, Pt);
- }
- else
- {
- IntPoint Pt = IntPoint(e->Curr.x, horzEdge->Curr.y);
- IntersectEdges( e, horzEdge, Pt);
- }
- TEdge* eNext = GetNextInAEL(e, dir);
- SwapPositionsInAEL( horzEdge, e );
- e = eNext;
- } //end while(e)
-
- //Break out of loop if HorzEdge.NextInLML is not also horizontal ...
- if (!horzEdge->NextInLML || !IsHorizontal(*horzEdge->NextInLML)) break;
-
- UpdateEdgeIntoAEL(horzEdge);
- if (horzEdge->OutIdx >= 0) AddOutPt(horzEdge, horzEdge->Bot);
- GetHorzDirection(*horzEdge, dir, horzLeft, horzRight);
-
- } //end for (;;)
-
- if (horzEdge->OutIdx >= 0 && !op1)
- {
- op1 = GetLastOutPt(horzEdge);
- TEdge* eNextHorz = m_SortedEdges;
- while (eNextHorz)
- {
- if (eNextHorz->OutIdx >= 0 &&
- HorzSegmentsOverlap(horzEdge->Bot.x,
- horzEdge->Top.x, eNextHorz->Bot.x, eNextHorz->Top.x))
- {
- OutPt* op2 = GetLastOutPt(eNextHorz);
- AddJoin(op2, op1, eNextHorz->Top);
- }
- eNextHorz = eNextHorz->NextInSEL;
- }
- AddGhostJoin(op1, horzEdge->Top);
- }
-
- if (horzEdge->NextInLML)
- {
- if(horzEdge->OutIdx >= 0)
- {
- op1 = AddOutPt( horzEdge, horzEdge->Top);
- //When StrictlySimple and 'horzEdge' is being touched by another edge, then
- //make sure both edges have a vertex here ...
- if (m_StrictSimple)
- {
- TEdge* ePrev = horzEdge->PrevInAEL;
- if ((horzEdge->WindDelta != 0) && ePrev && (ePrev->OutIdx >= 0) &&
- (ePrev->Curr.x == horzEdge->Top.x) && (ePrev->WindDelta != 0))
- {
- IntPoint pt = horzEdge->Top;
- AddOutPt(ePrev, pt);
- }
- TEdge* eNext = horzEdge->NextInAEL;
- if ((horzEdge->WindDelta != 0) && eNext && (eNext->OutIdx >= 0) &&
- (eNext->Curr.x == horzEdge->Top.x) && (eNext->WindDelta != 0))
- {
- IntPoint pt = horzEdge->Top;
- AddOutPt(eNext, pt);
- }
- }
- UpdateEdgeIntoAEL(horzEdge);
- if (horzEdge->WindDelta == 0) return;
- //nb: HorzEdge is no longer horizontal here
- TEdge* ePrev = horzEdge->PrevInAEL;
- TEdge* eNext = horzEdge->NextInAEL;
- if (ePrev && ePrev->Curr.x == horzEdge->Bot.x &&
- ePrev->Curr.y == horzEdge->Bot.y && ePrev->WindDelta != 0 &&
- (ePrev->OutIdx >= 0 && ePrev->Curr.y > ePrev->Top.y &&
- SlopesEqual(*horzEdge, *ePrev, m_UseFullRange)))
- {
- OutPt* op2 = AddOutPt(ePrev, horzEdge->Bot);
- AddJoin(op1, op2, horzEdge->Top);
- }
- else if (eNext && eNext->Curr.x == horzEdge->Bot.x &&
- eNext->Curr.y == horzEdge->Bot.y && eNext->WindDelta != 0 &&
- eNext->OutIdx >= 0 && eNext->Curr.y > eNext->Top.y &&
- SlopesEqual(*horzEdge, *eNext, m_UseFullRange))
- {
- OutPt* op2 = AddOutPt(eNext, horzEdge->Bot);
- AddJoin(op1, op2, horzEdge->Top);
- }
- }
- else
- UpdateEdgeIntoAEL(horzEdge);
- }
- else
- {
- if (horzEdge->OutIdx >= 0) AddOutPt(horzEdge, horzEdge->Top);
- DeleteFromAEL(horzEdge);
- }
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::ProcessIntersections(const cInt topY)
-{
- if( !m_ActiveEdges ) return true;
- try {
- BuildIntersectList(topY);
- size_t IlSize = m_IntersectList.size();
- if (IlSize == 0) return true;
- if (IlSize == 1 || FixupIntersectionOrder()) ProcessIntersectList();
- else return false;
- }
- catch(std::exception const& ex)
- {
- m_SortedEdges = 0;
- DisposeIntersectNodes();
- throw clipperException((std::string("ProcessIntersections error ") + ex.what()).c_str());
- }
- m_SortedEdges = 0;
- return true;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::DisposeIntersectNodes()
-{
- for (size_t i = 0; i < m_IntersectList.size(); ++i )
- delete m_IntersectList[i];
- m_IntersectList.clear();
-}
-//------------------------------------------------------------------------------
-
-void Clipper::BuildIntersectList(const cInt topY)
-{
- if ( !m_ActiveEdges ) return;
-
- //prepare for sorting ...
- TEdge* e = m_ActiveEdges;
- m_SortedEdges = e;
- while( e )
- {
- e->PrevInSEL = e->PrevInAEL;
- e->NextInSEL = e->NextInAEL;
- e->Curr.x = TopX( *e, topY );
- e = e->NextInAEL;
- }
-
- //bubblesort ...
- bool isModified;
- do
- {
- isModified = false;
- e = m_SortedEdges;
- while( e->NextInSEL )
- {
- TEdge *eNext = e->NextInSEL;
- IntPoint Pt;
- if(e->Curr.x > eNext->Curr.x)
- {
- IntersectPoint(*e, *eNext, Pt);
- if (Pt.y < topY) Pt = IntPoint(TopX(*e, topY), topY);
- IntersectNode * newNode = new IntersectNode;
- newNode->Edge1 = e;
- newNode->Edge2 = eNext;
- newNode->Pt = Pt;
- m_IntersectList.push_back(newNode);
-
- SwapPositionsInSEL(e, eNext);
- isModified = true;
- }
- else
- e = eNext;
- }
- if( e->PrevInSEL ) e->PrevInSEL->NextInSEL = 0;
- else break;
- }
- while ( isModified );
- m_SortedEdges = 0; //important
-}
-//------------------------------------------------------------------------------
-
-
-void Clipper::ProcessIntersectList()
-{
- for (size_t i = 0; i < m_IntersectList.size(); ++i)
- {
- IntersectNode* iNode = m_IntersectList[i];
- {
- IntersectEdges( iNode->Edge1, iNode->Edge2, iNode->Pt);
- SwapPositionsInAEL( iNode->Edge1 , iNode->Edge2 );
- }
- delete iNode;
- }
- m_IntersectList.clear();
-}
-//------------------------------------------------------------------------------
-
-bool IntersectListSort(IntersectNode* node1, IntersectNode* node2)
-{
- if (node2->Pt.y != node1->Pt.y)
- {
- return node2->Pt.y < node1->Pt.y;
- }
- else
- {
- return (node2->Edge1->WindCnt2 + node2->Edge2->WindCnt2) > (node1->Edge1->WindCnt2 + node1->Edge2->WindCnt2);
- }
-}
-//------------------------------------------------------------------------------
-
-inline bool EdgesAdjacent(const IntersectNode &inode)
-{
- return (inode.Edge1->NextInSEL == inode.Edge2) ||
- (inode.Edge1->PrevInSEL == inode.Edge2);
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::FixupIntersectionOrder()
-{
- //pre-condition: intersections are sorted Bottom-most first.
- //Now it's crucial that intersections are made only between adjacent edges,
- //so to ensure this the order of intersections may need adjusting ...
- CopyAELToSEL();
- std::stable_sort(m_IntersectList.begin(), m_IntersectList.end(), IntersectListSort);
- size_t cnt = m_IntersectList.size();
- for (size_t i = 0; i < cnt; ++i)
- {
- if (!EdgesAdjacent(*m_IntersectList[i]))
- {
- size_t j = i + 1;
- while (j < cnt && !EdgesAdjacent(*m_IntersectList[j])) j++;
- if (j == cnt) return false;
- std::swap(m_IntersectList[i], m_IntersectList[j]);
- }
- SwapPositionsInSEL(m_IntersectList[i]->Edge1, m_IntersectList[i]->Edge2);
- }
- return true;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::DoMaxima(TEdge *e)
-{
- TEdge* eMaxPair = GetMaximaPairEx(e);
- if (!eMaxPair)
- {
- if (e->OutIdx >= 0)
- {
- AddOutPt(e, e->Top);
- }
- DeleteFromAEL(e);
- return;
- }
-
- TEdge* ePrev = e->PrevInAEL;
- if (ePrev && ePrev->Curr.x == e->Top.x && ePrev->Top != e->Top && ePrev->OutIdx >= 0 &&
- ePrev->WindDelta != 0 && e->OutIdx >= 0 && e->WindDelta != 0)
- {
- IntPoint pt = e->Top;
- AddOutPt(ePrev, pt);
- }
- TEdge* eNext = e->NextInAEL;
- while(eNext && eNext != eMaxPair)
- {
- IntersectEdges(e, eNext, e->Top);
- SwapPositionsInAEL(e, eNext);
- eNext = e->NextInAEL;
- }
- eNext = eMaxPair->NextInAEL;
- if (eNext && eNext->Curr.x == e->Top.x && eNext->Top != e->Top && eNext->OutIdx >= 0 &&
- eNext->WindDelta != 0 && e->OutIdx >= 0 && e->WindDelta != 0)
- {
- IntPoint pt = e->Top;
- AddOutPt(eNext, pt);
- }
-
- if(e->OutIdx == Unassigned && eMaxPair->OutIdx == Unassigned)
- {
- DeleteFromAEL(e);
- DeleteFromAEL(eMaxPair);
- }
- else if( e->OutIdx >= 0 && eMaxPair->OutIdx >= 0 )
- {
- AddLocalMaxPoly(e, eMaxPair, e->Top);
- DeleteFromAEL(e);
- DeleteFromAEL(eMaxPair);
- }
-#ifdef use_lines
- else if (e->WindDelta == 0)
- {
- if (e->OutIdx >= 0)
- {
- AddOutPt(e, e->Top);
- e->OutIdx = Unassigned;
- }
- DeleteFromAEL(e);
-
- if (eMaxPair->OutIdx >= 0)
- {
- AddOutPt(eMaxPair, e->Top);
- eMaxPair->OutIdx = Unassigned;
- }
- DeleteFromAEL(eMaxPair);
- }
-#endif
- else throw clipperException("DoMaxima error");
-}
-//------------------------------------------------------------------------------
-
-void Clipper::ProcessEdgesAtTopOfScanbeam(const cInt topY)
-{
- TEdge* e = m_ActiveEdges;
- MaximaList next_maxima;
- while( e )
- {
- //1. process maxima, treating them as if they're 'bent' horizontal edges,
- // but exclude maxima with horizontal edges. nb: e can't be a horizontal.
- bool IsMaximaEdge = IsMaxima(e, topY);
-
- if(IsMaximaEdge)
- {
- TEdge* eMaxPair = GetMaximaPairEx(e);
- IsMaximaEdge = (!eMaxPair || !IsHorizontal(*eMaxPair));
- }
-
- if(IsMaximaEdge)
- {
- if (m_StrictSimple)
- {
- m_Maxima.push_back(e->Top.x);
- next_maxima.push_back(e->Top.x);
- }
- TEdge* ePrev = e->PrevInAEL;
- DoMaxima(e);
- if( !ePrev ) e = m_ActiveEdges;
- else e = ePrev->NextInAEL;
- }
- else
- {
- //2. promote horizontal edges, otherwise update Curr.x and Curr.y ...
- if (IsIntermediate(e, topY) && IsHorizontal(*e->NextInLML))
- {
- UpdateEdgeIntoAEL(e);
- if (e->OutIdx >= 0)
- {
- AddOutPt(e, e->Bot);
- if (m_StrictSimple)
- {
- m_Maxima.push_back(e->Top.x);
- m_Maxima.push_back(e->Bot.x);
- next_maxima.push_back(e->Bot.x);
- }
- }
- AddEdgeToSEL(e);
- }
- else
- {
- e->Curr.x = TopX( *e, topY );
- e->Curr.y = topY;
- }
-
- //When StrictlySimple and 'e' is being touched by another edge, then
- //make sure both edges have a vertex here ...
- if (m_StrictSimple && e->OutIdx >= 0 && e->WindDelta != 0)
- {
- TEdge* ePrev = e->PrevInAEL;
- while (ePrev && ePrev->Curr.x == e->Curr.x)
- {
- if (ePrev->OutIdx >= 0 && ePrev->WindDelta != 0 &&
- !(e->Bot == ePrev->Bot && e->Top == ePrev->Top))
- {
- IntPoint pt = e->Curr;
-#ifdef use_xyz
- SetZ(pt, *ePrev, *e);
-#endif
- OutPt* op = AddOutPt(ePrev, pt);
- OutPt* op2 = AddOutPt(e, pt);
- AddJoin(op, op2, pt); //StrictlySimple (type-3) join
- }
- ePrev = ePrev->PrevInAEL;
- }
- }
-
- e = e->NextInAEL;
- }
- }
- if (m_StrictSimple)
- {
- MinimaList::iterator lm = m_CurrentLM;
- while (lm != m_MinimaList.end() && lm->y == topY)
- {
- if (lm->LeftBound && lm->RightBound)
- {
- m_Maxima.push_back(lm->LeftBound->Bot.x);
- }
- ++lm;
- }
- }
-
- //3. Process horizontals at the Top of the scanbeam ...
- ProcessHorizontals();
- if (m_StrictSimple && !next_maxima.empty())
- {
- m_Maxima.insert(m_Maxima.end(), next_maxima.begin(), next_maxima.end());
- }
-
- //4. Promote intermediate vertices ...
- e = m_ActiveEdges;
- while(e)
- {
- if(IsIntermediate(e, topY))
- {
- OutPt* op = 0;
- if( e->OutIdx >= 0 )
- op = AddOutPt(e, e->Top);
- UpdateEdgeIntoAEL(e);
-
- //if output polygons share an edge, they'll need joining later ...
- TEdge* ePrev = e->PrevInAEL;
- TEdge* eNext = e->NextInAEL;
- if (ePrev && ePrev->Curr.x == e->Bot.x &&
- ePrev->Curr.y == e->Bot.y && op &&
- ePrev->OutIdx >= 0 && ePrev->Curr.y > ePrev->Top.y &&
- SlopesEqual(e->Curr, e->Top, ePrev->Curr, ePrev->Top, m_UseFullRange) &&
- (e->WindDelta != 0) && (ePrev->WindDelta != 0))
- {
- OutPt* op2 = AddOutPt(ePrev, e->Bot);
- AddJoin(op, op2, e->Top);
- }
- else if (eNext && eNext->Curr.x == e->Bot.x &&
- eNext->Curr.y == e->Bot.y && op &&
- eNext->OutIdx >= 0 && eNext->Curr.y > eNext->Top.y &&
- SlopesEqual(e->Curr, e->Top, eNext->Curr, eNext->Top, m_UseFullRange) &&
- (e->WindDelta != 0) && (eNext->WindDelta != 0))
- {
- OutPt* op2 = AddOutPt(eNext, e->Bot);
- AddJoin(op, op2, e->Top);
- }
- }
- e = e->NextInAEL;
- }
-}
-//------------------------------------------------------------------------------
-
-void Clipper::FixupOutPolyline(OutRec &outrec)
-{
- OutPt *pp = outrec.Pts;
- OutPt *lastPP = pp->Prev;
- while (pp != lastPP)
- {
- pp = pp->Next;
- if (pp->Pt == pp->Prev->Pt)
- {
- if (pp == lastPP) lastPP = pp->Prev;
- OutPt *tmpPP = pp->Prev;
- tmpPP->Next = pp->Next;
- pp->Next->Prev = tmpPP;
- delete pp;
- pp = tmpPP;
- }
- }
-
- if (pp == pp->Prev)
- {
- DisposeOutPts(pp);
- outrec.Pts = 0;
- return;
- }
-}
-//------------------------------------------------------------------------------
-
-void Clipper::FixupOutPolygon(OutRec &outrec)
-{
- //FixupOutPolygon() - removes duplicate points and simplifies consecutive
- //parallel edges by removing the middle vertex.
- OutPt *lastOK = 0;
- outrec.BottomPt = 0;
- OutPt *pp = outrec.Pts;
- bool preserveCol = m_PreserveCollinear || m_StrictSimple;
-
- for (;;)
- {
- if (pp->Prev == pp || pp->Prev == pp->Next)
- {
- DisposeOutPts(pp);
- outrec.Pts = 0;
- return;
- }
-
- //test for duplicate points and collinear edges ...
- if ((pp->Pt == pp->Next->Pt) || (pp->Pt == pp->Prev->Pt) ||
- (SlopesEqual(pp->Prev->Pt, pp->Pt, pp->Next->Pt, m_UseFullRange) &&
- (!preserveCol || !Pt2IsBetweenPt1AndPt3(pp->Prev->Pt, pp->Pt, pp->Next->Pt))))
- {
- lastOK = 0;
- OutPt *tmp = pp;
- pp->Prev->Next = pp->Next;
- pp->Next->Prev = pp->Prev;
- pp = pp->Prev;
- delete tmp;
- }
- else if (pp == lastOK) break;
- else
- {
- if (!lastOK) lastOK = pp;
- pp = pp->Next;
- }
- }
- outrec.Pts = pp;
-}
-//------------------------------------------------------------------------------
-
-int PointCount(OutPt *Pts)
-{
- if (!Pts) return 0;
- int result = 0;
- OutPt* p = Pts;
- do
- {
- result++;
- p = p->Next;
- }
- while (p != Pts);
- return result;
-}
-
-//------------------------------------------------------------------------------
-
-void Clipper::BuildResult(Paths &polys)
-{
- polys.reserve(m_PolyOuts.size());
- for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i)
- {
- if (!m_PolyOuts[i]->Pts) continue;
- Path pg;
- OutPt* p = m_PolyOuts[i]->Pts->Prev;
- int cnt = PointCount(p);
- if (cnt < 2) continue;
- pg.reserve(cnt);
- for (int j = 0; j < cnt; ++j)
- {
- pg.push_back(p->Pt);
- p = p->Prev;
- }
- polys.push_back(pg);
- }
-}
-//------------------------------------------------------------------------------
-
-void Clipper::BuildResult2(PolyTree& polytree)
-{
- polytree.Clear();
- polytree.AllNodes.reserve(m_PolyOuts.size());
- //add each output polygon/contour to polytree ...
- for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); i++)
- {
- OutRec* outRec = m_PolyOuts[i];
- int cnt = PointCount(outRec->Pts);
- if ((outRec->IsOpen && cnt < 2) || (!outRec->IsOpen && cnt < 3)) continue;
- FixHoleLinkage(*outRec);
- PolyNode* pn = new PolyNode();
- //nb: polytree takes ownership of all the PolyNodes
- polytree.AllNodes.push_back(pn);
- outRec->PolyNd = pn;
- pn->Parent = 0;
- pn->Index = 0;
- pn->Contour.reserve(cnt);
- OutPt *op = outRec->Pts->Prev;
- for (int j = 0; j < cnt; j++)
- {
- pn->Contour.push_back(op->Pt);
- op = op->Prev;
- }
- }
-
- //fixup PolyNode links etc ...
- polytree.Childs.reserve(m_PolyOuts.size());
- for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); i++)
- {
- OutRec* outRec = m_PolyOuts[i];
- if (!outRec->PolyNd) continue;
- if (outRec->IsOpen)
- {
- outRec->PolyNd->m_IsOpen = true;
- polytree.AddChild(*outRec->PolyNd);
- }
- else if (outRec->FirstLeft && outRec->FirstLeft->PolyNd)
- outRec->FirstLeft->PolyNd->AddChild(*outRec->PolyNd);
- else
- polytree.AddChild(*outRec->PolyNd);
- }
-}
-//------------------------------------------------------------------------------
-
-void SwapIntersectNodes(IntersectNode &int1, IntersectNode &int2)
-{
- //just swap the contents (because fIntersectNodes is a single-linked-list)
- IntersectNode inode = int1; //gets a copy of Int1
- int1.Edge1 = int2.Edge1;
- int1.Edge2 = int2.Edge2;
- int1.Pt = int2.Pt;
- int2.Edge1 = inode.Edge1;
- int2.Edge2 = inode.Edge2;
- int2.Pt = inode.Pt;
-}
-//------------------------------------------------------------------------------
-
-inline bool E2InsertsBeforeE1(TEdge &e1, TEdge &e2)
-{
- if (e2.Curr.x == e1.Curr.x)
- {
- if (e2.Top.y > e1.Top.y)
- return e2.Top.x < TopX(e1, e2.Top.y);
- else return e1.Top.x > TopX(e2, e1.Top.y);
- }
- else return e2.Curr.x < e1.Curr.x;
-}
-//------------------------------------------------------------------------------
-
-bool GetOverlap(const cInt a1, const cInt a2, const cInt b1, const cInt b2,
- cInt& Left, cInt& Right)
-{
- if (a1 < a2)
- {
- if (b1 < b2) {Left = std::max(a1,b1); Right = std::min(a2,b2);}
- else {Left = std::max(a1,b2); Right = std::min(a2,b1);}
- }
- else
- {
- if (b1 < b2) {Left = std::max(a2,b1); Right = std::min(a1,b2);}
- else {Left = std::max(a2,b2); Right = std::min(a1,b1);}
- }
- return Left < Right;
-}
-//------------------------------------------------------------------------------
-
-inline void UpdateOutPtIdxs(OutRec& outrec)
-{
- OutPt* op = outrec.Pts;
- do
- {
- op->Idx = outrec.Idx;
- op = op->Prev;
- }
- while(op != outrec.Pts);
-}
-//------------------------------------------------------------------------------
-
-void Clipper::InsertEdgeIntoAEL(TEdge *edge, TEdge* startEdge)
-{
- if(!m_ActiveEdges)
- {
- edge->PrevInAEL = 0;
- edge->NextInAEL = 0;
- m_ActiveEdges = edge;
- }
- else if(!startEdge && E2InsertsBeforeE1(*m_ActiveEdges, *edge))
- {
- edge->PrevInAEL = 0;
- edge->NextInAEL = m_ActiveEdges;
- m_ActiveEdges->PrevInAEL = edge;
- m_ActiveEdges = edge;
- }
- else
- {
- if(!startEdge) startEdge = m_ActiveEdges;
- while(startEdge->NextInAEL &&
- !E2InsertsBeforeE1(*startEdge->NextInAEL , *edge))
- startEdge = startEdge->NextInAEL;
- edge->NextInAEL = startEdge->NextInAEL;
- if(startEdge->NextInAEL) startEdge->NextInAEL->PrevInAEL = edge;
- edge->PrevInAEL = startEdge;
- startEdge->NextInAEL = edge;
- }
-}
-//----------------------------------------------------------------------
-
-OutPt* DupOutPt(OutPt* outPt, bool InsertAfter)
-{
- OutPt* result = new OutPt;
- result->Pt = outPt->Pt;
- result->Idx = outPt->Idx;
- if (InsertAfter)
- {
- result->Next = outPt->Next;
- result->Prev = outPt;
- outPt->Next->Prev = result;
- outPt->Next = result;
- }
- else
- {
- result->Prev = outPt->Prev;
- result->Next = outPt;
- outPt->Prev->Next = result;
- outPt->Prev = result;
- }
- return result;
-}
-//------------------------------------------------------------------------------
-
-bool JoinHorz(OutPt* op1, OutPt* op1b, OutPt* op2, OutPt* op2b,
- const IntPoint Pt, bool DiscardLeft)
-{
- Direction Dir1 = (op1->Pt.x > op1b->Pt.x ? dRightToLeft : dLeftToRight);
- Direction Dir2 = (op2->Pt.x > op2b->Pt.x ? dRightToLeft : dLeftToRight);
- if (Dir1 == Dir2) return false;
-
- //When DiscardLeft, we want Op1b to be on the Left of Op1, otherwise we
- //want Op1b to be on the Right. (And likewise with Op2 and Op2b.)
- //So, to facilitate this while inserting Op1b and Op2b ...
- //when DiscardLeft, make sure we're AT or RIGHT of Pt before adding Op1b,
- //otherwise make sure we're AT or LEFT of Pt. (Likewise with Op2b.)
- if (Dir1 == dLeftToRight)
- {
- while (op1->Next->Pt.x <= Pt.x &&
- op1->Next->Pt.x >= op1->Pt.x && op1->Next->Pt.y == Pt.y)
- op1 = op1->Next;
- if (DiscardLeft && (op1->Pt.x != Pt.x)) op1 = op1->Next;
- op1b = DupOutPt(op1, !DiscardLeft);
- if (op1b->Pt != Pt)
- {
- op1 = op1b;
- op1->Pt = Pt;
- op1b = DupOutPt(op1, !DiscardLeft);
- }
- }
- else
- {
- while (op1->Next->Pt.x >= Pt.x &&
- op1->Next->Pt.x <= op1->Pt.x && op1->Next->Pt.y == Pt.y)
- op1 = op1->Next;
- if (!DiscardLeft && (op1->Pt.x != Pt.x)) op1 = op1->Next;
- op1b = DupOutPt(op1, DiscardLeft);
- if (op1b->Pt != Pt)
- {
- op1 = op1b;
- op1->Pt = Pt;
- op1b = DupOutPt(op1, DiscardLeft);
- }
- }
-
- if (Dir2 == dLeftToRight)
- {
- while (op2->Next->Pt.x <= Pt.x &&
- op2->Next->Pt.x >= op2->Pt.x && op2->Next->Pt.y == Pt.y)
- op2 = op2->Next;
- if (DiscardLeft && (op2->Pt.x != Pt.x)) op2 = op2->Next;
- op2b = DupOutPt(op2, !DiscardLeft);
- if (op2b->Pt != Pt)
- {
- op2 = op2b;
- op2->Pt = Pt;
- op2b = DupOutPt(op2, !DiscardLeft);
- };
- } else
- {
- while (op2->Next->Pt.x >= Pt.x &&
- op2->Next->Pt.x <= op2->Pt.x && op2->Next->Pt.y == Pt.y)
- op2 = op2->Next;
- if (!DiscardLeft && (op2->Pt.x != Pt.x)) op2 = op2->Next;
- op2b = DupOutPt(op2, DiscardLeft);
- if (op2b->Pt != Pt)
- {
- op2 = op2b;
- op2->Pt = Pt;
- op2b = DupOutPt(op2, DiscardLeft);
- };
- };
-
- if ((Dir1 == dLeftToRight) == DiscardLeft)
- {
- op1->Prev = op2;
- op2->Next = op1;
- op1b->Next = op2b;
- op2b->Prev = op1b;
- }
- else
- {
- op1->Next = op2;
- op2->Prev = op1;
- op1b->Prev = op2b;
- op2b->Next = op1b;
- }
- return true;
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::JoinPoints(Join *j, OutRec* outRec1, OutRec* outRec2)
-{
- OutPt *op1 = j->OutPt1, *op1b;
- OutPt *op2 = j->OutPt2, *op2b;
-
- //There are 3 kinds of joins for output polygons ...
- //1. Horizontal joins where Join.OutPt1 & Join.OutPt2 are vertices anywhere
- //along (horizontal) collinear edges (& Join.OffPt is on the same horizontal).
- //2. Non-horizontal joins where Join.OutPt1 & Join.OutPt2 are at the same
- //location at the Bottom of the overlapping segment (& Join.OffPt is above).
- //3. StrictSimple joins where edges touch but are not collinear and where
- //Join.OutPt1, Join.OutPt2 & Join.OffPt all share the same point.
- bool isHorizontal = (j->OutPt1->Pt.y == j->OffPt.y);
-
- if (isHorizontal && (j->OffPt == j->OutPt1->Pt) &&
- (j->OffPt == j->OutPt2->Pt))
- {
- if (outRec1 != outRec2)
- {
- // First Op1 Next and Op2 Prev
- op1b = j->OutPt1->Next;
- while (op1b != op1 && (op1b->Pt == j->OffPt))
- op1b = op1b->Next;
- op2b = j->OutPt2->Prev;
- while (op2b != op2 && (op2b->Pt == j->OffPt))
- op2b = op2b->Prev;
- if (op1b->Pt == op2b->Pt)
- {
- OutPt* op1b_prev = op1b->Prev;
- OutPt* op2b_next = op2b->Next;
- op1b->Prev = op2b;
- op2b->Next = op1b;
- op1b_prev->Next = op2b_next;
- op2b_next->Prev = op1b_prev;
- return true;
- }
-
- // Second Op1 Prev and Op2 Next
- op2b = j->OutPt2->Next;
- while (op2b != op2 && (op2b->Pt == j->OffPt))
- op2b = op2b->Next;
- op1b = j->OutPt1->Prev;
- while (op1b != op1 && (op1b->Pt == j->OffPt))
- op1b = op1b->Prev;
- if (op2b->Pt == op1b->Pt)
- {
- OutPt* op2b_prev = op2b->Prev;
- OutPt* op1b_next = op1b->Next;
- op2b->Prev = op1b;
- op1b->Next = op2b;
- op2b_prev->Next = op1b_next;
- op1b_next->Prev = op2b_prev;
- return true;
- }
- return false;
- }
- //Strictly Simple join ...
- op1b = j->OutPt1->Next;
- while (op1b != op1 && (op1b->Pt == j->OffPt))
- op1b = op1b->Next;
- bool reverse1 = (op1b->Pt.y > j->OffPt.y);
- op2b = j->OutPt2->Next;
- while (op2b != op2 && (op2b->Pt == j->OffPt))
- op2b = op2b->Next;
- bool reverse2 = (op2b->Pt.y > j->OffPt.y);
- if (reverse1 == reverse2) return false;
- if (reverse1)
- {
- op1b = DupOutPt(op1, false);
- op2b = DupOutPt(op2, true);
- op1->Prev = op2;
- op2->Next = op1;
- op1b->Next = op2b;
- op2b->Prev = op1b;
- j->OutPt1 = op1;
- j->OutPt2 = op1b;
- return true;
- } else
- {
- op1b = DupOutPt(op1, true);
- op2b = DupOutPt(op2, false);
- op1->Next = op2;
- op2->Prev = op1;
- op1b->Prev = op2b;
- op2b->Next = op1b;
- j->OutPt1 = op1;
- j->OutPt2 = op1b;
- return true;
- }
- }
- else if (isHorizontal)
- {
- //treat horizontal joins differently to non-horizontal joins since with
- //them we're not yet sure where the overlapping is. OutPt1.Pt & OutPt2.Pt
- //may be anywhere along the horizontal edge.
- op1b = op1;
- while (op1->Prev->Pt.y == op1->Pt.y && op1->Prev != op1b && op1->Prev != op2)
- op1 = op1->Prev;
- while (op1b->Next->Pt.y == op1b->Pt.y && op1b->Next != op1 && op1b->Next != op2)
- op1b = op1b->Next;
- if (op1b->Next == op1 || op1b->Next == op2) return false; //a flat 'polygon'
-
- op2b = op2;
- while (op2->Prev->Pt.y == op2->Pt.y && op2->Prev != op2b && op2->Prev != op1b)
- op2 = op2->Prev;
- while (op2b->Next->Pt.y == op2b->Pt.y && op2b->Next != op2 && op2b->Next != op1)
- op2b = op2b->Next;
- if (op2b->Next == op2 || op2b->Next == op1) return false; //a flat 'polygon'
-
- cInt Left, Right;
- //Op1 --> Op1b & Op2 --> Op2b are the extremites of the horizontal edges
- if (!GetOverlap(op1->Pt.x, op1b->Pt.x, op2->Pt.x, op2b->Pt.x, Left, Right))
- return false;
-
- //DiscardLeftSide: when overlapping edges are joined, a spike will created
- //which needs to be cleaned up. However, we don't want Op1 or Op2 caught up
- //on the discard Side as either may still be needed for other joins ...
- IntPoint Pt;
- bool DiscardLeftSide;
- if (op1->Pt.x >= Left && op1->Pt.x <= Right)
- {
- Pt = op1->Pt; DiscardLeftSide = (op1->Pt.x > op1b->Pt.x);
- }
- else if (op2->Pt.x >= Left&& op2->Pt.x <= Right)
- {
- Pt = op2->Pt; DiscardLeftSide = (op2->Pt.x > op2b->Pt.x);
- }
- else if (op1b->Pt.x >= Left && op1b->Pt.x <= Right)
- {
- Pt = op1b->Pt; DiscardLeftSide = op1b->Pt.x > op1->Pt.x;
- }
- else
- {
- Pt = op2b->Pt; DiscardLeftSide = (op2b->Pt.x > op2->Pt.x);
- }
- j->OutPt1 = op1; j->OutPt2 = op2;
- return JoinHorz(op1, op1b, op2, op2b, Pt, DiscardLeftSide);
- } else
- {
- //nb: For non-horizontal joins ...
- // 1. Jr.OutPt1.Pt.y == Jr.OutPt2.Pt.y
- // 2. Jr.OutPt1.Pt > Jr.OffPt.y
-
- //make sure the polygons are correctly oriented ...
- op1b = op1->Next;
- while ((op1b->Pt == op1->Pt) && (op1b != op1)) op1b = op1b->Next;
- bool Reverse1 = ((op1b->Pt.y > op1->Pt.y) ||
- !SlopesEqual(op1->Pt, op1b->Pt, j->OffPt, m_UseFullRange));
- if (Reverse1)
- {
- op1b = op1->Prev;
- while ((op1b->Pt == op1->Pt) && (op1b != op1)) op1b = op1b->Prev;
- if ((op1b->Pt.y > op1->Pt.y) ||
- !SlopesEqual(op1->Pt, op1b->Pt, j->OffPt, m_UseFullRange)) return false;
- };
- op2b = op2->Next;
- while ((op2b->Pt == op2->Pt) && (op2b != op2))op2b = op2b->Next;
- bool Reverse2 = ((op2b->Pt.y > op2->Pt.y) ||
- !SlopesEqual(op2->Pt, op2b->Pt, j->OffPt, m_UseFullRange));
- if (Reverse2)
- {
- op2b = op2->Prev;
- while ((op2b->Pt == op2->Pt) && (op2b != op2)) op2b = op2b->Prev;
- if ((op2b->Pt.y > op2->Pt.y) ||
- !SlopesEqual(op2->Pt, op2b->Pt, j->OffPt, m_UseFullRange)) return false;
- }
-
- if ((op1b == op1) || (op2b == op2) || (op1b == op2b) ||
- ((outRec1 == outRec2) && (Reverse1 == Reverse2))) return false;
-
- if (Reverse1)
- {
- op1b = DupOutPt(op1, false);
- op2b = DupOutPt(op2, true);
- op1->Prev = op2;
- op2->Next = op1;
- op1b->Next = op2b;
- op2b->Prev = op1b;
- j->OutPt1 = op1;
- j->OutPt2 = op1b;
- return true;
- } else
- {
- op1b = DupOutPt(op1, true);
- op2b = DupOutPt(op2, false);
- op1->Next = op2;
- op2->Prev = op1;
- op1b->Prev = op2b;
- op2b->Next = op1b;
- j->OutPt1 = op1;
- j->OutPt2 = op1b;
- return true;
- }
- }
-}
-//----------------------------------------------------------------------
-
-static OutRec* ParseFirstLeft(OutRec* FirstLeft)
-{
- while (FirstLeft && !FirstLeft->Pts)
- FirstLeft = FirstLeft->FirstLeft;
- return FirstLeft;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::FixupFirstLefts1(OutRec* OldOutRec, OutRec* NewOutRec)
-{
- //tests if NewOutRec contains the polygon before reassigning FirstLeft
- for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i)
- {
- OutRec* outRec = m_PolyOuts[i];
- OutRec* firstLeft = ParseFirstLeft(outRec->FirstLeft);
- if (outRec->Pts && firstLeft == OldOutRec)
- {
- if (Poly2ContainsPoly1(outRec->Pts, NewOutRec->Pts))
- {
- if (outRec->IsHole == NewOutRec->IsHole)
- {
- outRec->IsHole = !outRec->IsHole;
- ReversePolyPtLinks(outRec->Pts);
- }
- outRec->FirstLeft = NewOutRec;
- }
- }
- }
-}
-//----------------------------------------------------------------------
-
-void Clipper::FixupFirstLefts2(OutRec* InnerOutRec, OutRec* OuterOutRec)
-{
- //A polygon has split into two such that one is now the inner of the other.
- //It's possible that these polygons now wrap around other polygons, so check
- //every polygon that's also contained by OuterOutRec's FirstLeft container
- //(including 0) to see if they've become inner to the new inner polygon ...
- for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i)
- {
- OutRec* outRec = m_PolyOuts[i];
-
- if (!outRec->Pts || outRec == OuterOutRec || outRec == InnerOutRec)
- continue;
- OutRec* firstLeft = ParseFirstLeft(outRec->FirstLeft);
- if (firstLeft != InnerOutRec && firstLeft != OuterOutRec)
- continue;
- if (Poly2ContainsPoly1(outRec->Pts, InnerOutRec->Pts))
- {
- if (outRec->IsHole == InnerOutRec->IsHole)
- {
- outRec->IsHole = !outRec->IsHole;
- ReversePolyPtLinks(outRec->Pts);
- }
- outRec->FirstLeft = InnerOutRec;
- }
- else
- {
- if (outRec->IsHole == OuterOutRec->IsHole)
- {
- if (Poly2ContainsPoly1(outRec->Pts, OuterOutRec->Pts))
- {
- outRec->FirstLeft = OuterOutRec;
- }
- else
- {
- outRec->FirstLeft = ParseFirstLeft(OuterOutRec->FirstLeft);
- }
- }
- else
- {
- if (Area(outRec->Pts) == 0.0 && !Poly2ContainsPoly1(outRec->Pts, OuterOutRec->Pts))
- {
- outRec->IsHole = !outRec->IsHole;
- outRec->FirstLeft = ParseFirstLeft(OuterOutRec->FirstLeft);
- ReversePolyPtLinks(outRec->Pts);
- }
- else
- {
- outRec->FirstLeft = OuterOutRec;
- }
- }
- }
- }
-}
-//----------------------------------------------------------------------
-void Clipper::FixupFirstLefts3(OutRec* OldOutRec, OutRec* NewOutRec)
-{
- //reassigns FirstLeft WITHOUT testing if NewOutRec contains the polygon
- for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i)
- {
- OutRec* outRec = m_PolyOuts[i];
- // unused variable `firstLeft`: is this a bug? (dane)
- //OutRec* firstLeft = ParseFirstLeft(outRec->FirstLeft);
- if (outRec->Pts && outRec->FirstLeft == OldOutRec)
- outRec->FirstLeft = NewOutRec;
- }
-}
-//----------------------------------------------------------------------
-
-void Clipper::JoinCommonEdges()
-{
- for (JoinList::size_type i = 0; i < m_Joins.size(); i++)
- {
- Join* join = m_Joins[i];
-
- OutRec *outRec1 = GetOutRec(join->OutPt1->Idx);
- OutRec *outRec2 = GetOutRec(join->OutPt2->Idx);
-
- if (!outRec1->Pts || !outRec2->Pts) continue;
- if (outRec1->IsOpen || outRec2->IsOpen) continue;
-
- //get the polygon fragment with the correct hole state (FirstLeft)
- //before calling JoinPoints() ...
- OutRec *holeStateRec;
- if (outRec1 == outRec2) holeStateRec = outRec1;
- else if (OutRec1RightOfOutRec2(outRec1, outRec2)) holeStateRec = outRec2;
- else if (OutRec1RightOfOutRec2(outRec2, outRec1)) holeStateRec = outRec1;
- else holeStateRec = GetLowermostRec(outRec1, outRec2);
-
- if (!JoinPoints(join, outRec1, outRec2)) continue;
-
- if (outRec1 == outRec2)
- {
- //instead of joining two polygons, we've just created a new one by
- //splitting one polygon into two.
- outRec1->BottomPt = 0;
- outRec2 = CreateOutRec();
- if (PointCount(join->OutPt1) > PointCount(join->OutPt2))
- {
- outRec1->Pts = join->OutPt1;
- outRec2->Pts = join->OutPt2;
- }
- else
- {
- outRec1->Pts = join->OutPt2;
- outRec2->Pts = join->OutPt1;
- }
-
- //update all OutRec2.Pts Idx's ...
- UpdateOutPtIdxs(*outRec2);
-
- if (Poly2ContainsPoly1(outRec2->Pts, outRec1->Pts))
- {
- //outRec1 contains outRec2 ...
- outRec2->IsHole = !outRec1->IsHole;
- outRec2->FirstLeft = outRec1;
-
- if (m_UsingPolyTree) FixupFirstLefts2(outRec2, outRec1);
-
- if ((outRec2->IsHole ^ m_ReverseOutput) == (Area(*outRec2) > 0))
- ReversePolyPtLinks(outRec2->Pts);
-
- } else if (Poly2ContainsPoly1(outRec1->Pts, outRec2->Pts))
- {
- //outRec2 contains outRec1 ...
- outRec2->IsHole = outRec1->IsHole;
- outRec1->IsHole = !outRec2->IsHole;
- outRec2->FirstLeft = outRec1->FirstLeft;
- outRec1->FirstLeft = outRec2;
-
- if (m_UsingPolyTree) FixupFirstLefts2(outRec1, outRec2);
-
- if ((outRec1->IsHole ^ m_ReverseOutput) == (Area(*outRec1) > 0))
- ReversePolyPtLinks(outRec1->Pts);
- }
- else
- {
- //the 2 polygons are completely separate ...
- outRec2->IsHole = outRec1->IsHole;
- outRec2->FirstLeft = outRec1->FirstLeft;
-
- //fixup FirstLeft pointers that may need reassigning to OutRec2
- if (m_UsingPolyTree) FixupFirstLefts1(outRec1, outRec2);
- }
-
- } else
- {
- //joined 2 polygons together ...
-
- outRec2->Pts = 0;
- outRec2->BottomPt = 0;
- outRec2->Idx = outRec1->Idx;
-
- outRec1->IsHole = holeStateRec->IsHole;
- if (holeStateRec == outRec2)
- outRec1->FirstLeft = outRec2->FirstLeft;
- outRec2->FirstLeft = outRec1;
-
- if (m_UsingPolyTree) FixupFirstLefts3(outRec2, outRec1);
- }
- }
-}
-
-//------------------------------------------------------------------------------
-// ClipperOffset support functions ...
-//------------------------------------------------------------------------------
-
-DoublePoint GetUnitNormal(const IntPoint &pt1, const IntPoint &pt2)
-{
- if(pt2.x == pt1.x && pt2.y == pt1.y)
- return DoublePoint(0, 0);
-
- double Dx = (double)(pt2.x - pt1.x);
- double dy = (double)(pt2.y - pt1.y);
- double f = 1 *1.0/ std::sqrt( Dx*Dx + dy*dy );
- Dx *= f;
- dy *= f;
- return DoublePoint(dy, -Dx);
-}
-
-//------------------------------------------------------------------------------
-// ClipperOffset class
-//------------------------------------------------------------------------------
-
-ClipperOffset::ClipperOffset(double miterLimit, double arcTolerance)
-{
- this->MiterLimit = miterLimit;
- this->ArcTolerance = arcTolerance;
- m_lowest.x = -1;
-}
-//------------------------------------------------------------------------------
-
-ClipperOffset::~ClipperOffset()
-{
- Clear();
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::Clear()
-{
- for (int i = 0; i < m_polyNodes.ChildCount(); ++i)
- delete m_polyNodes.Childs[i];
- m_polyNodes.Childs.clear();
- m_lowest.x = -1;
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::AddPath(const Path& path, JoinType joinType, EndType endType)
-{
- int highI = (int)path.size() - 1;
- if (highI < 0) return;
- PolyNode* newNode = new PolyNode();
- newNode->m_jointype = joinType;
- newNode->m_endtype = endType;
-
- //strip duplicate points from path and also get index to the lowest point ...
- if (endType == etClosedLine || endType == etClosedPolygon)
- while (highI > 0 && path[0] == path[highI]) highI--;
- newNode->Contour.reserve(highI + 1);
- newNode->Contour.push_back(path[0]);
- int j = 0, k = 0;
- for (int i = 1; i <= highI; i++)
- if (newNode->Contour[j] != path[i])
- {
- j++;
- newNode->Contour.push_back(path[i]);
- if (path[i].y > newNode->Contour[k].y ||
- (path[i].y == newNode->Contour[k].y &&
- path[i].x < newNode->Contour[k].x)) k = j;
- }
- if (endType == etClosedPolygon && j < 2)
- {
- delete newNode;
- return;
- }
- m_polyNodes.AddChild(*newNode);
-
- //if this path's lowest pt is lower than all the others then update m_lowest
- if (endType != etClosedPolygon) return;
- if (m_lowest.x < 0)
- m_lowest = IntPoint(m_polyNodes.ChildCount() - 1, k);
- else
- {
- IntPoint ip = m_polyNodes.Childs[(int)m_lowest.x]->Contour[(int)m_lowest.y];
- if (newNode->Contour[k].y > ip.y ||
- (newNode->Contour[k].y == ip.y &&
- newNode->Contour[k].x < ip.x))
- m_lowest = IntPoint(m_polyNodes.ChildCount() - 1, k);
- }
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::AddPaths(const Paths& paths, JoinType joinType, EndType endType)
-{
- for (Paths::size_type i = 0; i < paths.size(); ++i)
- AddPath(paths[i], joinType, endType);
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::FixOrientations()
-{
- //fixup orientations of all closed paths if the orientation of the
- //closed path with the lowermost vertex is wrong ...
- if (m_lowest.x >= 0 &&
- !Orientation(m_polyNodes.Childs[(int)m_lowest.x]->Contour))
- {
- for (int i = 0; i < m_polyNodes.ChildCount(); ++i)
- {
- PolyNode& node = *m_polyNodes.Childs[i];
- if (node.m_endtype == etClosedPolygon ||
- (node.m_endtype == etClosedLine && Orientation(node.Contour)))
- ReversePath(node.Contour);
- }
- } else
- {
- for (int i = 0; i < m_polyNodes.ChildCount(); ++i)
- {
- PolyNode& node = *m_polyNodes.Childs[i];
- if (node.m_endtype == etClosedLine && !Orientation(node.Contour))
- ReversePath(node.Contour);
- }
- }
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::Execute(Paths& solution, double delta)
-{
- solution.clear();
- FixOrientations();
- DoOffset(delta);
-
- //now clean up 'corners' ...
- Clipper clpr;
- clpr.AddPaths(m_destPolys, ptSubject, true);
- if (delta > 0)
- {
- clpr.Execute(ctUnion, solution, pftPositive, pftPositive);
- }
- else
- {
- IntRect r = clpr.GetBounds();
- Path outer(4);
- outer[0] = IntPoint(r.left - 10, r.bottom + 10);
- outer[1] = IntPoint(r.right + 10, r.bottom + 10);
- outer[2] = IntPoint(r.right + 10, r.top - 10);
- outer[3] = IntPoint(r.left - 10, r.top - 10);
-
- clpr.AddPath(outer, ptSubject, true);
- clpr.ReverseSolution(true);
- clpr.Execute(ctUnion, solution, pftNegative, pftNegative);
- if (!solution.empty()) solution.erase(solution.begin());
- }
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::Execute(PolyTree& solution, double delta)
-{
- solution.Clear();
- FixOrientations();
- DoOffset(delta);
-
- //now clean up 'corners' ...
- Clipper clpr;
- clpr.AddPaths(m_destPolys, ptSubject, true);
- if (delta > 0)
- {
- clpr.Execute(ctUnion, solution, pftPositive, pftPositive);
- }
- else
- {
- IntRect r = clpr.GetBounds();
- Path outer(4);
- outer[0] = IntPoint(r.left - 10, r.bottom + 10);
- outer[1] = IntPoint(r.right + 10, r.bottom + 10);
- outer[2] = IntPoint(r.right + 10, r.top - 10);
- outer[3] = IntPoint(r.left - 10, r.top - 10);
-
- clpr.AddPath(outer, ptSubject, true);
- clpr.ReverseSolution(true);
- clpr.Execute(ctUnion, solution, pftNegative, pftNegative);
- //remove the outer PolyNode rectangle ...
- if (solution.ChildCount() == 1 && solution.Childs[0]->ChildCount() > 0)
- {
- PolyNode* outerNode = solution.Childs[0];
- solution.Childs.reserve(outerNode->ChildCount());
- solution.Childs[0] = outerNode->Childs[0];
- solution.Childs[0]->Parent = outerNode->Parent;
- for (int i = 1; i < outerNode->ChildCount(); ++i)
- solution.AddChild(*outerNode->Childs[i]);
- }
- else
- solution.Clear();
- }
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::DoOffset(double delta)
-{
- m_destPolys.clear();
- m_delta = delta;
-
- //if Zero offset, just copy any CLOSED polygons to m_p and return ...
- if (NEAR_ZERO(delta))
- {
- m_destPolys.reserve(m_polyNodes.ChildCount());
- for (int i = 0; i < m_polyNodes.ChildCount(); i++)
- {
- PolyNode& node = *m_polyNodes.Childs[i];
- if (node.m_endtype == etClosedPolygon)
- m_destPolys.push_back(node.Contour);
- }
- return;
- }
-
- //see offset_triginometry3.svg in the documentation folder ...
- if (MiterLimit > 2) m_miterLim = 2/(MiterLimit * MiterLimit);
- else m_miterLim = 0.5;
-
- double y;
- if (ArcTolerance <= 0.0) y = def_arc_tolerance;
- else if (ArcTolerance > std::fabs(delta) * def_arc_tolerance)
- y = std::fabs(delta) * def_arc_tolerance;
- else y = ArcTolerance;
- //see offset_triginometry2.svg in the documentation folder ...
- double steps = pi / std::acos(1 - y / std::fabs(delta));
- if (steps > std::fabs(delta) * pi)
- steps = std::fabs(delta) * pi; //ie excessive precision check
- m_sin = std::sin(two_pi / steps);
- m_cos = std::cos(two_pi / steps);
- m_StepsPerRad = steps / two_pi;
- if (delta < 0.0) m_sin = -m_sin;
-
- m_destPolys.reserve(m_polyNodes.ChildCount() * 2);
- for (int i = 0; i < m_polyNodes.ChildCount(); i++)
- {
- PolyNode& node = *m_polyNodes.Childs[i];
- m_srcPoly = node.Contour;
-
- int len = (int)m_srcPoly.size();
- if (len == 0 || (delta <= 0 && (len < 3 || node.m_endtype != etClosedPolygon)))
- continue;
-
- m_destPoly.clear();
- if (len == 1)
- {
- if (node.m_jointype == jtRound)
- {
- double X = 1.0, Y = 0.0;
- for (cInt j = 1; j <= steps; j++)
- {
- m_destPoly.push_back(IntPoint(
- Round(m_srcPoly[0].x + X * delta),
- Round(m_srcPoly[0].y + Y * delta)));
- double X2 = X;
- X = X * m_cos - m_sin * Y;
- Y = X2 * m_sin + Y * m_cos;
- }
- }
- else
- {
- double X = -1.0, Y = -1.0;
- for (int j = 0; j < 4; ++j)
- {
- m_destPoly.push_back(IntPoint(
- Round(m_srcPoly[0].x + X * delta),
- Round(m_srcPoly[0].y + Y * delta)));
- if (X < 0) X = 1;
- else if (Y < 0) Y = 1;
- else X = -1;
- }
- }
- m_destPolys.push_back(m_destPoly);
- continue;
- }
- //build m_normals ...
- m_normals.clear();
- m_normals.reserve(len);
- for (int j = 0; j < len - 1; ++j)
- m_normals.push_back(GetUnitNormal(m_srcPoly[j], m_srcPoly[j + 1]));
- if (node.m_endtype == etClosedLine || node.m_endtype == etClosedPolygon)
- m_normals.push_back(GetUnitNormal(m_srcPoly[len - 1], m_srcPoly[0]));
- else
- m_normals.push_back(DoublePoint(m_normals[len - 2]));
-
- if (node.m_endtype == etClosedPolygon)
- {
- int k = len - 1;
- for (int j = 0; j < len; ++j)
- OffsetPoint(j, k, node.m_jointype);
- m_destPolys.push_back(m_destPoly);
- }
- else if (node.m_endtype == etClosedLine)
- {
- int k = len - 1;
- for (int j = 0; j < len; ++j)
- OffsetPoint(j, k, node.m_jointype);
- m_destPolys.push_back(m_destPoly);
- m_destPoly.clear();
- //re-build m_normals ...
- DoublePoint n = m_normals[len -1];
- for (int j = len - 1; j > 0; j--)
- m_normals[j] = DoublePoint(-m_normals[j - 1].x, -m_normals[j - 1].y);
- m_normals[0] = DoublePoint(-n.x, -n.y);
- k = 0;
- for (int j = len - 1; j >= 0; j--)
- OffsetPoint(j, k, node.m_jointype);
- m_destPolys.push_back(m_destPoly);
- }
- else
- {
- int k = 0;
- for (int j = 1; j < len - 1; ++j)
- OffsetPoint(j, k, node.m_jointype);
-
- IntPoint pt1;
- if (node.m_endtype == etOpenButt)
- {
- int j = len - 1;
- pt1 = IntPoint((cInt)Round(m_srcPoly[j].x + m_normals[j].x *
- delta), (cInt)Round(m_srcPoly[j].y + m_normals[j].y * delta));
- m_destPoly.push_back(pt1);
- pt1 = IntPoint((cInt)Round(m_srcPoly[j].x - m_normals[j].x *
- delta), (cInt)Round(m_srcPoly[j].y - m_normals[j].y * delta));
- m_destPoly.push_back(pt1);
- }
- else
- {
- int j = len - 1;
- k = len - 2;
- m_sinA = 0;
- m_normals[j] = DoublePoint(-m_normals[j].x, -m_normals[j].y);
- if (node.m_endtype == etOpenSquare)
- DoSquare(j, k);
- else
- DoRound(j, k);
- }
-
- //re-build m_normals ...
- for (int j = len - 1; j > 0; j--)
- m_normals[j] = DoublePoint(-m_normals[j - 1].x, -m_normals[j - 1].y);
- m_normals[0] = DoublePoint(-m_normals[1].x, -m_normals[1].y);
-
- k = len - 1;
- for (int j = k - 1; j > 0; --j) OffsetPoint(j, k, node.m_jointype);
-
- if (node.m_endtype == etOpenButt)
- {
- pt1 = IntPoint((cInt)Round(m_srcPoly[0].x - m_normals[0].x * delta),
- (cInt)Round(m_srcPoly[0].y - m_normals[0].y * delta));
- m_destPoly.push_back(pt1);
- pt1 = IntPoint((cInt)Round(m_srcPoly[0].x + m_normals[0].x * delta),
- (cInt)Round(m_srcPoly[0].y + m_normals[0].y * delta));
- m_destPoly.push_back(pt1);
- }
- else
- {
- k = 1;
- m_sinA = 0;
- if (node.m_endtype == etOpenSquare)
- DoSquare(0, 1);
- else
- DoRound(0, 1);
- }
- m_destPolys.push_back(m_destPoly);
- }
- }
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::OffsetPoint(int j, int& k, JoinType jointype)
-{
- //cross product ...
- m_sinA = (m_normals[k].x * m_normals[j].y - m_normals[j].x * m_normals[k].y);
- if (std::fabs(m_sinA * m_delta) < 1.0)
- {
- //dot product ...
- double cosA = (m_normals[k].x * m_normals[j].x + m_normals[j].y * m_normals[k].y );
- if (cosA > 0) // angle => 0 degrees
- {
- m_destPoly.push_back(IntPoint(Round(m_srcPoly[j].x + m_normals[k].x * m_delta),
- Round(m_srcPoly[j].y + m_normals[k].y * m_delta)));
- return;
- }
- //else angle => 180 degrees
- }
- else if (m_sinA > 1.0) m_sinA = 1.0;
- else if (m_sinA < -1.0) m_sinA = -1.0;
-
- if (m_sinA * m_delta < 0)
- {
- m_destPoly.push_back(IntPoint(Round(m_srcPoly[j].x + m_normals[k].x * m_delta),
- Round(m_srcPoly[j].y + m_normals[k].y * m_delta)));
- m_destPoly.push_back(m_srcPoly[j]);
- m_destPoly.push_back(IntPoint(Round(m_srcPoly[j].x + m_normals[j].x * m_delta),
- Round(m_srcPoly[j].y + m_normals[j].y * m_delta)));
- }
- else
- switch (jointype)
- {
- case jtMiter:
- {
- double r = 1 + (m_normals[j].x * m_normals[k].x +
- m_normals[j].y * m_normals[k].y);
- if (r >= m_miterLim) DoMiter(j, k, r); else DoSquare(j, k);
- break;
- }
- case jtSquare: DoSquare(j, k); break;
- case jtRound: DoRound(j, k); break;
- }
- k = j;
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::DoSquare(int j, int k)
-{
- double dx = std::tan(std::atan2(m_sinA,
- m_normals[k].x * m_normals[j].x + m_normals[k].y * m_normals[j].y) / 4);
- m_destPoly.push_back(IntPoint(
- Round(m_srcPoly[j].x + m_delta * (m_normals[k].x - m_normals[k].y * dx)),
- Round(m_srcPoly[j].y + m_delta * (m_normals[k].y + m_normals[k].x * dx))));
- m_destPoly.push_back(IntPoint(
- Round(m_srcPoly[j].x + m_delta * (m_normals[j].x + m_normals[j].y * dx)),
- Round(m_srcPoly[j].y + m_delta * (m_normals[j].y - m_normals[j].x * dx))));
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::DoMiter(int j, int k, double r)
-{
- double q = m_delta / r;
- m_destPoly.push_back(IntPoint(Round(m_srcPoly[j].x + (m_normals[k].x + m_normals[j].x) * q),
- Round(m_srcPoly[j].y + (m_normals[k].y + m_normals[j].y) * q)));
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::DoRound(int j, int k)
-{
- double a = std::atan2(m_sinA,
- m_normals[k].x * m_normals[j].x + m_normals[k].y * m_normals[j].y);
- int steps = std::max((int)Round(m_StepsPerRad * std::fabs(a)), 1);
-
- double X = m_normals[k].x, Y = m_normals[k].y, X2;
- for (int i = 0; i < steps; ++i)
- {
- m_destPoly.push_back(IntPoint(
- Round(m_srcPoly[j].x + X * m_delta),
- Round(m_srcPoly[j].y + Y * m_delta)));
- X2 = X;
- X = X * m_cos - m_sin * Y;
- Y = X2 * m_sin + Y * m_cos;
- }
- m_destPoly.push_back(IntPoint(
- Round(m_srcPoly[j].x + m_normals[j].x * m_delta),
- Round(m_srcPoly[j].y + m_normals[j].y * m_delta)));
-}
-
-//------------------------------------------------------------------------------
-// Miscellaneous public functions
-//------------------------------------------------------------------------------
-
-bool SortOutPt(OutPt* op1, OutPt* op2)
-{
- if (op1->Pt.y > op2->Pt.y)
- {
- return true;
- }
- else if (op1->Pt.y < op2->Pt.y)
- {
- return false;
- }
- else if (op1->Pt.x < op2->Pt.x)
- {
- return true;
- }
- else if (op1->Pt.x > op2->Pt.x)
- {
- return false;
- }
- else
- {
- return (op1->Idx < op2->Idx);
- }
-}
-
-//-----------------------------------------------------------------------------
-
-struct OutPtIntersect
-{
- OutPt * op1;
- OutPt * op2;
-};
-
-//-----------------------------------------------------------------------------
-
-bool Clipper::FindIntersectLoop(std::unordered_multimap<int, OutPtIntersect> & dupeRec,
- std::list<std::pair<int, OutPtIntersect> > & iList,
- OutRec * outRec_parent,
- int idx_origin,
- int idx_search,
- std::set<int> & visited,
- OutPt * orig_pt,
- OutPt * prev_pt)
-{
- auto range = dupeRec.equal_range(idx_search);
- // Check for direct connection
- for (auto it = range.first; it != range.second;)
- {
- OutRec * itRec1 = GetOutRec(it->second.op1->Idx);
- OutRec * itRec2 = GetOutRec(it->second.op2->Idx);
- if (itRec1->Idx != idx_search || (!itRec1->IsHole && !itRec2->IsHole))
- {
- it = dupeRec.erase(it);
- continue;
- }
- if (itRec2->Idx == idx_origin &&
- (outRec_parent == itRec2 || outRec_parent == ParseFirstLeft(itRec2->FirstLeft)) &&
- prev_pt->Pt != it->second.op2->Pt &&
- orig_pt->Pt != it->second.op2->Pt)
- {
- iList.emplace_front(idx_search, it->second);
- return true;
- }
- ++it;
- }
- range = dupeRec.equal_range(idx_search);
- visited.insert(idx_search);
- // Check for connection through chain of other intersections
- for (auto it = range.first; it != range.second && it != dupeRec.end() && it->first == idx_search; ++it)
- {
- OutRec * itRec = GetOutRec(it->second.op2->Idx);
- if (visited.count(itRec->Idx) > 0 ||
- (outRec_parent != itRec && outRec_parent != ParseFirstLeft(itRec->FirstLeft))
- || prev_pt->Pt == it->second.op2->Pt)
- {
- continue;
- }
- if (FindIntersectLoop(dupeRec, iList, outRec_parent, idx_origin, itRec->Idx, visited, orig_pt, it->second.op2))
- {
- iList.emplace_front(idx_search, it->second);
- return true;
- }
- }
- return false;
-}
-
-//-----------------------------------------------------------------------------
-
-bool Clipper::FixIntersects(std::unordered_multimap<int, OutPtIntersect> & dupeRec,
- OutPt * op_j,
- OutPt * op_k,
- OutRec * outRec_j,
- OutRec * outRec_k)
-{
- if (!outRec_j->IsHole && !outRec_k->IsHole)
- {
- // Both are not holes, return nothing to do.
- return false;
- }
- OutRec * outRec_origin;
- OutRec * outRec_search;
- OutRec * outRec_parent;
- OutPt * op_origin_1;
- OutPt * op_origin_2;
- if (!outRec_j->IsHole)
- {
- outRec_origin = outRec_j;
- outRec_parent = outRec_origin;
- outRec_search = outRec_k;
- op_origin_1 = op_j;
- op_origin_2 = op_k;
- }
- else if (!outRec_k->IsHole)
- {
- outRec_origin = outRec_k;
- outRec_parent = outRec_origin;
- outRec_search = outRec_j;
- op_origin_1 = op_k;
- op_origin_2 = op_j;
-
- }
- else // both are holes
- {
- // Order doesn't matter
- outRec_origin = outRec_j;
- outRec_parent = ParseFirstLeft(outRec_origin->FirstLeft);
- outRec_search = outRec_k;
- op_origin_1 = op_j;
- op_origin_2 = op_k;
- }
- if (outRec_parent != ParseFirstLeft(outRec_search->FirstLeft))
- {
- // The two holes do not have the same parent, do not add them
- // simply return!
- return false;
- }
- bool found = false;
- std::list<std::pair<int, OutPtIntersect> > iList;
- auto range = dupeRec.equal_range(outRec_search->Idx);
- // Check for direct connection
- for (auto it = range.first; it != range.second;)
- {
- OutRec * itRec1 = GetOutRec(it->second.op1->Idx);
- OutRec * itRec2 = GetOutRec(it->second.op2->Idx);
- if (outRec_search->Idx != itRec1->Idx || outRec_search->Idx == itRec2->Idx)
- {
- it = dupeRec.erase(it);
- continue;
- }
- if (itRec2->Idx == outRec_origin->Idx)
- {
- found = true;
- if (op_origin_1->Pt != it->second.op2->Pt)
- {
- iList.emplace_back(outRec_search->Idx, it->second);
- break;
- }
- }
- ++it;
- }
- if (!found)
- {
- range = dupeRec.equal_range(outRec_search->Idx);
- std::set<int> visited;
- visited.insert(outRec_search->Idx);
- // Check for connection through chain of other intersections
- for (auto it = range.first; it != range.second && it != dupeRec.end() && it->first == outRec_search->Idx; ++it)
- {
- OutRec * itRec = GetOutRec(it->second.op2->Idx);
- if (itRec->Idx != outRec_search->Idx &&
- op_origin_2->Pt != it->second.op2->Pt &&
- (outRec_parent == itRec || outRec_parent == ParseFirstLeft(itRec->FirstLeft)) &&
- FindIntersectLoop(dupeRec, iList, outRec_parent, outRec_origin->Idx, itRec->Idx, visited, op_origin_2, it->second.op2))
- {
- found = true;
- iList.emplace_front(outRec_search->Idx, it->second);
- break;
- }
- }
- }
- if (!found)
- {
- OutPtIntersect intPt_origin = { op_origin_1, op_origin_2 };
- OutPtIntersect intPt_search = { op_origin_2, op_origin_1 };
- dupeRec.emplace(outRec_origin->Idx, intPt_origin);
- dupeRec.emplace(outRec_search->Idx, intPt_search);
- return false;
- }
-
- if (iList.empty())
- {
- return false;
- }
- if (outRec_origin->IsHole)
- {
- for (auto & iRing : iList)
- {
- OutRec * outRec_itr = GetOutRec(iRing.first);
- if (!outRec_itr->IsHole)
- {
- // Make the hole the origin!
- OutPt * op1 = op_origin_1;
- op_origin_1 = iRing.second.op1;
- iRing.second.op1 = op1;
- OutPt * op2 = op_origin_2;
- op_origin_2 = iRing.second.op2;
- iRing.second.op2 = op2;
- iRing.first = outRec_origin->Idx;
- outRec_origin = outRec_itr;
- outRec_parent = outRec_origin;
- break;
- }
- }
- }
-
- // Switch
- OutPt * op_origin_1_next = op_origin_1->Next;
- OutPt * op_origin_2_next = op_origin_2->Next;
- op_origin_1->Next = op_origin_2_next;
- op_origin_2->Next = op_origin_1_next;
- op_origin_1_next->Prev = op_origin_2;
- op_origin_2_next->Prev = op_origin_1;
-
- for (auto iRing : iList)
- {
- OutPt * op_search_1 = iRing.second.op1;
- OutPt * op_search_2 = iRing.second.op2;
- OutPt * op_search_1_next = op_search_1->Next;
- OutPt * op_search_2_next = op_search_2->Next;
- op_search_1->Next = op_search_2_next;
- op_search_2->Next = op_search_1_next;
- op_search_1_next->Prev = op_search_2;
- op_search_2_next->Prev = op_search_1;
- }
-
- OutRec * outRec_new = CreateOutRec();
- outRec_new->IsHole = false;
- if (outRec_origin->IsHole && ((Area(op_origin_1) < 0) ^ m_ReverseOutput))
- {
- outRec_origin->Pts = op_origin_1;
- outRec_new->Pts = op_origin_2;
- }
- else
- {
- outRec_origin->Pts = op_origin_2;
- outRec_new->Pts = op_origin_1;
- }
-
- UpdateOutPtIdxs(*outRec_origin);
- UpdateOutPtIdxs(*outRec_new);
-
- outRec_origin->BottomPt = 0;
-
- std::list<std::pair<int, OutPtIntersect> > move_list;
- for (auto iRing : iList)
- {
- OutRec * outRec_itr = GetOutRec(iRing.first);
- outRec_itr->Pts = 0;
- outRec_itr->BottomPt = 0;
- outRec_itr->Idx = outRec_origin->Idx;
- if (outRec_origin->IsHole)
- {
- outRec_itr->FirstLeft = ParseFirstLeft(outRec_origin->FirstLeft);
- }
- else
- {
- outRec_itr->FirstLeft = outRec_origin;
- }
- outRec_itr->IsHole = outRec_origin->IsHole;
- if (m_UsingPolyTree)
- {
- FixupFirstLefts3(outRec_itr, outRec_origin);
- }
- }
- if (outRec_origin->IsHole)
- {
- outRec_new->FirstLeft = outRec_origin;
- }
- else
- {
- outRec_new->FirstLeft = outRec_origin->FirstLeft;
- }
- if (m_UsingPolyTree)
- {
- if (outRec_origin->IsHole)
- {
- FixupFirstLefts2(outRec_new, outRec_origin);
- }
- else
- {
- FixupFirstLefts1(outRec_origin, outRec_new);
- }
- }
- for (auto iRing : iList)
- {
- auto range_itr = dupeRec.equal_range(iRing.first);
- if (range_itr.first != range_itr.second)
- {
- for (auto it = range_itr.first; it != range_itr.second; ++it)
- {
- OutRec * itRec = GetOutRec(it->second.op1->Idx);
- OutRec * itRec2 = GetOutRec(it->second.op2->Idx);
- if (itRec == itRec2)
- {
- continue;
- }
- OutRec * flRec;
- OutRec * flRec2;
- if (itRec->IsHole)
- {
- flRec = ParseFirstLeft(itRec->FirstLeft);
- }
- else
- {
- flRec = itRec;
- }
- if (itRec2->IsHole)
- {
- flRec2 = ParseFirstLeft(itRec2->FirstLeft);
- }
- else
- {
- flRec2 = itRec2;
- }
- if ((itRec->IsHole || itRec2->IsHole) && (flRec == flRec2))
- {
- move_list.emplace_back(itRec->Idx, it->second);
- }
- }
- dupeRec.erase(iRing.first);
- }
- }
- auto range_itr = dupeRec.equal_range(outRec_origin->Idx);
- for (auto it = range_itr.first; it != range_itr.second;)
- {
- OutRec * itRec = GetOutRec(it->second.op1->Idx);
- OutRec * itRec2 = GetOutRec(it->second.op2->Idx);
- if (itRec == itRec2)
- {
- it = dupeRec.erase(it);
- continue;
- }
- OutRec * flRec;
- OutRec * flRec2;
- if (itRec->IsHole)
- {
- flRec = ParseFirstLeft(itRec->FirstLeft);
- }
- else
- {
- flRec = itRec;
- }
- if (itRec2->IsHole)
- {
- flRec2 = ParseFirstLeft(itRec2->FirstLeft);
- }
- else
- {
- flRec2 = itRec2;
- }
- if (itRec->Idx != outRec_origin->Idx)
- {
- if ((itRec->IsHole || itRec2->IsHole) && (flRec == flRec2))
- {
- move_list.emplace_back(itRec->Idx, it->second);
- }
- it = dupeRec.erase(it);
- }
- else
- {
- if ((itRec->IsHole || itRec2->IsHole) && (flRec == flRec2))
- {
- ++it;
- }
- else
- {
- it = dupeRec.erase(it);
- }
- }
- }
-
- if (!move_list.empty())
- {
- dupeRec.insert(move_list.begin(), move_list.end());
- }
- return true;
-}
-
-//-----------------------------------------------------------------------------
-
-void Clipper::DoSimplePolygons()
-{
- std::vector < OutPt*> m_OutPts;
- {
- PolyOutList::size_type i = 0;
- while (i < m_PolyOuts.size())
- {
- OutRec* outrec = m_PolyOuts[i++];
- OutPt* op = outrec->Pts;
- if (!op || outrec->IsOpen) continue;
- do
- {
- m_OutPts.push_back(op);
- op = op->Next;
- }
- while (op != outrec->Pts);
- }
- }
- std::stable_sort(m_OutPts.begin(), m_OutPts.end(), SortOutPt);
- std::unordered_multimap<int, OutPtIntersect> dupeRec;
- dupeRec.reserve(m_PolyOuts.size());
- std::size_t count = 0;
- for (std::size_t i = 1; i < m_OutPts.size(); ++i)
- {
- if (m_OutPts[i]->Pt == m_OutPts[i-1]->Pt)
- {
- ++count;
- continue;
- }
- if (count > 0)
- {
- for (std::size_t j = (i - count - 1); j < i; ++j)
- {
- if (m_OutPts[j]->Idx < 0) continue;
- OutRec * outRec_j = GetOutRec(m_OutPts[j]->Idx);
- int idx_j = outRec_j->Idx;
- for (std::size_t k = j + 1; k < i; ++k)
- {
- if (m_OutPts[k]->Idx < 0) continue;
- OutRec * outRec_k = GetOutRec(m_OutPts[k]->Idx);
- int idx_k = outRec_k->Idx;
- if (idx_k == idx_j)
- {
- OutPt * op = m_OutPts[j];
- OutPt * op2 = m_OutPts[k];
- OutRec * outrec = outRec_j;
- if (op != op2 && op2->Next != op && op2->Prev != op)
- {
- //split the polygon into two ...
- OutPt* op3 = op->Prev;
- OutPt* op4 = op2->Prev;
- op->Prev = op4;
- op4->Next = op;
- op2->Prev = op3;
- op3->Next = op2;
-
- OutRec* outrec2 = CreateOutRec();
- if (PointCount(op) > PointCount(op2))
- {
- outrec->Pts = op;
- outrec2->Pts = op2;
- }
- else
- {
- outrec->Pts = op2;
- outrec2->Pts = op;
- }
- UpdateOutPtIdxs(*outrec);
- UpdateOutPtIdxs(*outrec2);
- if (Poly2ContainsPoly1(outrec2->Pts, outrec->Pts))
- {
- //OutRec2 is contained by OutRec1 ...
- outrec2->IsHole = !outrec->IsHole;
- outrec2->FirstLeft = outrec;
- if (m_UsingPolyTree)
- {
- FixupFirstLefts2(outrec2, outrec);
- }
- auto range = dupeRec.equal_range(idx_j);
- std::list<std::pair<int, OutPtIntersect> > move_list;
- for (auto it = range.first; it != range.second;)
- {
- OutRec * itRec = GetOutRec(it->second.op1->Idx);
- OutRec * itRec2 = GetOutRec(it->second.op2->Idx);
- OutRec * flRec;
- OutRec * flRec2;
- if (itRec->IsHole)
- {
- flRec = ParseFirstLeft(itRec->FirstLeft);
- }
- else
- {
- flRec = itRec;
- }
- if (itRec2->IsHole)
- {
- flRec2 = ParseFirstLeft(itRec2->FirstLeft);
- }
- else
- {
- flRec2 = itRec2;
- }
- if (itRec->Idx != idx_j)
- {
- if ((itRec->IsHole || itRec2->IsHole) && (flRec == flRec2))
- {
- move_list.emplace_back(itRec->Idx, it->second);
- }
- it = dupeRec.erase(it);
- }
- else
- {
- if ((itRec->IsHole || itRec2->IsHole) && (flRec == flRec2))
- {
- ++it;
- }
- else
- {
- it = dupeRec.erase(it);
- }
- }
- }
- if (!move_list.empty())
- {
- dupeRec.insert(move_list.begin(), move_list.end());
- }
- if (!outrec->IsHole)
- {
- OutPtIntersect intPt1 = { outrec->Pts, outrec2->Pts };
- OutPtIntersect intPt2 = { outrec2->Pts, outrec->Pts };
- dupeRec.emplace(outrec->Idx, intPt1);
- dupeRec.emplace(outrec2->Idx, intPt2);
- }
- }
- else if (Poly2ContainsPoly1(outrec->Pts, outrec2->Pts))
- {
- //OutRec1 is contained by OutRec2 ...
- outrec2->IsHole = outrec->IsHole;
- outrec->IsHole = !outrec2->IsHole;
- outrec2->FirstLeft = outrec->FirstLeft;
- outrec->FirstLeft = outrec2;
- if (m_UsingPolyTree)
- {
- FixupFirstLefts2(outrec, outrec2);
- }
- auto range = dupeRec.equal_range(idx_j);
- std::list<std::pair<int, OutPtIntersect> > move_list;
- for (auto it = range.first; it != range.second;)
- {
- OutRec * itRec = GetOutRec(it->second.op1->Idx);
- OutRec * itRec2 = GetOutRec(it->second.op2->Idx);
- OutRec * flRec;
- OutRec * flRec2;
- if (itRec->IsHole)
- {
- flRec = ParseFirstLeft(itRec->FirstLeft);
- }
- else
- {
- flRec = itRec;
- }
- if (itRec2->IsHole)
- {
- flRec2 = ParseFirstLeft(itRec2->FirstLeft);
- }
- else
- {
- flRec2 = itRec2;
- }
- if (itRec->Idx != idx_j)
- {
- if ((itRec->IsHole || itRec2->IsHole) && (flRec == flRec2))
- {
- move_list.emplace_back(itRec->Idx, it->second);
- }
- it = dupeRec.erase(it);
- }
- else
- {
- if ((itRec->IsHole || itRec2->IsHole) && (flRec == flRec2))
- {
- ++it;
- }
- else
- {
- it = dupeRec.erase(it);
- }
- }
- }
- if (!move_list.empty())
- {
- dupeRec.insert(move_list.begin(), move_list.end());
- }
- if (!outrec2->IsHole)
- {
- OutPtIntersect intPt1 = { outrec->Pts, outrec2->Pts };
- OutPtIntersect intPt2 = { outrec2->Pts, outrec->Pts };
- dupeRec.emplace(outrec->Idx, intPt1);
- dupeRec.emplace(outrec2->Idx, intPt2);
- }
- }
- else
- {
- //the 2 polygons are separate ...
- outrec2->IsHole = outrec->IsHole;
- outrec2->FirstLeft = outrec->FirstLeft;
- if (m_UsingPolyTree)
- {
- FixupFirstLefts1(outrec, outrec2);
- }
- auto range = dupeRec.equal_range(idx_j);
- std::list<std::pair<int, OutPtIntersect> > move_list;
- for (auto it = range.first; it != range.second;)
- {
- OutRec * itRec = GetOutRec(it->second.op1->Idx);
- OutRec * itRec2 = GetOutRec(it->second.op2->Idx);
- OutRec * flRec;
- OutRec * flRec2;
- if (itRec->IsHole)
- {
- flRec = ParseFirstLeft(itRec->FirstLeft);
- }
- else
- {
- flRec = itRec;
- }
- if (itRec2->IsHole)
- {
- flRec2 = ParseFirstLeft(itRec2->FirstLeft);
- }
- else
- {
- flRec2 = itRec2;
- }
- if (itRec->Idx != idx_j)
- {
- if ((itRec->IsHole || itRec2->IsHole) && (flRec == flRec2))
- {
- move_list.emplace_back(itRec->Idx, it->second);
- }
- it = dupeRec.erase(it);
- }
- else
- {
- if ((itRec->IsHole || itRec2->IsHole) && (flRec == flRec2))
- {
- ++it;
- }
- else
- {
- it = dupeRec.erase(it);
- }
- }
- }
- if (!move_list.empty())
- {
- dupeRec.insert(move_list.begin(), move_list.end());
- }
- if (outrec2->IsHole)
- {
- OutPtIntersect intPt1 = { outrec->Pts, outrec2->Pts };
- OutPtIntersect intPt2 = { outrec2->Pts, outrec->Pts };
- dupeRec.emplace(outrec->Idx, intPt1);
- dupeRec.emplace(outrec2->Idx, intPt2);
- }
- }
- outRec_j = GetOutRec(m_OutPts[j]->Idx);
- idx_j = outRec_j->Idx;
- }
- continue;
- }
- if (FixIntersects(dupeRec, m_OutPts[j], m_OutPts[k], outRec_j, outRec_k))
- {
- outRec_j = GetOutRec(m_OutPts[j]->Idx);
- idx_j = outRec_j->Idx;
- }
- }
- }
- count = 0;
- }
- }
-}
-//------------------------------------------------------------------------------
-
-void ReversePath(Path& p)
-{
- std::reverse(p.begin(), p.end());
-}
-//------------------------------------------------------------------------------
-
-void ReversePaths(Paths& p)
-{
- for (Paths::size_type i = 0; i < p.size(); ++i)
- ReversePath(p[i]);
-}
-//------------------------------------------------------------------------------
-
-void SimplifyPolygon(const Path &in_poly, Paths &out_polys, PolyFillType fillType)
-{
- Clipper c;
- c.StrictlySimple(true);
- c.AddPath(in_poly, ptSubject, true);
- c.Execute(ctUnion, out_polys, fillType, fillType);
-}
-//------------------------------------------------------------------------------
-
-void SimplifyPolygons(const Paths &in_polys, Paths &out_polys, PolyFillType fillType)
-{
- Clipper c;
- c.StrictlySimple(true);
- c.AddPaths(in_polys, ptSubject, true);
- c.Execute(ctUnion, out_polys, fillType, fillType);
-}
-//------------------------------------------------------------------------------
-
-void SimplifyPolygons(Paths &polys, PolyFillType fillType)
-{
- SimplifyPolygons(polys, polys, fillType);
-}
-//------------------------------------------------------------------------------
-
-inline double DistanceSqrd(const IntPoint& pt1, const IntPoint& pt2)
-{
- double Dx = ((double)pt1.x - pt2.x);
- double dy = ((double)pt1.y - pt2.y);
- return (Dx*Dx + dy*dy);
-}
-//------------------------------------------------------------------------------
-
-double DistanceFromLineSqrd(
- const IntPoint& pt, const IntPoint& ln1, const IntPoint& ln2)
-{
- //The equation of a line in general form (Ax + By + C = 0)
- //given 2 points (x,y) & (x,y) is ...
- //(y - y)x + (x - x)y + (y - y)x - (x - x)y = 0
- //A = (y - y); B = (x - x); C = (y - y)x - (x - x)y
- //perpendicular distance of point (x,y) = (Ax + By + C)/Sqrt(A + B)
- //see http://en.wikipedia.org/wiki/Perpendicular_distance
- double A = double(ln1.y - ln2.y);
- double B = double(ln2.x - ln1.x);
- double C = A * ln1.x + B * ln1.y;
- C = A * pt.x + B * pt.y - C;
- return (C * C) / (A * A + B * B);
-}
-//---------------------------------------------------------------------------
-
-bool SlopesNearCollinear(const IntPoint& pt1,
- const IntPoint& pt2, const IntPoint& pt3, double distSqrd)
-{
- //this function is more accurate when the point that's geometrically
- //between the other 2 points is the one that's tested for distance.
- //ie makes it more likely to pick up 'spikes' ...
- if (Abs(pt1.x - pt2.x) > Abs(pt1.y - pt2.y))
- {
- if ((pt1.x > pt2.x) == (pt1.x < pt3.x))
- return DistanceFromLineSqrd(pt1, pt2, pt3) < distSqrd;
- else if ((pt2.x > pt1.x) == (pt2.x < pt3.x))
- return DistanceFromLineSqrd(pt2, pt1, pt3) < distSqrd;
- else
- return DistanceFromLineSqrd(pt3, pt1, pt2) < distSqrd;
- }
- else
- {
- if ((pt1.y > pt2.y) == (pt1.y < pt3.y))
- return DistanceFromLineSqrd(pt1, pt2, pt3) < distSqrd;
- else if ((pt2.y > pt1.y) == (pt2.y < pt3.y))
- return DistanceFromLineSqrd(pt2, pt1, pt3) < distSqrd;
- else
- return DistanceFromLineSqrd(pt3, pt1, pt2) < distSqrd;
- }
-}
-//------------------------------------------------------------------------------
-
-bool PointsAreClose(IntPoint pt1, IntPoint pt2, double distSqrd)
-{
- double Dx = (double)pt1.x - pt2.x;
- double dy = (double)pt1.y - pt2.y;
- return ((Dx * Dx) + (dy * dy) <= distSqrd);
-}
-//------------------------------------------------------------------------------
-
-OutPt* ExcludeOp(OutPt* op)
-{
- OutPt* result = op->Prev;
- result->Next = op->Next;
- op->Next->Prev = result;
- result->Idx = 0;
- return result;
-}
-//------------------------------------------------------------------------------
-
-void CleanPolygon(const Path& in_poly, Path& out_poly, double distance)
-{
- //distance = proximity in units/pixels below which vertices
- //will be stripped. Default ~= sqrt(2).
-
- size_t size = in_poly.size();
-
- if (size == 0)
- {
- out_poly.clear();
- return;
- }
-
- OutPt* outPts = new OutPt[size];
- for (size_t i = 0; i < size; ++i)
- {
- outPts[i].Pt = in_poly[i];
- outPts[i].Next = &outPts[(i + 1) % size];
- outPts[i].Next->Prev = &outPts[i];
- outPts[i].Idx = 0;
- }
-
- double distSqrd = distance * distance;
- OutPt* op = &outPts[0];
- while (op->Idx == 0 && op->Next != op->Prev)
- {
- if (PointsAreClose(op->Pt, op->Prev->Pt, distSqrd))
- {
- op = ExcludeOp(op);
- size--;
- }
- else if (PointsAreClose(op->Prev->Pt, op->Next->Pt, distSqrd))
- {
- ExcludeOp(op->Next);
- op = ExcludeOp(op);
- size -= 2;
- }
- else if (SlopesNearCollinear(op->Prev->Pt, op->Pt, op->Next->Pt, distSqrd))
- {
- op = ExcludeOp(op);
- size--;
- }
- else
- {
- op->Idx = 1;
- op = op->Next;
- }
- }
-
- if (size < 3) size = 0;
- out_poly.resize(size);
- for (size_t i = 0; i < size; ++i)
- {
- out_poly[i] = op->Pt;
- op = op->Next;
- }
- delete [] outPts;
-}
-//------------------------------------------------------------------------------
-
-void CleanPolygon(Path& poly, double distance)
-{
- CleanPolygon(poly, poly, distance);
-}
-//------------------------------------------------------------------------------
-
-void CleanPolygons(const Paths& in_polys, Paths& out_polys, double distance)
-{
- out_polys.resize(in_polys.size());
- for (Paths::size_type i = 0; i < in_polys.size(); ++i)
- CleanPolygon(in_polys[i], out_polys[i], distance);
-}
-//------------------------------------------------------------------------------
-
-void CleanPolygons(Paths& polys, double distance)
-{
- CleanPolygons(polys, polys, distance);
-}
-//------------------------------------------------------------------------------
-
-void Minkowski(const Path& poly, const Path& path,
- Paths& solution, bool isSum, bool isClosed)
-{
- int delta = (isClosed ? 1 : 0);
- size_t polyCnt = poly.size();
- size_t pathCnt = path.size();
- Paths pp;
- pp.reserve(pathCnt);
- if (isSum)
- for (size_t i = 0; i < pathCnt; ++i)
- {
- Path p;
- p.reserve(polyCnt);
- for (size_t j = 0; j < poly.size(); ++j)
- p.push_back(IntPoint(path[i].x + poly[j].x, path[i].y + poly[j].y));
- pp.push_back(p);
- }
- else
- for (size_t i = 0; i < pathCnt; ++i)
- {
- Path p;
- p.reserve(polyCnt);
- for (size_t j = 0; j < poly.size(); ++j)
- p.push_back(IntPoint(path[i].x - poly[j].x, path[i].y - poly[j].y));
- pp.push_back(p);
- }
-
- solution.clear();
- solution.reserve((pathCnt + delta) * (polyCnt + 1));
- for (size_t i = 0; i < pathCnt - 1 + delta; ++i)
- for (size_t j = 0; j < polyCnt; ++j)
- {
- Path quad;
- quad.reserve(4);
- quad.push_back(pp[i % pathCnt][j % polyCnt]);
- quad.push_back(pp[(i + 1) % pathCnt][j % polyCnt]);
- quad.push_back(pp[(i + 1) % pathCnt][(j + 1) % polyCnt]);
- quad.push_back(pp[i % pathCnt][(j + 1) % polyCnt]);
- if (!Orientation(quad)) ReversePath(quad);
- solution.push_back(quad);
- }
-}
-//------------------------------------------------------------------------------
-
-void MinkowskiSum(const Path& pattern, const Path& path, Paths& solution, bool pathIsClosed)
-{
- Minkowski(pattern, path, solution, true, pathIsClosed);
- Clipper c;
- c.AddPaths(solution, ptSubject, true);
- c.Execute(ctUnion, solution, pftNonZero, pftNonZero);
-}
-//------------------------------------------------------------------------------
-
-void TranslatePath(const Path& input, Path& output, const IntPoint delta)
-{
- //precondition: input != output
- output.resize(input.size());
- for (size_t i = 0; i < input.size(); ++i)
- output[i] = IntPoint(input[i].x + delta.x, input[i].y + delta.y);
-}
-//------------------------------------------------------------------------------
-
-void MinkowskiSum(const Path& pattern, const Paths& paths, Paths& solution, bool pathIsClosed)
-{
- Clipper c;
- for (size_t i = 0; i < paths.size(); ++i)
- {
- Paths tmp;
- Minkowski(pattern, paths[i], tmp, true, pathIsClosed);
- c.AddPaths(tmp, ptSubject, true);
- if (pathIsClosed)
- {
- Path tmp2;
- TranslatePath(paths[i], tmp2, pattern[0]);
- c.AddPath(tmp2, ptClip, true);
- }
- }
- c.Execute(ctUnion, solution, pftNonZero, pftNonZero);
-}
-//------------------------------------------------------------------------------
-
-void MinkowskiDiff(const Path& poly1, const Path& poly2, Paths& solution)
-{
- Minkowski(poly1, poly2, solution, false, true);
- Clipper c;
- c.AddPaths(solution, ptSubject, true);
- c.Execute(ctUnion, solution, pftNonZero, pftNonZero);
-}
-//------------------------------------------------------------------------------
-
-enum NodeType {ntAny, ntOpen, ntClosed};
-
-void AddPolyNodeToPaths(const PolyNode& polynode, NodeType nodetype, Paths& paths)
-{
- bool match = true;
- if (nodetype == ntClosed) match = !polynode.IsOpen();
- else if (nodetype == ntOpen) return;
-
- if (!polynode.Contour.empty() && match)
- paths.push_back(polynode.Contour);
- for (int i = 0; i < polynode.ChildCount(); ++i)
- AddPolyNodeToPaths(*polynode.Childs[i], nodetype, paths);
-}
-//------------------------------------------------------------------------------
-
-void PolyTreeToPaths(const PolyTree& polytree, Paths& paths)
-{
- paths.resize(0);
- paths.reserve(polytree.Total());
- AddPolyNodeToPaths(polytree, ntAny, paths);
-}
-//------------------------------------------------------------------------------
-
-void ClosedPathsFromPolyTree(const PolyTree& polytree, Paths& paths)
-{
- paths.resize(0);
- paths.reserve(polytree.Total());
- AddPolyNodeToPaths(polytree, ntClosed, paths);
-}
-//------------------------------------------------------------------------------
-
-void OpenPathsFromPolyTree(PolyTree& polytree, Paths& paths)
-{
- paths.resize(0);
- paths.reserve(polytree.Total());
- //Open paths are top level only, so ...
- for (int i = 0; i < polytree.ChildCount(); ++i)
- if (polytree.Childs[i]->IsOpen())
- paths.push_back(polytree.Childs[i]->Contour);
-}
-//------------------------------------------------------------------------------
-
-std::ostream& operator <<(std::ostream &s, const IntPoint &p)
-{
- s << "(" << p.x << "," << p.y << ")";
- return s;
-}
-//------------------------------------------------------------------------------
-
-std::ostream& operator <<(std::ostream &s, const Path &p)
-{
- if (p.empty()) return s;
- Path::size_type last = p.size() -1;
- for (Path::size_type i = 0; i < last; i++)
- s << "(" << p[i].x << "," << p[i].y << "), ";
- s << "(" << p[last].x << "," << p[last].y << ")\n";
- return s;
-}
-//------------------------------------------------------------------------------
-
-std::ostream& operator <<(std::ostream &s, const Paths &p)
-{
- for (Paths::size_type i = 0; i < p.size(); i++)
- s << p[i];
- s << "\n";
- return s;
-}
-//------------------------------------------------------------------------------
-
-} //ClipperLib namespace
diff --git a/src/clipper/clipper.hpp b/src/clipper/clipper.hpp deleted file mode 100644 index 661aeb33e6..0000000000 --- a/src/clipper/clipper.hpp +++ /dev/null @@ -1,450 +0,0 @@ -/*******************************************************************************
-* *
-* Author : Angus Johnson *
-* Version : 6.4.0 *
-* Date : 2 July 2015 *
-* Website : http://www.angusj.com *
-* Copyright : Angus Johnson 2010-2015 *
-* *
-* License: *
-* Use, modification & distribution is subject to Boost Software License Ver 1. *
-* http://www.boost.org/LICENSE_1_0.txt *
-* *
-* Attributions: *
-* The code in this library is an extension of Bala Vatti's clipping algorithm: *
-* "A generic solution to polygon clipping" *
-* Communications of the ACM, Vol 35, Issue 7 (July 1992) pp 56-63. *
-* http://portal.acm.org/citation.cfm?id=129906 *
-* *
-* Computer graphics and geometric modeling: implementation and algorithms *
-* By Max K. Agoston *
-* Springer; 1 edition (January 4, 2005) *
-* http://books.google.com/books?q=vatti+clipping+agoston *
-* *
-* See also: *
-* "Polygon Offsetting by Computing Winding Numbers" *
-* Paper no. DETC2005-85513 pp. 565-575 *
-* ASME 2005 International Design Engineering Technical Conferences *
-* and Computers and Information in Engineering Conference (IDETC/CIE2005) *
-* September 24-28, 2005 , Long Beach, California, USA *
-* http://www.me.berkeley.edu/~mcmains/pubs/DAC05OffsetPolygon.pdf *
-* *
-*******************************************************************************/
-
-#ifndef clipper_hpp
-#define clipper_hpp
-
-#define CLIPPER_VERSION "6.2.6"
-
-//use_int32: When enabled 32bit ints are used instead of 64bit ints. This
-//improve performance but coordinate values are limited to the range +/- 46340
-//#define use_int32
-
-//use_xyz: adds a Z member to IntPoint. Adds a minor cost to perfomance.
-//#define use_xyz
-
-//use_lines: Enables line clipping. Adds a very minor cost to performance.
-//#define use_lines
-
-//use_deprecated: Enables temporary support for the obsolete functions
-//#define use_deprecated
-
-#include <vector>
-#include <list>
-#include <set>
-#include <stdexcept>
-#include <cstring>
-#include <cstdlib>
-#include <ostream>
-#include <functional>
-#include <queue>
-#include <unordered_map>
-#if defined(CLIPPER_IMPL_INCLUDE)
-#include CLIPPER_IMPL_INCLUDE
-#endif
-
-namespace ClipperLib {
-
-enum ClipType { ctIntersection, ctUnion, ctDifference, ctXor };
-enum PolyType { ptSubject, ptClip };
-//By far the most widely used winding rules for polygon filling are
-//EvenOdd & NonZero (GDI, GDI+, XLib, OpenGL, Cairo, AGG, Quartz, SVG, Gr32)
-//Others rules include Positive, Negative and ABS_GTR_EQ_TWO (only in OpenGL)
-//see http://glprogramming.com/red/chapter11.html
-enum PolyFillType { pftEvenOdd, pftNonZero, pftPositive, pftNegative };
-
-#ifdef use_int32
- typedef int cInt;
- static cInt const loRange = 0x7FFF;
- static cInt const hiRange = 0x7FFF;
-#else
- typedef std::int64_t cInt;
- static cInt const loRange = 0x3FFFFFFF;
- static cInt const hiRange = 0x3FFFFFFFFFFFFFFFLL;
- typedef signed long long long64; //used by Int128 class
- typedef unsigned long long ulong64;
-
-#endif
-
-#if defined(CLIPPER_INTPOINT_IMPL)
-
-typedef CLIPPER_INTPOINT_IMPL IntPoint;
-
-#else
-
-struct IntPoint {
- cInt x;
- cInt y;
-#ifdef use_xyz
- cInt Z;
- IntPoint(cInt _x = 0, cInt _y = 0, cInt z = 0): x(_x), y(_y), Z(z) {};
-#else
- IntPoint(cInt _x = 0, cInt _y = 0): x(_x), y(_y) {};
-#endif
-
- friend inline bool operator== (const IntPoint& a, const IntPoint& b)
- {
- return a.x == b.x && a.y == b.y;
- }
- friend inline bool operator!= (const IntPoint& a, const IntPoint& b)
- {
- return a.x != b.x || a.y != b.y;
- }
-};
-#endif
-
-//------------------------------------------------------------------------------
-
-#if defined(CLIPPER_PATH_IMPL)
-
-typedef CLIPPER_PATH_IMPL Path;
-
-#else
-
-typedef std::vector< IntPoint > Path;
-
-#endif
-
-
-#if defined(CLIPPER_PATHS_IMPL)
-
-typedef CLIPPER_PATHS_IMPL Paths;
-
-#else
-
-typedef std::vector< Path > Paths;
-
-#endif
-
-
-
-inline Path& operator <<(Path& poly, const IntPoint& p) {poly.push_back(p); return poly;}
-inline Paths& operator <<(Paths& polys, const Path& p) {polys.push_back(p); return polys;}
-
-std::ostream& operator <<(std::ostream &s, const IntPoint &p);
-std::ostream& operator <<(std::ostream &s, const Path &p);
-std::ostream& operator <<(std::ostream &s, const Paths &p);
-
-struct DoublePoint
-{
- double x;
- double y;
- DoublePoint(double _x = 0, double _y = 0) : x(_x), y(_y) {}
- DoublePoint(IntPoint ip) : x((double)ip.x), y((double)ip.y) {}
-};
-//------------------------------------------------------------------------------
-
-#ifdef use_xyz
-typedef void (*ZFillCallback)(IntPoint& e1bot, IntPoint& e1top, IntPoint& e2bot, IntPoint& e2top, IntPoint& pt);
-#endif
-
-enum InitOptions {ioReverseSolution = 1, ioStrictlySimple = 2, ioPreserveCollinear = 4};
-enum JoinType {jtSquare, jtRound, jtMiter};
-enum EndType {etClosedPolygon, etClosedLine, etOpenButt, etOpenSquare, etOpenRound};
-
-class PolyNode;
-typedef std::vector< PolyNode* > PolyNodes;
-
-class PolyNode
-{
-public:
- PolyNode();
- virtual ~PolyNode(){};
- Path Contour;
- PolyNodes Childs;
- PolyNode* Parent;
- PolyNode* GetNext() const;
- bool IsHole() const;
- bool IsOpen() const;
- int ChildCount() const;
-private:
- unsigned Index; //node index in Parent.Childs
- bool m_IsOpen;
- JoinType m_jointype;
- EndType m_endtype;
- PolyNode* GetNextSiblingUp() const;
- void AddChild(PolyNode& child);
- friend class Clipper; //to access Index
- friend class ClipperOffset;
-};
-
-class PolyTree: public PolyNode
-{
-public:
- ~PolyTree(){Clear();};
- PolyNode* GetFirst() const;
- void Clear();
- int Total() const;
-private:
- PolyNodes AllNodes;
- friend class Clipper; //to access AllNodes
-};
-
-bool Orientation(const Path &poly);
-double Area(const Path &poly);
-int PointInPolygon(const IntPoint &pt, const Path &path);
-
-void SimplifyPolygon(const Path &in_poly, Paths &out_polys, PolyFillType fillType = pftEvenOdd);
-void SimplifyPolygons(const Paths &in_polys, Paths &out_polys, PolyFillType fillType = pftEvenOdd);
-void SimplifyPolygons(Paths &polys, PolyFillType fillType = pftEvenOdd);
-
-void CleanPolygon(const Path& in_poly, Path& out_poly, double distance = 1.415);
-void CleanPolygon(Path& poly, double distance = 1.415);
-void CleanPolygons(const Paths& in_polys, Paths& out_polys, double distance = 1.415);
-void CleanPolygons(Paths& polys, double distance = 1.415);
-
-void MinkowskiSum(const Path& pattern, const Path& path, Paths& solution, bool pathIsClosed);
-void MinkowskiSum(const Path& pattern, const Paths& paths, Paths& solution, bool pathIsClosed);
-void MinkowskiDiff(const Path& poly1, const Path& poly2, Paths& solution);
-
-void PolyTreeToPaths(const PolyTree& polytree, Paths& paths);
-void ClosedPathsFromPolyTree(const PolyTree& polytree, Paths& paths);
-void OpenPathsFromPolyTree(PolyTree& polytree, Paths& paths);
-
-void ReversePath(Path& p);
-void ReversePaths(Paths& p);
-
-struct IntRect { cInt left; cInt top; cInt right; cInt bottom; };
-
-//enums that are used internally ...
-enum EdgeSide { esLeft = 1, esRight = 2};
-
-//forward declarations (for stuff used internally) ...
-struct TEdge;
-struct IntersectNode;
-struct LocalMinimum;
-struct OutPt;
-struct OutRec;
-struct Join;
-struct OutPtIntersect;
-
-typedef std::vector < OutRec* > PolyOutList;
-typedef std::vector < TEdge* > EdgeList;
-typedef std::vector < Join* > JoinList;
-typedef std::vector < IntersectNode* > IntersectList;
-
-//------------------------------------------------------------------------------
-
-//ClipperBase is the ancestor to the Clipper class. It should not be
-//instantiated directly. This class simply abstracts the conversion of sets of
-//polygon coordinates into edge objects that are stored in a LocalMinima list.
-class ClipperBase
-{
-public:
- ClipperBase();
- virtual ~ClipperBase();
- virtual bool AddPath(const Path &pg, PolyType PolyTyp, bool Closed);
- bool AddPaths(const Paths &ppg, PolyType PolyTyp, bool Closed);
- virtual void Clear();
- IntRect GetBounds();
- bool PreserveCollinear() {return m_PreserveCollinear;};
- void PreserveCollinear(bool value) {m_PreserveCollinear = value;};
-protected:
- void DisposeLocalMinimaList();
- TEdge* AddBoundsToLML(TEdge *e, bool IsClosed);
- virtual void Reset();
- TEdge* ProcessBound(TEdge* E, bool IsClockwise);
- void InsertScanbeam(const cInt Y);
- bool PopScanbeam(cInt &Y);
- bool LocalMinimaPending();
- bool PopLocalMinima(cInt Y, const LocalMinimum *&locMin);
- OutRec* CreateOutRec();
- void DisposeAllOutRecs();
- void DisposeOutRec(PolyOutList::size_type index);
- void SwapPositionsInAEL(TEdge *edge1, TEdge *edge2);
- void DeleteFromAEL(TEdge *e);
- void UpdateEdgeIntoAEL(TEdge *&e);
-
- typedef std::vector<LocalMinimum> MinimaList;
- MinimaList::iterator m_CurrentLM;
- MinimaList m_MinimaList;
-
- bool m_UseFullRange;
- EdgeList m_edges;
- bool m_PreserveCollinear;
- bool m_HasOpenPaths;
- PolyOutList m_PolyOuts;
- TEdge *m_ActiveEdges;
-
- typedef std::priority_queue<cInt> ScanbeamList;
- ScanbeamList m_Scanbeam;
-};
-//------------------------------------------------------------------------------
-
-class Clipper : public virtual ClipperBase
-{
-public:
- Clipper(int initOptions = 0);
- bool Execute(ClipType clipType,
- Paths &solution,
- PolyFillType fillType = pftEvenOdd);
- bool Execute(ClipType clipType,
- Paths &solution,
- PolyFillType subjFillType,
- PolyFillType clipFillType);
- bool Execute(ClipType clipType,
- PolyTree &polytree,
- PolyFillType fillType = pftEvenOdd);
- bool Execute(ClipType clipType,
- PolyTree &polytree,
- PolyFillType subjFillType,
- PolyFillType clipFillType);
- bool ReverseSolution() { return m_ReverseOutput; };
- void ReverseSolution(bool value) {m_ReverseOutput = value;};
- bool StrictlySimple() {return m_StrictSimple;};
- void StrictlySimple(bool value) {m_StrictSimple = value;};
- //set the callback function for z value filling on intersections (otherwise Z is 0)
-#ifdef use_xyz
- void ZFillFunction(ZFillCallback zFillFunc);
-#endif
-protected:
- virtual bool ExecuteInternal();
-private:
- JoinList m_Joins;
- JoinList m_GhostJoins;
- IntersectList m_IntersectList;
- ClipType m_ClipType;
- typedef std::list<cInt> MaximaList;
- MaximaList m_Maxima;
- TEdge *m_SortedEdges;
- bool m_ExecuteLocked;
- PolyFillType m_ClipFillType;
- PolyFillType m_SubjFillType;
- bool m_ReverseOutput;
- bool m_UsingPolyTree;
- bool m_StrictSimple;
-#ifdef use_xyz
- ZFillCallback m_ZFill; //custom callback
-#endif
- void SetWindingCount(TEdge& edge);
- bool IsEvenOddFillType(const TEdge& edge) const;
- bool IsEvenOddAltFillType(const TEdge& edge) const;
- void InsertLocalMinimaIntoAEL(const cInt botY);
- void InsertEdgeIntoAEL(TEdge *edge, TEdge* startEdge);
- void AddEdgeToSEL(TEdge *edge);
- bool PopEdgeFromSEL(TEdge *&edge);
- void CopyAELToSEL();
- void DeleteFromSEL(TEdge *e);
- void SwapPositionsInSEL(TEdge *edge1, TEdge *edge2);
- bool IsContributing(const TEdge& edge) const;
- bool IsTopHorz(const cInt XPos);
- void DoMaxima(TEdge *e);
- void ProcessHorizontals();
- void ProcessHorizontal(TEdge *horzEdge);
- void AddLocalMaxPoly(TEdge *e1, TEdge *e2, const IntPoint &pt);
- OutPt* AddLocalMinPoly(TEdge *e1, TEdge *e2, const IntPoint &pt);
- OutRec* GetOutRec(int idx);
- void AppendPolygon(TEdge *e1, TEdge *e2);
- void IntersectEdges(TEdge *e1, TEdge *e2, IntPoint &pt);
- OutPt* AddOutPt(TEdge *e, const IntPoint &pt);
- OutPt* GetLastOutPt(TEdge *e);
- bool ProcessIntersections(const cInt topY);
- void BuildIntersectList(const cInt topY);
- void ProcessIntersectList();
- void ProcessEdgesAtTopOfScanbeam(const cInt topY);
- void BuildResult(Paths& polys);
- void BuildResult2(PolyTree& polytree);
- void SetHoleState(TEdge *e, OutRec *outrec);
- void DisposeIntersectNodes();
- bool FixupIntersectionOrder();
- void FixupOutPolygon(OutRec &outrec);
- void FixupOutPolyline(OutRec &outrec);
- bool IsHole(TEdge *e);
- bool FindOwnerFromSplitRecs(OutRec &outRec, OutRec *&currOrfl);
- void FixHoleLinkage(OutRec &outrec);
- void AddJoin(OutPt *op1, OutPt *op2, const IntPoint offPt);
- void ClearJoins();
- void ClearGhostJoins();
- void AddGhostJoin(OutPt *op, const IntPoint offPt);
- bool JoinPoints(Join *j, OutRec* outRec1, OutRec* outRec2);
- void JoinCommonEdges();
- void DoSimplePolygons();
- bool FindIntersectLoop(std::unordered_multimap<int, OutPtIntersect> & dupeRec,
- std::list<std::pair<int, OutPtIntersect> > & iList,
- OutRec * outRec_parent,
- int idx_origin,
- int idx_prev,
- std::set<int> & visited,
- OutPt * orig_pt,
- OutPt * prev_pt);
- bool FixIntersects(std::unordered_multimap<int, OutPtIntersect> & dupeRec,
- OutPt * op_j,
- OutPt * op_k,
- OutRec * outRec_j,
- OutRec * outRec_k);
- void FixupFirstLefts1(OutRec* OldOutRec, OutRec* NewOutRec);
- void FixupFirstLefts2(OutRec* InnerOutRec, OutRec* OuterOutRec);
- void FixupFirstLefts3(OutRec* OldOutRec, OutRec* NewOutRec);
-#ifdef use_xyz
- void SetZ(IntPoint& pt, TEdge& e1, TEdge& e2);
-#endif
-};
-//------------------------------------------------------------------------------
-
-class ClipperOffset
-{
-public:
- ClipperOffset(double miterLimit = 2.0, double roundPrecision = 0.25);
- ~ClipperOffset();
- void AddPath(const Path& path, JoinType joinType, EndType endType);
- void AddPaths(const Paths& paths, JoinType joinType, EndType endType);
- void Execute(Paths& solution, double delta);
- void Execute(PolyTree& solution, double delta);
- void Clear();
- double MiterLimit;
- double ArcTolerance;
-private:
- Paths m_destPolys;
- Path m_srcPoly;
- Path m_destPoly;
- std::vector<DoublePoint> m_normals;
- double m_delta, m_sinA, m_sin, m_cos;
- double m_miterLim, m_StepsPerRad;
- IntPoint m_lowest;
- PolyNode m_polyNodes;
-
- void FixOrientations();
- void DoOffset(double delta);
- void OffsetPoint(int j, int& k, JoinType jointype);
- void DoSquare(int j, int k);
- void DoMiter(int j, int k, double r);
- void DoRound(int j, int k);
-};
-//------------------------------------------------------------------------------
-
-class clipperException : public std::exception
-{
- public:
- clipperException(const char* description): m_descr(description) {}
- virtual ~clipperException() throw() {}
- virtual const char* what() const throw() {return m_descr.c_str();}
- private:
- std::string m_descr;
-};
-//------------------------------------------------------------------------------
-
-} //ClipperLib namespace
-
-#endif //clipper_hpp
-
-
diff --git a/src/clipper/fix_members.sh b/src/clipper/fix_members.sh deleted file mode 100755 index 998d45f0d6..0000000000 --- a/src/clipper/fix_members.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -export ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -perl -i -p -e "s/\.X/\.x/g;" ${ROOTDIR}/clipper.* -perl -i -p -e "s/\->X/\->x/g;" ${ROOTDIR}/clipper.* -perl -i -p -e "s/cInt X;/cInt x;/g;" ${ROOTDIR}/clipper.* -perl -i -p -e "s/double X;/double x;/g;" ${ROOTDIR}/clipper.* -perl -i -p -e "s/X\(x\)/x\(_x\)/g;" ${ROOTDIR}/clipper.* -perl -i -p -e "s/X\(\(/x\(\(/g;" ${ROOTDIR}/clipper.* -perl -i -p -e "s/double x = 0/double _x = 0/g;" ${ROOTDIR}/clipper.* -perl -i -p -e "s/cInt x = 0/cInt _x = 0/g;" ${ROOTDIR}/clipper.* - -perl -i -p -e "s/\.Y/\.y/g;" ${ROOTDIR}/clipper.* -perl -i -p -e "s/\->Y/\->y/g;" ${ROOTDIR}/clipper.* -perl -i -p -e "s/cInt Y;/cInt y;/g;" ${ROOTDIR}/clipper.* -perl -i -p -e "s/double Y;/double y;/g;" ${ROOTDIR}/clipper.* -perl -i -p -e "s/Y\(y\)/y\(_y\)/g;" ${ROOTDIR}/clipper.* -perl -i -p -e "s/Y\(\(/y\(\(/g;" ${ROOTDIR}/clipper.* -perl -i -p -e "s/cInt Y;/cInt y;/g;" ${ROOTDIR}/clipper.* -perl -i -p -e "s/double y = 0/double _y = 0/g;" ${ROOTDIR}/clipper.* -perl -i -p -e "s/cInt y = 0/cInt _y = 0/g;" ${ROOTDIR}/clipper.* - - diff --git a/src/mbgl/annotation/annotation_manager.hpp b/src/mbgl/annotation/annotation_manager.hpp index 856aeeed72..d254a360e0 100644 --- a/src/mbgl/annotation/annotation_manager.hpp +++ b/src/mbgl/annotation/annotation_manager.hpp @@ -9,7 +9,6 @@ #include <string> #include <vector> #include <unordered_set> -#include <unordered_map> namespace mbgl { diff --git a/src/mbgl/annotation/annotation_source.cpp b/src/mbgl/annotation/annotation_source.cpp index a9db9ad8ae..c52836c500 100644 --- a/src/mbgl/annotation/annotation_source.cpp +++ b/src/mbgl/annotation/annotation_source.cpp @@ -14,8 +14,8 @@ AnnotationSource::Impl::Impl(Source& base_) : Source::Impl(SourceType::Annotations, AnnotationManager::SourceID, base_) { } -Range<uint8_t> AnnotationSource::Impl::getZoomRange() { - return { 0, 22 }; +optional<Range<uint8_t>> AnnotationSource::Impl::getZoomRange() const { + return { { 0, 22 } }; } void AnnotationSource::Impl::loadDescription(FileSource&) { diff --git a/src/mbgl/annotation/annotation_source.hpp b/src/mbgl/annotation/annotation_source.hpp index d995222f33..07e00dc52d 100644 --- a/src/mbgl/annotation/annotation_source.hpp +++ b/src/mbgl/annotation/annotation_source.hpp @@ -18,9 +18,10 @@ public: void loadDescription(FileSource&) final; + optional<Range<uint8_t>> getZoomRange() const final; + private: uint16_t getTileSize() const final { return util::tileSize; } - Range<uint8_t> getZoomRange() final; std::unique_ptr<Tile> createTile(const OverscaledTileID&, const style::UpdateParameters&) final; }; diff --git a/src/mbgl/gl/attribute.cpp b/src/mbgl/gl/attribute.cpp index ff313fdcd0..eacaa37457 100644 --- a/src/mbgl/gl/attribute.cpp +++ b/src/mbgl/gl/attribute.cpp @@ -1,13 +1,10 @@ #include <mbgl/gl/attribute.hpp> #include <mbgl/gl/context.hpp> #include <mbgl/gl/gl.hpp> -#include <mbgl/gl/normalization.hpp> namespace mbgl { namespace gl { -static_assert(offsetof(Normalized<uint8_t>, value) == 0, "unexpected normalized offset"); - AttributeLocation bindAttributeLocation(ProgramID id, AttributeLocation location, const char* name) { MBGL_CHECK_ERROR(glBindAttribLocation(id, location, name)); return location; @@ -22,10 +19,6 @@ template <> DataType DataTypeOf< int32_t> = DataType::Integer; template <> DataType DataTypeOf<uint32_t> = DataType::UnsignedInteger; template <> DataType DataTypeOf<float> = DataType::Float; -template <class T> bool IsNormalized = false; -template <class T> bool IsNormalized<Normalized<T>> = true; -template <class T> DataType DataTypeOf<Normalized<T>> = DataTypeOf<T>; - template <class T, std::size_t N> void VariableAttributeBinding<T, N>::bind(Context& context, AttributeLocation location, @@ -40,7 +33,7 @@ void VariableAttributeBinding<T, N>::bind(Context& context, location, static_cast<GLint>(attributeSize), static_cast<GLenum>(DataTypeOf<T>), - static_cast<GLboolean>(IsNormalized<T>), + static_cast<GLboolean>(false), static_cast<GLsizei>(vertexSize), reinterpret_cast<GLvoid*>(attributeOffset + (vertexSize * vertexOffset)))); } @@ -50,11 +43,6 @@ template class VariableAttributeBinding<uint8_t, 2>; template class VariableAttributeBinding<uint8_t, 3>; template class VariableAttributeBinding<uint8_t, 4>; -template class VariableAttributeBinding<Normalized<uint8_t>, 1>; -template class VariableAttributeBinding<Normalized<uint8_t>, 2>; -template class VariableAttributeBinding<Normalized<uint8_t>, 3>; -template class VariableAttributeBinding<Normalized<uint8_t>, 4>; - template class VariableAttributeBinding<uint16_t, 1>; template class VariableAttributeBinding<uint16_t, 2>; template class VariableAttributeBinding<uint16_t, 3>; @@ -104,39 +92,6 @@ void ConstantAttributeBinding<uint8_t, 4>::bind(Context&, AttributeLocation loca template <> -void ConstantAttributeBinding<Normalized<uint8_t>, 1>::bind(Context&, AttributeLocation location, optional<VariableAttributeBinding<Normalized<uint8_t>, 1>>& oldBinding, std::size_t) const { - assert(location != 0); - oldBinding = {}; - MBGL_CHECK_ERROR(glDisableVertexAttribArray(location)); - MBGL_CHECK_ERROR(glVertexAttrib1f(location, value[0].denormalized())); -} - -template <> -void ConstantAttributeBinding<Normalized<uint8_t>, 2>::bind(Context&, AttributeLocation location, optional<VariableAttributeBinding<Normalized<uint8_t>, 2>>& oldBinding, std::size_t) const { - assert(location != 0); - oldBinding = {}; - MBGL_CHECK_ERROR(glDisableVertexAttribArray(location)); - MBGL_CHECK_ERROR(glVertexAttrib2f(location, value[0].denormalized(), value[1].denormalized())); -} - -template <> -void ConstantAttributeBinding<Normalized<uint8_t>, 3>::bind(Context&, AttributeLocation location, optional<VariableAttributeBinding<Normalized<uint8_t>, 3>>& oldBinding, std::size_t) const { - assert(location != 0); - oldBinding = {}; - MBGL_CHECK_ERROR(glDisableVertexAttribArray(location)); - MBGL_CHECK_ERROR(glVertexAttrib3f(location, value[0].denormalized(), value[1].denormalized(), value[2].denormalized())); -} - -template <> -void ConstantAttributeBinding<Normalized<uint8_t>, 4>::bind(Context&, AttributeLocation location, optional<VariableAttributeBinding<Normalized<uint8_t>, 4>>& oldBinding, std::size_t) const { - assert(location != 0); - oldBinding = {}; - MBGL_CHECK_ERROR(glDisableVertexAttribArray(location)); - MBGL_CHECK_ERROR(glVertexAttrib4f(location, value[0].denormalized(), value[1].denormalized(), value[2].denormalized(), value[3].denormalized())); -} - - -template <> void ConstantAttributeBinding<uint16_t, 1>::bind(Context&, AttributeLocation location, optional<VariableAttributeBinding<uint16_t, 1>>& oldBinding, std::size_t) const { assert(location != 0); oldBinding = {}; diff --git a/src/mbgl/gl/attribute.hpp b/src/mbgl/gl/attribute.hpp index 43e2c2d794..ab97ada0f2 100644 --- a/src/mbgl/gl/attribute.hpp +++ b/src/mbgl/gl/attribute.hpp @@ -113,8 +113,11 @@ public: } }; -#define MBGL_DEFINE_ATTRIBUTE(type_, n_, name_) \ - struct name_ : ::mbgl::gl::Attribute<type_, n_> { static auto name() { return #name_; } } +#define MBGL_DEFINE_ATTRIBUTE(type_, n_, name_) \ + struct name_ { \ + static auto name() { return #name_; } \ + using Type = ::mbgl::gl::Attribute<type_, n_>; \ + } namespace detail { @@ -234,15 +237,15 @@ public: using Types = TypeList<As...>; using Locations = IndexedTuple< TypeList<As...>, - TypeList<typename As::Location...>>; + TypeList<typename As::Type::Location...>>; using Bindings = IndexedTuple< TypeList<As...>, - TypeList<typename As::Binding...>>; + TypeList<typename As::Type::Binding...>>; using VariableBindings = IndexedTuple< TypeList<As...>, - TypeList<optional<typename As::VariableBinding>...>>; + TypeList<optional<typename As::Type::VariableBinding>...>>; - using Vertex = detail::Vertex<As...>; + using Vertex = detail::Vertex<typename As::Type...>; template <class A> static constexpr std::size_t Index = TypeIndex<A, As...>::value; @@ -253,7 +256,7 @@ public: template <class DrawMode> static Bindings allVariableBindings(const VertexBuffer<Vertex, DrawMode>& buffer) { - return Bindings { As::variableBinding(buffer, Index<As>)... }; + return Bindings { As::Type::variableBinding(buffer, Index<As>)... }; } static void bind(Context& context, @@ -261,11 +264,11 @@ public: VariableBindings& oldBindings, const Bindings& newBindings, std::size_t vertexOffset) { - util::ignore({ (As::bind(context, - locations.template get<As>(), - oldBindings.template get<As>(), - newBindings.template get<As>(), - vertexOffset), 0)... }); + util::ignore({ (As::Type::bind(context, + locations.template get<As>(), + oldBindings.template get<As>(), + newBindings.template get<As>(), + vertexOffset), 0)... }); } }; diff --git a/src/mbgl/gl/context.hpp b/src/mbgl/gl/context.hpp index 9d3ecec662..e4cc5a3af2 100644 --- a/src/mbgl/gl/context.hpp +++ b/src/mbgl/gl/context.hpp @@ -21,7 +21,6 @@ #include <vector> #include <array> #include <string> -#include <unordered_map> namespace mbgl { diff --git a/src/mbgl/gl/normalization.hpp b/src/mbgl/gl/normalization.hpp deleted file mode 100644 index 83fa67a3ec..0000000000 --- a/src/mbgl/gl/normalization.hpp +++ /dev/null @@ -1,35 +0,0 @@ -#pragma once - -#include <mbgl/math/clamp.hpp> - -#include <cassert> -#include <limits> - -namespace mbgl { -namespace gl { - -template <class T> -class Normalized { -public: - T value; - - Normalized() : value(0) {} - - explicit Normalized(float f) - : value(static_cast<T>(std::numeric_limits<T>::max() * util::clamp(f, 0.0f, 1.0f))) { - assert(f >= 0.0f); - assert(f <= 1.0f); - } - - float denormalized() const { - return float(value) / std::numeric_limits<T>::max(); - } -}; - -template <class T> -bool operator==(const Normalized<T>& lhs, const Normalized<T>& rhs) { - return lhs.value == rhs.value; -} - -} // namespace gl -} // namespace mbgl diff --git a/src/mbgl/layout/symbol_layout.hpp b/src/mbgl/layout/symbol_layout.hpp index c6e1743549..5b14090d97 100644 --- a/src/mbgl/layout/symbol_layout.hpp +++ b/src/mbgl/layout/symbol_layout.hpp @@ -51,7 +51,7 @@ public: State state = Pending; - std::unordered_map<std::string, + std::map<std::string, std::pair<style::IconPaintProperties::Evaluated, style::TextPaintProperties::Evaluated>> layerPaintProperties; private: diff --git a/src/mbgl/map/backend.cpp b/src/mbgl/map/backend.cpp index 8a06fe2d91..2a171cdb76 100644 --- a/src/mbgl/map/backend.cpp +++ b/src/mbgl/map/backend.cpp @@ -14,9 +14,4 @@ gl::Context& Backend::getContext() { Backend::~Backend() = default; -void Backend::notifyMapChange(MapChange) { - // no-op -} - - } // namespace mbgl diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index f4e994c931..24ae5643ee 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -16,6 +16,7 @@ #include <mbgl/storage/file_source.hpp> #include <mbgl/storage/resource.hpp> #include <mbgl/storage/response.hpp> +#include <mbgl/util/exception.hpp> #include <mbgl/util/projection.hpp> #include <mbgl/util/math.hpp> #include <mbgl/util/exception.hpp> @@ -58,10 +59,10 @@ public: ConstrainMode, ViewportMode); - void onSourceAttributionChanged(style::Source&, const std::string&) override; + void onSourceChanged(style::Source&) override; void onUpdate(Update) override; void onStyleLoaded() override; - void onStyleError() override; + void onStyleError(std::exception_ptr) override; void onResourceError(std::exception_ptr) override; void render(View&); @@ -70,6 +71,7 @@ public: void loadStyleJSON(const std::string&); Map& map; + MapObserver& observer; Backend& backend; FileSource& fileSource; Scheduler& scheduler; @@ -134,10 +136,11 @@ Map::Impl::Impl(Map& map_, ConstrainMode constrainMode_, ViewportMode viewportMode_) : map(map_), + observer(backend_), backend(backend_), fileSource(fileSource_), scheduler(scheduler_), - transform([this](MapChange change) { backend.notifyMapChange(change); }, + transform(observer, constrainMode_, viewportMode_), mode(mode_), @@ -264,10 +267,10 @@ void Map::Impl::render(View& view) { if (mode == MapMode::Continuous) { if (renderState == RenderState::Never) { - backend.notifyMapChange(MapChangeWillStartRenderingMap); + observer.onWillStartRenderingMap(); } - backend.notifyMapChange(MapChangeWillStartRenderingFrame); + observer.onWillStartRenderingFrame(); FrameData frameData { timePoint, pixelRatio, @@ -282,18 +285,16 @@ void Map::Impl::render(View& view) { painter->cleanup(); - backend.notifyMapChange(style->isLoaded() ? - MapChangeDidFinishRenderingFrameFullyRendered : - MapChangeDidFinishRenderingFrame); + observer.onDidFinishRenderingFrame(style->isLoaded() ? MapObserver::RenderMode::Full : MapObserver::RenderMode::Partial); if (!style->isLoaded()) { renderState = RenderState::Partial; } else if (renderState != RenderState::Fully) { renderState = RenderState::Fully; - backend.notifyMapChange(MapChangeDidFinishRenderingMapFullyRendered); + observer.onDidFinishRenderingMap(MapObserver::RenderMode::Full); if (loading) { loading = false; - backend.notifyMapChange(MapChangeDidFinishLoadingMap); + observer.onDidFinishLoadingMap(); } } @@ -341,7 +342,7 @@ void Map::setStyleURL(const std::string& url) { impl->loading = true; - impl->backend.notifyMapChange(MapChangeWillStartLoadingMap); + impl->observer.onWillStartLoadingMap(); impl->styleRequest = nullptr; impl->styleURL = url; @@ -364,11 +365,14 @@ void Map::setStyleURL(const std::string& url) { if (res.error) { if (res.error->reason == Response::Error::Reason::NotFound && util::mapbox::isMapboxURL(impl->styleURL)) { - Log::Error(Event::Setup, "style %s could not be found or is an incompatible legacy map or style", impl->styleURL.c_str()); + const std::string message = "style " + impl->styleURL + " could not be found or is an incompatible legacy map or style"; + Log::Error(Event::Setup, message.c_str()); + impl->onStyleError(std::make_exception_ptr(util::NotFoundException(message))); } else { - Log::Error(Event::Setup, "loading style failed: %s", res.error->message.c_str()); + const std::string message = "loading style failed: " + res.error->message; + Log::Error(Event::Setup, message.c_str()); + impl->onStyleError(std::make_exception_ptr(util::StyleLoadException(message))); } - impl->onStyleError(); impl->onResourceError(std::make_exception_ptr(std::runtime_error(res.error->message))); } else if (res.notModified || res.noContent) { return; @@ -385,7 +389,7 @@ void Map::setStyleJSON(const std::string& json) { impl->loading = true; - impl->backend.notifyMapChange(MapChangeWillStartLoadingMap); + impl->observer.onWillStartLoadingMap(); impl->styleURL.clear(); impl->styleJSON.clear(); @@ -1085,8 +1089,8 @@ void Map::onLowMemory() { } } -void Map::Impl::onSourceAttributionChanged(style::Source&, const std::string&) { - backend.notifyMapChange(MapChangeSourceDidChange); +void Map::Impl::onSourceChanged(style::Source& source) { + observer.onSourceChanged(source); } void Map::Impl::onUpdate(Update flags) { @@ -1095,11 +1099,11 @@ void Map::Impl::onUpdate(Update flags) { } void Map::Impl::onStyleLoaded() { - backend.notifyMapChange(MapChangeDidFinishLoadingStyle); + observer.onDidFinishLoadingStyle(); } -void Map::Impl::onStyleError() { - backend.notifyMapChange(MapChangeDidFailLoadingMap); +void Map::Impl::onStyleError(std::exception_ptr error) { + observer.onDidFailLoadingMap(error); } void Map::Impl::onResourceError(std::exception_ptr error) { diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp index eab9e97bc0..d325271388 100644 --- a/src/mbgl/map/transform.cpp +++ b/src/mbgl/map/transform.cpp @@ -37,10 +37,10 @@ static double _normalizeAngle(double angle, double anchorAngle) return angle; } -Transform::Transform(std::function<void(MapChange)> callback_, +Transform::Transform(MapObserver& observer_, ConstrainMode constrainMode, ViewportMode viewportMode) - : callback(std::move(callback_)), state(constrainMode, viewportMode) { + : observer(observer_), state(constrainMode, viewportMode) { } #pragma mark - Map View @@ -50,16 +50,12 @@ bool Transform::resize(const Size size) { return false; } - if (callback) { - callback(MapChangeRegionWillChange); - } + observer.onCameraWillChange(MapObserver::CameraChangeMode::Immediate); state.size = size; state.constrain(state.scale, state.x, state.y); - if (callback) { - callback(MapChangeRegionDidChange); - } + observer.onCameraDidChange(MapObserver::CameraChangeMode::Immediate); return true; } @@ -556,9 +552,7 @@ void Transform::startTransition(const CameraOptions& camera, } bool isAnimated = duration != Duration::zero(); - if (callback) { - callback(isAnimated ? MapChangeRegionWillChangeAnimated : MapChangeRegionWillChange); - } + observer.onCameraWillChange(isAnimated ? MapObserver::CameraChangeMode::Animated : MapObserver::CameraChangeMode::Immediate); // Associate the anchor, if given, with a coordinate. optional<ScreenCoordinate> anchor = camera.anchor; @@ -588,9 +582,7 @@ void Transform::startTransition(const CameraOptions& camera, if (animation.transitionFrameFn) { animation.transitionFrameFn(t); } - if (callback) { - callback(MapChangeRegionIsChanging); - } + observer.onCameraIsChanging(); } else { transitionFinishFn(); transitionFinishFn = nullptr; @@ -609,9 +601,7 @@ void Transform::startTransition(const CameraOptions& camera, if (animation.transitionFinishFn) { animation.transitionFinishFn(); } - if (callback) { - callback(isAnimated ? MapChangeRegionDidChangeAnimated : MapChangeRegionDidChange); - } + observer.onCameraDidChange(isAnimated ? MapObserver::CameraChangeMode::Animated : MapObserver::CameraChangeMode::Immediate); }; if (!isAnimated) { diff --git a/src/mbgl/map/transform.hpp b/src/mbgl/map/transform.hpp index 66c9915715..087ae8e690 100644 --- a/src/mbgl/map/transform.hpp +++ b/src/mbgl/map/transform.hpp @@ -1,8 +1,8 @@ #pragma once #include <mbgl/map/camera.hpp> +#include <mbgl/map/map_observer.hpp> #include <mbgl/map/mode.hpp> -#include <mbgl/map/change.hpp> #include <mbgl/map/transform_state.hpp> #include <mbgl/map/update.hpp> #include <mbgl/util/chrono.hpp> @@ -18,7 +18,7 @@ namespace mbgl { class Transform : private util::noncopyable { public: - Transform(std::function<void(MapChange)> = nullptr, + Transform(MapObserver& = MapObserver::nullObserver(), ConstrainMode = ConstrainMode::HeightOnly, ViewportMode = ViewportMode::Default); @@ -163,8 +163,7 @@ public: LatLng screenCoordinateToLatLng(const ScreenCoordinate&) const; private: - std::function<void(MapChange)> callback; - + MapObserver& observer; TransformState state; void startTransition(const CameraOptions&, diff --git a/src/mbgl/programs/attributes.hpp b/src/mbgl/programs/attributes.hpp index a2e0772762..7d39c04395 100644 --- a/src/mbgl/programs/attributes.hpp +++ b/src/mbgl/programs/attributes.hpp @@ -2,7 +2,6 @@ #include <mbgl/gl/attribute.hpp> #include <mbgl/gl/uniform.hpp> -#include <mbgl/gl/normalization.hpp> #include <cstdint> @@ -17,209 +16,104 @@ MBGL_DEFINE_ATTRIBUTE(int16_t, 4, a_pos_offset); MBGL_DEFINE_ATTRIBUTE(uint16_t, 2, a_texture_pos); template <std::size_t N> -struct a_data : gl::Attribute<uint8_t, N> { +struct a_data { static auto name() { return "a_data"; } + using Type = gl::Attribute<uint8_t, N>; }; template <std::size_t N> -struct a_offset : gl::Attribute<int16_t, N> { +struct a_offset { static auto name() { return "a_offset"; } + using Type = gl::Attribute<int16_t, N>; }; // Paint attributes -/* - ZoomInterpolatedAttribute<Attr> is a 'compound' attribute, representing two values of the - the base attribute Attr. These two values are provided to the shader to allow interpolation - between zoom levels, without the need to repopulate vertex buffers each frame as the map is - being zoomed. -*/ -template <class Attr> -struct ZoomInterpolatedAttribute : gl::Attribute<typename Attr::ValueType, Attr::Dimensions * 2> { - using Value = typename gl::Attribute<typename Attr::ValueType, Attr::Dimensions * 2>::Value; - - static auto name() { - return Attr::name(); - } - - template <class InputType> - static Value value(const InputType& min, const InputType& max){ - auto minValue = Attr::value(min); - auto maxValue = Attr::value(max); - Value result = {{}}; - for (size_t i = 0; i < Attr::Dimensions; i++) { - result[i] = minValue[i]; - result[Attr::Dimensions+i] = maxValue[i]; - } - return result; - } -}; - -template <class Attr> -struct InterpolationUniform : gl::UniformScalar<InterpolationUniform<Attr>, float> { - static auto name() { - static const std::string name = Attr::name() + std::string("_t"); - return name.c_str(); - } -}; - -/* - Encode a four-component color value into a pair of floats. Since csscolorparser - uses 8-bit precision for each color component, for each float we use the upper 8 - bits for one component (e.g. (color.r * 255) * 256), and the lower 8 for another. - - Also note: - - Colors come in as floats 0..1, so we scale by 255. - - Casting the scaled values to ints is important: without doing this, e.g., the - fractional part of the `r` component would corrupt the lower-8 bits of the encoded - value, which must be reserved for the `g` component. -*/ -static std::array<float, 2> encodeColor (const Color& color) { - const auto v1 = static_cast<uint16_t>( static_cast<uint16_t>(color.r*255)*256 + color.g*255); - const auto v2 = static_cast<uint16_t>( static_cast<uint16_t>(color.b*255)*256 + color.a*255); - return {{ static_cast<float>(v1), static_cast<float>(v2) }}; -} - -struct a_color : gl::Attribute<float, 2> { +struct a_color { static auto name() { return "a_color"; } - - static Value value(const Color& color) { - return encodeColor(color); - } + using Type = gl::Attribute<float, 2>; }; -// used in the symbol sdf shader -struct a_fill_color : gl::Attribute<float, 2> { +struct a_fill_color { static auto name() { return "a_fill_color"; } - - static Value value(const Color& color) { - return encodeColor(color); - } + using Type = gl::Attribute<float, 2>; }; -// used in the symbol sdf shader -struct a_halo_color : gl::Attribute<float, 2> { +struct a_halo_color { static auto name() { return "a_halo_color"; } - - static Value value(const Color& color) { - return encodeColor(color); - } + using Type = gl::Attribute<float, 2>; }; -struct a_stroke_color : gl::Attribute<float, 2> { +struct a_stroke_color { static auto name() { return "a_stroke_color"; } - - static Value value(const Color& color) { - return encodeColor(color); - } + using Type = gl::Attribute<float, 2>; }; -struct a_outline_color : gl::Attribute<float, 2> { +struct a_outline_color { static auto name() { return "a_outline_color"; } - - static Value value(const Color& color) { - return encodeColor(color); - } + using Type = gl::Attribute<float, 2>; }; -struct a_opacity : gl::Attribute<gl::Normalized<uint8_t>, 1> { +struct a_opacity { static auto name() { return "a_opacity"; } - - static Value value(float opacity) { - return {{ gl::Normalized<uint8_t>(opacity) }}; - } + using Type = gl::Attribute<float, 1>; }; -struct a_stroke_opacity : gl::Attribute<gl::Normalized<uint8_t>, 1> { +struct a_stroke_opacity { static auto name() { return "a_stroke_opacity"; } - - static Value value(float opacity) { - return {{ gl::Normalized<uint8_t>(opacity) }}; - } + using Type = gl::Attribute<float, 1>; }; -struct a_blur : gl::Attribute<float, 1> { +struct a_blur { static auto name() { return "a_blur"; } - - static Value value(float blur) { - return {{ blur }}; - } + using Type = gl::Attribute<float, 1>; }; -struct a_radius : gl::Attribute<float, 1> { +struct a_radius { static auto name() { return "a_radius"; } - - static Value value(float radius) { - return {{ radius }}; - } + using Type = gl::Attribute<float, 1>; }; -struct a_width : gl::Attribute<float, 1> { +struct a_width { static auto name() { return "a_width"; } - - static Value value(float width) { - return {{ width }}; - } + using Type = gl::Attribute<float, 1>; }; -struct a_height : gl::Attribute<float, 1> { +struct a_height { static auto name() { return "a_height"; } - - static Value value(float width) { - return {{ width }}; - } + using Type = gl::Attribute<float, 1>; }; -struct a_base : gl::Attribute<float, 1> { +struct a_base { static auto name() { return "a_base"; } - - static Value value(float width) { - return {{ width }}; - } + using Type = gl::Attribute<float, 1>; }; -struct a_gap_width : gl::Attribute<float, 1> { +struct a_gap_width { static auto name() { return "a_gapwidth"; } - - static Value value(float width) { - return {{ width }}; - } + using Type = gl::Attribute<float, 1>; }; -struct a_stroke_width : gl::Attribute<float, 1> { +struct a_stroke_width { static auto name() { return "a_stroke_width"; } - - static Value value(float width) { - return {{ width }}; - } + using Type = gl::Attribute<float, 1>; }; template <> -struct a_offset<1> : gl::Attribute<float, 1> { +struct a_offset<1> { static auto name() { return "a_offset"; } - - static Value value(float offset) { - return {{ offset }}; - } + using Type = gl::Attribute<float, 1>; }; -struct a_halo_width : gl::Attribute<float, 1> { +struct a_halo_width { static auto name() { return "a_halo_width"; } - - static Value value(float width) { - return {{ width }}; - } + using Type = gl::Attribute<float, 1>; }; -struct a_halo_blur : gl::Attribute<float, 1> { +struct a_halo_blur { static auto name() { return "a_halo_blur"; } - - static Value value(float blur) { - return {{ blur }}; - } + using Type = gl::Attribute<float, 1>; }; - - } // namespace attributes } // namespace mbgl diff --git a/src/mbgl/programs/program.hpp b/src/mbgl/programs/program.hpp index ffad767c3a..8437e3a651 100644 --- a/src/mbgl/programs/program.hpp +++ b/src/mbgl/programs/program.hpp @@ -1,13 +1,9 @@ #pragma once #include <mbgl/gl/program.hpp> -#include <mbgl/programs/program_parameters.hpp> #include <mbgl/programs/attributes.hpp> #include <mbgl/style/paint_property.hpp> -#include <mbgl/shaders/preludes.hpp> - -#include <sstream> -#include <cassert> +#include <mbgl/shaders/shaders.hpp> namespace mbgl { @@ -34,30 +30,11 @@ public: ProgramType program; Program(gl::Context& context, const ProgramParameters& programParameters) - : program(context, vertexSource(programParameters), fragmentSource(programParameters)) + : program(context, + shaders::vertexSource(programParameters, Shaders::vertexSource), + shaders::fragmentSource(programParameters, Shaders::fragmentSource)) {} - static std::string pixelRatioDefine(const ProgramParameters& parameters) { - std::ostringstream pixelRatioSS; - pixelRatioSS.imbue(std::locale("C")); - pixelRatioSS.setf(std::ios_base::showpoint); - pixelRatioSS << parameters.pixelRatio; - return std::string("#define DEVICE_PIXEL_RATIO ") + pixelRatioSS.str() + "\n"; - } - - static std::string fragmentSource(const ProgramParameters& parameters) { - std::string source = pixelRatioDefine(parameters) + shaders::fragmentPrelude + Shaders::fragmentSource; - if (parameters.overdraw) { - assert(source.find("#ifdef OVERDRAW_INSPECTOR") != std::string::npos); - source.replace(source.find_first_of('\n'), 1, "\n#define OVERDRAW_INSPECTOR\n"); - } - return source; - } - - static std::string vertexSource(const ProgramParameters& parameters) { - return pixelRatioDefine(parameters) + shaders::vertexPrelude + Shaders::vertexSource; - } - template <class DrawMode> void draw(gl::Context& context, DrawMode drawMode, diff --git a/src/mbgl/renderer/circle_bucket.cpp b/src/mbgl/renderer/circle_bucket.cpp index 6722d04497..e437eff135 100644 --- a/src/mbgl/renderer/circle_bucket.cpp +++ b/src/mbgl/renderer/circle_bucket.cpp @@ -13,8 +13,10 @@ using namespace style; CircleBucket::CircleBucket(const BucketParameters& parameters, const std::vector<const Layer*>& layers) : mode(parameters.mode) { for (const auto& layer : layers) { - paintPropertyBinders.emplace(layer->getID(), - CircleProgram::PaintPropertyBinders( + paintPropertyBinders.emplace( + std::piecewise_construct, + std::forward_as_tuple(layer->getID()), + std::forward_as_tuple( layer->as<CircleLayer>()->impl->paint.evaluated, parameters.tileID.overscaledZ)); } diff --git a/src/mbgl/renderer/circle_bucket.hpp b/src/mbgl/renderer/circle_bucket.hpp index 412db53f65..da12dcdecd 100644 --- a/src/mbgl/renderer/circle_bucket.hpp +++ b/src/mbgl/renderer/circle_bucket.hpp @@ -33,7 +33,7 @@ public: optional<gl::VertexBuffer<CircleLayoutVertex>> vertexBuffer; optional<gl::IndexBuffer<gl::Triangles>> indexBuffer; - std::unordered_map<std::string, CircleProgram::PaintPropertyBinders> paintPropertyBinders; + std::map<std::string, CircleProgram::PaintPropertyBinders> paintPropertyBinders; const MapMode mode; }; diff --git a/src/mbgl/renderer/fill_bucket.cpp b/src/mbgl/renderer/fill_bucket.cpp index 64efafb108..d566461673 100644 --- a/src/mbgl/renderer/fill_bucket.cpp +++ b/src/mbgl/renderer/fill_bucket.cpp @@ -29,8 +29,10 @@ struct GeometryTooLongException : std::exception {}; FillBucket::FillBucket(const BucketParameters& parameters, const std::vector<const Layer*>& layers) { for (const auto& layer : layers) { - paintPropertyBinders.emplace(layer->getID(), - FillProgram::PaintPropertyBinders( + paintPropertyBinders.emplace( + std::piecewise_construct, + std::forward_as_tuple(layer->getID()), + std::forward_as_tuple( layer->as<FillLayer>()->impl->paint.evaluated, parameters.tileID.overscaledZ)); } diff --git a/src/mbgl/renderer/fill_bucket.hpp b/src/mbgl/renderer/fill_bucket.hpp index b403e1053b..f505f313d1 100644 --- a/src/mbgl/renderer/fill_bucket.hpp +++ b/src/mbgl/renderer/fill_bucket.hpp @@ -37,7 +37,7 @@ public: optional<gl::IndexBuffer<gl::Lines>> lineIndexBuffer; optional<gl::IndexBuffer<gl::Triangles>> triangleIndexBuffer; - std::unordered_map<std::string, FillProgram::PaintPropertyBinders> paintPropertyBinders; + std::map<std::string, FillProgram::PaintPropertyBinders> paintPropertyBinders; }; } // namespace mbgl diff --git a/src/mbgl/renderer/line_bucket.cpp b/src/mbgl/renderer/line_bucket.cpp index 50a70c0fd4..13caea4539 100644 --- a/src/mbgl/renderer/line_bucket.cpp +++ b/src/mbgl/renderer/line_bucket.cpp @@ -18,8 +18,10 @@ LineBucket::LineBucket(const BucketParameters& parameters, : layout(layout_.evaluate(PropertyEvaluationParameters(parameters.tileID.overscaledZ))), overscaling(parameters.tileID.overscaleFactor()) { for (const auto& layer : layers) { - paintPropertyBinders.emplace(layer->getID(), - LineProgram::PaintPropertyBinders( + paintPropertyBinders.emplace( + std::piecewise_construct, + std::forward_as_tuple(layer->getID()), + std::forward_as_tuple( layer->as<LineLayer>()->impl->paint.evaluated, parameters.tileID.overscaledZ)); } @@ -28,7 +30,7 @@ LineBucket::LineBucket(const BucketParameters& parameters, void LineBucket::addFeature(const GeometryTileFeature& feature, const GeometryCollection& geometryCollection) { for (auto& line : geometryCollection) { - addGeometry(line); + addGeometry(line, feature.getType()); } for (auto& pair : paintPropertyBinders) { @@ -61,18 +63,18 @@ const float LINE_DISTANCE_SCALE = 1.0 / 2.0; // The maximum line distance, in tile units, that fits in the buffer. const float MAX_LINE_DISTANCE = std::pow(2, LINE_DISTANCE_BUFFER_BITS) / LINE_DISTANCE_SCALE; -void LineBucket::addGeometry(const GeometryCoordinates& coordinates) { +void LineBucket::addGeometry(const GeometryCoordinates& coordinates, FeatureType type) { const std::size_t len = [&coordinates] { std::size_t l = coordinates.size(); // If the line has duplicate vertices at the end, adjust length to remove them. - while (l > 2 && coordinates[l - 1] == coordinates[l - 2]) { + while (l >= 2 && coordinates[l - 1] == coordinates[l - 2]) { l--; } return l; }(); - if (len < 2) { - // fprintf(stderr, "a line must have at least two vertices\n"); + // Ignore invalid geometry. + if (len < (type == FeatureType::Polygon ? 3 : 2)) { return; } @@ -81,16 +83,8 @@ void LineBucket::addGeometry(const GeometryCoordinates& coordinates) { const double sharpCornerOffset = SHARP_CORNER_OFFSET * (float(util::EXTENT) / (util::tileSize * overscaling)); const GeometryCoordinate firstCoordinate = coordinates.front(); - const GeometryCoordinate lastCoordinate = coordinates[len - 1]; - const bool closed = firstCoordinate == lastCoordinate; - - if (len == 2 && closed) { - // fprintf(stderr, "a line may not have coincident points\n"); - return; - } - const LineCapType beginCap = layout.get<LineCap>(); - const LineCapType endCap = closed ? LineCapType::Butt : LineCapType(layout.get<LineCap>()); + const LineCapType endCap = type == FeatureType::Polygon ? LineCapType::Butt : LineCapType(layout.get<LineCap>()); double distance = 0; bool startOfLine = true; @@ -103,7 +97,7 @@ void LineBucket::addGeometry(const GeometryCoordinates& coordinates) { // the last three vertices added e1 = e2 = e3 = -1; - if (closed) { + if (type == FeatureType::Polygon) { currentCoordinate = coordinates[len - 2]; nextNormal = util::perp(util::unit(convertPoint<double>(firstCoordinate - *currentCoordinate))); } @@ -112,7 +106,7 @@ void LineBucket::addGeometry(const GeometryCoordinates& coordinates) { std::vector<TriangleElement> triangleStore; for (std::size_t i = 0; i < len; ++i) { - if (closed && i == len - 1) { + if (type == FeatureType::Polygon && i == len - 1) { // if the line is closed, we treat the last vertex like the first nextCoordinate = coordinates[1]; } else if (i + 1 < len) { diff --git a/src/mbgl/renderer/line_bucket.hpp b/src/mbgl/renderer/line_bucket.hpp index 78293d75f9..8d1ff2a3f2 100644 --- a/src/mbgl/renderer/line_bucket.hpp +++ b/src/mbgl/renderer/line_bucket.hpp @@ -38,10 +38,10 @@ public: optional<gl::VertexBuffer<LineLayoutVertex>> vertexBuffer; optional<gl::IndexBuffer<gl::Triangles>> indexBuffer; - std::unordered_map<std::string, LineProgram::PaintPropertyBinders> paintPropertyBinders; + std::map<std::string, LineProgram::PaintPropertyBinders> paintPropertyBinders; private: - void addGeometry(const GeometryCoordinates& line); + void addGeometry(const GeometryCoordinates&, FeatureType); struct TriangleElement { TriangleElement(uint16_t a_, uint16_t b_, uint16_t c_) : a(a_), b(b_), c(c_) {} diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp index fa4178dda1..1f2c81bc1c 100644 --- a/src/mbgl/renderer/symbol_bucket.cpp +++ b/src/mbgl/renderer/symbol_bucket.cpp @@ -9,7 +9,7 @@ namespace mbgl { using namespace style; SymbolBucket::SymbolBucket(style::SymbolLayoutProperties::Evaluated layout_, - const std::unordered_map<std::string, std::pair< + const std::map<std::string, std::pair< style::IconPaintProperties::Evaluated, style::TextPaintProperties::Evaluated>>& layerPaintProperties, float zoom, bool sdfIcons_, @@ -18,10 +18,13 @@ SymbolBucket::SymbolBucket(style::SymbolLayoutProperties::Evaluated layout_, sdfIcons(sdfIcons_), iconsNeedLinear(iconsNeedLinear_) { for (const auto& pair : layerPaintProperties) { - paintPropertyBinders.emplace(pair.first, std::make_pair( - SymbolIconProgram::PaintPropertyBinders(pair.second.first, zoom), - SymbolSDFTextProgram::PaintPropertyBinders(pair.second.second, zoom) - )); + paintPropertyBinders.emplace( + std::piecewise_construct, + std::forward_as_tuple(pair.first), + std::forward_as_tuple( + std::piecewise_construct, + std::forward_as_tuple(pair.second.first, zoom), + std::forward_as_tuple(pair.second.second, zoom))); } } diff --git a/src/mbgl/renderer/symbol_bucket.hpp b/src/mbgl/renderer/symbol_bucket.hpp index dcf3f5f495..d5141d2d96 100644 --- a/src/mbgl/renderer/symbol_bucket.hpp +++ b/src/mbgl/renderer/symbol_bucket.hpp @@ -17,7 +17,7 @@ namespace mbgl { class SymbolBucket : public Bucket { public: SymbolBucket(style::SymbolLayoutProperties::Evaluated, - const std::unordered_map<std::string, std::pair<style::IconPaintProperties::Evaluated, style::TextPaintProperties::Evaluated>>&, + const std::map<std::string, std::pair<style::IconPaintProperties::Evaluated, style::TextPaintProperties::Evaluated>>&, float zoom, bool sdfIcons, bool iconsNeedLinear); @@ -33,7 +33,7 @@ public: const bool sdfIcons; const bool iconsNeedLinear; - std::unordered_map<std::string, std::pair< + std::map<std::string, std::pair< SymbolIconProgram::PaintPropertyBinders, SymbolSDFTextProgram::PaintPropertyBinders>> paintPropertyBinders; diff --git a/src/mbgl/shaders/shaders.cpp b/src/mbgl/shaders/shaders.cpp new file mode 100644 index 0000000000..f7f5b4d44f --- /dev/null +++ b/src/mbgl/shaders/shaders.cpp @@ -0,0 +1,33 @@ +#include <mbgl/shaders/shaders.hpp> +#include <mbgl/shaders/preludes.hpp> +#include <mbgl/programs/program_parameters.hpp> + +#include <cassert> +#include <sstream> + +namespace mbgl { +namespace shaders { + +static std::string pixelRatioDefine(const ProgramParameters& parameters) { + std::ostringstream pixelRatioSS; + pixelRatioSS.imbue(std::locale("C")); + pixelRatioSS.setf(std::ios_base::showpoint); + pixelRatioSS << parameters.pixelRatio; + return std::string("#define DEVICE_PIXEL_RATIO ") + pixelRatioSS.str() + "\n"; +} + +std::string fragmentSource(const ProgramParameters& parameters, const char* fragmentSource) { + std::string source = pixelRatioDefine(parameters) + fragmentPrelude + fragmentSource; + if (parameters.overdraw) { + assert(source.find("#ifdef OVERDRAW_INSPECTOR") != std::string::npos); + source.replace(source.find_first_of('\n'), 1, "\n#define OVERDRAW_INSPECTOR\n"); + } + return source; +} + +std::string vertexSource(const ProgramParameters& parameters, const char* vertexSource) { + return pixelRatioDefine(parameters) + vertexPrelude + vertexSource; +} + +} // namespace shaders +} // namespace mbgl diff --git a/src/mbgl/shaders/shaders.hpp b/src/mbgl/shaders/shaders.hpp new file mode 100644 index 0000000000..e2912c5688 --- /dev/null +++ b/src/mbgl/shaders/shaders.hpp @@ -0,0 +1,15 @@ +#pragma once + +#include <string> + +namespace mbgl { + +class ProgramParameters; + +namespace shaders { + +std::string fragmentSource(const ProgramParameters&, const char* fragmentSource); +std::string vertexSource(const ProgramParameters&, const char* vertexSource); + +} // namespace shaders +} // namespace mbgl diff --git a/src/mbgl/style/layers/custom_layer.cpp b/src/mbgl/style/layers/custom_layer.cpp index 3407a7f5a5..2504f3f15c 100644 --- a/src/mbgl/style/layers/custom_layer.cpp +++ b/src/mbgl/style/layers/custom_layer.cpp @@ -20,5 +20,10 @@ CustomLayer::CustomLayer(const Impl& other) CustomLayer::~CustomLayer() = default; +template <> +bool Layer::is<CustomLayer>() const { + return type == Type::Custom; +} + } // namespace style } // namespace mbgl diff --git a/src/mbgl/style/observer.hpp b/src/mbgl/style/observer.hpp index f28fdfc084..60432334e2 100644 --- a/src/mbgl/style/observer.hpp +++ b/src/mbgl/style/observer.hpp @@ -5,6 +5,8 @@ #include <mbgl/style/source_observer.hpp> #include <mbgl/map/update.hpp> +#include <exception> + namespace mbgl { namespace style { @@ -13,7 +15,7 @@ class Observer : public GlyphAtlasObserver, public SourceObserver { public: virtual void onUpdate(Update) {} - virtual void onStyleError() {} + virtual void onStyleError(std::exception_ptr) {} virtual void onStyleLoaded() {} virtual void onResourceError(std::exception_ptr) {} }; diff --git a/src/mbgl/style/paint_property.hpp b/src/mbgl/style/paint_property.hpp index d4a5ee4c76..6fe53de573 100644 --- a/src/mbgl/style/paint_property.hpp +++ b/src/mbgl/style/paint_property.hpp @@ -15,7 +15,6 @@ #include <mbgl/util/indexed_tuple.hpp> #include <mbgl/util/ignore.hpp> -#include <unordered_map> #include <utility> namespace mbgl { @@ -139,8 +138,8 @@ public: } private: - std::unordered_map<ClassID, Value> values; - std::unordered_map<ClassID, TransitionOptions> transitions; + std::map<ClassID, Value> values; + std::map<ClassID, TransitionOptions> transitions; }; template <class T> diff --git a/src/mbgl/style/paint_property_binder.hpp b/src/mbgl/style/paint_property_binder.hpp index 17c99fe1d9..e6e957958c 100644 --- a/src/mbgl/style/paint_property_binder.hpp +++ b/src/mbgl/style/paint_property_binder.hpp @@ -8,31 +8,84 @@ namespace mbgl { namespace style { +/* + ZoomInterpolatedAttribute<Attr> is a 'compound' attribute, representing two values of the + the base attribute Attr. These two values are provided to the shader to allow interpolation + between zoom levels, without the need to repopulate vertex buffers each frame as the map is + being zoomed. +*/ +template <class A> +using ZoomInterpolatedAttributeType = gl::Attribute<typename A::ValueType, A::Dimensions * 2>; + +inline std::array<float, 1> attributeValue(float v) { + return {{ v }}; +} + +/* + Encode a four-component color value into a pair of floats. Since csscolorparser + uses 8-bit precision for each color component, for each float we use the upper 8 + bits for one component (e.g. (color.r * 255) * 256), and the lower 8 for another. + + Also note: + - Colors come in as floats 0..1, so we scale by 255. + - Casting the scaled values to ints is important: without doing this, e.g., the + fractional part of the `r` component would corrupt the lower-8 bits of the encoded + value, which must be reserved for the `g` component. +*/ +inline std::array<float, 2> attributeValue(const Color& color) { + return {{ + static_cast<float>(static_cast<uint16_t>(color.r * 255) * 256 + static_cast<uint16_t>(color.g * 255)), + static_cast<float>(static_cast<uint16_t>(color.b * 255) * 256 + static_cast<uint16_t>(color.a * 255)) + }}; +} + +template <size_t N> +std::array<float, N*2> zoomInterpolatedAttributeValue(const std::array<float, N>& min, const std::array<float, N>& max) { + std::array<float, N*2> result; + for (size_t i = 0; i < N; i++) { + result[i] = min[i]; + result[i+N] = max[i]; + } + return result; +} + template <class T, class A> -class ConstantPaintPropertyBinder { +class PaintPropertyBinder { public: - using BaseAttribute = A; - using BaseAttributeValue = typename BaseAttribute::Value; - using BaseAttributeBinding = typename BaseAttribute::Binding; + using Attribute = ZoomInterpolatedAttributeType<A>; + using AttributeBinding = typename Attribute::Binding; - using Attribute = attributes::ZoomInterpolatedAttribute<BaseAttribute>; + virtual ~PaintPropertyBinder() = default; + + virtual void populateVertexVector(const GeometryTileFeature& feature, std::size_t length) = 0; + virtual void upload(gl::Context& context) = 0; + virtual AttributeBinding attributeBinding(const PossiblyEvaluatedPropertyValue<T>& currentValue) const = 0; + virtual float interpolationFactor(float currentZoom) const = 0; + + static std::unique_ptr<PaintPropertyBinder> create(const PossiblyEvaluatedPropertyValue<T>& value, float zoom, T defaultValue); +}; + +template <class T, class A> +class ConstantPaintPropertyBinder : public PaintPropertyBinder<T, A> { +public: + using Attribute = ZoomInterpolatedAttributeType<A>; using AttributeBinding = typename Attribute::Binding; ConstantPaintPropertyBinder(T constant_) : constant(std::move(constant_)) { } - void populateVertexVector(const GeometryTileFeature&, std::size_t) {} - void upload(gl::Context&) {} + void populateVertexVector(const GeometryTileFeature&, std::size_t) override {} + void upload(gl::Context&) override {} - AttributeBinding attributeBinding(const PossiblyEvaluatedPropertyValue<T>& currentValue) const { - auto val = currentValue.constantOr(constant); + AttributeBinding attributeBinding(const PossiblyEvaluatedPropertyValue<T>& currentValue) const override { + auto value = attributeValue(currentValue.constantOr(constant)); return typename Attribute::ConstantBinding { - Attribute::value(val, val) + zoomInterpolatedAttributeValue(value, value) }; } - float interpolationFactor(float) const { + float interpolationFactor(float) const override { return 0.0f; } @@ -41,14 +94,13 @@ private: }; template <class T, class A> -class SourceFunctionPaintPropertyBinder { +class SourceFunctionPaintPropertyBinder : public PaintPropertyBinder<T, A> { public: using BaseAttribute = A; using BaseAttributeValue = typename BaseAttribute::Value; - using BaseAttributeBinding = typename BaseAttribute::Binding; - using BaseVertex = typename gl::Attributes<BaseAttribute>::Vertex; + using BaseVertex = gl::detail::Vertex<BaseAttribute>; - using Attribute = attributes::ZoomInterpolatedAttribute<BaseAttribute>; + using Attribute = ZoomInterpolatedAttributeType<A>; using AttributeBinding = typename Attribute::Binding; SourceFunctionPaintPropertyBinder(SourceFunction<T> function_, T defaultValue_) @@ -56,30 +108,29 @@ public: defaultValue(std::move(defaultValue_)) { } - void populateVertexVector(const GeometryTileFeature& feature, std::size_t length) { - auto val = function.evaluate(feature, defaultValue); - BaseAttributeValue value = BaseAttribute::value(val); + void populateVertexVector(const GeometryTileFeature& feature, std::size_t length) override { + auto value = attributeValue(function.evaluate(feature, defaultValue)); for (std::size_t i = vertexVector.vertexSize(); i < length; ++i) { vertexVector.emplace_back(BaseVertex { value }); } } - void upload(gl::Context& context) { + void upload(gl::Context& context) override { vertexBuffer = context.createVertexBuffer(std::move(vertexVector)); } - AttributeBinding attributeBinding(const PossiblyEvaluatedPropertyValue<T>& currentValue) const { + AttributeBinding attributeBinding(const PossiblyEvaluatedPropertyValue<T>& currentValue) const override { if (currentValue.isConstant()) { - auto val = *currentValue.constant(); + BaseAttributeValue value = attributeValue(*currentValue.constant()); return typename Attribute::ConstantBinding { - Attribute::value(val, val) + zoomInterpolatedAttributeValue(value, value) }; } else { return Attribute::variableBinding(*vertexBuffer, 0, BaseAttribute::Dimensions); } } - float interpolationFactor(float) const { + float interpolationFactor(float) const override { return 0.0f; } @@ -91,12 +142,15 @@ private: }; template <class T, class A> -class CompositeFunctionPaintPropertyBinder { +class CompositeFunctionPaintPropertyBinder : public PaintPropertyBinder<T, A> { public: - using Attribute = attributes::ZoomInterpolatedAttribute<A>; + using BaseAttribute = A; + using BaseAttributeValue = typename BaseAttribute::Value; + + using Attribute = ZoomInterpolatedAttributeType<A>; using AttributeValue = typename Attribute::Value; using AttributeBinding = typename Attribute::Binding; - using Vertex = typename gl::Attributes<Attribute>::Vertex; + using Vertex = gl::detail::Vertex<Attribute>; CompositeFunctionPaintPropertyBinder(CompositeFunction<T> function_, float zoom, T defaultValue_) : function(std::move(function_)), @@ -104,30 +158,32 @@ public: coveringRanges(function.coveringRanges(zoom)) { } - void populateVertexVector(const GeometryTileFeature& feature, std::size_t length) { + void populateVertexVector(const GeometryTileFeature& feature, std::size_t length) override { Range<T> range = function.evaluate(std::get<1>(coveringRanges), feature, defaultValue); - AttributeValue minMax = Attribute::value(range.min, range.max); + AttributeValue value = zoomInterpolatedAttributeValue( + attributeValue(range.min), + attributeValue(range.max)); for (std::size_t i = vertexVector.vertexSize(); i < length; ++i) { - vertexVector.emplace_back(Vertex { minMax }); + vertexVector.emplace_back(Vertex { value }); } } - void upload(gl::Context& context) { + void upload(gl::Context& context) override { vertexBuffer = context.createVertexBuffer(std::move(vertexVector)); } - AttributeBinding attributeBinding(const PossiblyEvaluatedPropertyValue<T>& currentValue) const { + AttributeBinding attributeBinding(const PossiblyEvaluatedPropertyValue<T>& currentValue) const override { if (currentValue.isConstant()) { - auto val = *currentValue.constant(); + BaseAttributeValue value = attributeValue(*currentValue.constant()); return typename Attribute::ConstantBinding { - Attribute::value(val, val) + zoomInterpolatedAttributeValue(value, value) }; } else { return Attribute::variableBinding(*vertexBuffer, 0); } } - float interpolationFactor(float currentZoom) const { + float interpolationFactor(float currentZoom) const override { return util::interpolationFactor(1.0f, std::get<0>(coveringRanges), currentZoom); } @@ -140,66 +196,34 @@ private: optional<gl::VertexBuffer<Vertex>> vertexBuffer; }; -template <class PaintProperty> -class PaintPropertyBinder { -public: - using Type = typename PaintProperty::Type; - using PropertyValue = typename PaintProperty::EvaluatedType; - - using BaseAttribute = typename PaintProperty::Attribute; - using Attribute = attributes::ZoomInterpolatedAttribute<BaseAttribute>; - using AttributeBinding = typename Attribute::Binding; - - using Binder = variant< - ConstantPaintPropertyBinder<Type, BaseAttribute>, - SourceFunctionPaintPropertyBinder<Type, BaseAttribute>, - CompositeFunctionPaintPropertyBinder<Type, BaseAttribute>>; - - PaintPropertyBinder(const PropertyValue& value, float zoom) - : binder(value.match( - [&] (const Type& constant) -> Binder { - return ConstantPaintPropertyBinder<Type, BaseAttribute>(constant); - }, - [&] (const SourceFunction<Type>& function) { - return SourceFunctionPaintPropertyBinder<Type, BaseAttribute>(function, PaintProperty::defaultValue()); - }, - [&] (const CompositeFunction<Type>& function) { - return CompositeFunctionPaintPropertyBinder<Type, BaseAttribute>(function, zoom, PaintProperty::defaultValue()); - } - )) { - } - - void populateVertexVector(const GeometryTileFeature& feature, std::size_t length) { - binder.match([&] (auto& b) { - b.populateVertexVector(feature, length); - }); - } - - void upload(gl::Context& context) { - binder.match([&] (auto& b) { - b.upload(context); - }); - } - - AttributeBinding attributeBinding(const PropertyValue& currentValue) const { - return binder.match([&] (const auto& b) { - return b.attributeBinding(currentValue); - }); - } +template <class T, class A> +std::unique_ptr<PaintPropertyBinder<T, A>> +PaintPropertyBinder<T, A>::create(const PossiblyEvaluatedPropertyValue<T>& value, float zoom, T defaultValue) { + return value.match( + [&] (const T& constant) -> std::unique_ptr<PaintPropertyBinder<T, A>> { + return std::make_unique<ConstantPaintPropertyBinder<T, A>>(constant); + }, + [&] (const SourceFunction<T>& function) { + return std::make_unique<SourceFunctionPaintPropertyBinder<T, A>>(function, defaultValue); + }, + [&] (const CompositeFunction<T>& function) { + return std::make_unique<CompositeFunctionPaintPropertyBinder<T, A>>(function, zoom, defaultValue); + } + ); +} - using InterpolationUniform = attributes::InterpolationUniform<Attribute>; - using InterpolationUniformValue = typename InterpolationUniform::Value; +template <class Attr> +struct ZoomInterpolatedAttribute { + static auto name() { return Attr::name(); } + using Type = ZoomInterpolatedAttributeType<typename Attr::Type>; +}; - InterpolationUniformValue interpolationUniformValue(float currentZoom) const { - return InterpolationUniformValue { - binder.match([&] (const auto& b) { - return b.interpolationFactor(currentZoom); - }) - }; +template <class Attr> +struct InterpolationUniform : gl::UniformScalar<InterpolationUniform<Attr>, float> { + static auto name() { + static const std::string name = Attr::name() + std::string("_t"); + return name.c_str(); } - -private: - Binder binder; }; template <class Ps> @@ -208,43 +232,56 @@ class PaintPropertyBinders; template <class... Ps> class PaintPropertyBinders<TypeList<Ps...>> { public: - using Binders = IndexedTuple<TypeList<Ps...>, TypeList<PaintPropertyBinder<Ps>...>>; + template <class P> + using Binder = PaintPropertyBinder<typename P::Type, typename P::Attribute::Type>; + + using Binders = IndexedTuple< + TypeList<Ps...>, + TypeList<std::unique_ptr<Binder<Ps>>...>>; template <class EvaluatedProperties> PaintPropertyBinders(const EvaluatedProperties& properties, float z) - : binders(PaintPropertyBinder<Ps>(properties.template get<Ps>(), z)...) { + : binders(Binder<Ps>::create(properties.template get<Ps>(), z, Ps::defaultValue())...) { (void)z; // Workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56958 } + PaintPropertyBinders(PaintPropertyBinders&&) = default; + PaintPropertyBinders(const PaintPropertyBinders&) = delete; + void populateVertexVectors(const GeometryTileFeature& feature, std::size_t length) { util::ignore({ - (binders.template get<Ps>().populateVertexVector(feature, length), 0)... + (binders.template get<Ps>()->populateVertexVector(feature, length), 0)... }); } void upload(gl::Context& context) { util::ignore({ - (binders.template get<Ps>().upload(context), 0)... + (binders.template get<Ps>()->upload(context), 0)... }); } - using Attributes = gl::Attributes<typename PaintPropertyBinder<Ps>::Attribute...>; + template <class P> + using Attribute = ZoomInterpolatedAttribute<typename P::Attribute>; + + using Attributes = gl::Attributes<Attribute<Ps>...>; using AttributeBindings = typename Attributes::Bindings; template <class EvaluatedProperties> AttributeBindings attributeBindings(const EvaluatedProperties& currentProperties) const { - return typename Attributes::Bindings { - binders.template get<Ps>().attributeBinding(currentProperties.template get<Ps>())... + return AttributeBindings { + binders.template get<Ps>()->attributeBinding(currentProperties.template get<Ps>())... }; } - using Uniforms = gl::Uniforms<typename PaintPropertyBinder<Ps>::InterpolationUniform...>; + using Uniforms = gl::Uniforms<InterpolationUniform<typename Ps::Attribute>...>; using UniformValues = typename Uniforms::Values; UniformValues uniformValues(float currentZoom) const { (void)currentZoom; // Workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56958 return UniformValues { - binders.template get<Ps>().interpolationUniformValue(currentZoom)... + typename InterpolationUniform<typename Ps::Attribute>::Value { + binders.template get<Ps>()->interpolationFactor(currentZoom) + }... }; } diff --git a/src/mbgl/style/source.cpp b/src/mbgl/style/source.cpp index 25c06024d6..f10fc6916b 100644 --- a/src/mbgl/style/source.cpp +++ b/src/mbgl/style/source.cpp @@ -17,7 +17,11 @@ const std::string& Source::getID() const { optional<std::string> Source::getAttribution() const { return baseImpl->getAttribution(); } - + +optional<Range<uint8_t>> Source::getZoomRange() const { + return baseImpl->getZoomRange(); +} + std::vector<Feature> Source::querySourceFeatures(const SourceQueryOptions& options) { return baseImpl->querySourceFeatures(options); } diff --git a/src/mbgl/style/source_impl.cpp b/src/mbgl/style/source_impl.cpp index 1f8301629f..356d420e19 100644 --- a/src/mbgl/style/source_impl.cpp +++ b/src/mbgl/style/source_impl.cpp @@ -91,15 +91,15 @@ void Source::Impl::updateTiles(const UpdateParameters& parameters) { } const uint16_t tileSize = getTileSize(); - const Range<uint8_t> zoomRange = getZoomRange(); + const optional<Range<uint8_t>> zoomRange = getZoomRange(); // Determine the overzooming/underzooming amounts and required tiles. int32_t overscaledZoom = util::coveringZoomLevel(parameters.transformState.getZoom(), type, tileSize); int32_t tileZoom = overscaledZoom; std::vector<UnwrappedTileID> idealTiles; - if (overscaledZoom >= zoomRange.min) { - int32_t idealZoom = std::min<int32_t>(zoomRange.max, overscaledZoom); + if (overscaledZoom >= zoomRange->min) { + int32_t idealZoom = std::min<int32_t>(zoomRange->max, overscaledZoom); // Make sure we're not reparsing overzoomed raster tiles. if (type == SourceType::Raster) { @@ -142,7 +142,7 @@ void Source::Impl::updateTiles(const UpdateParameters& parameters) { renderTiles.clear(); algorithm::updateRenderables(getTileFn, createTileFn, retainTileFn, renderTileFn, - idealTiles, zoomRange, tileZoom); + idealTiles, *zoomRange, tileZoom); if (type != SourceType::Annotations) { size_t conservativeCacheSize = diff --git a/src/mbgl/style/source_impl.hpp b/src/mbgl/style/source_impl.hpp index b9707edaa7..b4941dc638 100644 --- a/src/mbgl/style/source_impl.hpp +++ b/src/mbgl/style/source_impl.hpp @@ -83,6 +83,7 @@ public: const std::string id; virtual optional<std::string> getAttribution() const { return {}; }; + virtual optional<Range<uint8_t>> getZoomRange() const = 0; bool loaded = false; @@ -109,7 +110,6 @@ private: void onTileError(Tile&, std::exception_ptr) override; virtual uint16_t getTileSize() const = 0; - virtual Range<uint8_t> getZoomRange() = 0; virtual std::unique_ptr<Tile> createTile(const OverscaledTileID&, const UpdateParameters&) = 0; std::map<UnwrappedTileID, RenderTile> renderTiles; diff --git a/src/mbgl/style/source_observer.hpp b/src/mbgl/style/source_observer.hpp index 9be7c67960..c97ba19e84 100644 --- a/src/mbgl/style/source_observer.hpp +++ b/src/mbgl/style/source_observer.hpp @@ -17,7 +17,7 @@ public: virtual ~SourceObserver() = default; virtual void onSourceLoaded(Source&) {} - virtual void onSourceAttributionChanged(Source&, const std::string&) {} + virtual void onSourceChanged(Source&) {} virtual void onSourceError(Source&, std::exception_ptr) {} // Source description needs to be reloaded diff --git a/src/mbgl/style/sources/geojson_source_impl.cpp b/src/mbgl/style/sources/geojson_source_impl.cpp index c7c3753076..b050e5482e 100644 --- a/src/mbgl/style/sources/geojson_source_impl.cpp +++ b/src/mbgl/style/sources/geojson_source_impl.cpp @@ -153,9 +153,11 @@ void GeoJSONSource::Impl::loadDescription(FileSource& fileSource) { }); } -Range<uint8_t> GeoJSONSource::Impl::getZoomRange() { - assert(loaded); - return { 0, options.maxzoom }; +optional<Range<uint8_t>> GeoJSONSource::Impl::getZoomRange() const { + if (loaded) { + return { { 0, options.maxzoom }}; + } + return {}; } std::unique_ptr<Tile> GeoJSONSource::Impl::createTile(const OverscaledTileID& tileID, diff --git a/src/mbgl/style/sources/geojson_source_impl.hpp b/src/mbgl/style/sources/geojson_source_impl.hpp index eec7cf0605..b827a0b26c 100644 --- a/src/mbgl/style/sources/geojson_source_impl.hpp +++ b/src/mbgl/style/sources/geojson_source_impl.hpp @@ -28,10 +28,11 @@ public: return util::tileSize; } + optional<Range<uint8_t>> getZoomRange() const final; + private: void _setGeoJSON(const GeoJSON&); - Range<uint8_t> getZoomRange() final; std::unique_ptr<Tile> createTile(const OverscaledTileID&, const UpdateParameters&) final; GeoJSONOptions options; diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index cef7f0c219..5f9983ae94 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -25,6 +25,7 @@ #include <mbgl/renderer/render_item.hpp> #include <mbgl/renderer/render_tile.hpp> #include <mbgl/util/constants.hpp> +#include <mbgl/util/exception.hpp> #include <mbgl/util/geometry.hpp> #include <mbgl/util/string.hpp> #include <mbgl/util/logging.hpp> @@ -110,8 +111,9 @@ void Style::setJSON(const std::string& json) { auto error = parser.parse(json); if (error) { - Log::Error(Event::ParseStyle, "Failed to parse style: %s", util::toString(error).c_str()); - observer->onStyleError(); + std::string message = "Failed to parse style: " + util::toString(error); + Log::Error(Event::ParseStyle, message.c_str()); + observer->onStyleError(std::make_exception_ptr(util::StyleParseException(message))); observer->onResourceError(error); return; } @@ -589,8 +591,8 @@ void Style::onSourceLoaded(Source& source) { observer->onUpdate(Update::Repaint); } -void Style::onSourceAttributionChanged(Source& source, const std::string& attribution) { - observer->onSourceAttributionChanged(source, attribution); +void Style::onSourceChanged(Source& source) { + observer->onSourceChanged(source); } void Style::onSourceError(Source& source, std::exception_ptr error) { diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp index 36ccd1f30e..0c65129422 100644 --- a/src/mbgl/style/style.hpp +++ b/src/mbgl/style/style.hpp @@ -140,7 +140,7 @@ private: // SourceObserver implementation. void onSourceLoaded(Source&) override; - void onSourceAttributionChanged(Source&, const std::string&) override; + void onSourceChanged(Source&) override; void onSourceError(Source&, std::exception_ptr) override; void onSourceDescriptionChanged(Source&) override; void onTileChanged(Source&, const OverscaledTileID&) override; diff --git a/src/mbgl/style/tile_source_impl.cpp b/src/mbgl/style/tile_source_impl.cpp index 7dd6ae6dbc..daa6389a8e 100644 --- a/src/mbgl/style/tile_source_impl.cpp +++ b/src/mbgl/style/tile_source_impl.cpp @@ -24,7 +24,7 @@ Tileset TileSourceImpl::parseTileJSON(const std::string& json, const std::string throw std::runtime_error(message.str()); } - conversion::Result<Tileset> result = conversion::convert<Tileset>(document); + conversion::Result<Tileset> result = conversion::convert<Tileset, JSValue>(document); if (!result) { throw std::runtime_error(result.error().message); } @@ -107,15 +107,17 @@ void TileSourceImpl::loadDescription(FileSource& fileSource) { observer->onSourceLoaded(base); if (attributionChanged) { - observer->onSourceAttributionChanged(base, newTileset.attribution); + observer->onSourceChanged(base); } } }); } -Range<uint8_t> TileSourceImpl::getZoomRange() { - assert(loaded); - return tileset.zoomRange; +optional<Range<uint8_t>> TileSourceImpl::getZoomRange() const { + if (loaded) { + return tileset.zoomRange; + } + return {}; } optional<std::string> TileSourceImpl::getAttribution() const { diff --git a/src/mbgl/style/tile_source_impl.hpp b/src/mbgl/style/tile_source_impl.hpp index 2b17872d2b..2993caf20a 100644 --- a/src/mbgl/style/tile_source_impl.hpp +++ b/src/mbgl/style/tile_source_impl.hpp @@ -35,10 +35,9 @@ public: } optional<std::string> getAttribution() const override; + optional<Range<uint8_t>> getZoomRange() const final; protected: - Range<uint8_t> getZoomRange() final; - const variant<std::string, Tileset> urlOrTileset; const uint16_t tileSize; diff --git a/src/mbgl/tile/geometry_tile_data.cpp b/src/mbgl/tile/geometry_tile_data.cpp index ebf27e7858..680f8d1497 100644 --- a/src/mbgl/tile/geometry_tile_data.cpp +++ b/src/mbgl/tile/geometry_tile_data.cpp @@ -1,7 +1,7 @@ #include <mbgl/tile/geometry_tile_data.hpp> #include <mbgl/tile/tile_id.hpp> -#include <clipper/clipper.hpp> +#include <mapbox/geometry/wagyu/wagyu.hpp> namespace mbgl { @@ -17,8 +17,8 @@ static double signedArea(const GeometryCoordinates& ring) { return sum; } -static ClipperLib::Path toClipperPath(const GeometryCoordinates& ring) { - ClipperLib::Path result; +static LinearRing<int32_t> toWagyuPath(const GeometryCoordinates& ring) { + LinearRing<int32_t> result; result.reserve(ring.size()); for (const auto& p : ring) { result.emplace_back(p.x, p.y); @@ -26,63 +26,29 @@ static ClipperLib::Path toClipperPath(const GeometryCoordinates& ring) { return result; } -static GeometryCoordinates fromClipperPath(const ClipperLib::Path& path) { - GeometryCoordinates result; - result.reserve(path.size() + 1); - - for (const auto& p : path) { - using Coordinate = GeometryCoordinates::coordinate_type; - assert(p.x >= std::numeric_limits<Coordinate>::min()); - assert(p.x <= std::numeric_limits<Coordinate>::max()); - assert(p.y >= std::numeric_limits<Coordinate>::min()); - assert(p.y <= std::numeric_limits<Coordinate>::max()); - result.emplace_back(Coordinate(p.x), Coordinate(p.y)); - } - - // Clipper does not repeat initial point, but our geometry model requires it. - if (!result.empty()) { - result.push_back(result.front()); - } - - return result; -} - -static void processPolynodeBranch(ClipperLib::PolyNode* polynode, GeometryCollection& rings) { - // Exterior ring. - rings.push_back(fromClipperPath(polynode->Contour)); - assert(signedArea(rings.back()) > 0); - - // Interior rings. - for (auto * ring : polynode->Childs) { - rings.push_back(fromClipperPath(ring->Contour)); - assert(signedArea(rings.back()) < 0); - } - - // PolyNodes may be nested in the case of a polygon inside a hole. - for (auto * ring : polynode->Childs) { - for (auto * subRing : ring->Childs) { - processPolynodeBranch(subRing, rings); +static GeometryCollection toGeometryCollection(MultiPolygon<int16_t>&& multipolygon) { + GeometryCollection result; + for (auto& polygon : multipolygon) { + for (auto& ring : polygon) { + result.emplace_back(std::move(ring)); } } + return result; } GeometryCollection fixupPolygons(const GeometryCollection& rings) { - ClipperLib::Clipper clipper; - clipper.StrictlySimple(true); + using namespace mapbox::geometry::wagyu; + + wagyu<int32_t> clipper; for (const auto& ring : rings) { - clipper.AddPath(toClipperPath(ring), ClipperLib::ptSubject, true); + clipper.add_ring(toWagyuPath(ring)); } - ClipperLib::PolyTree polygons; - clipper.Execute(ClipperLib::ctUnion, polygons, ClipperLib::pftEvenOdd, ClipperLib::pftEvenOdd); - clipper.Clear(); + MultiPolygon<int16_t> multipolygon; + clipper.execute(clip_type_union, multipolygon, fill_type_even_odd, fill_type_even_odd); - GeometryCollection result; - for (auto * polynode : polygons.Childs) { - processPolynodeBranch(polynode, result); - } - return result; + return toGeometryCollection(std::move(multipolygon)); } std::vector<GeometryCollection> classifyRings(const GeometryCollection& rings) { diff --git a/src/mbgl/tile/geometry_tile_data.hpp b/src/mbgl/tile/geometry_tile_data.hpp index 8a10ec058a..285f86cc7b 100644 --- a/src/mbgl/tile/geometry_tile_data.hpp +++ b/src/mbgl/tile/geometry_tile_data.hpp @@ -21,6 +21,13 @@ using GeometryCoordinate = Point<int16_t>; class GeometryCoordinates : public std::vector<GeometryCoordinate> { public: using coordinate_type = int16_t; + + GeometryCoordinates() = default; + GeometryCoordinates(const std::vector<GeometryCoordinate>& v) + : std::vector<GeometryCoordinate>(v) {} + GeometryCoordinates(std::vector<GeometryCoordinate>&& v) + : std::vector<GeometryCoordinate>(std::move(v)) {} + using std::vector<GeometryCoordinate>::vector; }; diff --git a/src/mbgl/tile/geometry_tile_worker.hpp b/src/mbgl/tile/geometry_tile_worker.hpp index 58b5e23cfd..91bf81a697 100644 --- a/src/mbgl/tile/geometry_tile_worker.hpp +++ b/src/mbgl/tile/geometry_tile_worker.hpp @@ -8,7 +8,6 @@ #include <atomic> #include <memory> -#include <unordered_map> namespace mbgl { diff --git a/src/mbgl/tile/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp index 68f48e81fd..4bb4d830ec 100644 --- a/src/mbgl/tile/vector_tile.cpp +++ b/src/mbgl/tile/vector_tile.cpp @@ -5,7 +5,6 @@ #include <protozero/pbf_reader.hpp> #include <unordered_map> -#include <unordered_map> #include <functional> #include <utility> diff --git a/src/mbgl/util/compression.cpp b/src/mbgl/util/compression.cpp index 18cb189d02..832c38b8d5 100644 --- a/src/mbgl/util/compression.cpp +++ b/src/mbgl/util/compression.cpp @@ -22,6 +22,11 @@ const static bool zlibVersionCheck __attribute__((unused)) = []() { namespace mbgl { namespace util { +// Needed when using a zlib compiled with -DZ_PREFIX +// because it will mess with this function name and +// cause a link error. +#undef z_compress + std::string compress(const std::string &raw) { z_stream deflate_stream; memset(&deflate_stream, 0, sizeof(deflate_stream)); diff --git a/test/api/annotations.test.cpp b/test/api/annotations.test.cpp index 30027d8610..87d64d53de 100644 --- a/test/api/annotations.test.cpp +++ b/test/api/annotations.test.cpp @@ -73,7 +73,7 @@ TEST(Annotations, LineAnnotation) { TEST(Annotations, FillAnnotation) { AnnotationTest test; - Polygon<double> polygon = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }}; + Polygon<double> polygon = { {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }; FillAnnotation annotation { polygon }; annotation.color = Color::red(); @@ -98,7 +98,7 @@ TEST(Annotations, AntimeridianAnnotationSmall) { lineAnnotation.width = { 2 }; test.map.addAnnotation(lineAnnotation); - Polygon<double> polygon = {{ {{ { antimeridian+10, 0 }, { antimeridian - 10, 10 }, { antimeridian-10, -10 } }} }}; + Polygon<double> polygon = { {{ { antimeridian+10, 0 }, { antimeridian - 10, 10 }, { antimeridian-10, -10 } }} }; FillAnnotation polygonAnnotation { polygon }; polygonAnnotation.color = Color::blue(); test.map.addAnnotation(polygonAnnotation); @@ -119,7 +119,7 @@ TEST(Annotations, AntimeridianAnnotationLarge) { lineAnnotation.width = { 2 }; test.map.addAnnotation(lineAnnotation); - Polygon<double> polygon = {{ {{ { antimeridian-10, 0 }, { -antimeridian+10, 10 }, { -antimeridian+10, -10 } }} }}; + Polygon<double> polygon = { {{ { antimeridian-10, 0 }, { -antimeridian+10, 10 }, { -antimeridian+10, -10 } }} }; FillAnnotation polygonAnnotation { polygon }; polygonAnnotation.color = Color::blue(); test.map.addAnnotation(polygonAnnotation); @@ -130,7 +130,7 @@ TEST(Annotations, AntimeridianAnnotationLarge) { TEST(Annotations, OverlappingFillAnnotation) { AnnotationTest test; - Polygon<double> polygon = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }}; + Polygon<double> polygon = { {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }; FillAnnotation underlaidAnnotation { polygon }; underlaidAnnotation.color = Color::green(); FillAnnotation overlaidAnnotation { polygon }; @@ -145,7 +145,7 @@ TEST(Annotations, OverlappingFillAnnotation) { TEST(Annotations, StyleSourcedShapeAnnotation) { AnnotationTest test; - Polygon<double> polygon = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }}; + Polygon<double> polygon = { {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }; test.map.setStyleJSON(util::read_file("test/fixtures/api/annotation.json")); test.map.addAnnotation(StyleSourcedAnnotation { polygon, "annotation" }); @@ -171,7 +171,7 @@ TEST(Annotations, NonImmediateAdd) { test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json")); test::render(test.map, test.view); - Polygon<double> polygon = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }}; + Polygon<double> polygon = { {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }; FillAnnotation annotation { polygon }; annotation.color = Color::red(); @@ -245,7 +245,7 @@ TEST(Annotations, UpdateLineAnnotationStyle) { TEST(Annotations, UpdateFillAnnotationGeometry) { AnnotationTest test; - FillAnnotation annotation { Polygon<double> {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }} }; + FillAnnotation annotation { Polygon<double> { {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} } }; annotation.color = Color::red(); test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json")); @@ -253,7 +253,7 @@ TEST(Annotations, UpdateFillAnnotationGeometry) { test::render(test.map, test.view); - annotation.geometry = Polygon<double> {{ {{ { 0, 0 }, { 0, 45 }, { 45, 0 } }} }}; + annotation.geometry = Polygon<double> { {{ { 0, 0 }, { 0, 45 }, { 45, 0 } }} }; test.map.updateAnnotation(fill, annotation); test.checkRendering("update_fill_geometry"); } @@ -261,7 +261,7 @@ TEST(Annotations, UpdateFillAnnotationGeometry) { TEST(Annotations, UpdateFillAnnotationStyle) { AnnotationTest test; - Polygon<double> polygon = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }}; + Polygon<double> polygon = { {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }; FillAnnotation annotation { polygon }; annotation.color = Color::red(); diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp index 618c2e6a74..2d995fc599 100644 --- a/test/map/map.test.cpp +++ b/test/map/map.test.cpp @@ -24,9 +24,29 @@ using namespace mbgl; using namespace mbgl::style; using namespace std::literals::string_literals; +class BackendTest : public HeadlessBackend { +public: + BackendTest() : HeadlessBackend(test::sharedDisplay()) {} + + void onDidFailLoadingMap(std::exception_ptr) final { + if (didFailLoadingMapCallback) { + didFailLoadingMapCallback(); + } + } + + void onDidFinishLoadingStyle() final { + if (didFinishLoadingStyleCallback) { + didFinishLoadingStyleCallback(); + } + } + + std::function<void()> didFailLoadingMapCallback; + std::function<void()> didFinishLoadingStyleCallback; +}; + struct MapTest { util::RunLoop runLoop; - HeadlessBackend backend { test::sharedDisplay() }; + BackendTest backend; OffscreenView view { backend.getContext() }; StubFileSource fileSource; ThreadPool threadPool { 4 }; @@ -85,11 +105,9 @@ TEST(Map, SetStyleInvalidJSON) { Log::setObserver(std::make_unique<FixtureLogObserver>()); bool fail = false; - test.backend.setMapChangeCallback([&](MapChange change) { - if (change == mbgl::MapChangeDidFailLoadingMap) { - fail = true; - } - }); + test.backend.didFailLoadingMapCallback = [&]() { + fail = true; + }; { Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, @@ -118,11 +136,9 @@ TEST(Map, SetStyleInvalidURL) { return response; }; - test.backend.setMapChangeCallback([&](MapChange change) { - if (change == mbgl::MapChangeDidFailLoadingMap) { - test.runLoop.stop(); - } - }); + test.backend.didFailLoadingMapCallback = [&]() { + test.runLoop.stop(); + }; Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still); map.setStyleURL("mapbox://bar"); @@ -233,11 +249,9 @@ TEST(Map, StyleLoadedSignal) { // The map should emit a signal on style loaded bool emitted = false; - test.backend.setMapChangeCallback([&](MapChange change) { - if (change == mbgl::MapChangeDidFinishLoadingStyle) { - emitted = true; - } - }); + test.backend.didFinishLoadingStyleCallback = [&]() { + emitted = true; + }; map.setStyleJSON(util::read_file("test/fixtures/api/empty.json")); EXPECT_TRUE(emitted); @@ -255,11 +269,9 @@ TEST(Map, TEST_REQUIRES_SERVER(StyleNetworkErrorRetry)) { Map map(test.backend, test.view.getSize(), 1, fileSource, test.threadPool, MapMode::Still); map.setStyleURL("http://127.0.0.1:3000/style-fail-once-500"); - test.backend.setMapChangeCallback([&](MapChange change) { - if (change == mbgl::MapChangeDidFinishLoadingStyle) { - test.runLoop.stop(); - } - }); + test.backend.didFinishLoadingStyleCallback = [&]() { + test.runLoop.stop(); + }; test.runLoop.run(); } @@ -275,17 +287,15 @@ TEST(Map, TEST_REQUIRES_SERVER(StyleNotFound)) { util::Timer timer; // Not found errors should not trigger a retry like other errors. - test.backend.setMapChangeCallback([&](MapChange change) { - if (change == mbgl::MapChangeDidFinishLoadingStyle) { - FAIL() << "Should not retry on not found!"; - } + test.backend.didFinishLoadingStyleCallback = [&]() { + FAIL() << "Should not retry on not found!"; + }; - if (change == mbgl::MapChangeDidFailLoadingMap) { - timer.start(Milliseconds(1100), 0s, [&] { - test.runLoop.stop(); - }); - } - }); + test.backend.didFailLoadingMapCallback = [&]() { + timer.start(Milliseconds(1100), 0s, [&] { + test.runLoop.stop(); + }); + }; test.runLoop.run(); diff --git a/test/map/transform.test.cpp b/test/map/transform.test.cpp index 9125b6ef1d..5bff4ee5ef 100644 --- a/test/map/transform.test.cpp +++ b/test/map/transform.test.cpp @@ -215,7 +215,7 @@ TEST(Transform, ConstrainHeightOnly) { TEST(Transform, ConstrainWidthAndHeight) { LatLng loc; - Transform transform(nullptr, ConstrainMode::WidthAndHeight); + Transform transform(MapObserver::nullObserver(), ConstrainMode::WidthAndHeight); transform.resize({ 1000, 1000 }); transform.setScale(std::pow(2, util::MAX_ZOOM)); diff --git a/test/src/mbgl/test/stub_style_observer.hpp b/test/src/mbgl/test/stub_style_observer.hpp index 95280565ff..9312cfa550 100644 --- a/test/src/mbgl/test/stub_style_observer.hpp +++ b/test/src/mbgl/test/stub_style_observer.hpp @@ -30,8 +30,8 @@ public: if (sourceLoaded) sourceLoaded(source); } - void onSourceAttributionChanged(Source& source, const std::string& attribution) override { - if (sourceAttributionChanged) sourceAttributionChanged(source, attribution); + void onSourceChanged(Source& source) override { + if (sourceChanged) sourceChanged(source); } void onSourceError(Source& source, std::exception_ptr error) override { @@ -60,7 +60,7 @@ public: std::function<void ()> spriteLoaded; std::function<void (std::exception_ptr)> spriteError; std::function<void (Source&)> sourceLoaded; - std::function<void (Source&, std::string)> sourceAttributionChanged; + std::function<void (Source&)> sourceChanged; std::function<void (Source&, std::exception_ptr)> sourceError; std::function<void (Source&)> sourceDescriptionChanged; std::function<void (Source&, const OverscaledTileID&)> tileChanged; diff --git a/test/style/conversion/function.test.cpp b/test/style/conversion/function.test.cpp index 5a3ec93917..4dc6549c78 100644 --- a/test/style/conversion/function.test.cpp +++ b/test/style/conversion/function.test.cpp @@ -13,7 +13,7 @@ using namespace mbgl::style::conversion; auto parseFunction(const std::string& src) { JSDocument doc; doc.Parse<0>(src); - return convert<CameraFunction<float>>(doc); + return convert<CameraFunction<float>, JSValue>(doc); } TEST(StyleConversion, Function) { diff --git a/test/style/filter.test.cpp b/test/style/filter.test.cpp index 33b64978f5..2f12246078 100644 --- a/test/style/filter.test.cpp +++ b/test/style/filter.test.cpp @@ -16,7 +16,7 @@ using namespace mbgl::style; Filter parse(const char * expression) { rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> doc; doc.Parse<0>(expression); - return *conversion::convert<Filter>(doc); + return *conversion::convert<Filter, JSValue>(doc); } Feature feature(const PropertyMap& properties, const Geometry<double>& geometry = Point<double>()) { diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp index fb7737e417..f637f1ccde 100644 --- a/test/style/source.test.cpp +++ b/test/style/source.test.cpp @@ -13,15 +13,20 @@ #include <mbgl/util/tileset.hpp> #include <mbgl/util/default_thread_pool.hpp> #include <mbgl/util/logging.hpp> +#include <mbgl/util/optional.hpp> +#include <mbgl/util/range.hpp> #include <mbgl/map/transform.hpp> #include <mbgl/style/style.hpp> #include <mbgl/style/update_parameters.hpp> #include <mbgl/style/layers/line_layer.hpp> #include <mbgl/annotation/annotation_manager.hpp> +#include <mbgl/annotation/annotation_source.hpp> #include <mapbox/geojsonvt.hpp> +#include <cstdint> + using namespace mbgl; class SourceTest { @@ -65,6 +70,32 @@ public: } }; +TEST(Source, DefaultZoomRange) { + VectorSource vectorSource("vectorSource", "url"); + EXPECT_FALSE(vectorSource.getZoomRange()); + vectorSource.baseImpl->loaded = true; + EXPECT_EQ(vectorSource.getZoomRange()->min, 0u); + EXPECT_EQ(vectorSource.getZoomRange()->max, 22u); + + GeoJSONSource geojsonSource("source"); + EXPECT_FALSE(geojsonSource.getZoomRange()); + geojsonSource.baseImpl->loaded = true; + EXPECT_EQ(geojsonSource.getZoomRange()->min, 0u); + EXPECT_EQ(geojsonSource.getZoomRange()->max, 18u); + + Tileset tileset; + RasterSource rasterSource("source", tileset, 512); + EXPECT_FALSE(rasterSource.getZoomRange()); + rasterSource.baseImpl->loaded = true; + EXPECT_EQ(rasterSource.getZoomRange()->min, 0u); + EXPECT_EQ(rasterSource.getZoomRange()->max, 22u); + EXPECT_EQ(*rasterSource.getZoomRange(), tileset.zoomRange); + + AnnotationSource annotationSource; + EXPECT_EQ(annotationSource.getZoomRange()->min, 0u); + EXPECT_EQ(annotationSource.getZoomRange()->max, 22u); +} + TEST(Source, LoadingFail) { SourceTest test; @@ -364,8 +395,8 @@ TEST(Source, RasterTileAttribution) { return response; }; - test.observer.sourceAttributionChanged = [&] (Source&, std::string attribution) { - EXPECT_EQ(mapboxOSM, attribution); + test.observer.sourceChanged = [&] (Source& source) { + EXPECT_EQ(mapboxOSM, source.getAttribution()); EXPECT_FALSE(mapboxOSM.find("©️ OpenStreetMap") == std::string::npos); test.end(); }; diff --git a/test/tile/tile_coordinate.test.cpp b/test/tile/tile_coordinate.test.cpp index 4d58bf8c51..d1bef85cb5 100644 --- a/test/tile/tile_coordinate.test.cpp +++ b/test/tile/tile_coordinate.test.cpp @@ -1,6 +1,5 @@ #include <mbgl/test/util.hpp> -#include <mbgl/map/change.hpp> #include <mbgl/map/transform.hpp> #include <mbgl/map/transform_state.hpp> #include <mbgl/tile/tile.hpp> @@ -13,17 +12,35 @@ using namespace mbgl; TEST(TileCoordinate, FromLatLng) { + size_t changeCount = 0; - std::vector<MapChange> changes = { - MapChangeRegionWillChange, - MapChangeRegionDidChange, + struct TransformObserver : public mbgl::MapObserver { + void onCameraWillChange(MapObserver::CameraChangeMode mode) final { + if (mode == MapObserver::CameraChangeMode::Immediate && cameraWillChangeImmediateCallback) { + cameraWillChangeImmediateCallback(); + } + } + + void onCameraDidChange(MapObserver::CameraChangeMode mode) final { + if (mode == MapObserver::CameraChangeMode::Immediate && cameraDidChangeImmediateCallback) { + cameraDidChangeImmediateCallback(); + } + } + + std::function<void()> cameraWillChangeImmediateCallback; + std::function<void()> cameraDidChangeImmediateCallback; }; - auto onMapChange = [&](MapChange change) { - ASSERT_EQ(change, changes[changeCount]); + + TransformObserver observer; + observer.cameraWillChangeImmediateCallback = [&]() { + ASSERT_EQ(changeCount, 0u); ++changeCount; }; + observer.cameraDidChangeImmediateCallback = [&]() { + ASSERT_EQ(changeCount, 1u); + }; - Transform transform(onMapChange); + Transform transform(observer); const double max = util::tileSize; transform.resize({ static_cast<uint32_t>(max), static_cast<uint32_t>(max) }); diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp index 49fdcbd9f8..859fd417b0 100644 --- a/test/tile/vector_tile.test.cpp +++ b/test/tile/vector_tile.test.cpp @@ -61,7 +61,7 @@ TEST(VectorTile, Issue7615) { style::SymbolLayer symbolLayer("symbol", "source"); auto symbolBucket = std::make_shared<SymbolBucket>( style::SymbolLayoutProperties::Evaluated(), - std::unordered_map< + std::map< std::string, std::pair<style::IconPaintProperties::Evaluated, style::TextPaintProperties::Evaluated>>(), 0.0f, false, false); |