- updated version, Changelog.txt

- small fixes

Author: janbender

CMake/Common.cmake

@@ -19,25 +19,24 @@ endif (USE_DOUBLE_PRECISION)
 
 cmake_dependent_option(USE_AVX "Use AVX" ON "NOT USE_DOUBLE_PRECISION" OFF)
 if (USE_AVX)
-	set(FOUND_ACCELERATE OFF)
 	if (APPLE)
 		find_library(ACCELERATE Accelerate)
-	endif()
-	if (ACCELERATE)
-		set(FOUND_ACCELERATE ON)
-		message(STATUS "Using Accelerate")
-		link_libraries(${ACCELERATE})
+
+		if (ACCELERATE)
+			message(STATUS "Using Accelerate")
+			link_libraries(${ACCELERATE})
+			set(FOUND_SIMD ON)
+			add_definitions(-DUSE_AVX)
+		endif()
 	else()
 		include(avx)
 		set_avx_flags()
 		if (FOUND_AVX2)
 			message(STATUS "Using AVX2")
+			set(FOUND_SIMD ON)
+			add_definitions(-DUSE_AVX)
 		endif()
 	endif()
-	if (FOUND_ACCELERATE OR FOUND_AVX2)
-		set(FOUND_SIMD ON)
-		add_definitions(-DUSE_AVX)
-	endif()
 endif()
 
 cmake_dependent_option(USE_PERFORMANCE_OPTIMIZATION "Optimize performance (higher memory consumption)" ON "FOUND_SIMD" OFF)
@@ -75,10 +74,6 @@ endif()
 
 option(USE_OpenMP "Use OpenMP" ON)
 if(USE_OpenMP)
-	# Add the default openmp installation directory for apple systems
-	if(APPLE)
-		set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH};/opt/homebrew/opt/libomp)
-	endif()
 	FIND_PACKAGE(OpenMP)
 	if(OPENMP_FOUND)
 		if (CMAKE_VERSION VERSION_GREATER "3.8")
@@ -87,8 +82,6 @@ if(USE_OpenMP)
 			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
 			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
 		endif()
-	else()
-		message("OpenMP could not be found. On Apple devices, make sure to install it with `brew install libomp`.")
 	endif()
 endif()
 

Changelog.txt

@@ -1,3 +1,7 @@
+2.15.0
+	- macOS support (thanks to Robin Rademacher)
+	- update to OpenGL 3.3 (thanks to Robin Rademacher)
+
 2.14.1
 	- updated CompactNSearch
 	- updated DiscreGrid

GUI/OpenGL/MiniGL.cpp

@@ -107,10 +107,10 @@ void MiniGL::getOpenGLVersion(int &major_version, int &minor_version)
 void MiniGL::coordinateSystem() 
 {
 	Vector3r a(0,0,0);
-	Vector3r b(2,0,0);
-	Vector3r c(0,2,0);
-	Vector3r d(0,0,2);
-	float lineWidth = 3.0;
+	Vector3r b(1,0,0);
+	Vector3r c(0,1,0);
+	Vector3r d(0,0,1);
+	float lineWidth = 1.0;
 	Vector3f color;
 
 	color << 1,0,0;
@@ -362,12 +362,12 @@ void MiniGL::drawGrid_xz(float *color)
 	glDisableVertexAttribArray(0);
 	disableShader();
 
-	float lineWidth = 3.0;
+	float lineWidth = 1.0;
 
 	drawVector(Vector3r(-size, 0.0, 0.0), Vector3r(0.0, 0.0, 0.0), lineWidth, color);
-	drawVector(Vector3r(2.0, 0.0, 0.0), Vector3r(size, 0.0, 0.0), lineWidth, color);
+	drawVector(Vector3r(1.0, 0.0, 0.0), Vector3r(size, 0.0, 0.0), lineWidth, color);
 	drawVector(Vector3r(0.0, 0.0, -size), Vector3r(0.0, 0.0, 0.0), lineWidth, color);
-	drawVector(Vector3r(0.0, 0.0, 2.0), Vector3r(0.0, 0.0, size), lineWidth, color);
+	drawVector(Vector3r(0.0, 0.0, 1.0), Vector3r(0.0, 0.0, size), lineWidth, color);
 }
 
 void MiniGL::drawGrid_xy(float *color)
