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

Visual mode: "Select" action with "with the same textures" / "with the same height" modifiers (Shift/Ctrl + LMB) now works properly with vavoom-type 3d floors.

Browse source
This commit is contained in:
MaxED 2014-09-22 11:51:49 +00:00
parent da00faf278
commit ccc2e00073
2 changed files with 67 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
Source/Plugins/BuilderModes/VisualModes/VisualCeiling.cs
View file

@ -422,6 +422,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
}
List<Sector> neighbours = new List<Sector>();
bool regularorvavoom = extrafloor == null || (extrafloor != null && extrafloor.VavoomType);
//collect neighbour sectors
foreach(Sidedef side in Sector.Sector.Sidedefs)
@ -433,7 +434,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
bool add;
// When current ceiling is part of a 3d floor, it looks like a floor, so we need to select adjacent floors
if(level.sector != Sector.Sector)
if(level.sector != Sector.Sector && !regularorvavoom)
{
add = (withSameTexture && side.Other.Sector.FloorTexture == level.sector.CeilTexture);
@ -452,26 +453,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
vs.Floor.SelectNeighbours(select, withSameTexture, withSameHeight);
}
}
// (De)select adjacent extra floors
foreach(VisualCeiling ec in vs.ExtraCeilings)
{
if(select == ec.Selected) continue;
add = (withSameTexture && level.sector.CeilTexture == ec.level.sector.CeilTexture);
if(withSameHeight)
{
add = ((withSameTexture && add) || !withSameTexture) && level.sector.CeilHeight == ec.level.sector.CeilHeight;
}
if(add)
{
ec.SelectNeighbours(select, withSameTexture, withSameHeight);
}
}
}
else // Regular ceiling
else // Regular ceiling or vavoom-type extra ceiling
{
// (De)select adjacent ceilings
add = (withSameTexture && side.Other.Sector.CeilTexture == level.sector.CeilTexture);
@ -491,23 +474,41 @@ namespace CodeImp.DoomBuilder.BuilderModes
vs.Ceiling.SelectNeighbours(select, withSameTexture, withSameHeight);
}
}
}
// (De)select adjacent extra floors
foreach(VisualFloor ef in vs.ExtraFloors)
// (De)select adjacent extra ceilings
foreach(VisualCeiling ec in vs.ExtraCeilings)
{
if(select == ec.Selected || ec.extrafloor.VavoomType != regularorvavoom) continue;
add = (withSameTexture && level.sector.CeilTexture == ec.level.sector.CeilTexture);
if(withSameHeight)
{
if(select == ef.Selected) continue;
add = ((withSameTexture && add) || !withSameTexture) && level.sector.CeilHeight == ec.level.sector.CeilHeight;
}
add = (withSameTexture && level.sector.CeilTexture == ef.Level.sector.FloorTexture);
if(add)
{
ec.SelectNeighbours(select, withSameTexture, withSameHeight);
}
}
if(withSameHeight)
{
add = ((withSameTexture && add) || !withSameTexture) && level.sector.CeilHeight == ef.Level.sector.FloorHeight;
}
// (De)select adjacent extra floors
foreach(VisualFloor ef in vs.ExtraFloors)
{
if(select == ef.Selected || ef.ExtraFloor.VavoomType == regularorvavoom) continue;
if(add)
{
ef.SelectNeighbours(select, withSameTexture, withSameHeight);
}
add = (withSameTexture && level.sector.CeilTexture == ef.Level.sector.FloorTexture);
if(withSameHeight)
{
add = ((withSameTexture && add) || !withSameTexture) && level.sector.CeilHeight == ef.Level.sector.FloorHeight;
}
if(add)
{
ef.SelectNeighbours(select, withSameTexture, withSameHeight);
}
}
}

67
Source/Plugins/BuilderModes/VisualModes/VisualFloor.cs
View file

@ -378,7 +378,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
{
if (!withSameTexture && !withSameHeight) return;
if (select && !selected) {
if (select && !selected)
{
selected = true;
mode.AddSelectedObject(this);
}
@ -389,6 +390,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
}
List<Sector> neighbours = new List<Sector>();
bool regularorvavoom = extrafloor == null || (extrafloor != null && extrafloor.VavoomType);
//collect neighbour sectors
foreach(Sidedef side in Sector.Sector.Sidedefs)
@ -400,7 +402,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
bool add;
// When current floor is part of a 3d floor, it looks like a ceiling, so we need to select adjacent ceilings
if (level.sector != Sector.Sector)
if (level.sector != Sector.Sector && !regularorvavoom)
{
add = (withSameTexture && side.Other.Sector.CeilTexture == level.sector.FloorTexture);
@ -419,26 +421,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
vs.Ceiling.SelectNeighbours(select, withSameTexture, withSameHeight);
}
}
// (De)select adjacent extra floors
foreach(VisualFloor ef in vs.ExtraFloors)
{
if(select == ef.Selected) continue;
add = (withSameTexture && level.sector.FloorTexture == ef.level.sector.FloorTexture);
if(withSameHeight)
{
add = ((withSameTexture && add) || !withSameTexture) && level.sector.FloorHeight == ef.level.sector.FloorHeight;
}
if(add)
{
ef.SelectNeighbours(select, withSameTexture, withSameHeight);
}
}
}
else // Regular floor
else // Regular floor or vavoom-type extrafloor
{
// (De)select adjacent floor
add = (withSameTexture && side.Other.Sector.FloorTexture == level.sector.FloorTexture);
@ -458,23 +442,40 @@ namespace CodeImp.DoomBuilder.BuilderModes
vs.Floor.SelectNeighbours(select, withSameTexture, withSameHeight);
}
}
}
// (De)select adjacent extra ceilings
foreach(VisualCeiling ec in vs.ExtraCeilings)
// (De)select adjacent extra floors
foreach(VisualFloor ef in vs.ExtraFloors) {
if (select == ef.Selected || ef.extrafloor.VavoomType != regularorvavoom) continue;
add = (withSameTexture && level.sector.FloorTexture == ef.level.sector.FloorTexture);
if (withSameHeight)
{
if(select == ec.Selected) continue;
add = ((withSameTexture && add) || !withSameTexture) && level.sector.FloorHeight == ef.level.sector.FloorHeight;
}
add = (withSameTexture && level.sector.FloorTexture == ec.Level.sector.CeilTexture);
if (add)
{
ef.SelectNeighbours(select, withSameTexture, withSameHeight);
}
}
if(withSameHeight)
{
add = ((withSameTexture && add) || !withSameTexture) && level.sector.FloorHeight == ec.Level.sector.CeilHeight;
}
// (De)select adjacent vavoom type extra ceilings
foreach(VisualCeiling ec in vs.ExtraCeilings)
{
if(select == ec.Selected || ec.ExtraFloor.VavoomType == regularorvavoom) continue;
if(add)
{
ec.SelectNeighbours(select, withSameTexture, withSameHeight);
}
add = (withSameTexture && level.sector.FloorTexture == ec.Level.sector.CeilTexture);
if (withSameHeight)
{
add = ((withSameTexture && add) || !withSameTexture) && level.sector.FloorHeight == ec.Level.sector.CeilHeight;
}
if (add)
{
ec.SelectNeighbours(select, withSameTexture, withSameHeight);
}
}
}