- updated PositionBasedDynamics

- updated GenericParameters

Author: janbender

CITATION.cff

@@ -20,4 +20,4 @@ keywords:
   - fluids
   - simulation
 license: MIT
-version: 2.12.0
+

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 "42d52ad551fafba600ee99e59fb0f9c7b557e2ed"
+	GIT_TAG "a4e2744eea526270cfe38b826440d09f66473316"
 	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 "06e18ba4c1fab9401a494f5479e026641467f22e"
+	GIT_TAG "00db2e091a88a628099787cf6fada941e851dbfa"
 	INSTALL_DIR ${ExternalInstallDir}/PositionBasedDynamics
 	DEPENDS Ext_GenericParameters Ext_Discregrid
 	CMAKE_ARGS -DCMAKE_BUILD_TYPE=${EXT_CMAKE_BUILD_TYPE}

Changelog.txt

@@ -1,3 +1,6 @@
+	- updated PositionBasedDynamics
+	- updated GenericParameters
+
 2.12.4
 	- added citation file
 	- fixed rigid body colors in visualization

README.md

@@ -21,7 +21,7 @@ SPlisHSPlasH can export the particle data in the partio and vtk format. If you w
 - [Blender Sequence Loader](https://github.com/InteractiveComputerGraphics/blender-sequence-loader)
 - [MayaPartioTools](https://github.com/InteractiveComputerGraphics/MayaPartioTools)
 
-**Author**: [Jan Bender](http://www.interactive-graphics.de)
+**Author**: [Jan Bender](https://animation.rwth-aachen.de/person/1/)
 
 ## License
 
@@ -55,7 +55,7 @@ For Windows and Linux targets there exists prebuilt python wheel files which can
 ```
 pip install pysplishsplash
 ```
-These are available for Python Versions. See also here: [pySPlisHSPlasH](https://pypi.org/project/pySPlisHSPlasH/).
+These are available for Python versions 3.6-3.10. See also here: [pySPlisHSPlasH](https://pypi.org/project/pySPlisHSPlasH/).
 If you do not meet these conditions please refer to the build instructions and to the python binding 
 [Getting started guide](https://github.com/InteractiveComputerGraphics/SPlisHSPlasH/blob/master/doc/py_getting_started.md).
 
@@ -193,9 +193,21 @@ The following videos were generated using the SPlisHSPlasH library:
 [![Video](https://img.youtube.com/vi/D_nEhix1G-w/0.jpg)](https://www.youtube.com/watch?v=D_nEhix1G-w) | [![Video](https://img.youtube.com/vi/elZieJNBYqk/0.jpg)](https://www.youtube.com/watch?v=elZieJNBYqk)
 *Volume Maps: An Implicit Boundary Representation for SPH* | *Implicit Frictional Boundary Handling for SPH*
 [![Video](https://img.youtube.com/vi/AV_pl1bMIb8/0.jpg)](https://www.youtube.com/watch?v=AV_pl1bMIb8) | [![Video](https://img.youtube.com/vi/1u5N0eedzic/0.jpg)](https://www.youtube.com/watch?v=1u5N0eedzic) 
-*Fast Corotated Elastic SPH Solids with Implicit Zero-Energy Mode Control* | 
-[![Video](https://img.youtube.com/vi/8NkyiftmDN0/0.jpg)](https://www.youtube.com/watch?v=8NkyiftmDN0) | 
+*Fast Corotated Elastic SPH Solids with Implicit Zero-Energy Mode Control* | *A comparison of linear consistent correction methods for first-order SPH derivatives*
+[![Video](https://img.youtube.com/vi/8NkyiftmDN0/0.jpg)](https://www.youtube.com/watch?v=8NkyiftmDN0) | [![Video](https://img.youtube.com/vi/k0kKR8mXmK4/0.jpg)](https://www.youtube.com/watch?v=k0kKR8mXmK4)
 
+## Citation 
+
+To cite SPlisHSPlasH you can use this BibTeX entry:
+
+```bibtex
+@software{SPlisHSPlasH_Library,
+  author = {Bender, Jan and others},
+  license = {MIT},
+  title = {{SPlisHSPlasH Library}},
+  url = {https://github.com/InteractiveComputerGraphics/SPlisHSPlasH},
+}
+```
 
 ## References
 

Simulator/PositionBasedDynamicsWrapper/PBDWrapper.cpp

@@ -165,32 +165,6 @@ void PBDWrapper::readScene(const std::string &sceneFileName, const std::vector<
 
 	PBD::Simulation *sim = PBD::Simulation::getCurrent();
 	sim->setVecValue<Real>(PBD::Simulation::GRAVITATION, &data.m_gravity[0]);
-	m_timeStep->setValue(PBD::TimeStepController::VELOCITY_UPDATE_METHOD, data.m_velocityUpdateMethod);
-	if (data.m_triangleModelSimulationMethod != -1)
-		m_clothSimulationMethod = data.m_triangleModelSimulationMethod;
-	if (data.m_tetModelSimulationMethod != -1)
-		m_solidSimulationMethod = data.m_tetModelSimulationMethod;
-	if (data.m_triangleModelBendingMethod != -1)
-		m_bendingMethod = data.m_triangleModelBendingMethod;
-	m_cd.setTolerance(data.m_contactTolerance);
-	m_model.setContactStiffnessRigidBody(data.m_contactStiffnessRigidBody);
-	m_model.setContactStiffnessParticleRigidBody(data.m_contactStiffnessParticleRigidBody);
-
-	m_distanceStiffness = data.m_cloth_stiffness;
-	m_bendingStiffness = data.m_cloth_bendingStiffness;
-	m_xxStiffness = data.m_cloth_xxStiffness;
-	m_yyStiffness = data.m_cloth_yyStiffness;
-	m_xyStiffness = data.m_cloth_xyStiffness;
-	m_xyPoissonRatio = data.m_cloth_xyPoissonRatio;
-	m_yxPoissonRatio = data.m_cloth_yxPoissonRatio;
-	m_normalizeStretch = data.m_cloth_normalizeStretch;
-	m_normalizeShear = data.m_cloth_normalizeShear;
-
-	m_solidStiffness = data.m_solid_stiffness;
-	m_solidPoissonRatio = data.m_solid_poissonRatio;
-	m_solidNormalizeStretch = data.m_solid_normalizeStretch;
-	m_solidNormalizeShear = data.m_solid_normalizeShear;
-	m_volumeStiffness = data.m_volume_stiffness;
 
 	//////////////////////////////////////////////////////////////////////////
 	// rigid bodies