stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-28 06:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a problem where slope handles could be picked through other geometry

Browse source
This commit is contained in:
biwa 2020-02-23 01:07:40 +01:00
parent 631ccc12af
commit 73e8d5440f
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Source/Core/VisualModes/VisualMode.cs
View file

@ -732,8 +732,7 @@ namespace CodeImp.DoomBuilder.VisualModes
{ {
VisualSector vs = allsectors[General.Map.VisualCamera.Sector]; VisualSector vs = allsectors[General.Map.VisualCamera.Sector];
sectors.Add(General.Map.VisualCamera.Sector, vs); sectors.Add(General.Map.VisualCamera.Sector, vs);
if(pickingmode == PickingMode.Default) foreach(VisualGeometry g in vs.FixedGeometry) pickables.Add(g);
foreach(VisualGeometry g in vs.FixedGeometry) pickables.Add(g);
// Add slope handles // Add slope handles
if (General.Map.UDMF && pickingmode == PickingMode.SlopeHandles && allslopehandles.ContainsKey(General.Map.VisualCamera.Sector)) if (General.Map.UDMF && pickingmode == PickingMode.SlopeHandles && allslopehandles.ContainsKey(General.Map.VisualCamera.Sector))
@ -776,14 +775,11 @@ namespace CodeImp.DoomBuilder.VisualModes
if(!sectors.ContainsKey(ld.Front.Sector)) if(!sectors.ContainsKey(ld.Front.Sector))
{ {
sectors.Add(ld.Front.Sector, vs); sectors.Add(ld.Front.Sector, vs);
if (pickingmode == PickingMode.Default) foreach (VisualGeometry g in vs.FixedGeometry)
{ {
foreach (VisualGeometry g in vs.FixedGeometry) // Must have content
{ if (g.Triangles > 0)
// Must have content pickables.Add(g);
if (g.Triangles > 0)
pickables.Add(g);
}
} }
// Add slope handles // Add slope handles
@ -792,7 +788,7 @@ namespace CodeImp.DoomBuilder.VisualModes
} }
// Add sidedef if on the front side // Add sidedef if on the front side
if(side < 0.0f && pickingmode == PickingMode.Default) if(side < 0.0f)
{ {
List<VisualGeometry> sidedefgeo = vs.GetSidedefGeometry(ld.Front); List<VisualGeometry> sidedefgeo = vs.GetSidedefGeometry(ld.Front);
foreach(VisualGeometry g in sidedefgeo) foreach(VisualGeometry g in sidedefgeo)
@ -820,14 +816,11 @@ namespace CodeImp.DoomBuilder.VisualModes
if(!sectors.ContainsKey(ld.Back.Sector)) if(!sectors.ContainsKey(ld.Back.Sector))
{ {
sectors.Add(ld.Back.Sector, vs); sectors.Add(ld.Back.Sector, vs);
if (pickingmode == PickingMode.Default) foreach (VisualGeometry g in vs.FixedGeometry)
{ {
foreach (VisualGeometry g in vs.FixedGeometry) // Must have content
{ if (g.Triangles > 0)
// Must have content pickables.Add(g);
if (g.Triangles > 0)
pickables.Add(g);
}
} }
// Add slope handles // Add slope handles
@ -836,7 +829,7 @@ namespace CodeImp.DoomBuilder.VisualModes
} }
// Add sidedef if on the front side // Add sidedef if on the front side
if(side > 0.0f && pickingmode == PickingMode.Default) if(side > 0.0f)
{ {
List<VisualGeometry> sidedefgeo = vs.GetSidedefGeometry(ld.Back); List<VisualGeometry> sidedefgeo = vs.GetSidedefGeometry(ld.Back);
foreach(VisualGeometry g in sidedefgeo) foreach(VisualGeometry g in sidedefgeo)
@ -857,11 +850,10 @@ namespace CodeImp.DoomBuilder.VisualModes
} }
// Add all the visible things // Add all the visible things
if(pickingmode == PickingMode.Default) foreach(VisualThing vt in visiblethings) pickables.Add(vt);
foreach(VisualThing vt in visiblethings) pickables.Add(vt);
//mxd. And all visual vertices //mxd. And all visual vertices
if (General.Map.UDMF && General.Settings.GZShowVisualVertices && pickingmode == PickingMode.Default) if (General.Map.UDMF && General.Settings.GZShowVisualVertices)
{ {
foreach (KeyValuePair<Vertex, VisualVertexPair> pair in vertices) foreach (KeyValuePair<Vertex, VisualVertexPair> pair in vertices)
pickables.AddRange(pair.Value.Vertices); pickables.AddRange(pair.Value.Vertices);
@ -897,6 +889,11 @@ namespace CodeImp.DoomBuilder.VisualModes
// Setup final result // Setup final result
result.hitpos = from + to * result.u_ray; result.hitpos = from + to * result.u_ray;
// If picking mode is for slope handles only return slope handles. We have to do it this
// way because otherwise it's possible to pick slope handles through other geometry
if (pickingmode == PickingMode.SlopeHandles && !(result.picked is VisualSlope))
result.picked = null;
// Done // Done
return result; return result;
} }