stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-31 12:50:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Using Edit Selection Mode on sectors with plane equation slopes works correctly now (flipping still doesn't work)

Browse source
This commit is contained in:
biwa 2020-05-16 12:26:16 +02:00
parent f0bfc74702
commit 4fd976feb9
1 changed files with 41 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs
View file

@ -1567,34 +1567,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Resume normal undo/redo recording
General.Map.UndoRedo.IgnorePropChanges = false;
//mxd. Update sector slopes?
if(General.Map.UDMF)
{
// We need a different kind of offset...
Vector2D relativeoffset = offset - baseoffset;
foreach(Sector s in selectedsectors.Keys)
{
// Update floor slope?
if(s.FloorSlope.GetLengthSq() > 0 && !float.IsNaN(s.FloorSlopeOffset / s.FloorSlope.z))
{
Vector3D center = new Vector3D(s.BBox.X + s.BBox.Width / 2, s.BBox.Y + s.BBox.Height / 2, slopeheights[s][0]);
Plane p = new Plane(center, s.FloorSlope.GetAngleXY() + rotation + Angle2D.PIHALF, -s.FloorSlope.GetAngleZ(), true);
s.FloorSlope = p.Normal;
s.FloorSlopeOffset = p.Offset;
}
// Update ceiling slope?
if(s.CeilSlope.GetLengthSq() > 0 && !float.IsNaN(s.CeilSlopeOffset / s.CeilSlope.z))
{
Vector3D center = new Vector3D(s.BBox.X + s.BBox.Width / 2, s.BBox.Y + s.BBox.Height / 2, slopeheights[s][1]);
Plane p = new Plane(center, s.CeilSlope.GetAngleXY() + rotation + Angle2D.PIHALF, -s.CeilSlope.GetAngleZ(), false);
s.CeilSlope = p.Normal;
s.CeilSlopeOffset = p.Offset;
}
}
}
// Mark selected geometry
General.Map.Map.ClearAllMarks(false);
General.Map.Map.MarkAllSelectedGeometry(true, true, true, true, false);
@ -1602,8 +1574,47 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Move geometry to new position
UpdateGeometry();
//mxd. Update sector slopes?
// Do this after UpdateGeometry() because it makes calculating the new slopes much easier
if (General.Map.UDMF)
{
foreach (Sector s in selectedsectors.Keys)
{
// Manually update the sector bounding boxes, because they still contain the old values
s.UpdateBBox();
// Update floor slope?
if (s.FloorSlope.GetLengthSq() > 0 && !float.IsNaN(s.FloorSlopeOffset / s.FloorSlope.z))
{
float angle = s.FloorSlope.GetAngleXY() + rotation + Angle2D.PIHALF;
// Not sure what the logic should be for flipping horizintally and/or vertically
//if (size.x < 0.0f) angle += Angle2D.PI;
//if (size.y < 0.0f) angle += Angle2D.PI;
Vector3D center = new Vector3D(s.BBox.X + s.BBox.Width / 2, s.BBox.Y + s.BBox.Height / 2, slopeheights[s][0]);
Plane p = new Plane(center, angle, -s.FloorSlope.GetAngleZ(), true);
s.FloorSlope = p.Normal;
s.FloorSlopeOffset = p.Offset;
}
// Update ceiling slope?
if (s.CeilSlope.GetLengthSq() > 0 && !float.IsNaN(s.CeilSlopeOffset / s.CeilSlope.z))
{
float angle = s.CeilSlope.GetAngleXY() + rotation + Angle2D.PIHALF;
// Not sure what the logic should be for flipping horizintally and/or vertically
//if (size.x < 0.0f) angle += Angle2D.PI;
//if (size.y < 0.0f) angle += Angle2D.PI;
Vector3D center = new Vector3D(s.BBox.X + s.BBox.Width / 2, s.BBox.Y + s.BBox.Height / 2, slopeheights[s][1]);
Plane p = new Plane(center, angle, -s.CeilSlope.GetAngleZ(), false);
s.CeilSlope = p.Normal;
s.CeilSlopeOffset = p.Offset;
}
}
}
//mxd. Update floor/ceiling texture settings
if(General.Map.UDMF) UpdateTextureTransform();
if (General.Map.UDMF) UpdateTextureTransform();
General.Map.Map.Update(true, true);