stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-21 03:11:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

OBJ Exporter: fixed a problem where concave sectors with exactly four corners were not exported correctly. Fixes #249

Browse source
This commit is contained in:
biwa 2021-03-22 16:16:34 +01:00
parent 6de1d10065
commit 72ff5ecf24
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Source/Plugins/BuilderModes/IO/WavefrontExporter.cs
View file

@ -11,6 +11,7 @@ using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Rendering;
using CodeImp.DoomBuilder.VisualModes;
using CodeImp.DoomBuilder.Windows;
using CodeImp.DoomBuilder.BuilderModes.Interface;
using System.Windows.Forms;
@ -559,7 +560,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.IO
if (!skipTextures.Contains(texture))
{
CheckTextureName(ref flatgeo, ref texture);
flatgeo[texture].AddRange(OptimizeGeometry(vc.Vertices, (vc.ExtraFloor.VavoomType ? vc.GeometryType : VisualModes.VisualGeometryType.FLOOR)));
flatgeo[texture].AddRange(OptimizeGeometry(vc.Vertices, (vc.ExtraFloor.VavoomType ? vc.GeometryType : VisualGeometryType.FLOOR)));
}
}
@ -570,7 +571,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.IO
if (!skipTextures.Contains(texture))
{
CheckTextureName(ref flatgeo, ref texture);
flatgeo[texture].AddRange(OptimizeGeometry(vf.Vertices, (vf.ExtraFloor.VavoomType ? vf.GeometryType : VisualModes.VisualGeometryType.CEILING)));
flatgeo[texture].AddRange(OptimizeGeometry(vf.Vertices, (vf.ExtraFloor.VavoomType ? vf.GeometryType : VisualGeometryType.CEILING)));
}
}
@ -596,25 +597,19 @@ namespace CodeImp.DoomBuilder.BuilderModes.IO
#region ================== Surface optimization
private static List<WorldVertex[]> OptimizeGeometry(WorldVertex[] verts, VisualModes.VisualGeometryType geotype)
private static List<WorldVertex[]> OptimizeGeometry(WorldVertex[] verts, VisualGeometryType geotype)
{
return OptimizeGeometry(verts, geotype, false);
}
private static List<WorldVertex[]> OptimizeGeometry(WorldVertex[] verts, VisualModes.VisualGeometryType geotype, bool skiprectoptimization)
private static List<WorldVertex[]> OptimizeGeometry(WorldVertex[] verts, VisualGeometryType geotype, bool skiprectoptimization)
{
List<WorldVertex[]> groups = new List<WorldVertex[]>();
if(!skiprectoptimization && verts.Length == 6) //rectangular surface
// Only do optimizations for walls right now. Doing them blindly for floors/ceilings will cause problems with concave sectors with 4 corners
if(!skiprectoptimization && verts.Length == 6 && (geotype != VisualGeometryType.CEILING && geotype != VisualGeometryType.FLOOR)) //rectangular surface
{
if(geotype == VisualModes.VisualGeometryType.CEILING)
{
verts = new[] { verts[2], verts[5], verts[1], verts[0] };
}
else
{
verts = new[] { verts[5], verts[2], verts[1], verts[0] };
}
verts = new[] { verts[5], verts[2], verts[1], verts[0] };
groups.Add(verts);
}
else