Skip to content

Commit 0040fa3

Browse files
authored
Merge branch 'InteractiveComputerGraphics:master' into fix-macos
2 parents 23c98cb + 4b3b11a commit 0040fa3

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

Changelog.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2.12.2
2+
- added a CMake option for each tool so that the build can be disabled/enabled
3+
14
2.12.1
25
- all scene file parameters are now GenericParameters
36
- updated Python examples

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ https://ge.in.tum.de/publications/2020-ummenhofer-iclr/
254254
https://dl.acm.org/doi/10.1145/3355089.3356503
255255
* Zhongyao Yang, Maolin Wu, Shiguang Liu. Helmholtz decomposition-based SPH. Virtual Reality & Intelligent Hardware 3, 2, 2021
256256
https://www.sciencedirect.com/science/article/pii/S2096579621000176
257-
257+
* Min Li, Hongshu Li, Weiliang Meng, Jian Zhu, Gary Zhang. An efficient non-iterative smoothed particle hydrodynamics fluid simulation method with variable smoothing length. Visual Computing for Industry, Biomedicine, and Art 6, 1, 2023
258+
* Yalmar Ponce Atencio, Manuel J. Ibarra, Juan José Oré Cerrón, Roberto Quispe Quispe, Richard Flores Condori, Julio Huanca Marín, Mary Huaman Carrión. Particle-Based Physics for Interactive Applications. Lecture Notes in Networks and Systems book series (LNNS,volume 216), 2021
258259

259260

Tools/CMakeLists.txt

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
1-
add_subdirectory(PartioViewer)
2-
add_subdirectory(FoamGenerator)
3-
add_subdirectory(SurfaceSampling)
4-
add_subdirectory(VolumeSampling)
5-
add_subdirectory(partio2vtk)
6-
add_subdirectory(MeshSkinning)
7-
add_subdirectory(ParameterParser)
1+
macro(add_tool arg)
2+
option(Build_${arg} "Build ${arg}" ON)
3+
if (Build_${arg})
4+
add_subdirectory(${arg})
5+
endif()
6+
endmacro()
7+
8+
add_tool(PartioViewer)
9+
add_tool(FoamGenerator)
10+
add_tool(SurfaceSampling)
11+
add_tool(VolumeSampling)
12+
add_tool(partio2vtk)
13+
add_tool(MeshSkinning)
14+
add_tool(ParameterParser)
815

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.12.1
1+
2.12.2

0 commit comments

Comments
 (0)