Eveyrhing is now GLES and OpenGL 3.3 compatible in theory.

Should compile on MacOS.

Author: fwilliams

.travis.yml

@@ -5,7 +5,6 @@ cache: ccache
 branches:
   only:
     - master
-    - michael
 addons:
   apt:
     sources:
@@ -40,7 +39,7 @@ matrix:
     compiler: gcc-7
     env:
     - MATRIX_EVAL="export CC=gcc-7 CXX=g++-7 CONFIG=Release PYTHON=python3"
-  - os: linux
+  - 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'"

CMakeLists.txt

@@ -3,7 +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 +112,13 @@ 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_link_libraries(contourtree Qt5::Core Qt5::Widgets -fopenmp spdlog)
+  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 +132,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)
 target_include_directories(utils PUBLIC ${UTILS_INCLUDE_DIRS})
 target_include_directories(utils SYSTEM PUBLIC "${PROJECT_SOURCE_DIR}/external/glm")
 

src/main.cpp

@@ -56,9 +56,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_debugging(log_opengl_debug);
     return false;
 }
 

src/ui/bounding_widget_2d.cpp

@@ -563,7 +563,7 @@ bool Bounding_Polygon_Widget::post_draw(BoundingCage::KeyFrameIterator kf, bool
     //
     // Render the slice of the volume for this keyframe into an OpenGL texture
     //
-    glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, -1, "Render slice");
+    push_opengl_debug_group("Render Slice");
     {
         glUseProgram(plane.program);
         glBindVertexArray(empty_vao);
@@ -600,13 +600,13 @@ bool Bounding_Polygon_Widget::post_draw(BoundingCage::KeyFrameIterator kf, bool
         glBindVertexArray(0);
         glUseProgram(0);
     }
-    glPopDebugGroup();
+    pop_opengl_debug_group();
 
 
     //
     // Render the bounding-box, center, and axes into the same texture
     //
-    glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, -1, "Render polygon");
+    push_opengl_debug_group("Render Polygon");
     {
         const glm::vec2 centroid_2d = G2f(kf->centroid_2d());
         const glm::vec2 r_axis = G2f(kf->right_rotated_2d()), u_axis = G2f(kf->up_rotated_2d());
@@ -647,7 +647,7 @@ bool Bounding_Polygon_Widget::post_draw(BoundingCage::KeyFrameIterator kf, bool
             }
         }
     }
-    glPopDebugGroup();
+    pop_opengl_debug_group();
 
     // Restore the framebuffer and viewport
     glBindFramebuffer(GL_FRAMEBUFFER, 0);
@@ -658,7 +658,7 @@ bool Bounding_Polygon_Widget::post_draw(BoundingCage::KeyFrameIterator kf, bool
     //
     // Blit the texture we just rendered to the screen
     //
-    glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, -1, "Texture Blit");
+    push_opengl_debug_group("Texture Blit");
     {
         int width;
         int height;
@@ -709,7 +709,7 @@ bool Bounding_Polygon_Widget::post_draw(BoundingCage::KeyFrameIterator kf, bool
         glBindVertexArray(0);
         glUseProgram(0);
     }
-    glPopDebugGroup();
+    pop_opengl_debug_group();
     glEnable(GL_DEPTH_TEST);
 
     return false;

src/utils/gl/point_line_rendering.cpp

@@ -1,4 +1,5 @@
 #include "point_line_rendering.h"
+#include "utils/utils.h"
 
 #include <igl/opengl/create_shader_program.h>
 
@@ -68,7 +69,7 @@ void PointLineRenderer::destroy() {
 
 
 bool PointLineRenderer::update_polyline_3d(int polyline_id, GLfloat* vertices, GLfloat* colors, GLsizei num_vertices, PolylineStyle style) {
-    glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, -1, "update_polyline_3d");
+    push_opengl_debug_group("update_polyline_3d");
     if (polyline_id >= _polylines.size() || polyline_id < 0) {
         return false;
     }
@@ -93,12 +94,12 @@ bool PointLineRenderer::update_polyline_3d(int polyline_id, GLfloat* vertices, G
 
     glBindBuffer(GL_ARRAY_BUFFER, 0);
 
-    glPopDebugGroup();
+    pop_opengl_debug_group();
     return true;
 }
 
 bool PointLineRenderer::update_polyline_3d(int polyline_id, GLfloat* vertices, glm::vec4 color, GLsizei num_vertices, PolylineStyle style) {
-    glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, -1, "update_polyline_3d");
+    push_opengl_debug_group("update_polyline_3d");
     if (polyline_id >= _polylines.size() || polyline_id < 0) {
         return false;
     }
@@ -123,13 +124,13 @@ bool PointLineRenderer::update_polyline_3d(int polyline_id, GLfloat* vertices, g
     glDisableVertexAttribArray(1);
     glBindVertexArray(0);
 
-    glPopDebugGroup();
+    pop_opengl_debug_group();
     return true;
 }
 
 
 int PointLineRenderer::add_polyline_3d(GLfloat* vertices, GLfloat* colors, GLsizei num_vertices, PolylineStyle style) {
-    glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, -1, "add_polyline_3d");
+    push_opengl_debug_group("add_polyline_3d");
 
     Polyline polyline;
 
@@ -170,13 +171,13 @@ int PointLineRenderer::add_polyline_3d(GLfloat* vertices, GLfloat* colors, GLsiz
         _polylines.push_back(polyline);
     }
 
-    glPopDebugGroup();
+    pop_opengl_debug_group();
 
     return polyline_id;
 }
 
 int PointLineRenderer::add_polyline_3d(GLfloat* vertices, glm::vec4 color, GLsizei num_vertices, PolylineStyle style) {
-    glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, -1, "add_polyline_3d");
+    push_opengl_debug_group("add_polyline_3d");
 
     Polyline polyline;
 
@@ -210,7 +211,7 @@ int PointLineRenderer::add_polyline_3d(GLfloat* vertices, glm::vec4 color, GLsiz
         _polylines.push_back(polyline);
     }
 
-    glPopDebugGroup();
+    pop_opengl_debug_group();
 
     return polyline_id;
 }