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

Vertex rendering options (#701)

Browse source 
* Extended rendering options for drawing vertices
* Fixed vertex scale slider behaviour
* Force plot highlighted vertex in DragSectorsMode
* Moved ShouldRenderVertices property into the properties region
* made config file variable lower case to be in line with other config file variables
This commit is contained in:
volte 2022-02-06 06:19:03 -05:00 committed by GitHub
parent 9cd1c8654e
commit be06471f52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 143 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Source/Core/Config/ProgramConfiguration.cs
View file

@ -148,6 +148,8 @@ namespace CodeImp.DoomBuilder.Config
//volte
private bool classicRendering;
private bool flatShadeVertices;
private bool alwaysShowVertices;
// These are not stored in the configuration, only used at runtime
private int defaultbrightness;
@ -277,6 +279,10 @@ namespace CodeImp.DoomBuilder.Config
//volte
public bool ClassicRendering { get { return classicRendering; } internal set { classicRendering = value; } }
public bool FlatShadeVertices { get { return flatShadeVertices; } internal set { flatShadeVertices = value; } }
public bool AlwaysShowVertices { get { return alwaysShowVertices; } internal set { alwaysShowVertices = value; } }
//mxd. Left here for compatibility reasons...
public string DefaultTexture { get { return General.Map != null ? General.Map.Options.DefaultWallTexture : "-"; } set { if(General.Map != null) General.Map.Options.DefaultWallTexture = value; } }
public string DefaultFloorTexture { get { return General.Map != null ? General.Map.Options.DefaultFloorTexture : "-"; } set { if(General.Map != null) General.Map.Options.DefaultFloorTexture = value; } }
@ -412,6 +418,8 @@ namespace CodeImp.DoomBuilder.Config
// volte
classicRendering = cfg.ReadSetting("classicrendering", false);
alwaysShowVertices = cfg.ReadSetting("alwaysshowvertices", true);
flatShadeVertices = cfg.ReadSetting("flatshadevertices", false);
//mxd. Sector defaults
defaultceilheight = cfg.ReadSetting("defaultceilheight", 128);
@ -555,6 +563,8 @@ namespace CodeImp.DoomBuilder.Config
//volte
cfg.WriteSetting("classicrendering", classicRendering);
cfg.WriteSetting("alwaysshowvertices", alwaysShowVertices);
cfg.WriteSetting("flatshadevertices", flatShadeVertices);
//mxd. Sector defaults
cfg.WriteSetting("defaultceilheight", defaultceilheight);

3
Source/Core/Editing/ClassicMode.cs
View file

@ -89,6 +89,9 @@ namespace CodeImp.DoomBuilder.Editing
#region ================== Properties
// If false, then vertices will not be drawn if "hide vertices outside vertex mode" is enabled
public virtual bool AlwaysShowVertices { get { return false; } }
// Mouse status
public Vector2D MousePos { get { return mousepos; } }
public Vector2D MouseLastPos { get { return mouselastpos; } }

6
Source/Core/Rendering/IRenderer2D.cs
View file

@ -64,9 +64,9 @@ namespace CodeImp.DoomBuilder.Rendering
void PlotLinedefSet(ICollection<Linedef> linedefs);
void PlotSector(Sector s);
void PlotSector(Sector s, PixelColor c);
void PlotVertex(Vertex v, int colorindex);
void PlotVertexAt(Vector2D v, int colorindex);
void PlotVerticesSet(ICollection<Vertex> vertices);
void PlotVertex(Vertex v, int colorindex, bool checkMode = true);
void PlotVertexAt(Vector2D v, int colorindex, bool checkMode = true);
void PlotVerticesSet(ICollection<Vertex> vertices, bool checkMode = true);
void RenderThing(Thing t, PixelColor c, float alpha);
void RenderThingSet(ICollection<Thing> things, float alpha);
void RenderRectangle(RectangleF rect, float bordersize, PixelColor c, bool transformrect);

31
Source/Core/Rendering/Plotter.cs
View file

@ -128,23 +128,26 @@ namespace CodeImp.DoomBuilder.Rendering
for (int xp = x1; xp <= x2; xp++)
pixels[yp * width + xp] = c;
// Vertical edges
for (int yp = y1 + 1; yp <= y2 - 1; yp++)
if (!General.Settings.FlatShadeVertices)
{
pixels[yp * width + x1] = l;
pixels[yp * width + x2] = d;
}
// Vertical edges
for (int yp = y1 + 1; yp <= y2 - 1; yp++)
{
pixels[yp * width + x1] = l;
pixels[yp * width + x2] = d;
}
// Horizontal edges
for (int xp = x1 + 1; xp <= x2 - 1; xp++)
{
pixels[y1 * width + xp] = l;
pixels[y2 * width + xp] = d;
}
// Horizontal edges
for (int xp = x1 + 1; xp <= x2 - 1; xp++)
{
pixels[y1 * width + xp] = l;
pixels[y2 * width + xp] = d;
}
// Corners
pixels[y2 * width + x2] = d;
pixels[y1 * width + x1] = l;
// Corners
pixels[y2 * width + x2] = d;
pixels[y1 * width + x1] = l;
}
}
/*
else

34
Source/Core/Rendering/Renderer2D.cs
View file

@ -125,10 +125,22 @@ namespace CodeImp.DoomBuilder.Rendering
public SurfaceManager Surfaces { get { return surfaces; } }
public RectangleF Viewport { get { return viewport; } } //mxd
private bool ShouldRenderVertices
{
get
{
if (!(General.Editing.Mode is ClassicMode mode))
{
return true;
}
return mode.AlwaysShowVertices || General.Settings.AlwaysShowVertices;
}
}
#endregion
#region ================== Constructor / Disposer
// Constructor
internal Renderer2D(RenderDevice graphics) : base(graphics)
{
@ -2116,8 +2128,12 @@ namespace CodeImp.DoomBuilder.Rendering
}
// This renders a single vertex
public void PlotVertex(Vertex v, int colorindex)
public void PlotVertex(Vertex v, int colorindex, bool checkMode = true)
{
if (checkMode && !ShouldRenderVertices)
{
return;
}
// Transform vertex coordinates
Vector2D nv = v.Position.GetTransformed(translatex, translatey, scale, -scale);
@ -2126,8 +2142,13 @@ namespace CodeImp.DoomBuilder.Rendering
}
// This renders a single vertex at specified coordinates
public void PlotVertexAt(Vector2D v, int colorindex)
public void PlotVertexAt(Vector2D v, int colorindex, bool checkMode = true)
{
if (checkMode && !ShouldRenderVertices)
{
return;
}
// Transform vertex coordinates
Vector2D nv = v.GetTransformed(translatex, translatey, scale, -scale);
@ -2136,8 +2157,13 @@ namespace CodeImp.DoomBuilder.Rendering
}
// This renders a set of vertices
public void PlotVerticesSet(ICollection<Vertex> vertices)
public void PlotVerticesSet(ICollection<Vertex> vertices, bool checkMode = true)
{
if (checkMode && !ShouldRenderVertices)
{
return;
}
// Go for all vertices
foreach(Vertex v in vertices) PlotVertex(v, DetermineVertexColor(v));
}

12
Source/Core/Resources/Actions.cfg
View file

@ -1157,7 +1157,17 @@ togglefixedthingsscale //mxd
allowmouse = false;
allowscroll = false;
}
togglealwaysshowvertices
{
title = "Toggle Always Show Vertices";
category = "view";
description = "When enabled, vertices will always be drawn, regardless of the current mode.";
allowkeys = true;
allowmouse = false;
allowscroll = false;
}
togglebrightness //mxd
{
title = "Toggle Full Brightness";

14
Source/Core/Windows/MainForm.Designer.cs generated
View file

@ -288,6 +288,7 @@ namespace CodeImp.DoomBuilder.Windows
this.modecontrolsloolbar = new System.Windows.Forms.ToolStrip();
this.itemtogglecomments = new System.Windows.Forms.ToolStripMenuItem();
this.itemtogglefixedthingsscale = new System.Windows.Forms.ToolStripMenuItem();
this.itemtogglealwaysshowvertices = new System.Windows.Forms.ToolStripMenuItem();
this.itemdynamicgridsize = new System.Windows.Forms.ToolStripMenuItem();
this.itemaligngridtolinedef = new System.Windows.Forms.ToolStripMenuItem();
this.itemsetgridorigintovertex = new System.Windows.Forms.ToolStripMenuItem();
@ -795,6 +796,7 @@ namespace CodeImp.DoomBuilder.Windows
this.itemtogglegrid,
this.itemtogglecomments,
this.itemtogglefixedthingsscale,
this.itemtogglealwaysshowvertices,
this.separatorrendering,
this.itemdynlightmodes,
this.itemmodelmodes,
@ -2831,6 +2833,17 @@ namespace CodeImp.DoomBuilder.Windows
this.itemtogglefixedthingsscale.Text = "Fixed Things Scale";
this.itemtogglefixedthingsscale.Click += new System.EventHandler(this.InvokeTaggedAction);
//
// itemtogglealwaysshowvertices
//
this.itemtogglealwaysshowvertices.Checked = true;
this.itemtogglealwaysshowvertices.CheckOnClick = true;
this.itemtogglealwaysshowvertices.CheckState = System.Windows.Forms.CheckState.Checked;
this.itemtogglealwaysshowvertices.Name = "itemtogglealwaysshowvertices";
this.itemtogglealwaysshowvertices.Size = new System.Drawing.Size(215, 22);
this.itemtogglealwaysshowvertices.Tag = "builder_togglealwaysshowvertices";
this.itemtogglealwaysshowvertices.Text = "Always Show Vertices";
this.itemtogglealwaysshowvertices.Click += new System.EventHandler(this.InvokeTaggedAction);
//
// itemdynamicgridsize
//
this.itemdynamicgridsize.Checked = true;
@ -3136,5 +3149,6 @@ namespace CodeImp.DoomBuilder.Windows
private ToolStripMenuItem itemdynamicgridsize;
private ToolStripMenuItem itemtogglecomments;
private ToolStripMenuItem itemtogglefixedthingsscale;
private ToolStripMenuItem itemtogglealwaysshowvertices;
}
}

13
Source/Core/Windows/MainForm.cs
View file

@ -2951,6 +2951,19 @@ namespace CodeImp.DoomBuilder.Windows
// Redraw display to show changes
RedrawDisplay();
}
//mxd. Action to toggle fixed things scale
[BeginAction("togglealwaysshowvertices")]
internal void ToggleAlwaysShowVertices()
{
General.Settings.AlwaysShowVertices = !General.Settings.AlwaysShowVertices;
itemtogglealwaysshowvertices.Checked = General.Settings.AlwaysShowVertices;
DisplayStatus(StatusType.Action, "Always show vertices is " + (General.Settings.AlwaysShowVertices ? "ENABLED" : "DISABLED"));
// Redraw display to show changes
RedrawDisplay();
}
// Action to toggle snap to grid
[BeginAction("togglesnap")]

28
Source/Core/Windows/PreferencesForm.Designer.cs generated
View file

@ -66,6 +66,7 @@ namespace CodeImp.DoomBuilder.Windows
this.label26 = new System.Windows.Forms.Label();
this.label31 = new System.Windows.Forms.Label();
this.cbMarkExtraFloors = new System.Windows.Forms.CheckBox();
this.cbFlatShadeVertices = new System.Windows.Forms.CheckBox();
this.label32 = new System.Windows.Forms.Label();
this.label30 = new System.Windows.Forms.Label();
this.cbOldHighlightMode = new System.Windows.Forms.CheckBox();
@ -285,7 +286,7 @@ namespace CodeImp.DoomBuilder.Windows
groupBox1.Controls.Add(this.defaultviewmode);
groupBox1.Location = new System.Drawing.Point(8, 8);
groupBox1.Name = "groupBox1";
groupBox1.Size = new System.Drawing.Size(331, 438);
groupBox1.Size = new System.Drawing.Size(331, 462);
groupBox1.TabIndex = 0;
groupBox1.TabStop = false;
groupBox1.Text = " Options ";
@ -400,10 +401,12 @@ namespace CodeImp.DoomBuilder.Windows
this.vertexScale.LargeChange = 1;
this.vertexScale.Location = new System.Drawing.Point(127, 119);
this.vertexScale.Minimum = 1;
this.vertexScale.Maximum = 40;
this.vertexScale.Name = "vertexScale";
this.vertexScale.Size = new System.Drawing.Size(116, 45);
this.vertexScale.TabIndex = 4;
this.vertexScale.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
this.vertexScale.TickFrequency = 4;
this.vertexScale.Value = 1;
this.vertexScale.ValueChanged += new System.EventHandler(this.vertexScale_ValueChanged);
//
@ -636,6 +639,17 @@ namespace CodeImp.DoomBuilder.Windows
" color.");
this.cbMarkExtraFloors.UseVisualStyleBackColor = true;
//
// cbFlatShadeVertices
//
this.cbFlatShadeVertices.AutoSize = true;
this.cbFlatShadeVertices.Location = new System.Drawing.Point(18, 489);
this.cbFlatShadeVertices.Name = "cbFlatShadeVertices";
this.cbFlatShadeVertices.Size = new System.Drawing.Size(175, 17);
this.cbFlatShadeVertices.TabIndex = 1;
this.cbFlatShadeVertices.Text = "Flat shade vertices";
this.toolTip1.SetToolTip(this.cbFlatShadeVertices, "When enabled, vertices in classic mode will be drawn with flat shading instead of a raised border.");
this.cbFlatShadeVertices.UseVisualStyleBackColor = true;
//
// label32
//
this.label32.AutoSize = true;
@ -712,7 +726,7 @@ namespace CodeImp.DoomBuilder.Windows
// apply
//
this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.apply.Location = new System.Drawing.Point(467, 548);
this.apply.Location = new System.Drawing.Point(467, 573);
this.apply.Name = "apply";
this.apply.Size = new System.Drawing.Size(112, 25);
this.apply.TabIndex = 0;
@ -724,7 +738,7 @@ namespace CodeImp.DoomBuilder.Windows
//
this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.cancel.Location = new System.Drawing.Point(585, 548);
this.cancel.Location = new System.Drawing.Point(585, 573);
this.cancel.Name = "cancel";
this.cancel.Size = new System.Drawing.Size(112, 25);
this.cancel.TabIndex = 1;
@ -747,7 +761,7 @@ namespace CodeImp.DoomBuilder.Windows
this.tabs.Name = "tabs";
this.tabs.Padding = new System.Drawing.Point(24, 3);
this.tabs.SelectedIndex = 0;
this.tabs.Size = new System.Drawing.Size(688, 527);
this.tabs.Size = new System.Drawing.Size(688, 552);
this.tabs.TabIndex = 0;
this.tabs.SelectedIndexChanged += new System.EventHandler(this.tabs_SelectedIndexChanged);
//
@ -1203,7 +1217,7 @@ namespace CodeImp.DoomBuilder.Windows
this.fieldofviewlabel.Name = "fieldofviewlabel";
this.fieldofviewlabel.Size = new System.Drawing.Size(23, 13);
this.fieldofviewlabel.TabIndex = 19;
this.fieldofviewlabel.Text = "50°";
this.fieldofviewlabel.Text = "50°";
//
// label4
//
@ -1428,6 +1442,7 @@ namespace CodeImp.DoomBuilder.Windows
this.appearancegroup1.Controls.Add(this.activethingsalphalabel);
this.appearancegroup1.Controls.Add(this.label31);
this.appearancegroup1.Controls.Add(this.cbMarkExtraFloors);
this.appearancegroup1.Controls.Add(this.cbFlatShadeVertices);
this.appearancegroup1.Controls.Add(this.activethingsalpha);
this.appearancegroup1.Controls.Add(this.hiddenthingsalphalabel);
this.appearancegroup1.Controls.Add(this.label32);
@ -2393,7 +2408,7 @@ namespace CodeImp.DoomBuilder.Windows
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.CancelButton = this.cancel;
this.ClientSize = new System.Drawing.Size(709, 585);
this.ClientSize = new System.Drawing.Size(709, 610);
this.Controls.Add(this.cancel);
this.Controls.Add(this.apply);
this.Controls.Add(this.tabs);
@ -2559,6 +2574,7 @@ namespace CodeImp.DoomBuilder.Windows
private CodeImp.DoomBuilder.Controls.ColorControl color3dFloors;
private System.Windows.Forms.TextBox actiondescription;
private System.Windows.Forms.CheckBox cbMarkExtraFloors;
private System.Windows.Forms.CheckBox cbFlatShadeVertices;
private CodeImp.DoomBuilder.Controls.TransparentTrackBar recentFiles;
private System.Windows.Forms.Label labelRecentFiles;
private System.Windows.Forms.Label label25;

10
Source/Core/Windows/PreferencesForm.cs
View file

@ -97,6 +97,7 @@ namespace CodeImp.DoomBuilder.Windows
texturesizesbelow.Checked = General.Settings.TextureSizesBelow;
cbShowFPS.Checked = General.Settings.ShowFPS;
autolaunchontest.Checked = General.Settings.AutoLaunchOnTest;
cbFlatShadeVertices.Checked = General.Settings.FlatShadeVertices;
//mxd
locatetexturegroup.Checked = General.Settings.LocateTextureGroup;
@ -108,8 +109,8 @@ namespace CodeImp.DoomBuilder.Windows
labelDynLightCount.Text = General.Settings.GZMaxDynamicLights.ToString();
cbStretchView.Checked = General.Settings.GZStretchView;
cbOldHighlightMode.Checked = General.Settings.GZOldHighlightMode;
vertexScale.Value = General.Clamp((int)(General.Settings.GZVertexScale2D), vertexScale.Minimum, vertexScale.Maximum);
vertexScaleLabel.Text = vertexScale.Value * 100 + "%" + (vertexScale.Value == 1 ? " (default)" : "");
vertexScale.Value = General.Clamp((int)(General.Settings.GZVertexScale2D * 4.0), vertexScale.Minimum, vertexScale.Maximum);
vertexScaleLabel.Text = vertexScale.Value * 25 + "%" + (vertexScale.Value == 4 ? " (default)" : "");
cbMarkExtraFloors.Checked = General.Settings.GZMarkExtraFloors;
recentFiles.Value = General.Settings.MaxRecentFiles;
screenshotsfolderpath.Text = General.Settings.ScreenshotsPath;
@ -335,6 +336,7 @@ namespace CodeImp.DoomBuilder.Windows
General.Settings.ScreenshotsPath = screenshotsfolderpath.Text.Trim(); //mxd
General.Settings.ShowFPS = cbShowFPS.Checked;
General.Settings.AutoLaunchOnTest = autolaunchontest.Checked;
General.Settings.FlatShadeVertices = cbFlatShadeVertices.Checked;
// Script settings
General.Settings.ScriptFontBold = scriptfontbold.Checked;
@ -416,7 +418,7 @@ namespace CodeImp.DoomBuilder.Windows
General.Settings.FilterAnisotropy = RenderDevice.AF_STEPS[anisotropicfiltering.Value];
General.Settings.AntiAliasingSamples = RenderDevice.AA_STEPS[antialiasing.Value];
General.Settings.GZStretchView = cbStretchView.Checked;
General.Settings.GZVertexScale2D = vertexScale.Value;
General.Settings.GZVertexScale2D = (float)vertexScale.Value / 4.0f;
General.Settings.GZOldHighlightMode = cbOldHighlightMode.Checked;
General.Settings.GZMarkExtraFloors = cbMarkExtraFloors.Checked;
@ -530,7 +532,7 @@ namespace CodeImp.DoomBuilder.Windows
//mxd
private void vertexScale_ValueChanged(object sender, EventArgs e)
{
vertexScaleLabel.Text = (vertexScale.Value * 100) + "%";
vertexScaleLabel.Text = (vertexScale.Value * 25) + "%";
}
//mxd

2
Source/Plugins/BuilderModes/ClassicModes/DragSectorsMode.cs
View file

@ -170,7 +170,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Draw the dragged item highlighted
// This is important to know, because this item is used
// for snapping to the grid and snapping to nearest items
renderer.PlotVertex(dragitem, ColorCollection.HIGHLIGHT);
renderer.PlotVertex(dragitem, ColorCollection.HIGHLIGHT, false);
// Done
renderer.Finish();

7
Source/Plugins/BuilderModes/ClassicModes/DragVerticesMode.cs
View file

@ -48,7 +48,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
#endregion
#region ================== Properties
public override bool AlwaysShowVertices
{
get { return true; }
}
#endregion
#region ================== Constructor / Disposer

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

@ -77,7 +77,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
#region ================== Properties
public override object HighlightedObject { get { return highlighted; } }
public override bool AlwaysShowVertices { get { return true; } }
#endregion
#region ================== Constructor / Disposer

2
Source/Plugins/BuilderModes/ClassicModes/VerticesMode.cs
View file

@ -66,6 +66,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
public override object HighlightedObject { get { return highlighted; } }
public override bool AlwaysShowVertices { get { return true; } }
#endregion
#region ================== Constructor / Disposer

2
Source/Plugins/NodesViewer/NodesViewerMode.cs
View file

@ -51,6 +51,8 @@ namespace CodeImp.DoomBuilder.Plugins.NodesViewer
public Vector2D[] Vertices { get { return verts; } }
public Subsector[] Subsectors { get { return ssectors; } }
public NodesForm Form { get { return form; } }
public override bool AlwaysShowVertices { get { return true; } }
#endregion