- cleanup some code

janbender · janbender · commit 06e18ba4c1fa · 2022-12-07T14:35:29.000+01:00
- glfw fps limit
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,7 @@
+2.1.4 
+	- cleanup some code
+	- glfw fps limit
+
 2.1.3
 	- fixed compilation on macOS thanks to Robin Rademacher
 
diff --git a/Demos/CouplingDemos/RigidBodyClothCouplingDemo.cpp b/Demos/CouplingDemos/RigidBodyClothCouplingDemo.cpp
@@ -215,15 +215,14 @@ void loadObj(const std::string &filename, VertexData &vd, IndexedFaceMesh &mesh,
 	}
 	for (unsigned int i = 0; i < nFaces; i++)
 	{
-		// Reduce the indices by one
 		int posIndices[3];
 		int texIndices[3];
 		for (int j = 0; j < 3; j++)
 		{
-			posIndices[j] = faces[i].posIndices[j] - 1;
+			posIndices[j] = faces[i].posIndices[j];
 			if (nTexCoords > 0)
 			{
-				texIndices[j] = faces[i].texIndices[j] - 1;
+				texIndices[j] = faces[i].texIndices[j];
 				mesh.addUVIndex(texIndices[j]);
 			}
 		}
diff --git a/Demos/DistanceFieldDemos/ClothCollisionDemo.cpp b/Demos/DistanceFieldDemos/ClothCollisionDemo.cpp
@@ -189,15 +189,14 @@ void loadObj(const std::string &filename, VertexData &vd, IndexedFaceMesh &mesh,
 	}
 	for (unsigned int i = 0; i < nFaces; i++)
 	{
-		// Reduce the indices by one
 		int posIndices[3];
 		int texIndices[3];
 		for (int j = 0; j < 3; j++)
 		{
-			posIndices[j] = faces[i].posIndices[j] - 1;
+			posIndices[j] = faces[i].posIndices[j];
 			if (nTexCoords > 0)
 			{
-				texIndices[j] = faces[i].texIndices[j] - 1;
+				texIndices[j] = faces[i].texIndices[j];
 				mesh.addUVIndex(texIndices[j]);
 			}
 		}
diff --git a/Demos/DistanceFieldDemos/DeformableCollisionDemo.cpp b/Demos/DistanceFieldDemos/DeformableCollisionDemo.cpp
@@ -174,15 +174,14 @@ void loadObj(const std::string &filename, VertexData &vd, IndexedFaceMesh &mesh,
 	}
 	for (unsigned int i = 0; i < nFaces; i++)
 	{
-		// Reduce the indices by one
 		int posIndices[3];
 		int texIndices[3];
 		for (int j = 0; j < 3; j++)
 		{
-			posIndices[j] = faces[i].posIndices[j] - 1;
+			posIndices[j] = faces[i].posIndices[j];
 			if (nTexCoords > 0)
 			{
-				texIndices[j] = faces[i].texIndices[j] - 1;
+				texIndices[j] = faces[i].texIndices[j];
 				mesh.addUVIndex(texIndices[j]);
 			}
 		}
diff --git a/Demos/DistanceFieldDemos/RigidBodyCollisionDemo.cpp b/Demos/DistanceFieldDemos/RigidBodyCollisionDemo.cpp
@@ -172,15 +172,14 @@ void loadObj(const std::string &filename, VertexData &vd, IndexedFaceMesh &mesh,
 	}
 	for (unsigned int i = 0; i < nFaces; i++)
 	{
-		// Reduce the indices by one
 		int posIndices[3];
 		int texIndices[3];
 		for (int j = 0; j < 3; j++)
 		{
-			posIndices[j] = faces[i].posIndices[j] - 1;
+			posIndices[j] = faces[i].posIndices[j];
 			if (nTexCoords > 0)
 			{
-				texIndices[j] = faces[i].texIndices[j] - 1;
+				texIndices[j] = faces[i].texIndices[j];
 				mesh.addUVIndex(texIndices[j]);
 			}
 		}
diff --git a/Demos/GenericConstraintsDemos/GenericRigidBodyConstraintsDemo.cpp b/Demos/GenericConstraintsDemos/GenericRigidBodyConstraintsDemo.cpp
@@ -162,15 +162,14 @@ void loadObj(const std::string &filename, VertexData &vd, IndexedFaceMesh &mesh,
 	}
 	for (unsigned int i = 0; i < nFaces; i++)
 	{
-		// Reduce the indices by one
 		int posIndices[3];
 		int texIndices[3];
 		for (int j = 0; j < 3; j++)
 		{
-			posIndices[j] = faces[i].posIndices[j] - 1;
+			posIndices[j] = faces[i].posIndices[j];
 			if (nTexCoords > 0)
 			{
-				texIndices[j] = faces[i].texIndices[j] - 1;
+				texIndices[j] = faces[i].texIndices[j];
 				mesh.addUVIndex(texIndices[j]);
 			}
 		}
diff --git a/Demos/RigidBodyDemos/ChainDemo.cpp b/Demos/RigidBodyDemos/ChainDemo.cpp
@@ -158,15 +158,14 @@ void loadObj(const std::string &filename, VertexData &vd, IndexedFaceMesh &mesh,
 	}
 	for (unsigned int i = 0; i < nFaces; i++)
 	{
-		// Reduce the indices by one
 		int posIndices[3];
 		int texIndices[3];
 		for (int j = 0; j < 3; j++)
 		{
-			posIndices[j] = faces[i].posIndices[j] - 1;
+			posIndices[j] = faces[i].posIndices[j];
 			if (nTexCoords > 0)
 			{
-				texIndices[j] = faces[i].texIndices[j] - 1;
+				texIndices[j] = faces[i].texIndices[j];
 				mesh.addUVIndex(texIndices[j]);
 			}
 		}
diff --git a/Demos/RigidBodyDemos/JointDemo.cpp b/Demos/RigidBodyDemos/JointDemo.cpp
@@ -207,15 +207,14 @@ void loadObj(const std::string &filename, VertexData &vd, IndexedFaceMesh &mesh,
 	}
 	for (unsigned int i = 0; i < nFaces; i++)
 	{
-		// Reduce the indices by one
 		int posIndices[3];
 		int texIndices[3];
 		for (int j = 0; j < 3; j++)
 		{
-			posIndices[j] = faces[i].posIndices[j] - 1;
+			posIndices[j] = faces[i].posIndices[j];
 			if (nTexCoords > 0)
 			{
-				texIndices[j] = faces[i].texIndices[j] - 1;
+				texIndices[j] = faces[i].texIndices[j];
 				mesh.addUVIndex(texIndices[j]);
 			}
 		}
diff --git a/Demos/SceneLoaderDemo/SceneLoaderDemo.cpp b/Demos/SceneLoaderDemo/SceneLoaderDemo.cpp
@@ -327,15 +327,14 @@ void loadObj(const std::string &filename, VertexData &vd, IndexedFaceMesh &mesh,
 	}
 	for (unsigned int i = 0; i < nFaces; i++)
 	{
-		// Reduce the indices by one
 		int posIndices[3];
 		int texIndices[3];
 		for (int j = 0; j < 3; j++)
 		{
-			posIndices[j] = faces[i].posIndices[j] - 1;
+			posIndices[j] = faces[i].posIndices[j];
 			if (nTexCoords > 0)
 			{
-				texIndices[j] = faces[i].texIndices[j] - 1;
+				texIndices[j] = faces[i].texIndices[j];
 				mesh.addUVIndex(texIndices[j]);
 			}
 		}
diff --git a/Demos/StiffRodsDemos/DirectPositionBasedSolverForStiffRodsDemo.cpp b/Demos/StiffRodsDemos/DirectPositionBasedSolverForStiffRodsDemo.cpp
@@ -339,15 +339,14 @@ void loadObj(const std::string &filename, VertexData &vd, IndexedFaceMesh &mesh,
 	}
 	for (unsigned int i = 0; i < nFaces; i++)
 	{
-		// Reduce the indices by one
 		int posIndices[3];
 		int texIndices[3];
 		for (int j = 0; j < 3; j++)
 		{
-			posIndices[j] = faces[i].posIndices[j] - 1;
+			posIndices[j] = faces[i].posIndices[j];
 			if (nTexCoords > 0)
 			{
-				texIndices[j] = faces[i].texIndices[j] - 1;
+				texIndices[j] = faces[i].texIndices[j];
 				mesh.addUVIndex(texIndices[j]);
 			}
 		}
diff --git a/Demos/StiffRodsDemos/StretchBendingTwistingDemo.cpp b/Demos/StiffRodsDemos/StretchBendingTwistingDemo.cpp
@@ -166,15 +166,14 @@ void loadObj(const std::string &filename, VertexData &vd, IndexedFaceMesh &mesh,
 	}
 	for (unsigned int i = 0; i < nFaces; i++)
 	{
-		// Reduce the indices by one
 		int posIndices[3];
 		int texIndices[3];
 		for (int j = 0; j < 3; j++)
 		{
-			posIndices[j] = faces[i].posIndices[j] - 1;
+			posIndices[j] = faces[i].posIndices[j];
 			if (nTexCoords > 0)
 			{
-				texIndices[j] = faces[i].texIndices[j] - 1;
+				texIndices[j] = faces[i].texIndices[j];
 				mesh.addUVIndex(texIndices[j]);
 			}
 		}
diff --git a/Demos/Visualization/MiniGL.cpp b/Demos/Visualization/MiniGL.cpp
@@ -74,6 +74,7 @@ GLFWwindow* MiniGL::m_glfw_window = nullptr;
 std::vector<MiniGL::Triangle> MiniGL::m_drawTriangle;
 std::vector<MiniGL::Line> MiniGL::m_drawLines;
 std::vector<MiniGL::Point> MiniGL::m_drawPoints;
+double MiniGL::m_lastTime;
 
 
 
@@ -506,6 +507,8 @@ void MiniGL::init(int argc, char **argv, const int width, const int height, cons
 	initTweakBar();
 
 	glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
+
+	m_lastTime = glfwGetTime();
 }
 
 void MiniGL::initTexture()
@@ -1023,23 +1026,28 @@ void MiniGL::mainLoop()
 {
 	while (!glfwWindowShouldClose(m_glfw_window))
 	{
-		glfwPollEvents();
-
 		if (idlefunc != nullptr)
 			idlefunc();
 
-		glPolygonMode(GL_FRONT_AND_BACK, drawMode);
-		viewport();
+		double currentTime = glfwGetTime();
+		if (currentTime - m_lastTime >= 1.0 / 60.0)  // render at maximum at 60 fps
+		{
+			glfwPollEvents();
+
+			glPolygonMode(GL_FRONT_AND_BACK, drawMode);
+			viewport();
 
-		drawElements();
+			drawElements();
 
-		if (scenefunc != nullptr)
-			scenefunc();
+			if (scenefunc != nullptr)
+				scenefunc();
 
-		TwDraw();  // draw the tweak bar(s)
+			TwDraw();  // draw the tweak bar(s)
 
-		glfwSwapBuffers(m_glfw_window);
-		//glFlush();
+			glfwSwapBuffers(m_glfw_window);
+			//glFlush();
+			m_lastTime = currentTime;
+		}
 	}
 
 	if (destroyfunc != nullptr)
diff --git a/Demos/Visualization/MiniGL.h b/Demos/Visualization/MiniGL.h
@@ -128,6 +128,7 @@ namespace PBD
 		static std::vector<Triangle> m_drawTriangle;
 		static GLUquadricObj* m_sphereQuadric;
 		static GLFWwindow* m_glfw_window;
+		static double m_lastTime;
 
 		static void reshape (GLFWwindow* glfw_window, int w, int h);
 		static void keyboard(GLFWwindow* window, int key, int scancode, int action, int mods);		
diff --git a/Utils/OBJLoader.h b/Utils/OBJLoader.h
@@ -12,9 +12,9 @@ namespace Utilities
 	*/
 	struct MeshFaceIndices
 	{
-		std::array<int, 3> posIndices;
-		std::array<int, 3> texIndices;
-		std::array<int, 3> normalIndices;
+		int posIndices[3];
+		int texIndices[3];
+		int normalIndices[3];
 	};
 
 	/** \brief Read for OBJ files. 
@@ -107,9 +107,9 @@ namespace Utilities
 						{
 							pos_buffer.clear();
 							StringTools::tokenize(f_buffer[i], pos_buffer, "/");
-							faceIndex.posIndices[i] = stoi(pos_buffer[0]);
-							faceIndex.texIndices[i] = stoi(pos_buffer[1]);
-							faceIndex.normalIndices[i] = stoi(pos_buffer[2]);
+							faceIndex.posIndices[i] = stoi(pos_buffer[0]) - 1;
+							faceIndex.texIndices[i] = stoi(pos_buffer[1]) - 1;
+							faceIndex.normalIndices[i] = stoi(pos_buffer[2]) - 1;
 						}
 					}
 					else if (vn)
@@ -121,8 +121,8 @@ namespace Utilities
 						{
 							pos_buffer.clear();
 							StringTools::tokenize(f_buffer[i], pos_buffer, "/");
-							faceIndex.posIndices[i] = stoi(pos_buffer[0]);
-							faceIndex.normalIndices[i] = stoi(pos_buffer[1]);
+							faceIndex.posIndices[i] = stoi(pos_buffer[0]) - 1;
+							faceIndex.normalIndices[i] = stoi(pos_buffer[1]) - 1;
 						}
 					}
 					else if (vt)
@@ -134,8 +134,8 @@ namespace Utilities
 						{
 							pos_buffer.clear();
 							StringTools::tokenize(f_buffer[i], pos_buffer, "/");
-							faceIndex.posIndices[i] = stoi(pos_buffer[0]);
-							faceIndex.texIndices[i] = stoi(pos_buffer[1]);
+							faceIndex.posIndices[i] = stoi(pos_buffer[0]) - 1;
+							faceIndex.texIndices[i] = stoi(pos_buffer[1]) - 1;
 						}
 					}
 					else
@@ -145,7 +145,7 @@ namespace Utilities
 						StringTools::tokenize(parse_str, f_buffer);
 						for (int i = 0; i < 3; ++i)
 						{
-							faceIndex.posIndices[i] = stoi(f_buffer[i]);
+							faceIndex.posIndices[i] = stoi(f_buffer[i]) - 1;
 						}
 					}
 					faces->push_back(faceIndex);
diff --git a/version b/version
@@ -1 +1 @@
-2.1.3
+2.1.4

Original file line number	Diff line number	Diff line change
`@@ -215,15 +215,14 @@ void loadObj(const std::string &filename, VertexData &vd, IndexedFaceMesh &mesh,`
`215`	`215`	`}`
`216`	`216`	`for (unsigned int i = 0; i < nFaces; i++)`
`217`	`217`	`{`
`218`		`- // Reduce the indices by one`
`219`	`218`	`int posIndices[3];`
`220`	`219`	`int texIndices[3];`
`221`	`220`	`for (int j = 0; j < 3; j++)`
`222`	`221`	`{`
`223`		`- posIndices[j] = faces[i].posIndices[j] - 1;`
	`222`	`+ posIndices[j] = faces[i].posIndices[j];`
`224`	`223`	`if (nTexCoords > 0)`
`225`	`224`	`{`
`226`		`- texIndices[j] = faces[i].texIndices[j] - 1;`
	`225`	`+ texIndices[j] = faces[i].texIndices[j];`
`227`	`226`	`mesh.addUVIndex(texIndices[j]);`
`228`	`227`	`}`
`229`	`228`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,15 +189,14 @@ void loadObj(const std::string &filename, VertexData &vd, IndexedFaceMesh &mesh,`
`189`	`189`	`}`
`190`	`190`	`for (unsigned int i = 0; i < nFaces; i++)`
`191`	`191`	`{`
`192`		`- // Reduce the indices by one`
`193`	`192`	`int posIndices[3];`
`194`	`193`	`int texIndices[3];`
`195`	`194`	`for (int j = 0; j < 3; j++)`
`196`	`195`	`{`
`197`		`- posIndices[j] = faces[i].posIndices[j] - 1;`
	`196`	`+ posIndices[j] = faces[i].posIndices[j];`
`198`	`197`	`if (nTexCoords > 0)`
`199`	`198`	`{`
`200`		`- texIndices[j] = faces[i].texIndices[j] - 1;`
	`199`	`+ texIndices[j] = faces[i].texIndices[j];`
`201`	`200`	`mesh.addUVIndex(texIndices[j]);`
`202`	`201`	`}`
`203`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,15 +174,14 @@ void loadObj(const std::string &filename, VertexData &vd, IndexedFaceMesh &mesh,`
`174`	`174`	`}`
`175`	`175`	`for (unsigned int i = 0; i < nFaces; i++)`
`176`	`176`	`{`
`177`		`- // Reduce the indices by one`
`178`	`177`	`int posIndices[3];`
`179`	`178`	`int texIndices[3];`
`180`	`179`	`for (int j = 0; j < 3; j++)`
`181`	`180`	`{`
`182`		`- posIndices[j] = faces[i].posIndices[j] - 1;`
	`181`	`+ posIndices[j] = faces[i].posIndices[j];`
`183`	`182`	`if (nTexCoords > 0)`
`184`	`183`	`{`
`185`		`- texIndices[j] = faces[i].texIndices[j] - 1;`
	`184`	`+ texIndices[j] = faces[i].texIndices[j];`
`186`	`185`	`mesh.addUVIndex(texIndices[j]);`
`187`	`186`	`}`
`188`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,15 +172,14 @@ void loadObj(const std::string &filename, VertexData &vd, IndexedFaceMesh &mesh,`
`172`	`172`	`}`
`173`	`173`	`for (unsigned int i = 0; i < nFaces; i++)`
`174`	`174`	`{`
`175`		`- // Reduce the indices by one`
`176`	`175`	`int posIndices[3];`
`177`	`176`	`int texIndices[3];`
`178`	`177`	`for (int j = 0; j < 3; j++)`
`179`	`178`	`{`
`180`		`- posIndices[j] = faces[i].posIndices[j] - 1;`
	`179`	`+ posIndices[j] = faces[i].posIndices[j];`
`181`	`180`	`if (nTexCoords > 0)`
`182`	`181`	`{`
`183`		`- texIndices[j] = faces[i].texIndices[j] - 1;`
	`182`	`+ texIndices[j] = faces[i].texIndices[j];`
`184`	`183`	`mesh.addUVIndex(texIndices[j]);`
`185`	`184`	`}`
`186`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,15 +162,14 @@ void loadObj(const std::string &filename, VertexData &vd, IndexedFaceMesh &mesh,`
`162`	`162`	`}`
`163`	`163`	`for (unsigned int i = 0; i < nFaces; i++)`
`164`	`164`	`{`
`165`		`- // Reduce the indices by one`
`166`	`165`	`int posIndices[3];`
`167`	`166`	`int texIndices[3];`
`168`	`167`	`for (int j = 0; j < 3; j++)`
`169`	`168`	`{`
`170`		`- posIndices[j] = faces[i].posIndices[j] - 1;`
	`169`	`+ posIndices[j] = faces[i].posIndices[j];`
`171`	`170`	`if (nTexCoords > 0)`
`172`	`171`	`{`
`173`		`- texIndices[j] = faces[i].texIndices[j] - 1;`
	`172`	`+ texIndices[j] = faces[i].texIndices[j];`
`174`	`173`	`mesh.addUVIndex(texIndices[j]);`
`175`	`174`	`}`
`176`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -158,15 +158,14 @@ void loadObj(const std::string &filename, VertexData &vd, IndexedFaceMesh &mesh,`
`158`	`158`	`}`
`159`	`159`	`for (unsigned int i = 0; i < nFaces; i++)`
`160`	`160`	`{`
`161`		`- // Reduce the indices by one`
`162`	`161`	`int posIndices[3];`
`163`	`162`	`int texIndices[3];`
`164`	`163`	`for (int j = 0; j < 3; j++)`
`165`	`164`	`{`
`166`		`- posIndices[j] = faces[i].posIndices[j] - 1;`
	`165`	`+ posIndices[j] = faces[i].posIndices[j];`
`167`	`166`	`if (nTexCoords > 0)`
`168`	`167`	`{`
`169`		`- texIndices[j] = faces[i].texIndices[j] - 1;`
	`168`	`+ texIndices[j] = faces[i].texIndices[j];`
`170`	`169`	`mesh.addUVIndex(texIndices[j]);`
`171`	`170`	`}`
`172`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -207,15 +207,14 @@ void loadObj(const std::string &filename, VertexData &vd, IndexedFaceMesh &mesh,`
`207`	`207`	`}`
`208`	`208`	`for (unsigned int i = 0; i < nFaces; i++)`
`209`	`209`	`{`
`210`		`- // Reduce the indices by one`
`211`	`210`	`int posIndices[3];`
`212`	`211`	`int texIndices[3];`
`213`	`212`	`for (int j = 0; j < 3; j++)`
`214`	`213`	`{`
`215`		`- posIndices[j] = faces[i].posIndices[j] - 1;`
	`214`	`+ posIndices[j] = faces[i].posIndices[j];`
`216`	`215`	`if (nTexCoords > 0)`
`217`	`216`	`{`
`218`		`- texIndices[j] = faces[i].texIndices[j] - 1;`
	`217`	`+ texIndices[j] = faces[i].texIndices[j];`
`219`	`218`	`mesh.addUVIndex(texIndices[j]);`
`220`	`219`	`}`
`221`	`220`	`}`
Original file line number	Diff line number	Diff line change
`@@ -327,15 +327,14 @@ void loadObj(const std::string &filename, VertexData &vd, IndexedFaceMesh &mesh,`
`327`	`327`	`}`
`328`	`328`	`for (unsigned int i = 0; i < nFaces; i++)`
`329`	`329`	`{`
`330`		`- // Reduce the indices by one`
`331`	`330`	`int posIndices[3];`
`332`	`331`	`int texIndices[3];`
`333`	`332`	`for (int j = 0; j < 3; j++)`
`334`	`333`	`{`
`335`		`- posIndices[j] = faces[i].posIndices[j] - 1;`
	`334`	`+ posIndices[j] = faces[i].posIndices[j];`
`336`	`335`	`if (nTexCoords > 0)`
`337`	`336`	`{`
`338`		`- texIndices[j] = faces[i].texIndices[j] - 1;`
	`337`	`+ texIndices[j] = faces[i].texIndices[j];`
`339`	`338`	`mesh.addUVIndex(texIndices[j]);`
`340`	`339`	`}`
`341`	`340`	`}`
Original file line number	Diff line number	Diff line change
`@@ -339,15 +339,14 @@ void loadObj(const std::string &filename, VertexData &vd, IndexedFaceMesh &mesh,`
`339`	`339`	`}`
`340`	`340`	`for (unsigned int i = 0; i < nFaces; i++)`
`341`	`341`	`{`
`342`		`- // Reduce the indices by one`
`343`	`342`	`int posIndices[3];`
`344`	`343`	`int texIndices[3];`
`345`	`344`	`for (int j = 0; j < 3; j++)`
`346`	`345`	`{`
`347`		`- posIndices[j] = faces[i].posIndices[j] - 1;`
	`346`	`+ posIndices[j] = faces[i].posIndices[j];`
`348`	`347`	`if (nTexCoords > 0)`
`349`	`348`	`{`
`350`		`- texIndices[j] = faces[i].texIndices[j] - 1;`
	`349`	`+ texIndices[j] = faces[i].texIndices[j];`
`351`	`350`	`mesh.addUVIndex(texIndices[j]);`
`352`	`351`	`}`
`353`	`352`	`}`