stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-26 13:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

OBJ model loader: fixed sanity checks for faces that reference non-existing vertices, texture coordinates, or normals

Browse source
This commit is contained in:
biwa 2021-06-24 18:07:05 +02:00
parent 2407b2d1f3
commit a86a596e00
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Source/Core/GZBuilder/md3/ModelReader.cs
View file

@ -1290,8 +1290,19 @@ namespace CodeImp.DoomBuilder.GZBuilder.MD3
while ((line = reader.ReadLine()) != null) {
string[] fields = line.Trim().Split(new[] { ' ', '\t' }, 2, StringSplitOptions.RemoveEmptyEntries);
if (fields.Length == 0) continue; // Empty line
if (fields[0].Trim() == "#") continue; // Comment
// Empty line
if (fields.Length == 0)
{
linenum++;
continue;
}
// Comment
if (fields[0].Trim() == "#")
{
linenum++;
continue;
}
string keyword = fields[0].Trim();
string payload = null;
@ -1346,25 +1357,25 @@ namespace CodeImp.DoomBuilder.GZBuilder.MD3
{
// Sanity check for vertices
for (int i=0; i < fv.Count; i++)
if(fv[i] != -1 && fv[i] > vertices.Count)
if(fv[i] != -1 && fv[i] >= vertices.Count)
{
result.Errors = String.Format("Error in line {0}: vertex {1} does not exist", linenum, i + 1);
result.Errors = String.Format("Error in line {0}: vertex {1} does not exist", linenum, fv[i] + 1);
return result;
}
// Sanity check for texture coordinates
for (int i=0; i < vt.Count; i++)
if(vt[i] != -1 && vt[i] > texcoords.Count)
if(vt[i] != -1 && vt[i] >= texcoords.Count)
{
result.Errors = String.Format("Error in line {0}: texture coordinate {1} does not exist", linenum, i + 1);
result.Errors = String.Format("Error in line {0}: texture coordinate {1} does not exist", linenum, vt[i] + 1);
return result;
}
// Sanity check for normals
for (int i = 0; i < vn.Count; i++)
if (vn[i] != -1 && vn[i] > normals.Count)
if (vn[i] != -1 && vn[i] >= normals.Count)
{
result.Errors = String.Format("Error in line {0}: vertex {1} does not exist", linenum, i + 1);
result.Errors = String.Format("Error in line {0}: vertex {1} does not exist", linenum, vn[i] + 1);
return result;
}