stjr/ZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/ZoneBuilder.git synced 2025-04-22 09:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Display (zoom tube) waypoint sequences in classic (2D) modes, like NiGHTS paths, and move their display settings to the Appearance tab.

Browse source
This commit is contained in:
sphere 2021-02-21 20:39:42 +01:00
parent 1f962e46e9
commit 16880b3527
13 changed files with 278 additions and 217 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Source/Core/IO/DoomMapSetIO.cs
View file

@ -98,12 +98,13 @@ namespace CodeImp.DoomBuilder.IO
public override int AxisType { get { return -1; } }
public override int AxisTransferType { get { return -1; } }
public override int AxisTransferLineType { get { return -1; } }
#endregion
public override int WaypointType { get { return -1; } }
#endregion
#region ================== Reading
#region ================== Reading
// This reads a map from the file and returns a MapSet
public override MapSet Read(MapSet map, string mapname)
// This reads a map from the file and returns a MapSet
public override MapSet Read(MapSet map, string mapname)
{
// Find the index where first map lump begins
int firstindex = wad.FindLumpIndex(mapname) + 1;

9
Source/Core/IO/HexenMapSetIO.cs
View file

@ -98,12 +98,13 @@ namespace CodeImp.DoomBuilder.IO
public override int AxisType { get { return -1; } }
public override int AxisTransferType { get { return -1; } }
public override int AxisTransferLineType { get { return -1; } }
#endregion
public override int WaypointType { get { return -1; } }
#endregion
#region ================== Reading
#region ================== Reading
// This reads a map from the file and returns a MapSet
public override MapSet Read(MapSet map, string mapname)
// This reads a map from the file and returns a MapSet
public override MapSet Read(MapSet map, string mapname)
{
// Find the index where first map lump begins
int firstindex = wad.FindLumpIndex(mapname) + 1;

3
Source/Core/IO/IMapSetIO.cs
View file

@ -77,6 +77,7 @@ namespace CodeImp.DoomBuilder.IO
int AxisType { get; }
int AxisTransferType { get; }
int AxisTransferLineType { get; }
List<int> StartTypes { get; }
int WaypointType { get; }
List<int> StartTypes { get; }
}
}

3
Source/Core/IO/MapSetIO.cs
View file

@ -100,7 +100,8 @@ namespace CodeImp.DoomBuilder.IO
public abstract int AxisType { get; }
public abstract int AxisTransferType { get; }
public abstract int AxisTransferLineType { get; }
public List<int> StartTypes { get { return startTypes; } }
public abstract int WaypointType { get; }
public List<int> StartTypes { get { return startTypes; } }
#endregion
#region ================== Constructor / Disposer

1
Source/Core/IO/SRB2MapSetIO.cs
View file

@ -67,6 +67,7 @@ namespace CodeImp.DoomBuilder.IO
public override int AxisType { get { return 1700; } }
public override int AxisTransferType { get { return 1701; } }
public override int AxisTransferLineType { get { return 1702; } }
public override int WaypointType { get { return 753; } }
#endregion
#region ================== Reading

9
Source/Core/IO/UniversalMapSetIO.cs
View file