@@ -392,12 +392,12 @@ void MiniGL::drawGrid_xy(float *color)
 	glDisableVertexAttribArray(0);
 	disableShader();
 
-	float lineWidth = 3.0;
+	float lineWidth = 1.0;
 
 	drawVector(Vector3r(-size, 0.0, 0.0), Vector3r(0.0, 0.0, 0.0), lineWidth, color);
-	drawVector(Vector3r(2.0, 0.0, 0.0), Vector3r(size, 0.0, 0.0), lineWidth, color);
+	drawVector(Vector3r(1.0, 0.0, 0.0), Vector3r(size, 0.0, 0.0), lineWidth, color);
 	drawVector(Vector3r(0.0, -size, 0.0), Vector3r(0.0, 0.0, 0.0), lineWidth, color);
-	drawVector(Vector3r(0.0, 2.0, 0.0), Vector3r(0.0, size, 0.0), lineWidth, color);
+	drawVector(Vector3r(0.0, 1.0, 0.0), Vector3r(0.0, size, 0.0), lineWidth, color);
 }
 
 void MiniGL::setViewport(float pfovy, float pznear, float pzfar, const Vector3r &peyepoint, const Vector3r &plookat)

README.md

@@ -1,7 +1,7 @@
 <img src="https://raw.githubusercontent.com/InteractiveComputerGraphics/SPlisHSPlasH/master/doc/images/logo.jpg" width="250">
 <br>
 
-<p align=center><img src="https://github.com/InteractiveComputerGraphics/SPlisHSPlasH/workflows/build-linux/badge.svg">&nbsp;&nbsp; <img src="https://github.com/InteractiveComputerGraphics/SPlisHSPlasH/workflows/build-linux-wheels/badge.svg">&nbsp;&nbsp; <img src="https://github.com/InteractiveComputerGraphics/SPlisHSPlasH/workflows/build-windows/badge.svg">&nbsp;&nbsp; <img src="https://github.com/InteractiveComputerGraphics/SPlisHSPlasH/workflows/build-windows-wheels/badge.svg">&nbsp;&nbsp; <a href='https://splishsplash.readthedocs.io/en/latest/?badge=latest'><img src='https://readthedocs.org/projects/splishsplash/badge/?version=latest' alt='Documentation Status' /></a></p>
+<p align=center><img src="https://github.com/InteractiveComputerGraphics/SPlisHSPlasH/workflows/build-linux/badge.svg">&nbsp;&nbsp; <img src="https://github.com/InteractiveComputerGraphics/SPlisHSPlasH/workflows/build-linux-wheels/badge.svg">&nbsp;&nbsp; <img src="https://github.com/InteractiveComputerGraphics/SPlisHSPlasH/workflows/build-windows/badge.svg">&nbsp;&nbsp; <img src="https://github.com/InteractiveComputerGraphics/SPlisHSPlasH/workflows/build-windows-wheels/badge.svg">&nbsp;&nbsp; <img src="https://github.com/InteractiveComputerGraphics/SPlisHSPlasH/workflows/build-mac/badge.svg">&nbsp;&nbsp; <img src="https://github.com/InteractiveComputerGraphics/SPlisHSPlasH/workflows/build-mac-wheels/badge.svg">&nbsp;&nbsp; <a href='https://splishsplash.readthedocs.io/en/latest/?badge=latest'><img src='https://readthedocs.org/projects/splishsplash/badge/?version=latest' alt='Documentation Status' /></a></p>
 <p align=center>
  <img src="https://raw.githubusercontent.com/InteractiveComputerGraphics/SPlisHSPlasH/master/doc/images/teaser.gif">
 </p>