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

Visual mode, "Raise/Lower Sector to Nearest" actions: both floor and ceiling heights of adjacent sectors are now taken into account.

Browse source
This commit is contained in:
MaxED 2015-01-15 21:51:38 +00:00
parent f06387bd32
commit cc4a599506
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs
View file

@ -2030,14 +2030,16 @@ namespace CodeImp.DoomBuilder.BuilderModes
}
else
{
//get next higher ceiling from surrounding unselected sectors
//get next higher floor or ceiling from surrounding unselected sectors
foreach(KeyValuePair<Sector, VisualCeiling> group in ceilings)
{
foreach(Sidedef side in group.Key.Sidedefs)
{
if(side.Other == null || ceilings.ContainsKey(side.Other.Sector) || floors.ContainsKey(side.Other.Sector))
continue;
if(side.Other.Sector.CeilHeight < targetCeilingHeight && side.Other.Sector.CeilHeight > maxSelectedHeight)
if(side.Other.Sector.FloorHeight < targetCeilingHeight && side.Other.Sector.FloorHeight > maxSelectedHeight)
targetCeilingHeight = side.Other.Sector.FloorHeight;
else if(side.Other.Sector.CeilHeight < targetCeilingHeight && side.Other.Sector.CeilHeight > maxSelectedHeight)
targetCeilingHeight = side.Other.Sector.CeilHeight;
}
}
@ -2069,7 +2071,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
}
else
{
//get next higher floor from surrounding unselected sectors
//get next higher floor or ceiling from surrounding unselected sectors
foreach(KeyValuePair<Sector, VisualFloor> group in floors)
{
foreach(Sidedef side in group.Key.Sidedefs)
@ -2078,6 +2080,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
continue;
if(side.Other.Sector.FloorHeight > maxSelectedHeight && side.Other.Sector.FloorHeight < targetFloorHeight && side.Other.Sector.FloorHeight <= minSelectedCeilingHeight)
targetFloorHeight = side.Other.Sector.FloorHeight;
else if(side.Other.Sector.CeilHeight > maxSelectedHeight && side.Other.Sector.CeilHeight < targetFloorHeight && side.Other.Sector.CeilHeight <= side.Sector.CeilHeight)
targetFloorHeight = side.Other.Sector.CeilHeight;
}
}
}
@ -2249,14 +2253,16 @@ namespace CodeImp.DoomBuilder.BuilderModes
}
else
{
//get next floor lower height from surrounding unselected sectors
//get next lower ceiling or floor from surrounding unselected sectors
foreach(KeyValuePair<Sector, VisualFloor> group in floors)
{
foreach(Sidedef side in group.Key.Sidedefs)
{
if(side.Other == null || ceilings.ContainsKey(side.Other.Sector) || floors.ContainsKey(side.Other.Sector))
continue;
if(side.Other.Sector.FloorHeight > targetFloorHeight && side.Other.Sector.FloorHeight < minSelectedHeight)
if(side.Other.Sector.CeilHeight > targetFloorHeight && side.Other.Sector.CeilHeight < minSelectedHeight)
targetFloorHeight = side.Other.Sector.CeilHeight;
else if(side.Other.Sector.FloorHeight > targetFloorHeight && side.Other.Sector.FloorHeight < minSelectedHeight)
targetFloorHeight = side.Other.Sector.FloorHeight;
}
}
@ -2288,7 +2294,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
}
else
{
//get next lower ceiling height from surrounding unselected sectors
//get next lower ceiling or floor from surrounding unselected sectors
foreach(KeyValuePair<Sector, VisualCeiling> group in ceilings)
{
foreach(Sidedef side in group.Key.Sidedefs)
@ -2297,6 +2303,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
continue;
if(side.Other.Sector.CeilHeight > targetCeilingHeight && side.Other.Sector.CeilHeight < minSelectedHeight && side.Other.Sector.CeilHeight >= maxSelectedFloorHeight)
targetCeilingHeight = side.Other.Sector.CeilHeight;
else if(side.Other.Sector.FloorHeight > targetCeilingHeight && side.Other.Sector.FloorHeight < minSelectedHeight && side.Other.Sector.FloorHeight >= side.Sector.FloorHeight)
targetCeilingHeight = side.Other.Sector.FloorHeight;
}
}
}