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

Visual mode, auto align textures: actually, it won't break anything if we vertical clamp texture offsets of a 3d floor sidedef while auto-aligning (this reverts a part of previous commit)...

Browse source 
Classic modes: event lines are drawn once again while panning the view (I've disabled this a while ago trying to fix performance problems in Classic modes).
This commit is contained in:
MaxED 2013-11-08 08:18:33 +00:00
parent 766e4d46f3
commit 0654cec075
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs
View file

@ -321,11 +321,11 @@ namespace CodeImp.DoomBuilder.BuilderModes
if(renderer.StartPlotter(true)) if(renderer.StartPlotter(true))
{ {
renderer.PlotLinedefSet(General.Map.Map.Linedefs); renderer.PlotLinedefSet(General.Map.Map.Linedefs);
if(!panning) //mxd for(int i = 0; i < Linedef.NUM_ARGS; i++) BuilderPlug.Me.PlotAssociations(renderer, association[i]);
for(int i = 0; i < Linedef.NUM_ARGS; i++) BuilderPlug.Me.PlotAssociations(renderer, association[i]);
if((highlighted != null) && !highlighted.IsDisposed) if((highlighted != null) && !highlighted.IsDisposed)
{ {
if(!panning) BuilderPlug.Me.PlotReverseAssociations(renderer, highlightasso); //mxd BuilderPlug.Me.PlotReverseAssociations(renderer, highlightasso);
renderer.PlotLinedef(highlighted, General.Colors.Highlight); renderer.PlotLinedef(highlighted, General.Colors.Highlight);
} }
renderer.PlotVerticesSet(General.Map.Map.Vertices); renderer.PlotVerticesSet(General.Map.Map.Vertices);

6
Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs
View file

@ -573,7 +573,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
if((highlighted != null) && !highlighted.IsDisposed) if((highlighted != null) && !highlighted.IsDisposed)
{ {
renderer.PlotSector(highlighted, General.Colors.Highlight); renderer.PlotSector(highlighted, General.Colors.Highlight);
if(!panning) BuilderPlug.Me.PlotReverseAssociations(renderer, highlightasso); //mxd BuilderPlug.Me.PlotReverseAssociations(renderer, highlightasso);
} }
renderer.Finish(); renderer.Finish();
} }
@ -589,7 +589,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Render selection // Render selection
if(renderer.StartOverlay(true)) if(renderer.StartOverlay(true))
{ {
if(!panning && highlighted != null && !highlighted.IsDisposed) BuilderPlug.Me.RenderReverseAssociations(renderer, highlightasso); //mxd if(highlighted != null && !highlighted.IsDisposed) BuilderPlug.Me.RenderReverseAssociations(renderer, highlightasso); //mxd
if(selecting) RenderMultiSelection(); if(selecting) RenderMultiSelection();
renderer.Finish(); renderer.Finish();
} }
@ -750,7 +750,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
public override void OnMouseMove(MouseEventArgs e) public override void OnMouseMove(MouseEventArgs e)
{ {
base.OnMouseMove(e); base.OnMouseMove(e);
if(panning) return; //mxd. Skip all this jass while panning if(panning) return; //mxd. Skip all this jazz while panning
//mxd //mxd
if(selectpressed && !editpressed && !selecting) { if(selectpressed && !editpressed && !selecting) {

6
Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
View file

@ -147,10 +147,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
{ {
renderer.PlotLinedefSet(General.Map.Map.Linedefs); renderer.PlotLinedefSet(General.Map.Map.Linedefs);
renderer.PlotVerticesSet(General.Map.Map.Vertices); renderer.PlotVerticesSet(General.Map.Map.Vertices);
if (!panning) { //mxd for (int i = 0; i < Thing.NUM_ARGS; i++) BuilderPlug.Me.PlotAssociations(renderer, association[i]);
for (int i = 0; i < Thing.NUM_ARGS; i++) BuilderPlug.Me.PlotAssociations(renderer, association[i]); if ((highlighted != null) && !highlighted.IsDisposed) BuilderPlug.Me.PlotReverseAssociations(renderer, highlightasso);
if ((highlighted != null) && !highlighted.IsDisposed) BuilderPlug.Me.PlotReverseAssociations(renderer, highlightasso);
}
renderer.Finish(); renderer.Finish();
} }

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

@ -3218,7 +3218,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
if(j.sidedef.Index != j.controlSide.Index) { if(j.sidedef.Index != j.controlSide.Index) {
offset -= j.controlSide.OffsetY; offset -= j.controlSide.OffsetY;
offset -= j.controlSide.Fields.GetValue("offsety_mid", 0.0f); offset -= j.controlSide.Fields.GetValue("offsety_mid", 0.0f);
j.sidedef.Fields["offsety_mid"] = new UniValue(UniversalType.Float, offset); j.sidedef.Fields["offsety_mid"] = new UniValue(UniversalType.Float, offset % texture.Height);
} else { } else {
offset = GetMiddleOffsetY(j.sidedef, offset, j.scaleY, true); offset = GetMiddleOffsetY(j.sidedef, offset, j.scaleY, true);