Skip to content

Commit 45f1683

Browse files
janbenderjanbender
committed
- updated version, Changelog.txt
- small fixes
1 parent 02faa57 commit 45f1683

6 files changed

Lines changed: 1039 additions & 516 deletions

File tree

‎CMake/Common.cmake‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,24 @@ endif (USE_DOUBLE_PRECISION)
1919

2020
cmake_dependent_option(USE_AVX "Use AVX" ON "NOT USE_DOUBLE_PRECISION" OFF)
2121
if (USE_AVX)
22-
set(FOUND_ACCELERATE OFF)
2322
if (APPLE)
2423
find_library(ACCELERATE Accelerate)
25-
endif()
26-
if (ACCELERATE)
27-
set(FOUND_ACCELERATE ON)
28-
message(STATUS "Using Accelerate")
29-
link_libraries(${ACCELERATE})
24+
25+
if (ACCELERATE)
26+
message(STATUS "Using Accelerate")
27+
link_libraries(${ACCELERATE})
28+
set(FOUND_SIMD ON)
29+
add_definitions(-DUSE_AVX)
30+
endif()
3031
else()
3132
include(avx)
3233
set_avx_flags()
3334
if (FOUND_AVX2)
3435
message(STATUS "Using AVX2")
36+
set(FOUND_SIMD ON)
37+
add_definitions(-DUSE_AVX)
3538
endif()
3639
endif()
37-
if (FOUND_ACCELERATE OR FOUND_AVX2)
38-
set(FOUND_SIMD ON)
39-
add_definitions(-DUSE_AVX)
40-
endif()
4140
endif()
4241

4342
cmake_dependent_option(USE_PERFORMANCE_OPTIMIZATION "Optimize performance (higher memory consumption)" ON "FOUND_SIMD" OFF)
@@ -75,10 +74,6 @@ endif()
7574

7675
option(USE_OpenMP "Use OpenMP" ON)
7776
if(USE_OpenMP)
78-
# Add the default openmp installation directory for apple systems
79-
if(APPLE)
80-
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH};/opt/homebrew/opt/libomp)
81-
endif()
8277
FIND_PACKAGE(OpenMP)
8378
if(OPENMP_FOUND)
8479
if (CMAKE_VERSION VERSION_GREATER "3.8")
@@ -87,8 +82,6 @@ if(USE_OpenMP)
8782
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
8883
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
8984
endif()
90-
else()
91-
message("OpenMP could not be found. On Apple devices, make sure to install it with `brew install libomp`.")
9285
endif()
9386
endif()
9487

‎Changelog.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2.15.0
2+
- macOS support (thanks to Robin Rademacher)
3+
- update to OpenGL 3.3 (thanks to Robin Rademacher)
4+
15
2.14.1
26
- updated CompactNSearch
37
- updated DiscreGrid

‎GUI/OpenGL/MiniGL.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ void MiniGL::getOpenGLVersion(int &major_version, int &minor_version)
107107
void MiniGL::coordinateSystem()
108108
{
109109
Vector3r a(0,0,0);
110-
Vector3r b(2,0,0);
111-
Vector3r c(0,2,0);
112-
Vector3r d(0,0,2);
113-
float lineWidth = 3.0;
110+
Vector3r b(1,0,0);
111+
Vector3r c(0,1,0);
112+
Vector3r d(0,0,1);
113+
float lineWidth = 1.0;
114114
Vector3f color;
115115

116116
color << 1,0,0;
@@ -362,12 +362,12 @@ void MiniGL::drawGrid_xz(float *color)
362362
glDisableVertexAttribArray(0);
363363
disableShader();
364364

365-
float lineWidth = 3.0;
365+
float lineWidth = 1.0;
366366

367367
drawVector(Vector3r(-size, 0.0, 0.0), Vector3r(0.0, 0.0, 0.0), lineWidth, color);
368-
drawVector(Vector3r(2.0, 0.0, 0.0), Vector3r(size, 0.0, 0.0), lineWidth, color);
368+
drawVector(Vector3r(1.0, 0.0, 0.0), Vector3r(size, 0.0, 0.0), lineWidth, color);
369369
drawVector(Vector3r(0.0, 0.0, -size), Vector3r(0.0, 0.0, 0.0), lineWidth, color);
370-
drawVector(Vector3r(0.0, 0.0, 2.0), Vector3r(0.0, 0.0, size), lineWidth, color);
370+
drawVector(Vector3r(0.0, 0.0, 1.0), Vector3r(0.0, 0.0, size), lineWidth, color);
371371
}
372372

373373
void MiniGL::drawGrid_xy(float *color)
@@ -392,12 +392,12 @@ void MiniGL::drawGrid_xy(float *color)
392392
glDisableVertexAttribArray(0);
393393
disableShader();
394394

395-
float lineWidth = 3.0;
395+
float lineWidth = 1.0;
396396

397397
drawVector(Vector3r(-size, 0.0, 0.0), Vector3r(0.0, 0.0, 0.0), lineWidth, color);
398-
drawVector(Vector3r(2.0, 0.0, 0.0), Vector3r(size, 0.0, 0.0), lineWidth, color);
398+
drawVector(Vector3r(1.0, 0.0, 0.0), Vector3r(size, 0.0, 0.0), lineWidth, color);
399399
drawVector(Vector3r(0.0, -size, 0.0), Vector3r(0.0, 0.0, 0.0), lineWidth, color);
400-
drawVector(Vector3r(0.0, 2.0, 0.0), Vector3r(0.0, size, 0.0), lineWidth, color);
400+
drawVector(Vector3r(0.0, 1.0, 0.0), Vector3r(0.0, size, 0.0), lineWidth, color);
401401
}
402402

403403
void MiniGL::setViewport(float pfovy, float pznear, float pzfar, const Vector3r &peyepoint, const Vector3r &plookat)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<img src="https://raw.githubusercontent.com/InteractiveComputerGraphics/SPlisHSPlasH/master/doc/images/logo.jpg" width="250">
22
<br>
33

4-
<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>
4+
<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>
55
<p align=center>
66
<img src="https://raw.githubusercontent.com/InteractiveComputerGraphics/SPlisHSPlasH/master/doc/images/teaser.gif">
77
</p>

0 commit comments

Comments
 (0)