Change: Remove duplicate vertex check in Obj parser- Too slow...

leezer3 · Jul 1, 2018 · f9afb75 · f9afb75
1 parent 7e799e9
commit f9afb75
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 36 deletions.
diff --git a/source/ObjectViewer/Parsers/WavefrontObjParser.cs b/source/ObjectViewer/Parsers/WavefrontObjParser.cs
@@ -39,12 +39,12 @@ internal Material()
 		}
 		private class MeshBuilder
 		{
-			internal List<VertexTemplate> Vertices;
+			internal List<Vertex> Vertices;
 			internal List<World.MeshFace> Faces;
 			internal Material[] Materials;
 			internal MeshBuilder()
 			{
-				this.Vertices = new List<VertexTemplate>();
+				this.Vertices = new List<Vertex>();
 				this.Faces = new List<World.MeshFace>();
 				this.Materials = new Material[] { };
 			}
@@ -165,7 +165,7 @@ internal static ObjectManager.StaticObject ReadObject(string FileName, System.Te
 						//Creates a new face
 
 						//Create the temp list to hook out the vertices 
-						List<VertexTemplate> vertices = new List<VertexTemplate>();
+						List<Vertex> vertices = new List<Vertex>();
 						List<Vector3> normals = new List<Vector3>();
 						for (int f = 1; f < Arguments.Count; f++)
 						{
@@ -268,17 +268,8 @@ internal static ObjectManager.StaticObject ReadObject(string FileName, System.Te
 						World.MeshFaceVertex[] Vertices = new World.MeshFaceVertex[vertices.Count];
 						for (int k = 0; k < vertices.Count; k++)
 						{
-							int v = Builder.Vertices.FindIndex(a => a.Equals(vertices[k]));
-							if (v != -1)
-							{
-								Vertices[k].Index = (ushort)v;
-							}
-							else
-							{
-								Builder.Vertices.Add(vertices[k]);
-								Vertices[k].Index = (ushort)(Builder.Vertices.Count -1);
-							}
-
+							Builder.Vertices.Add(vertices[k]);
+							Vertices[k].Index = (ushort)(Builder.Vertices.Count -1);
 							Vertices[k].Normal = normals[k];
 						}
 						Builder.Faces.Add(currentMaterial == -1 ? new World.MeshFace(Vertices, 0) : new World.MeshFace(Vertices, (ushort)currentMaterial));

diff --git a/source/OpenBVE/Parsers/Object/Generic/WavefrontObjParser.cs b/source/OpenBVE/Parsers/Object/Generic/WavefrontObjParser.cs
@@ -268,17 +268,8 @@ internal static ObjectManager.StaticObject ReadObject(string FileName, System.Te
 						World.MeshFaceVertex[] Vertices = new World.MeshFaceVertex[vertices.Count];
 						for (int k = 0; k < vertices.Count; k++)
 						{
-							int v = Builder.Vertices.FindIndex(a => a.Equals(vertices[k]));
-							if (v != -1)
-							{
-								Vertices[k].Index = (ushort)v;
-							}
-							else
-							{
-								Builder.Vertices.Add(vertices[k]);
-								Vertices[k].Index = (ushort)(Builder.Vertices.Count -1);
-							}
-
+							Builder.Vertices.Add(vertices[k]);
+							Vertices[k].Index = (ushort)(Builder.Vertices.Count -1);
 							Vertices[k].Normal = normals[k];
 						}
 						Builder.Faces.Add(currentMaterial == -1 ? new World.MeshFace(Vertices, 0) : new World.MeshFace(Vertices, (ushort)currentMaterial));

diff --git a/source/RouteViewer/Parsers/WavefrontObjParser.cs b/source/RouteViewer/Parsers/WavefrontObjParser.cs
@@ -268,17 +268,8 @@ internal static ObjectManager.StaticObject ReadObject(string FileName, System.Te
 						World.MeshFaceVertex[] Vertices = new World.MeshFaceVertex[vertices.Count];
 						for (int k = 0; k < vertices.Count; k++)
 						{
-							int v = Builder.Vertices.FindIndex(a => a.Equals(vertices[k]));
-							if (v != -1)
-							{
-								Vertices[k].Index = (ushort)v;
-							}
-							else
-							{
-								Builder.Vertices.Add(vertices[k]);
-								Vertices[k].Index = (ushort)(Builder.Vertices.Count -1);
-							}
-
+							Builder.Vertices.Add(vertices[k]);
+							Vertices[k].Index = (ushort)(Builder.Vertices.Count -1);
 							Vertices[k].Normal = normals[k];
 						}
 						Builder.Faces.Add(currentMaterial == -1 ? new World.MeshFace(Vertices, 0) : new World.MeshFace(Vertices, (ushort)currentMaterial));