stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-29 23:22:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Infinitely repeating midtextures: Handle offsets correctly

Browse source
This commit is contained in:
MascaraSnake 2023-05-23 09:53:47 +02:00
parent cbf1fe14c8
commit 787dfe33f4
1 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Source/Plugins/BuilderModes/VisualModes/VisualMiddleDouble.cs
View file

@ -228,11 +228,11 @@ namespace CodeImp.DoomBuilder.BuilderModes
repetitions = 1; repetitions = 1;
} }
// First determine the visible portion of the texture
double textop, texbottom;
if (!RepeatIndefinitely) if (!RepeatIndefinitely)
{ {
// First determine the visible portion of the texture
double textop;
// Determine top portion height // Determine top portion height
if(Sidedef.Line.IsFlagSet(General.Map.Config.PegMidtextureFlag)) if(Sidedef.Line.IsFlagSet(General.Map.Config.PegMidtextureFlag))
textop = geobottom + tof.y + repetitions * Math.Abs(tsz.y); textop = geobottom + tof.y + repetitions * Math.Abs(tsz.y);
@ -240,7 +240,21 @@ namespace CodeImp.DoomBuilder.BuilderModes
textop = geotop + tof.y; textop = geotop + tof.y;
// Calculate bottom portion height // Calculate bottom portion height
double texbottom = textop - repetitions * Math.Abs(tsz.y); texbottom = textop - repetitions * Math.Abs(tsz.y);
}
else
{
if (Sidedef.Line.IsFlagSet(General.Map.Config.PegMidtextureFlag))
{
textop = geotop;
texbottom = geobottom + tof.y;
}
else
{
textop = geotop + tof.y;
texbottom = geobottom;
}
}
// Create crop planes (we also need these for intersection testing) // Create crop planes (we also need these for intersection testing)
topclipplane = new Plane(new Vector3D(0, 0, -1), textop); topclipplane = new Plane(new Vector3D(0, 0, -1), textop);
@ -249,7 +263,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Crop polygon by these heights // Crop polygon by these heights
CropPoly(ref poly, topclipplane, true); CropPoly(ref poly, topclipplane, true);
CropPoly(ref poly, bottomclipplane, true); CropPoly(ref poly, bottomclipplane, true);
}
//mxd. In(G)ZDoom, middle sidedef parts are not clipped by extrafloors of any type... //mxd. In(G)ZDoom, middle sidedef parts are not clipped by extrafloors of any type...
List<WallPolygon> polygons = new List<WallPolygon> { poly }; List<WallPolygon> polygons = new List<WallPolygon> { poly };
@ -294,13 +307,13 @@ namespace CodeImp.DoomBuilder.BuilderModes
// This performs a fast test in object picking // This performs a fast test in object picking
public override bool PickFastReject(Vector3D from, Vector3D to, Vector3D dir) public override bool PickFastReject(Vector3D from, Vector3D to, Vector3D dir)
{ {
if(!RepeatIndefinitely) //if(!RepeatIndefinitely)
{ //{
// When the texture is not repeated indefinitely, leave when outside crop planes // When the texture is not repeated indefinitely, leave when outside crop planes
if((pickintersect.z < bottomclipplane.GetZ(pickintersect)) || if((pickintersect.z < bottomclipplane.GetZ(pickintersect)) ||
(pickintersect.z > topclipplane.GetZ(pickintersect))) (pickintersect.z > topclipplane.GetZ(pickintersect)))
return false; return false;
} //}
return base.PickFastReject(from, to, dir); return base.PickFastReject(from, to, dir);
} }
@ -328,7 +341,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
% imageWidth); % imageWidth);
int oy; int oy;
if (RepeatIndefinitely) /*if (RepeatIndefinitely)
{ {
bool pegbottom = Sidedef.Line.IsFlagSet(General.Map.Config.PegMidtextureFlag); bool pegbottom = Sidedef.Line.IsFlagSet(General.Map.Config.PegMidtextureFlag);
double zoffset = (pegbottom ? Sidedef.Sector.FloorHeight : Sidedef.Sector.CeilHeight); double zoffset = (pegbottom ? Sidedef.Sector.FloorHeight : Sidedef.Sector.CeilHeight);
@ -337,10 +350,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
% imageHeight); % imageHeight);
} }
else else
{ {*/
double zoffset = bottomclipplane.GetZ(pickintersect); double zoffset = bottomclipplane.GetZ(pickintersect);
oy = (int)Math.Ceiling(((pickintersect.z - zoffset) * UniFields.GetFloat(Sidedef.Fields, "scaley_mid", 1.0f) / texscale.y) % imageHeight); oy = (int)Math.Ceiling(((pickintersect.z - zoffset) * UniFields.GetFloat(Sidedef.Fields, "scaley_mid", 1.0f) / texscale.y) % imageHeight);
} //}
// Make sure offsets are inside of texture dimensions... // Make sure offsets are inside of texture dimensions...
if (ox < 0) ox += imageWidth; if (ox < 0) ox += imageWidth;