Modified source code for added compatibility on MacOS

.appveyor.yml

@@ -5,13 +5,37 @@ clone_folder: C:\projects\fish_deformation
 branches:
   only:
     - master
+    - michael
 install:
   - git submodule update --init --recursive
   - cinstall: python
+build:
+  parallel: true
 build_script:
-  - echo Running cmake...
+  - echo Running cmake ..
+  - cd c:\tools\vcpkg
+  - .\vcpkg.exe --triplet x64-windows install mpir mpfr
   - cd c:\projects\fish_deformation
+  - set PATH=C:\Python%PYTHON%-x64;C:\Python%PYTHON%-x64\Scripts;%PATH%
   - mkdir build
   - cd build
-  - cmake -G "Visual Studio 15 2017 Win64" -T "host=x64" ..
-  - msbuild %MSBuildOptions% fish_deformation
+  - cmake -G "Visual Studio 15 2017 Win64"
+      -DCMAKE_PREFIX_PATH="C:/Qt/5.10.1/msvc2017_64/lib/cmake"  
+      -DMPFR_INCLUDE_DIR:PATH="C:/tools/vcpkg/installed/x64-windows/include" 
+      -DMPFR_LIBRARIES:FILEPATH="C:/tools/vcpkg/installed/x64-windows/lib/mpfr.lib" 
+      -DGMP_INCLUDE_DIR:PATH="C:/tools/vcpkg/installed/x64-windows/include" 
+      -DGMP_LIBRARIES:FILEPATH="C:/tools/vcpkg/installed/x64-windows/lib/mpir.lib" 
+      -DBOOST_ROOT="C:/Libraries/boost_1_65_1" ../
+  - set MSBuildOptions=/v:m /p:Configuration=Release /p:Platform=x64
+  - msbuild %MSBuildOptions% fish_deformation.sln
+after_build:
+  - cd ..
+  - mkdir unwind
+  - copy build\src\Release\unwind.exe unwind
+  - copy build\src\Release\mpir.dll unwind
+  - cd C:\Qt\latest\msvc2017_64\bin
+  - windeployqt C:\projects\fish_deformation\unwind\unwind.exe
+  - cd C:\projects\fish_deformation
+  - 7z a unwind.zip unwind\
+artifacts:
+  - path: unwind.zip

.travis.yml

@@ -0,0 +1,86 @@
+dist: trusty
+sudo: true
+language: cpp
+cache: ccache
+branches:
+  only:
+    - master
+    - michael
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - cmake
+    - g++-6
+    - gcc-6
+    - g++-7
+    - gcc-7
+    - libblas-dev
+    - libboost-filesystem-dev
+    - libboost-system-dev
+    - libboost-thread-dev
+    - libglu1-mesa-dev
+    - liblapack-dev
+    - libmpfr-dev
+    - libpython3-dev
+    - python3-setuptools
+    - qt5-default
+    - xorg-dev
+  homebrew:
+    packages:
+    - ccache
+matrix:
+  include:
+  - os: linux
+    compiler: gcc-6
+    env:
+    - MATRIX_EVAL="export CC=gcc-6 CXX=g++-6 CONFIG=Release PYTHON=python3"
+  - os: linux
+    compiler: gcc-7
+    env:
+    - MATRIX_EVAL="export CC=gcc-7 CXX=g++-7 CONFIG=Release PYTHON=python3"
+  - os: linux # same config like above but with -DLIBIGL_USE_STATIC_LIBRARY=OFF to test static and header-only builds
+    compiler: gcc-7
+    env:
+    - MATRIX_EVAL="export CC=gcc-7 CXX=g++-7 CONFIG=Release PYTHON=python3 CMAKE_EXTRA='-DLIBIGL_USE_STATIC_LIBRARY=OFF'"
+  - os: linux
+    compiler: gcc-7
+    env:
+    - MATRIX_EVAL="export CC=gcc-7 CXX=g++-7 CONFIG=Release PYTHON=python3 CMAKE_EXTRA='-DLIBIGL_EIGEN_VERSION=3.3.7'"
+  - os: osx
+    osx_image: xcode10.2
+    compiler: clang
+    env:
+    - MATRIX_EVAL="export CONFIG=Release PYTHON=python3 LIBIGL_NUM_THREADS=1"
+  - os: osx
+    osx_image: xcode10.2
+    compiler: clang
+    env:
+    - MATRIX_EVAL="export CONFIG=Release PYTHON=python3 LIBIGL_NUM_THREADS=1 CMAKE_EXTRA='-DLIBIGL_USE_STATIC_LIBRARY=OFF'"
+  - os: osx
+    osx_image: xcode10.2
+    compiler: clang
+    env:
+    - MATRIX_EVAL="export CONFIG=Release PYTHON=python3 LIBIGL_NUM_THREADS=1 CMAKE_EXTRA='-DLIBIGL_EIGEN_VERSION=3.3.7'""
+
+install:
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi
+- eval "${MATRIX_EVAL}"
+- ccache --max-size=5.0G
+- ccache -V && ccache --show-stats && ccache --zero-stats
+
+script:
+# Tutorials and tests
+- mkdir build
+- pushd build
+- cmake ${CMAKE_EXTRA}
+    -DCMAKE_BUILD_TYPE=$CONFIG
+    -DLIBIGL_CHECK_UNDEFINED=ON
+    -DLIBIGL_WITH_CGAL=ON
+    ../
+- make -j8
+- ctest --verbose
+- popd
+- rm -rf build
+- ccache --show-stats

