- made function names consistent

Author: janbender

Demos/GenericConstraintsDemos/GenericConstraints.cpp

@@ -69,7 +69,7 @@ bool GenericDistanceConstraint::solvePositionConstraint(SimulationModel &model)
 	const Eigen::Vector3f x[2] = { x1, x2 };
 
 	Eigen::Vector3f corr[2];
-	const bool res = PositionBasedGenericConstraints::solveGenericConstraint<2, 1>(
+	const bool res = PositionBasedGenericConstraints::solve_GenericConstraint<2, 1>(
 		invMass, x, &m_restLength,
 		GenericDistanceConstraint::constraintFct,
 		GenericDistanceConstraint::gradientFct,
@@ -179,7 +179,7 @@ bool GenericIsometricBendingConstraint::solvePositionConstraint(SimulationModel
 
  	Eigen::Vector3f corr[4];
 
-	const bool res = PositionBasedGenericConstraints::solveGenericConstraint<4, 1>(
+	const bool res = PositionBasedGenericConstraints::solve_GenericConstraint<4, 1>(
 		invMass, x, &m_Q,
 		GenericIsometricBendingConstraint::constraintFct,
 		//GenericIsometricBendingConstraint::gradientFct,

PositionBasedDynamics/PositionBasedGenericConstraints.h

@@ -28,7 +28,7 @@ namespace PBD
 		 * @param  corr_x position corrections of constrained particles
 		 */		
 		template<unsigned int numberOfParticles, unsigned int dim>
-		static bool solveGenericConstraint(
+		static bool solve_GenericConstraint(
 			const float invMass[numberOfParticles],							// inverse mass is zero if particle is static
 			const Eigen::Vector3f x[numberOfParticles],						// positions of particles
 			void *userData,
@@ -63,7 +63,7 @@ namespace PBD
 		* @param  corr_x position corrections of constrained particles
 		*/
 		template<unsigned int numberOfParticles, unsigned int dim>
-		static bool solveGenericConstraint(
+		static bool solve_GenericConstraint(
 			const float invMass[numberOfParticles],							// inverse mass is zero if particle is static
 			const Eigen::Vector3f x[numberOfParticles],						// positions of particles
 			void *userData,
@@ -107,7 +107,7 @@ namespace PBD
 
 
 	template<unsigned int numberOfParticles, unsigned int dim>
-	bool PositionBasedGenericConstraints::solveGenericConstraint(
+	bool PositionBasedGenericConstraints::solve_GenericConstraint(
 		const float invMass[numberOfParticles],							// inverse mass is zero if particle is static
 		const Eigen::Vector3f x[numberOfParticles],						// positions of particles
 		void *userData,
@@ -170,7 +170,7 @@ namespace PBD
 	}
 
 	template<unsigned int numberOfParticles, unsigned int dim>
-	bool PositionBasedGenericConstraints::solveGenericConstraint(
+	bool PositionBasedGenericConstraints::solve_GenericConstraint(
 		const float invMass[numberOfParticles],							// inverse mass is zero if particle is static
 		const Eigen::Vector3f x[numberOfParticles],						// positions of particles
 		void *userData,

doc/GenericConstraints.dox

@@ -67,7 +67,7 @@ void GenericDistanceConstraint::gradientFct(
 
 If the constraint and the gradient function are defined, a solver step can be performed by calling:
 \code{.cpp}
-const bool res = PositionBasedGenericConstraints::solveGenericConstraint<2, 1>(
+const bool res = PositionBasedGenericConstraints::solve_GenericConstraint<2, 1>(
 	invMass, x, &m_restLength,
 	GenericDistanceConstraint::constraintFct,
 	GenericDistanceConstraint::gradientFct,
@@ -112,7 +112,7 @@ void GenericIsometricBendingConstraint::constraintFct(
 
 If the constraint function is defined, a solver step can be performed by calling:
 \code{.cpp}
-const bool res = PositionBasedGenericConstraints::solveGenericConstraint<4, 1>(
+const bool res = PositionBasedGenericConstraints::solve_GenericConstraint<4, 1>(
 	invMass, x, &m_Q,
 	GenericIsometricBendingConstraint::constraintFct,
 	corr);