- added some documentation

- cleaned up project
- added new Joint demo
- added HingeJoint
- added BallOnLineJoint
- separated deformable, fluid and rigid body dynamics in different classes
- cleaned up interface
- added doxygen files

Author: janbender

Changelog.txt

@@ -1,3 +1,11 @@
+	- added some documentation
+	- cleaned up project 
+	- added new Joint demo
+	- added HingeJoint
+	- added BallOnLineJoint
+	- separated deformable, fluid and rigid body dynamics in different classes
+	- cleaned up interface
+	- added doxygen files
 	- update to Eigen 3.2.5
 	- resolve compiler errors in Visual Studio 2010
 

Demos/BarDemo/CMakeLists.txt

@@ -41,6 +41,7 @@ include_directories( ${EIGEN3_INCLUDE_DIR} )
 include_directories(${PROJECT_PATH}/extern/freeglut/include)
 include_directories(${PROJECT_PATH}/extern/glew/include)
 
+set_target_properties(BarDemo PROPERTIES FOLDER "Demos")
 add_dependencies(BarDemo ${SIMULATION_DEPENDENCIES})
 target_link_libraries(BarDemo ${SIMULATION_LINK_LIBRARIES})
 VIS_SOURCE_GROUPS()

Demos/BarDemo/TetModel.cpp

@@ -94,9 +94,9 @@ void TetModel::initTetConstraints()
 					};
 
  		TetConstraint tc;
- 		PositionBasedDynamics::computeStrainTetraInvRestMat(x1, x2, x3, x4, tc.invRestMat_SBD);
- 		PositionBasedDynamics::computeFEMTetraInvRestMat(x1, x2, x3, x4, tc.tetVolume, tc.invRestMat_FEM);
-		PositionBasedDynamics::computeShapeMatchingRestInfo(x, w, 4, tc.restCm_SM, tc.invRestMat_SM);
+		PositionBasedDynamics::initStrainTetraInvRestMat(x1, x2, x3, x4, tc.invRestMat_SBD);
+ 		PositionBasedDynamics::initFEMTetraInvRestMat(x1, x2, x3, x4, tc.tetVolume, tc.invRestMat_FEM);
+		PositionBasedDynamics::initShapeMatchingRestInfo(x, w, 4, tc.restCm_SM, tc.invRestMat_SM);
  		m_tetConstraints.push_back(tc);
  	}
 }

Demos/CMakeLists.txt

@@ -1,3 +1,3 @@
 include(Visualization/CMakeLists.txt)
 
-subdirs(BarDemo ClothDemo FluidDemo RigidBodyDemo)
+subdirs(BarDemo ClothDemo FluidDemo RigidBodyDemos)

Demos/ClothDemo/CMakeLists.txt

@@ -40,6 +40,7 @@ include_directories( ${EIGEN3_INCLUDE_DIR} )
 include_directories(${PROJECT_PATH}/extern/freeglut/include)
 include_directories(${PROJECT_PATH}/extern/glew/include)
 
+set_target_properties(ClothDemo PROPERTIES FOLDER "Demos")
 add_dependencies(ClothDemo ${SIMULATION_DEPENDENCIES})
 target_link_libraries(ClothDemo ${SIMULATION_LINK_LIBRARIES})
 VIS_SOURCE_GROUPS()

Demos/ClothDemo/TriangleModel.cpp

@@ -103,8 +103,8 @@ void TriangleModel::initTriangleConstraints()
 		const Eigen::Vector3f y3(x3[0], x3[2], 0.0);
 
 		TriangleConstraint tc;
-		PositionBasedDynamics::computeStrainTriangleInvRestMat(y1, y2, y3, tc.invRestMat_SBD);
-		PositionBasedDynamics::computeFEMTriangleInvRestMat(x1, x2, x3, tc.triangleArea, tc.invRestMat_FEM);
+		PositionBasedDynamics::initStrainTriangleInvRestMat(y1, y2, y3, tc.invRestMat_SBD);
+		PositionBasedDynamics::initFEMTriangleInvRestMat(x1, x2, x3, tc.triangleArea, tc.invRestMat_FEM);
 		m_triangleConstraints.push_back(tc);
 	}
 }
@@ -151,7 +151,7 @@ void TriangleModel::initBendingConstraints()
 				bc.vertex3 = edges[i].m_vert[0];
 				bc.vertex4 = edges[i].m_vert[1];				
 				bc.restAngle = 0.0f;