CMakeLists.txt

@@ -3,8 +3,9 @@ project(fish_deformation)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/voroffset/cmake)
-
-
+if (APPLE)
+  set(CMAKE_PREFIX_PATH /usr/local/opt/qt/lib/cmake)
+endif ()
 
 
 #################################
@@ -110,8 +111,12 @@ file(GLOB CT_SRCS external/Segmentangling/ContourTree/*.cpp)
 set(CT_INCLUDE_DIRS external/Segmentangling/ContourTree)
 list(REMOVE_ITEM CT_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/external/Segmentangling/ContourTree/main.cpp")
 add_library(contourtree STATIC ${CT_SRCS})
-target_compile_options(contourtree PRIVATE "-fopenmp")
-target_link_libraries(contourtree Qt5::Core Qt5::Widgets -fopenmp spdlog)
+if (NOT APPLE)
+  target_compile_options(contourtree PRIVATE "-fopenmp")
+  target_link_libraries(contourtree Qt5::Core Qt5::Widgets -fopenmp spdlog)
+else ()
+  target_link_libraries(contourtree Qt5::Core Qt5::Widgets spdlog)
+endif ()
 target_include_directories(contourtree PUBLIC ${CT_INCLUDE_DIRS})
 target_compile_definitions(contourtree PUBLIC CONTOUR_TREE_USE_SPDLOG)
 
@@ -125,7 +130,7 @@ list(FILTER UTILS_HEADER EXCLUDE REGEX cgal*)
 add_library(utils STATIC ${UTILS_SRCS} ${UTILS_HEADER})
 set_property(TARGET utils PROPERTY CXX_STANDARD 14)
 set_property(TARGET utils PROPERTY CXX_STANDARD_REQUIRED ON)
-target_link_libraries(utils igl::core igl::opengl igl::cgal igl::triangle spdlog Qt5::Core Qt5::Widgets spdlog)
+target_link_libraries(utils igl::core igl::opengl igl::cgal igl::triangle spdlog Qt5::Core Qt5::Widgets spdlog glfw ${GLFW_LIBRARIES})
 target_include_directories(utils PUBLIC ${UTILS_INCLUDE_DIRS})
 target_include_directories(utils SYSTEM PUBLIC "${PROJECT_SOURCE_DIR}/external/glm")
 

src/main.cpp

@@ -8,6 +8,7 @@
 #include "ui/endpoint_selection_plugin.h"
 #include "ui/bounding_polygon_plugin.h"
 #include "ui/state.h"
+#include "utils/utils.h"
 #include "Logger.hpp"
 
 State _state;
@@ -26,9 +27,11 @@ void log_opengl_debug(GLenum source, GLenum type, GLuint id, GLenum severity,
     if (id == 131185 || id == 7 || id == 131218) {
         return;
     }
+#if !defined(__APPLE__)
     if (source == GL_DEBUG_SOURCE_APPLICATION) {
         return;
     }
+#endif
     _state.logger->error(
         "OpenGL Debug msg: Source: {}, Type: {}, Id: {}, Severity: {}, Message: {}",
         source, type, id, severity, std::string(message)
@@ -56,8 +59,7 @@ bool init(igl::opengl::glfw::Viewer& viewer) {
     ct_logger->set_level(CONTOURTREE_LOGGER_LEVEL);
     contourtree::Logger::setLogger(ct_logger);
 
-    glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
-    glDebugMessageCallback(log_opengl_debug, NULL);
+    init_opengl_debug(log_opengl_debug);
 
     return false;
 }

src/ui/bounding_polygon_plugin.cpp

@@ -59,9 +59,7 @@ void Bounding_Polygon_Menu::deinitialize() {
 }
 
 bool Bounding_Polygon_Menu::is_2d_widget_in_focus()  {
-    double mouse_x, mouse_y;
-    glfwGetCursorPos(viewer->window, &mouse_x, &mouse_y);
-    glm::vec2 p(mouse_x, mouse_y);
+    glm::vec2 p(viewer->current_mouse_x, viewer->current_mouse_y);
     return widget_2d.is_point_in_widget(p) && !mouse_in_popup;
 }
 
@@ -344,10 +342,15 @@ bool Bounding_Polygon_Menu::post_draw() {
     bool ret = FishUIViewerPlugin::post_draw();
 
     int window_width, window_height;
-    glfwGetWindowSize(viewer->window, &window_width, &window_height);
+    get_window_size(viewer->window, &window_width, &window_height);
+#ifdef __APPLE__
+    glViewport(-window_width*view_hsplit, -(1.0+view_vsplit)*window_height/scaling_factor,
+                window_width, scaling_factor*(1.0-view_vsplit)*window_height);
+    widget_2d.position = glm::vec2(0.f, view_vsplit*window_height/(scaling_factor*scaling_factor));
+#else
     glViewport(0, 0, window_width, window_height);
-
     widget_2d.position = glm::vec2(0.f, view_vsplit*window_height);
+#endif
     widget_2d.size = glm::vec2(window_width*view_hsplit, (1.0-view_vsplit)*window_height);
     ret = widget_2d.post_draw(state.cage.keyframe_for_index(current_cut_index), is_2d_widget_in_focus());
 
@@ -360,10 +363,12 @@ bool Bounding_Polygon_Menu::post_draw() {
         ret = widget_3d.post_draw_curved(G4f(widget_3d_viewport), state.cage.keyframe_for_index(current_cut_index));
     }
 
+    float window_scaling_factor;
+    get_scaling_factor(&window_scaling_factor);
 
     ImGui::SetNextWindowBgAlpha(0.5f);
-    float window_height_float = static_cast<float>(window_height);
-    float window_width_float = static_cast<float>(window_width);
+    float window_height_float = static_cast<float>(window_height/window_scaling_factor);
+    float window_width_float = static_cast<float>(window_width/window_scaling_factor);
     ImGui::SetNextWindowPos(ImVec2(0.f, (1.0-view_vsplit)*window_height_float), ImGuiSetCond_Always);
     ImGui::SetNextWindowSize(ImVec2(window_width_float, window_height_float*view_vsplit), ImGuiSetCond_Always);
     ImGui::Begin("Select Boundary", nullptr,
@@ -401,6 +406,9 @@ bool Bounding_Polygon_Menu::post_draw() {
 
     ImGui::SameLine();
     ImVec2 cursor_pos = ImGui::GetCursorScreenPos();
+#ifdef __APPLE__
+    cursor_pos.x *= (1.0+keyframe_nudge_amount);
+#endif
     ImGui::PushItemWidth(ImGui::GetWindowWidth() - 2.f*cursor_pos.x);
     if(ImGui::SliderFloat("", &current_cut_index,
                           static_cast<float>(state.cage.min_index()),
@@ -493,16 +501,14 @@ bool Bounding_Polygon_Menu::post_draw() {
         }
     }
     if (show_edit_transfer_function) {
-        ImGui::SetNextWindowSize(ImVec2(window_width*view_vsplit, 0), ImGuiSetCond_FirstUseEver);
+        ImGui::SetNextWindowSize(ImVec2(window_width*view_vsplit/window_scaling_factor, 0), ImGuiSetCond_FirstUseEver);
         ImGui::Begin("Edit Transfer Function", &show_edit_transfer_function, ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize);
         ImVec2 popup_pos = ImGui::GetWindowPos();
         ImVec2 popup_size = ImGui::GetWindowSize();
         tf_widget.post_draw(!show_save_popup /* active */);
 
