- fixed WIN32 issues

Jan Bender · Jan Bender · commit 2ce95a4de18d · 2015-07-15T14:49:16.000+02:00
diff --git a/Demos/ClothDemo/TimeStepTriangleModel.cpp b/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++)
 			{
diff --git a/Demos/ClothDemo/TriangleModel.cpp b/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;
 }
diff --git a/Demos/ClothDemo/TriangleModel.h b/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();
 			
 	};
 }
diff --git a/extern/AntTweakBar/include/AntTweakBar.h b/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)

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ void TimeStepTriangleModel::constraintProjection(TriangleModel &model)`
`112`	`112`	`}`
`113`	`113`	`else if (m_simulationMethod == 2) // strain energy constraint`
`114`	`114`	`{`
`115`		`- std::vector<TriangleModel::TriangleConstraint> &triangleConstraints = model.getTriangleConstraints();`
	`115`	`+ TriangleModel::TriangleConstraintVector &triangleConstraints = model.getTriangleConstraints();`
`116`	`116`	`const unsigned int *tris = model.getParticleMesh().getFaces().data();`
`117`	`117`	`const unsigned int nFaces = model.getParticleMesh().numFaces();`
`118`	`118`	`for (unsigned int i = 0; i < nFaces; i++)`
`@@ -152,7 +152,7 @@ void TimeStepTriangleModel::constraintProjection(TriangleModel &model)`
`152`	`152`	`}`
`153`	`153`	`else if (m_simulationMethod == 3) // strain based dynamics`
`154`	`154`	`{`
`155`		`- std::vector<TriangleModel::TriangleConstraint> &triangleConstraints = model.getTriangleConstraints();`
	`155`	`+ TriangleModel::TriangleConstraintVector &triangleConstraints = model.getTriangleConstraints();`
`156`	`156`	`const unsigned int *tris = model.getParticleMesh().getFaces().data();`
`157`	`157`	`const unsigned int nFaces = model.getParticleMesh().numFaces();`
`158`	`158`	`for (unsigned int i = 0; i < nFaces; i++)`
`@@ -192,7 +192,7 @@ void TimeStepTriangleModel::constraintProjection(TriangleModel &model)`
`192`	`192`
`193`	`193`	`if (m_bendingMethod != 0)`
`194`	`194`	`{`
`195`		`- std::vector<TriangleModel::BendingConstraint> &bendingConstraints = model.getBendingConstraints();`
	`195`	`+ TriangleModel::BendingConstraintVector &bendingConstraints = model.getBendingConstraints();`
`196`	`196`
`197`	`197`	`for (unsigned int i = 0; i < (unsigned int)bendingConstraints.size(); i++)`
`198`	`198`	`{`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@ void TriangleModel::initTriangleConstraints()`
`90`	`90`	`unsigned int nFaces = getParticleMesh().numFaces();`
`91`	`91`	`const unsigned int *tris = getParticleMesh().getFaces().data();`
`92`	`92`	`const ParticleData &pd = getParticleMesh().getVertexData();`
	`93`	`+ m_triangleConstraints.reserve(nFaces);`
`93`	`94`	`for (unsigned int i = 0; i < nFaces; i++)`
`94`	`95`	`{`
`95`	`96`	`const Eigen::Vector3f &x1 = pd.getPosition0(tris[3 * i]);`
`@@ -157,12 +158,12 @@ void TriangleModel::initBendingConstraints()`
`157`	`158`	`}`
`158`	`159`	`}`
`159`	`160`
`160`		`-std::vector<TriangleModel::BendingConstraint> & TriangleModel::getBendingConstraints()`
	`161`	`+TriangleModel::BendingConstraintVector & TriangleModel::getBendingConstraints()`
`161`	`162`	`{`
`162`	`163`	`return m_bendingConstraints;`
`163`	`164`	`}`
`164`	`165`
`165`		`-std::vector<TriangleModel::TriangleConstraint> & TriangleModel::getTriangleConstraints()`
	`166`	`+TriangleModel::TriangleConstraintVector & TriangleModel::getTriangleConstraints()`
`166`	`167`	`{`
`167`	`168`	`return m_triangleConstraints;`
`168`	`169`	`}`