-				PositionBasedDynamics::computeQuadraticBendingMat(pd.getPosition0(bc.vertex1), pd.getPosition0(bc.vertex2), pd.getPosition0(bc.vertex3), pd.getPosition0(bc.vertex4), bc.Q);
+				PositionBasedDynamics::initQuadraticBendingMat(pd.getPosition0(bc.vertex1), pd.getPosition0(bc.vertex2), pd.getPosition0(bc.vertex3), pd.getPosition0(bc.vertex4), bc.Q);
 				m_bendingConstraints.push_back(bc);
 			}
 		}

Demos/FluidDemo/CMakeLists.txt

@@ -41,6 +41,7 @@ include_directories( ${EIGEN3_INCLUDE_DIR} )
 include_directories(${PROJECT_PATH}/extern/freeglut/include)
 include_directories(${PROJECT_PATH}/extern/glew/include)
 
+set_target_properties(FluidDemo PROPERTIES FOLDER "Demos")
 add_dependencies(FluidDemo ${SIMULATION_DEPENDENCIES})
 target_link_libraries(FluidDemo ${SIMULATION_LINK_LIBRARIES})
 VIS_SOURCE_GROUPS()

Demos/FluidDemo/TimeStepFluidModel.cpp

@@ -1,6 +1,6 @@
 #include "TimeStepFluidModel.h"
 #include "Demos/Utils/TimeManager.h"
-#include "PositionBasedDynamics/PositionBasedDynamics.h"
+#include "PositionBasedDynamics/PositionBasedFluids.h"
 #include "PositionBasedDynamics/TimeIntegration.h"
 #include "PositionBasedDynamics/SPHKernels.h"
 
@@ -97,7 +97,7 @@ void TimeStepFluidModel::computeDensities(FluidModel &model)
 		{
 			float &density = model.getDensity(i);
 			float density_err;
-			PositionBasedDynamics::computePBFDensity(i, numParticles, &pd.getPosition(0), &pd.getMass(0), &model.getBoundaryX(0), &model.getBoundaryPsi(0), numNeighbors[i], neighbors[i], model.getDensity0(), true, density_err, density);
+			PositionBasedFluids::computePBFDensity(i, numParticles, &pd.getPosition(0), &pd.getMass(0), &model.getBoundaryX(0), &model.getBoundaryPsi(0), numNeighbors[i], neighbors[i], model.getDensity0(), true, density_err, density);
 		}
 	}
 }
@@ -209,8 +209,8 @@ void TimeStepFluidModel::constraintProjection(FluidModel &model)
 			for (int i = 0; i < (int)nParticles; i++)
 			{
 				float density_err;
-				PositionBasedDynamics::computePBFDensity(i, nParticles, &pd.getPosition(0), &pd.getMass(0), &model.getBoundaryX(0), &model.getBoundaryPsi(0), numNeighbors[i], neighbors[i], model.getDensity0(), true, density_err, model.getDensity(i));
-				PositionBasedDynamics::computePBFLagrangeMultiplier(i, nParticles, &pd.getPosition(0), &pd.getMass(0), &model.getBoundaryX(0), &model.getBoundaryPsi(0), model.getDensity(i), numNeighbors[i], neighbors[i], model.getDensity0(), true, model.getLambda(i));
+				PositionBasedFluids::computePBFDensity(i, nParticles, &pd.getPosition(0), &pd.getMass(0), &model.getBoundaryX(0), &model.getBoundaryPsi(0), numNeighbors[i], neighbors[i], model.getDensity0(), true, density_err, model.getDensity(i));
+				PositionBasedFluids::computePBFLagrangeMultiplier(i, nParticles, &pd.getPosition(0), &pd.getMass(0), &model.getBoundaryX(0), &model.getBoundaryPsi(0), model.getDensity(i), numNeighbors[i], neighbors[i], model.getDensity0(), true, model.getLambda(i));
 			}
 		}
 
@@ -220,7 +220,7 @@ void TimeStepFluidModel::constraintProjection(FluidModel &model)
 			for (int i = 0; i < (int)nParticles; i++)
 			{
 				Eigen::Vector3f corr;
-				PositionBasedDynamics::solveDensityConstraint(i, nParticles, &pd.getPosition(0), &pd.getMass(0), &model.getBoundaryX(0), &model.getBoundaryPsi(0), numNeighbors[i], neighbors[i], model.getDensity0(), true, &model.getLambda(0), corr);
+				PositionBasedFluids::solveDensityConstraint(i, nParticles, &pd.getPosition(0), &pd.getMass(0), &model.getBoundaryX(0), &model.getBoundaryPsi(0), numNeighbors[i], neighbors[i], model.getDensity0(), true, &model.getLambda(0), corr);
 				model.getDeltaX(i) = corr;
 			}
 		}