-        double mouse_x, mouse_y;
-        glfwGetCursorPos(viewer->window, &mouse_x, &mouse_y);
-        bool in_window_x = (mouse_x >= popup_pos[0]) && (mouse_x <= (popup_pos[0] + popup_size[0]));
-        bool in_window_y = (mouse_y >= popup_pos[1]) && (mouse_y <= (popup_pos[1] + popup_size[1]));
+        bool in_window_x = (viewer->current_mouse_x >= popup_pos[0]) && (viewer->current_mouse_x <= (popup_pos[0] + popup_size[0]));
+        bool in_window_y = (viewer->current_mouse_y >= popup_pos[1]) && (viewer->current_mouse_y <= (popup_pos[1] + popup_size[1]));
         mouse_in_popup = (in_window_x && in_window_y);
 
         ImGui::Separator();
@@ -602,7 +608,7 @@ bool Bounding_Polygon_Menu::post_draw() {
         show_save_popup = true;
     }
     if (show_save_popup) {
-        post_draw_save(window_width);
+        post_draw_save(window_width/window_scaling_factor);
     }
     ImGui::End();
 

src/ui/bounding_polygon_plugin.h

@@ -44,6 +44,7 @@ class Bounding_Polygon_Menu : public FishUIViewerPlugin {
 
     void post_draw_transfer_function();
 
+    float scaling_factor = 2.0; // Scaling factor for window sizes of the two menus
     float view_hsplit = 0.5; // Horizontal split for the two menus (normalized distance
     float view_vsplit = 0.2; // Vertical split for the bottom menu (normalized distance from the bottom)