Merge branch 'InteractiveComputerGraphics:master' into fix-macos

Author: ruberith

.github/workflows/build-linux.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: apt-get update
       run: sudo apt-get update --fix-missing
     - name: Install packages
@@ -31,11 +31,11 @@ jobs:
         python-version: [cp36-cp36m, cp37-cp37m, cp38-cp38, cp39-cp39, cp310-cp310]
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
 
     # Set up python
     - name: Set up Python 3.8
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: 3.8
 

.github/workflows/build-windows.yml

@@ -15,11 +15,11 @@ jobs:
 
     steps:
     # Checkout repo
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
 
     # Set up python
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -39,11 +39,11 @@ jobs:
     strategy:
       matrix:
         # python-version: [3.7]
-        python-version: ['2.7', '3.5', '3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 
     steps:
     # Checkout repo
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
 
     # Set up python
     - name: Set up Python ${{ matrix.python-version }}

CMake/DataCopyTargets.cmake

@@ -24,9 +24,9 @@ add_dependencies(CopyPBDShaders Ext_PBD)
 set_target_properties(CopyPBDShaders PROPERTIES FOLDER "Data copy")
 
 add_custom_target(CopyImguiFonts
-	${CMAKE_COMMAND} -E copy
-	${PROJECT_SOURCE_DIR}/extern/imgui/misc/fonts/Roboto-Medium.ttf
-	${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/resources/fonts/Roboto-Medium.ttf
+	${CMAKE_COMMAND} -E copy_directory
+	${PROJECT_SOURCE_DIR}/extern/imgui/misc/fonts
+	${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/resources/fonts
 	COMMENT "Copying fonts"
 )
-set_target_properties(CopyImguiFonts PROPERTIES FOLDER "Data copy")
+set_target_properties(CopyImguiFonts PROPERTIES FOLDER "Data copy")

CMake/SetUpExternalProjects.cmake

@@ -33,7 +33,7 @@ ExternalProject_Add(
 	Ext_GenericParameters
 	PREFIX "${CMAKE_BINARY_DIR}/extern/GenericParameters"
 	GIT_REPOSITORY https://github.com/InteractiveComputerGraphics/GenericParameters.git
-	GIT_TAG "89ae733fb8b8b9df25d0e44a0e49e51136901e8c"
+	GIT_TAG "42d52ad551fafba600ee99e59fb0f9c7b557e2ed"
 	INSTALL_DIR ${ExternalInstallDir}/GenericParameters
 	CMAKE_ARGS -DCMAKE_BUILD_TYPE=${EXT_CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=${ExternalInstallDir}/GenericParameters -DGENERICPARAMETERS_NO_TESTS:BOOL=1 -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
 )
@@ -47,7 +47,7 @@ ExternalProject_Add(
 	Ext_PBD
 	PREFIX "${CMAKE_BINARY_DIR}/extern/PositionBasedDynamics"
 	GIT_REPOSITORY https://github.com/InteractiveComputerGraphics/PositionBasedDynamics.git
-	GIT_TAG "77298f1eac1246d5302fcdc026db8c6addf50e86"
+	GIT_TAG "06e18ba4c1fab9401a494f5479e026641467f22e"
 	INSTALL_DIR ${ExternalInstallDir}/PositionBasedDynamics
 	DEPENDS Ext_GenericParameters Ext_Discregrid
 	CMAKE_ARGS -DCMAKE_BUILD_TYPE=${EXT_CMAKE_BUILD_TYPE}

CMakeLists.txt

@@ -21,8 +21,6 @@ endif()
 
 set(TOPLEVEL_INCLUDE_DIR ${PROJECT_SOURCE_DIR})
 
-option(USE_IMGUI "Use imgui instead of AntTweakBar"	ON)
-
 ################################################################################
 # foreign external libraries
 ################################################################################
@@ -32,11 +30,8 @@ add_subdirectory(extern/md5)
 add_subdirectory(extern/tinyexpr)
 if (NOT SPH_LIBS_ONLY)
 	add_subdirectory(extern/glfw)
-	if (USE_IMGUI)
-		add_subdirectory(extern/imgui)
-	else()
-		add_subdirectory(extern/AntTweakBar)
-	endif()
+	add_subdirectory(extern/imgui)
+	add_subdirectory(extern/nfd)
 	if (USE_PYTHON_BINDINGS)
 		add_subdirectory(extern/pybind)
 	endif ()

Changelog.txt

@@ -1,3 +1,29 @@
+2.12.1
+	- all scene file parameters are now GenericParameters
+	- updated Python examples
+	- added ParameterParser tool which can generate a scene file json schema or an example scene file with all parameters
+	- added json schema for scene files 
+	- fixed OBJ meshes
+	- updated glfw
+	- updated pybind11 
+
+2.12.0
+	- added PLY exporter
+	- improved the DFSPH implementation significantly
+	- added documentation for DFSPH
+	- improved GUI
+	- updated imgui
+	- removed AntTweakBar
+	- bugfixes
+	- implemented an avx version of XSPH
+
+2.11.6
+	- updated Catch2
+	- fixes for new gcc version
+
+2.11.5 
+	- updated cxxopts
+
 2.11.4
 	- updated Readme
 	- removed numpy restriction