Merge branch 'master' of https://github.com/janbender/PositionBasedDynamics

Author: janbender

Demos/ClothDemo/TimeStepTriangleModel.cpp

@@ -112,7 +112,7 @@ void TimeStepTriangleModel::constraintProjection(TriangleModel &model)
 		}
 		else if (m_simulationMethod == 2)		// strain energy constraint
 		{
-			std::vector<TriangleModel::TriangleConstraint> &triangleConstraints = model.getTriangleConstraints();
+			TriangleModel::TriangleConstraintVector &triangleConstraints = model.getTriangleConstraints();
 			const unsigned int *tris = model.getParticleMesh().getFaces().data();
 			const unsigned int nFaces = model.getParticleMesh().numFaces();
 			for (unsigned int i = 0; i < nFaces; i++)
@@ -152,7 +152,7 @@ void TimeStepTriangleModel::constraintProjection(TriangleModel &model)
 		}
 		else if (m_simulationMethod == 3)		// strain based dynamics
 		{
-			std::vector<TriangleModel::TriangleConstraint> &triangleConstraints = model.getTriangleConstraints();
+			TriangleModel::TriangleConstraintVector &triangleConstraints = model.getTriangleConstraints();
 			const unsigned int *tris = model.getParticleMesh().getFaces().data();
 			const unsigned int nFaces = model.getParticleMesh().numFaces();
 			for (unsigned int i = 0; i < nFaces; i++)
@@ -192,7 +192,7 @@ void TimeStepTriangleModel::constraintProjection(TriangleModel &model)
 
 		if (m_bendingMethod != 0)
 		{
-			std::vector<TriangleModel::BendingConstraint> &bendingConstraints = model.getBendingConstraints();
+			TriangleModel::BendingConstraintVector &bendingConstraints = model.getBendingConstraints();
 
 			for (unsigned int i = 0; i < (unsigned int)bendingConstraints.size(); i++)
 			{

Demos/ClothDemo/TriangleModel.cpp

@@ -90,6 +90,7 @@ void TriangleModel::initTriangleConstraints()
 	unsigned int nFaces = getParticleMesh().numFaces();
 	const unsigned int *tris = getParticleMesh().getFaces().data();
 	const ParticleData &pd = getParticleMesh().getVertexData();
+	m_triangleConstraints.reserve(nFaces);
 	for (unsigned int i = 0; i < nFaces; i++)
 	{
 		const Eigen::Vector3f &x1 = pd.getPosition0(tris[3 * i]);
@@ -157,12 +158,12 @@ void TriangleModel::initBendingConstraints()
 	}
 }
 
-std::vector<TriangleModel::BendingConstraint> & TriangleModel::getBendingConstraints()
+TriangleModel::BendingConstraintVector & TriangleModel::getBendingConstraints()
 {
 	return m_bendingConstraints;
 }
 
-std::vector<TriangleModel::TriangleConstraint> & TriangleModel::getTriangleConstraints()
+TriangleModel::TriangleConstraintVector & TriangleModel::getTriangleConstraints()
 {
 	return m_triangleConstraints;
 }

Demos/ClothDemo/TriangleModel.h

@@ -32,12 +32,14 @@ namespace PBD
 			virtual ~TriangleModel();
 
 			typedef IndexedFaceMesh<ParticleData> ParticleMesh;
+			typedef std::vector<BendingConstraint, Eigen::aligned_allocator<BendingConstraint>> BendingConstraintVector;
+			typedef std::vector<TriangleConstraint, Eigen::aligned_allocator<TriangleConstraint>> TriangleConstraintVector;
 
 		protected:
 			/** Face mesh of particles which represents the simulation model */
 			ParticleMesh m_particleMesh;
-			std::vector<BendingConstraint> m_bendingConstraints;
-			std::vector<TriangleConstraint> m_triangleConstraints;
+			BendingConstraintVector m_bendingConstraints;
+			TriangleConstraintVector m_triangleConstraints;
 			float m_stiffness;			
 			float m_bendingStiffness;
 			float m_xxStiffness;			
@@ -81,8 +83,8 @@ namespace PBD
 			virtual void reset();
 			void updateMeshNormals();
 
-			std::vector<BendingConstraint> &getBendingConstraints();
-			std::vector<TriangleConstraint> &getTriangleConstraints();
+			BendingConstraintVector &getBendingConstraints();
+			TriangleConstraintVector &getTriangleConstraints();
 
 	};
 }

extern/AntTweakBar/include/AntTweakBar.h

@@ -42,7 +42,7 @@
 //  OS specific definitions
 // ----------------------------------------------------------------------------
 
-#if (defined(_WIN32) || defined(_WIN64)) && !defined(TW_STATIC)
+#if (defined(_WIN32) || defined(_WIN64)) //&& !defined(TW_STATIC)
 #   define TW_CALL          __stdcall
 #   define TW_CDECL_CALL    __cdecl
 #   define TW_EXPORT_API    __declspec(dllexport)