@ -149,12 +149,13 @@ namespace CodeImp.DoomBuilder.IO
public override int AxisType { get { return -1; } }
public override int AxisTransferType { get { return -1; } }
public override int AxisTransferLineType { get { return -1; } }
#endregion
public override int WaypointType { get { return -1; } }
#endregion
#region ================== Reading
#region ================== Reading
// This reads a map from the file and returns a MapSet
public override MapSet Read(MapSet map, string mapname)
// This reads a map from the file and returns a MapSet
public override MapSet Read(MapSet map, string mapname)
{
UniversalStreamReader udmfreader = new UniversalStreamReader(uifields); //mxd

28
Source/Core/Rendering/ColorCollection.cs
View file

@ -37,7 +37,7 @@ namespace CodeImp.DoomBuilder.Rendering
private const float DARK_ADDITION = -0.2f;
// Palette size
private const int NUM_COLORS = 60;
private const int NUM_COLORS = 62;
public const int NUM_THING_COLORS = 20;
public const int THING_COLORS_OFFSET = 20;
@ -102,12 +102,14 @@ namespace CodeImp.DoomBuilder.Rendering
public const int SCRIPTFOLDFORE = 57;
public const int SCRIPTFOLDBACK = 58;
public const int PROPERTIES = 59;
#endregion
public const int WAYPOINTCOLOR = 60;
public const int WAYPOINTLOOPCOLOR = 61;
#endregion
#region ================== Variables
#region ================== Variables
// Colors
private readonly PixelColor[] colors;
// Colors
private readonly PixelColor[] colors;
private readonly PixelColor[] brightcolors;
private readonly PixelColor[] darkcolors;
@ -158,13 +160,15 @@ namespace CodeImp.DoomBuilder.Rendering
public PixelColor Includes { get { return colors[INCLUDES]; } internal set { colors[INCLUDES] = value; } } //mxd
public PixelColor ScriptFoldForeColor { get { return colors[SCRIPTFOLDFORE]; } internal set { colors[SCRIPTFOLDFORE] = value; } } //mxd
public PixelColor ScriptFoldBackColor { get { return colors[SCRIPTFOLDBACK]; } internal set { colors[SCRIPTFOLDBACK] = value; } } //mxd
public PixelColor WaypointColor { get { return colors[WAYPOINTCOLOR]; } internal set { colors[WAYPOINTCOLOR] = value; } } //mxd
public PixelColor WaypointLoopColor { get { return colors[WAYPOINTLOOPCOLOR]; } internal set { colors[WAYPOINTLOOPCOLOR] = value; } } //mxd
#endregion
#endregion
#region ================== Constructor / Disposer
#region ================== Constructor / Disposer
// Constructor for settings from configuration
internal ColorCollection(Configuration cfg)
// Constructor for settings from configuration
internal ColorCollection(Configuration cfg)
{
// Initialize
colors = new PixelColor[NUM_COLORS];
@ -201,9 +205,11 @@ namespace CodeImp.DoomBuilder.Rendering
if(colors[THINGCOLOR19].ToInt() == 0) colors[THINGCOLOR19] = PixelColor.FromColor(Color.Goldenrod);
if (colors[SCRIPTFOLDFORE].ToInt() == 0) colors[SCRIPTFOLDFORE] = PixelColor.FromColor(SystemColors.ControlDark);
if (colors[SCRIPTFOLDBACK].ToInt() == 0) colors[SCRIPTFOLDBACK] = PixelColor.FromColor(SystemColors.ControlLightLight);
if (colors[WAYPOINTCOLOR].ToInt() == 0) colors[WAYPOINTCOLOR] = PixelColor.FromColor(Color.Orange);
if (colors[WAYPOINTLOOPCOLOR].ToInt() == 0) colors[WAYPOINTLOOPCOLOR] = PixelColor.FromColor(Color.SaddleBrown);
// Create assist colors
CreateAssistColors();
// Create assist colors
CreateAssistColors();
// Create color correction table
CreateCorrectionTable();

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

@ -1442,19 +1442,39 @@ namespace CodeImp.DoomBuilder.Rendering
ICollection<Thing> things = General.Map.Map.Things;
List<Thing> axes = new List<Thing>();
List<Thing> axistransferlines = new List<Thing>();
List<Thing> waypoints = new List<Thing>();
foreach (Thing t in things)
foreach (Thing t in things)
{
int type = t.SRB2Type;
if (type == General.Map.FormatInterface.AxisType) axes.Add(t);
if (type == General.Map.FormatInterface.AxisTransferLineType) axistransferlines.Add(t);
}
if (type == General.Map.FormatInterface.WaypointType) waypoints.Add(t);
}
//Sort waypoints by angle
waypoints.Sort((x,y) => (x.AngleDoom.CompareTo(y.AngleDoom)));
//Sort by axis number and mare number.
axistransferlines.Sort((x, y) => (x.GetFlagsValue() | (x.Parameter)<<16).CompareTo((y.GetFlagsValue() | (y.Parameter) << 16)));
//Render (zoom tube) waypoint sequences.
int i = 0;
int size = waypoints.Count;
int seqStart = 0;
while (i < size - 1)
{
int iNext = i + 1;
if (waypoints[i].AngleDoom % 256 == 0)
seqStart = i;
if (iNext < size && waypoints[iNext].AngleDoom == waypoints[i].AngleDoom + 1) // next waypoint of this sequence?
RenderLine((Vector2D)waypoints[i].Position, (Vector2D)waypoints[iNext].Position, 1.5f, General.Colors.WaypointColor, true);
else // draw different line between last and first waypoint of this sequence
RenderLine((Vector2D)waypoints[i].Position, (Vector2D)waypoints[seqStart].Position, 0.75f, General.Colors.WaypointLoopColor, true);
i = iNext;
}
//Render axis transfer lines.
int i = 0;
int size = axistransferlines.Count;
i = 0;
size = axistransferlines.Count;
while (i < size - 1)
{
int iNext = i;

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

@ -397,9 +397,9 @@ togglegrid
//mxd
togglenightspath
{
title = "Toggle NiGHTS Path";
title = "Toggle Waypoint and NiGHTS Paths";
category = "classic";
description = "Toggles NiGHTS path rendering in classic modes.";
description = "Toggles (zoom tube) waypoint and NiGHTS path rendering in classic modes.";
allowkeys = true;
allowmouse = false;
allowscroll = false;

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

@ -1601,7 +1601,7 @@ namespace CodeImp.DoomBuilder.Windows
this.buttontogglenightspath.Name = "buttontogglenightspath";
this.buttontogglenightspath.Size = new System.Drawing.Size(23, 22);
this.buttontogglenightspath.Tag = "builder_togglenightspath";
this.buttontogglenightspath.Text = "Show NiGHTS Path";
this.buttontogglenightspath.Text = "Show Waypoint and NiGHTS Paths";
this.buttontogglenightspath.Click += new System.EventHandler(this.InvokeTaggedAction);
//
// separatorfullbrightness
@ -2469,7 +2469,7 @@ namespace CodeImp.DoomBuilder.Windows
this.itemrendernightspath.Name = "itemrendernightspath";
this.itemrendernightspath.Size = new System.Drawing.Size(215, 22);
this.itemrendernightspath.Tag = "builder_togglenightspath";
this.itemrendernightspath.Text = "&Show NiGHTS Path";
this.itemrendernightspath.Text = "Show Waypoint and NiGHTS Paths";
this.itemrendernightspath.Click += new System.EventHandler(this.InvokeTaggedAction);
//
// MainForm

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

@ -161,6 +161,20 @@ namespace CodeImp.DoomBuilder.Windows
this.classicbilinear = new System.Windows.Forms.CheckBox();
this.imagebrightnesslabel = new System.Windows.Forms.Label();
this.imagebrightness = new System.Windows.Forms.TrackBar();
this.nightsgroup = new System.Windows.Forms.GroupBox();
this.nightscolormare8 = new CodeImp.DoomBuilder.Controls.ColorControl();
this.nightscolormare7 = new CodeImp.DoomBuilder.Controls.ColorControl();
this.nightscolormare6 = new CodeImp.DoomBuilder.Controls.ColorControl();
this.nightscolormare5 = new CodeImp.DoomBuilder.Controls.ColorControl();
this.nightscolormare4 = new CodeImp.DoomBuilder.Controls.ColorControl();
this.nightscolormare3 = new CodeImp.DoomBuilder.Controls.ColorControl();
this.nightscolormare2 = new CodeImp.DoomBuilder.Controls.ColorControl();
this.nightscolormare1 = new CodeImp.DoomBuilder.Controls.ColorControl();
this.label23 = new System.Windows.Forms.Label();
this.nightscircleprecision = new System.Windows.Forms.TrackBar();
this.nightscircleprecisionlabel = new System.Windows.Forms.Label();
this.waypointcolor1 = new CodeImp.DoomBuilder.Controls.ColorControl();
this.waypointcolor2 = new CodeImp.DoomBuilder.Controls.ColorControl();
this.tabscripteditor = new System.Windows.Forms.TabPage();
this.groupBox9 = new System.Windows.Forms.GroupBox();
this.scriptshowfolding = new System.Windows.Forms.CheckBox();
@ -202,18 +216,6 @@ namespace CodeImp.DoomBuilder.Windows
this.colorconstants = new CodeImp.DoomBuilder.Controls.ColorControl();
this.previewgroup = new System.Windows.Forms.GroupBox();
this.scriptedit = new CodeImp.DoomBuilder.Controls.ScriptEditorPreviewControl();
this.tabnights = new System.Windows.Forms.TabPage();
this.nightscolormare8 = new CodeImp.DoomBuilder.Controls.ColorControl();
this.nightscolormare7 = new CodeImp.DoomBuilder.Controls.ColorControl();
this.nightscolormare6 = new CodeImp.DoomBuilder.Controls.ColorControl();
this.nightscolormare5 = new CodeImp.DoomBuilder.Controls.ColorControl();
this.nightscolormare4 = new CodeImp.DoomBuilder.Controls.ColorControl();
this.nightscolormare3 = new CodeImp.DoomBuilder.Controls.ColorControl();
this.nightscolormare2 = new CodeImp.DoomBuilder.Controls.ColorControl();
this.nightscircleprecision = new System.Windows.Forms.TrackBar();
this.label23 = new System.Windows.Forms.Label();
this.nightscircleprecisionlabel = new System.Windows.Forms.Label();
this.nightscolormare1 = new CodeImp.DoomBuilder.Controls.ColorControl();
this.tabpasting = new System.Windows.Forms.TabPage();
this.label16 = new System.Windows.Forms.Label();
this.pasteoptions = new CodeImp.DoomBuilder.Controls.PasteOptionsControl();
@ -257,14 +259,14 @@ namespace CodeImp.DoomBuilder.Windows
((System.ComponentModel.ISupportInitialize)(this.tbDynLightSize)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tbDynLightCount)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.imagebrightness)).BeginInit();
this.nightsgroup.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.nightscircleprecision)).BeginInit();
this.tabscripteditor.SuspendLayout();
this.groupBox9.SuspendLayout();
this.groupBox8.SuspendLayout();
this.groupBox7.SuspendLayout();
this.groupBox6.SuspendLayout();
this.previewgroup.SuspendLayout();
this.tabnights.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.nightscircleprecision)).BeginInit();
this.tabpasting.SuspendLayout();
this.SuspendLayout();
//
@ -687,7 +689,7 @@ namespace CodeImp.DoomBuilder.Windows
this.colorsgroup1.Controls.Add(this.colorlinedefs);
this.colorsgroup1.Location = new System.Drawing.Point(8, 8);
this.colorsgroup1.Name = "colorsgroup1";
this.colorsgroup1.Size = new System.Drawing.Size(203, 516);
this.colorsgroup1.Size = new System.Drawing.Size(203, 388);
this.colorsgroup1.TabIndex = 0;
this.colorsgroup1.TabStop = false;
this.colorsgroup1.Text = " Display ";
@ -730,7 +732,7 @@ namespace CodeImp.DoomBuilder.Windows
//
this.doublesidedalpha.BackColor = System.Drawing.SystemColors.Window;
this.doublesidedalpha.LargeChange = 3;
this.doublesidedalpha.Location = new System.Drawing.Point(11, 349);
this.doublesidedalpha.Location = new System.Drawing.Point(11, 341);
this.doublesidedalpha.Name = "doublesidedalpha";
this.doublesidedalpha.Size = new System.Drawing.Size(130, 45);
this.doublesidedalpha.TabIndex = 2;
@ -784,7 +786,7 @@ namespace CodeImp.DoomBuilder.Windows
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(14, 328);
this.label2.Location = new System.Drawing.Point(14, 324);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(141, 13);
this.label2.TabIndex = 14;
@ -794,7 +796,7 @@ namespace CodeImp.DoomBuilder.Windows
// doublesidedalphalabel
//
this.doublesidedalphalabel.AutoSize = true;
this.doublesidedalphalabel.Location = new System.Drawing.Point(147, 361);
this.doublesidedalphalabel.Location = new System.Drawing.Point(147, 353);
this.doublesidedalphalabel.Name = "doublesidedalphalabel";
this.doublesidedalphalabel.Size = new System.Drawing.Size(21, 13);
this.doublesidedalphalabel.TabIndex = 16;
@ -847,7 +849,7 @@ namespace CodeImp.DoomBuilder.Windows
// cbStretchView
//
this.cbStretchView.AutoSize = true;
this.cbStretchView.Location = new System.Drawing.Point(25, 313);
this.cbStretchView.Location = new System.Drawing.Point(25, 311);
this.cbStretchView.Name = "cbStretchView";
this.cbStretchView.Size = new System.Drawing.Size(172, 17);
this.cbStretchView.TabIndex = 18;
@ -898,7 +900,6 @@ namespace CodeImp.DoomBuilder.Windows
this.tabs.Controls.Add(this.tabkeys);
this.tabs.Controls.Add(this.tabcolors);
this.tabs.Controls.Add(this.tabscripteditor);
this.tabs.Controls.Add(this.tabnights);
this.tabs.Controls.Add(this.tabpasting);
this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tabs.Location = new System.Drawing.Point(11, 13);
@ -1512,6 +1513,7 @@ namespace CodeImp.DoomBuilder.Windows
//
this.tabcolors.Controls.Add(this.appearancegroup1);
this.tabcolors.Controls.Add(this.colorsgroup1);
this.tabcolors.Controls.Add(this.nightsgroup);
this.tabcolors.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tabcolors.Location = new System.Drawing.Point(4, 22);
this.tabcolors.Name = "tabcolors";
@ -1553,9 +1555,9 @@ namespace CodeImp.DoomBuilder.Windows
this.appearancegroup1.Controls.Add(this.classicbilinear);
this.appearancegroup1.Controls.Add(this.imagebrightnesslabel);
this.appearancegroup1.Controls.Add(this.imagebrightness);
this.appearancegroup1.Location = new System.Drawing.Point(217, 14);
this.appearancegroup1.Location = new System.Drawing.Point(217, 8);
this.appearancegroup1.Name = "appearancegroup1";
this.appearancegroup1.Size = new System.Drawing.Size(457, 487);
this.appearancegroup1.Size = new System.Drawing.Size(457, 388);
this.appearancegroup1.TabIndex = 24;
this.appearancegroup1.TabStop = false;
this.appearancegroup1.Text = " Additional Options ";
@ -1587,7 +1589,7 @@ namespace CodeImp.DoomBuilder.Windows
// cbDrawThingsFixedSize
//
this.cbDrawThingsFixedSize.AutoSize = true;
this.cbDrawThingsFixedSize.Location = new System.Drawing.Point(237, 313);
this.cbDrawThingsFixedSize.Location = new System.Drawing.Point(237, 311);
this.cbDrawThingsFixedSize.Name = "cbDrawThingsFixedSize";
this.cbDrawThingsFixedSize.Size = new System.Drawing.Size(172, 17);
this.cbDrawThingsFixedSize.TabIndex = 39;
@ -1784,6 +1786,182 @@ namespace CodeImp.DoomBuilder.Windows
this.imagebrightness.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
this.imagebrightness.ValueChanged += new System.EventHandler(this.imagebrightness_ValueChanged);
//
// nightsgroup
//
this.nightsgroup.Controls.Add(this.nightscolormare8);
this.nightsgroup.Controls.Add(this.nightscolormare7);
this.nightsgroup.Controls.Add(this.nightscolormare6);
this.nightsgroup.Controls.Add(this.nightscolormare5);
this.nightsgroup.Controls.Add(this.nightscolormare4);
this.nightsgroup.Controls.Add(this.nightscolormare3);
this.nightsgroup.Controls.Add(this.nightscolormare2);
this.nightsgroup.Controls.Add(this.nightscolormare1);
this.nightsgroup.Controls.Add(this.label23);
this.nightsgroup.Controls.Add(this.nightscircleprecision);
this.nightsgroup.Controls.Add(this.nightscircleprecisionlabel);
this.nightsgroup.Controls.Add(this.waypointcolor1);
this.nightsgroup.Controls.Add(this.waypointcolor2);
this.nightsgroup.Location = new System.Drawing.Point(8, 401);
this.nightsgroup.Name = "nightsgroup";
this.nightsgroup.Size = new System.Drawing.Size(666, 129);
this.nightsgroup.TabIndex = 4;
this.nightsgroup.TabStop = false;
this.nightsgroup.Text = "Waypoints / NiGHTS Display";
//
// nightscolormare8
//
this.nightscolormare8.BackColor = System.Drawing.Color.Transparent;
this.nightscolormare8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nightscolormare8.Label = "Path color (Mare 8):";
this.nightscolormare8.Location = new System.Drawing.Point(207, 98);
this.nightscolormare8.MaximumSize = new System.Drawing.Size(10000, 23);
this.nightscolormare8.MinimumSize = new System.Drawing.Size(100, 23);
this.nightscolormare8.Name = "nightscolormare8";
this.nightscolormare8.Size = new System.Drawing.Size(168, 23);
this.nightscolormare8.TabIndex = 39;
//
// nightscolormare7
//
this.nightscolormare7.BackColor = System.Drawing.Color.Transparent;
this.nightscolormare7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nightscolormare7.Label = "Path color (Mare 7):";
this.nightscolormare7.Location = new System.Drawing.Point(207, 71);
this.nightscolormare7.MaximumSize = new System.Drawing.Size(10000, 23);
this.nightscolormare7.MinimumSize = new System.Drawing.Size(100, 23);
this.nightscolormare7.Name = "nightscolormare7";
this.nightscolormare7.Size = new System.Drawing.Size(168, 23);
this.nightscolormare7.TabIndex = 38;
//
// nightscolormare6
//
this.nightscolormare6.BackColor = System.Drawing.Color.Transparent;
this.nightscolormare6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nightscolormare6.Label = "Path color (Mare 6):";
this.nightscolormare6.Location = new System.Drawing.Point(207, 44);
this.nightscolormare6.MaximumSize = new System.Drawing.Size(10000, 23);
this.nightscolormare6.MinimumSize = new System.Drawing.Size(100, 23);
this.nightscolormare6.Name = "nightscolormare6";
this.nightscolormare6.Size = new System.Drawing.Size(168, 23);
this.nightscolormare6.TabIndex = 37;
//
// nightscolormare5
//
this.nightscolormare5.BackColor = System.Drawing.Color.Transparent;
this.nightscolormare5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nightscolormare5.Label = "Path color (Mare 5):";
this.nightscolormare5.Location = new System.Drawing.Point(207, 17);
this.nightscolormare5.MaximumSize = new System.Drawing.Size(10000, 23);
this.nightscolormare5.MinimumSize = new System.Drawing.Size(100, 23);
this.nightscolormare5.Name = "nightscolormare5";
this.nightscolormare5.Size = new System.Drawing.Size(168, 23);
this.nightscolormare5.TabIndex = 36;
//
// nightscolormare4
//
this.nightscolormare4.BackColor = System.Drawing.Color.Transparent;
this.nightscolormare4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nightscolormare4.Label = "Path color (Mare 4):";
this.nightscolormare4.Location = new System.Drawing.Point(15, 98);
this.nightscolormare4.MaximumSize = new System.Drawing.Size(10000, 23);
this.nightscolormare4.MinimumSize = new System.Drawing.Size(100, 23);
this.nightscolormare4.Name = "nightscolormare4";
this.nightscolormare4.Size = new System.Drawing.Size(168, 23);
this.nightscolormare4.TabIndex = 35;
//
// nightscolormare3
//
this.nightscolormare3.BackColor = System.Drawing.Color.Transparent;
this.nightscolormare3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nightscolormare3.Label = "Path color (Mare 3):";
this.nightscolormare3.Location = new System.Drawing.Point(15, 71);
this.nightscolormare3.MaximumSize = new System.Drawing.Size(10000, 23);
this.nightscolormare3.MinimumSize = new System.Drawing.Size(100, 23);
this.nightscolormare3.Name = "nightscolormare3";
this.nightscolormare3.Size = new System.Drawing.Size(168, 23);
this.nightscolormare3.TabIndex = 34;
//
// nightscolormare2
//
this.nightscolormare2.BackColor = System.Drawing.Color.Transparent;
this.nightscolormare2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nightscolormare2.Label = "Path color (Mare 2):";
this.nightscolormare2.Location = new System.Drawing.Point(15, 44);
this.nightscolormare2.MaximumSize = new System.Drawing.Size(10000, 23);
this.nightscolormare2.MinimumSize = new System.Drawing.Size(100, 23);
this.nightscolormare2.Name = "nightscolormare2";
this.nightscolormare2.Size = new System.Drawing.Size(168, 23);
this.nightscolormare2.TabIndex = 33;
//
// nightscolormare1
//
this.nightscolormare1.BackColor = System.Drawing.Color.Transparent;
this.nightscolormare1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nightscolormare1.Label = "Path color (Mare 1):";
this.nightscolormare1.Location = new System.Drawing.Point(15, 17);
this.nightscolormare1.MaximumSize = new System.Drawing.Size(10000, 23);
this.nightscolormare1.MinimumSize = new System.Drawing.Size(100, 23);
this.nightscolormare1.Name = "nightscolormare1";
this.nightscolormare1.Size = new System.Drawing.Size(168, 23);
this.nightscolormare1.TabIndex = 29;
//
// label23
//
this.label23.AutoSize = true;
this.label23.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label23.Location = new System.Drawing.Point(399, 90);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(102, 13);
this.label23.TabIndex = 31;
this.label23.Text = "Axis circle precision:";
this.label23.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// nightscircleprecision
//
this.nightscircleprecision.BackColor = System.Drawing.SystemColors.Window;
this.nightscircleprecision.LargeChange = 1;
this.nightscircleprecision.Location = new System.Drawing.Point(501, 78);
this.nightscircleprecision.Maximum = 36;
this.nightscircleprecision.Minimum = 1;
this.nightscircleprecision.Name = "nightscircleprecision";
this.nightscircleprecision.Size = new System.Drawing.Size(130, 45);
this.nightscircleprecision.TabIndex = 30;
this.nightscircleprecision.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
this.nightscircleprecision.Value = 36;
//
// nightscircleprecisionlabel
//
this.nightscircleprecisionlabel.AutoSize = true;
this.nightscircleprecisionlabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nightscircleprecisionlabel.Location = new System.Drawing.Point(634, 90);
this.nightscircleprecisionlabel.Name = "nightscircleprecisionlabel";
this.nightscircleprecisionlabel.Size = new System.Drawing.Size(25, 13);
this.nightscircleprecisionlabel.TabIndex = 32;
this.nightscircleprecisionlabel.Text = "360";
//
// waypointcolor1
//
this.waypointcolor1.BackColor = System.Drawing.Color.Transparent;
this.waypointcolor1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.waypointcolor1.Label = "Waypoint color:";
this.waypointcolor1.Location = new System.Drawing.Point(399, 44);
this.waypointcolor1.MaximumSize = new System.Drawing.Size(10000, 23);
this.waypointcolor1.MinimumSize = new System.Drawing.Size(100, 23);
this.waypointcolor1.Name = "waypointcolor1";
this.waypointcolor1.Size = new System.Drawing.Size(168, 23);
this.waypointcolor1.TabIndex = 29;
//
// waypointcolor2
//
this.waypointcolor2.BackColor = System.Drawing.Color.Transparent;
this.waypointcolor2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.waypointcolor2.Label = "Waypoint color (loop):";
this.waypointcolor2.Location = new System.Drawing.Point(399, 17);
this.waypointcolor2.MaximumSize = new System.Drawing.Size(10000, 23);
this.waypointcolor2.MinimumSize = new System.Drawing.Size(100, 23);
this.waypointcolor2.Name = "waypointcolor2";
this.waypointcolor2.Size = new System.Drawing.Size(168, 23);
this.waypointcolor2.TabIndex = 29;
//
// tabscripteditor
//
this.tabscripteditor.Controls.Add(this.groupBox9);
@ -2301,157 +2479,6 @@ namespace CodeImp.DoomBuilder.Windows
this.scriptedit.Size = new System.Drawing.Size(445, 132);
this.scriptedit.TabIndex = 0;
//
// tabnights
//
this.tabnights.Controls.Add(this.nightscolormare8);
this.tabnights.Controls.Add(this.nightscolormare7);
this.tabnights.Controls.Add(this.nightscolormare6);
this.tabnights.Controls.Add(this.nightscolormare5);
this.tabnights.Controls.Add(this.nightscolormare4);
this.tabnights.Controls.Add(this.nightscolormare3);
this.tabnights.Controls.Add(this.nightscolormare2);
this.tabnights.Controls.Add(this.nightscircleprecision);
this.tabnights.Controls.Add(this.label23);
this.tabnights.Controls.Add(this.nightscircleprecisionlabel);
this.tabnights.Controls.Add(this.nightscolormare1);
this.tabnights.Location = new System.Drawing.Point(4, 22);
this.tabnights.Name = "tabnights";
this.tabnights.Padding = new System.Windows.Forms.Padding(3);
this.tabnights.Size = new System.Drawing.Size(682, 533);
this.tabnights.TabIndex = 4;
this.tabnights.Text = "NiGHTS";
this.tabnights.UseVisualStyleBackColor = true;
//
// nightscolormare8
//
this.nightscolormare8.BackColor = System.Drawing.Color.Transparent;
this.nightscolormare8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nightscolormare8.Label = "Path color (Mare 8):";
this.nightscolormare8.Location = new System.Drawing.Point(238, 118);
this.nightscolormare8.MaximumSize = new System.Drawing.Size(10000, 23);
this.nightscolormare8.MinimumSize = new System.Drawing.Size(100, 23);
this.nightscolormare8.Name = "nightscolormare8";
this.nightscolormare8.Size = new System.Drawing.Size(168, 23);
this.nightscolormare8.TabIndex = 39;
//
// nightscolormare7
//
this.nightscolormare7.BackColor = System.Drawing.Color.Transparent;
this.nightscolormare7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nightscolormare7.Label = "Path color (Mare 7):";
this.nightscolormare7.Location = new System.Drawing.Point(238, 89);
this.nightscolormare7.MaximumSize = new System.Drawing.Size(10000, 23);
this.nightscolormare7.MinimumSize = new System.Drawing.Size(100, 23);
this.nightscolormare7.Name = "nightscolormare7";
this.nightscolormare7.Size = new System.Drawing.Size(168, 23);
this.nightscolormare7.TabIndex = 38;
//
// nightscolormare6
//
this.nightscolormare6.BackColor = System.Drawing.Color.Transparent;
this.nightscolormare6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nightscolormare6.Label = "Path color (Mare 6):";
this.nightscolormare6.Location = new System.Drawing.Point(238, 60);
this.nightscolormare6.MaximumSize = new System.Drawing.Size(10000, 23);
this.nightscolormare6.MinimumSize = new System.Drawing.Size(100, 23);
this.nightscolormare6.Name = "nightscolormare6";
this.nightscolormare6.Size = new System.Drawing.Size(168, 23);
this.nightscolormare6.TabIndex = 37;
//
// nightscolormare5
//
this.nightscolormare5.BackColor = System.Drawing.Color.Transparent;
this.nightscolormare5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nightscolormare5.Label = "Path color (Mare 5):";
this.nightscolormare5.Location = new System.Drawing.Point(238, 31);
this.nightscolormare5.MaximumSize = new System.Drawing.Size(10000, 23);
this.nightscolormare5.MinimumSize = new System.Drawing.Size(100, 23);
this.nightscolormare5.Name = "nightscolormare5";
this.nightscolormare5.Size = new System.Drawing.Size(168, 23);
this.nightscolormare5.TabIndex = 36;
//
// nightscolormare4
//
this.nightscolormare4.BackColor = System.Drawing.Color.Transparent;
this.nightscolormare4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nightscolormare4.Label = "Path color (Mare 4):";
this.nightscolormare4.Location = new System.Drawing.Point(21, 118);
this.nightscolormare4.MaximumSize = new System.Drawing.Size(10000, 23);
this.nightscolormare4.MinimumSize = new System.Drawing.Size(100, 23);
this.nightscolormare4.Name = "nightscolormare4";
this.nightscolormare4.Size = new System.Drawing.Size(168, 23);
this.nightscolormare4.TabIndex = 35;
//
// nightscolormare3
//
this.nightscolormare3.BackColor = System.Drawing.Color.Transparent;
this.nightscolormare3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nightscolormare3.Label = "Path color (Mare 3):";
this.nightscolormare3.Location = new System.Drawing.Point(21, 89);
this.nightscolormare3.MaximumSize = new System.Drawing.Size(10000, 23);
this.nightscolormare3.MinimumSize = new System.Drawing.Size(100, 23);
this.nightscolormare3.Name = "nightscolormare3";
this.nightscolormare3.Size = new System.Drawing.Size(168, 23);
this.nightscolormare3.TabIndex = 34;
//
// nightscolormare2
//
this.nightscolormare2.BackColor = System.Drawing.Color.Transparent;
this.nightscolormare2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nightscolormare2.Label = "Path color (Mare 2):";
this.nightscolormare2.Location = new System.Drawing.Point(21, 60);
this.nightscolormare2.MaximumSize = new System.Drawing.Size(10000, 23);
this.nightscolormare2.MinimumSize = new System.Drawing.Size(100, 23);
this.nightscolormare2.Name = "nightscolormare2";
this.nightscolormare2.Size = new System.Drawing.Size(168, 23);
this.nightscolormare2.TabIndex = 33;
//
// nightscircleprecision
//
this.nightscircleprecision.BackColor = System.Drawing.SystemColors.Window;
this.nightscircleprecision.LargeChange = 1;
this.nightscircleprecision.Location = new System.Drawing.Point(474, 52);
this.nightscircleprecision.Maximum = 36;
this.nightscircleprecision.Minimum = 1;
this.nightscircleprecision.Name = "nightscircleprecision";
this.nightscircleprecision.Size = new System.Drawing.Size(130, 45);
this.nightscircleprecision.TabIndex = 30;
this.nightscircleprecision.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
this.nightscircleprecision.Value = 36;
//
// label23
//
this.label23.AutoSize = true;
this.label23.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label23.Location = new System.Drawing.Point(477, 31);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(102, 13);
this.label23.TabIndex = 31;
this.label23.Text = "Axis circle precision:";
this.label23.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// nightscircleprecisionlabel
//
this.nightscircleprecisionlabel.AutoSize = true;
this.nightscircleprecisionlabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nightscircleprecisionlabel.Location = new System.Drawing.Point(610, 64);
this.nightscircleprecisionlabel.Name = "nightscircleprecisionlabel";
this.nightscircleprecisionlabel.Size = new System.Drawing.Size(25, 13);
this.nightscircleprecisionlabel.TabIndex = 32;
this.nightscircleprecisionlabel.Text = "360";
//
// nightscolormare1
//
this.nightscolormare1.BackColor = System.Drawing.Color.Transparent;
this.nightscolormare1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nightscolormare1.Label = "Path color (Mare 1):";
this.nightscolormare1.Location = new System.Drawing.Point(21, 31);
this.nightscolormare1.MaximumSize = new System.Drawing.Size(10000, 23);
this.nightscolormare1.MinimumSize = new System.Drawing.Size(100, 23);
this.nightscolormare1.Name = "nightscolormare1";
this.nightscolormare1.Size = new System.Drawing.Size(168, 23);
this.nightscolormare1.TabIndex = 29;
//
// tabpasting
//
this.tabpasting.Controls.Add(this.label16);
@ -2550,6 +2577,9 @@ namespace CodeImp.DoomBuilder.Windows
((System.ComponentModel.ISupportInitialize)(this.tbDynLightSize)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tbDynLightCount)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.imagebrightness)).EndInit();
this.nightsgroup.ResumeLayout(false);
this.nightsgroup.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.nightscircleprecision)).EndInit();
this.tabscripteditor.ResumeLayout(false);
this.groupBox9.ResumeLayout(false);
this.groupBox9.PerformLayout();
@ -2560,9 +2590,6 @@ namespace CodeImp.DoomBuilder.Windows
this.groupBox6.ResumeLayout(false);
this.groupBox6.PerformLayout();
this.previewgroup.ResumeLayout(false);
this.tabnights.ResumeLayout(false);
this.tabnights.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.nightscircleprecision)).EndInit();
this.tabpasting.ResumeLayout(false);
this.ResumeLayout(false);
@ -2632,7 +2659,8 @@ namespace CodeImp.DoomBuilder.Windows
private CodeImp.DoomBuilder.Controls.PasteOptionsControl pasteoptions;
private System.Windows.Forms.Label label16;
private System.Windows.Forms.GroupBox appearancegroup1;
private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.GroupBox nightsgroup;
private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.ComboBox dockersposition;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.CheckBox collapsedockers;
@ -2692,8 +2720,9 @@ namespace CodeImp.DoomBuilder.Windows
private System.Windows.Forms.Label labelBackups;
private System.Windows.Forms.Label label27;
private System.Windows.Forms.CheckBox cbDrawFullCrosshair;
private System.Windows.Forms.TabPage tabnights;
private Controls.ColorControl nightscolormare1;
private Controls.ColorControl waypointcolor1;
private Controls.ColorControl waypointcolor2;
private System.Windows.Forms.Label nightscircleprecisionlabel;
private System.Windows.Forms.Label label23;
private System.Windows.Forms.TrackBar nightscircleprecision;

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

@ -231,8 +231,11 @@ namespace CodeImp.DoomBuilder.Windows
nightscolormare7.Color = General.Colors.GetNiGHTSColor(6);
nightscolormare8.Color = General.Colors.GetNiGHTSColor(7);
// Paste options
pasteoptions.Setup(General.Settings.PasteOptions.Copy());
waypointcolor1.Color = General.Colors.WaypointColor;
waypointcolor2.Color = General.Colors.WaypointLoopColor;
// Paste options
pasteoptions.Setup(General.Settings.PasteOptions.Copy());
// Allow plugins to add tabs
this.SuspendLayout();

3
Source/Core/Windows/PreferencesForm.resx
View file

@ -147,9 +147,6 @@
<metadata name="label29.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="scriptallmanstyle.ToolTip" xml:space="preserve">
<value>When enabled, the opening brace
will be placed on a new line when