mirror of
https://git.do.srb2.org/STJr/ZoneBuilder.git
synced 2025-02-27 22:31:15 +00:00
Made NiGHTS path color configurable
This commit is contained in:
parent
652ff5aaf3
commit
32f3fbbd70
5 changed files with 31 additions and 11 deletions
Build
Source/Core
|
@ -297,6 +297,7 @@ colors
|
||||||
color38 = -4343957;
|
color38 = -4343957;
|
||||||
color39 = -2448096;
|
color39 = -2448096;
|
||||||
color40 = -17477;
|
color40 = -17477;
|
||||||
|
color41 = -8688;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,7 @@ namespace CodeImp.DoomBuilder.Rendering
|
||||||
private const float DARK_ADDITION = -0.2f;
|
private const float DARK_ADDITION = -0.2f;
|
||||||
|
|
||||||
// Palette size
|
// Palette size
|
||||||
private const int NUM_COLORS = 41;
|
private const int NUM_COLORS = 42;
|
||||||
public const int NUM_THING_COLORS = 20;
|
public const int NUM_THING_COLORS = 20;
|
||||||
public const int THING_COLORS_OFFSET = 20;
|
public const int THING_COLORS_OFFSET = 20;
|
||||||
|
|
||||||
|
@ -84,6 +84,7 @@ namespace CodeImp.DoomBuilder.Rendering
|
||||||
public const int THINGCOLOR18 = 38;
|
public const int THINGCOLOR18 = 38;
|
||||||
public const int THINGCOLOR19 = 39;
|
public const int THINGCOLOR19 = 39;
|
||||||
public const int THREEDFLOORCOLOR = 40; //mxd
|
public const int THREEDFLOORCOLOR = 40; //mxd
|
||||||
|
public const int NIGHTSCOLOR = 41;
|
||||||
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
@ -119,6 +120,8 @@ namespace CodeImp.DoomBuilder.Rendering
|
||||||
public PixelColor ModelWireframe { get { return colors[MODELWIRECOLOR]; } internal set { colors[MODELWIRECOLOR] = value; } }
|
public PixelColor ModelWireframe { get { return colors[MODELWIRECOLOR]; } internal set { colors[MODELWIRECOLOR] = value; } }
|
||||||
public PixelColor InfoLine { get { return colors[INFOLINECOLOR]; } internal set { colors[INFOLINECOLOR] = value; } }
|
public PixelColor InfoLine { get { return colors[INFOLINECOLOR]; } internal set { colors[INFOLINECOLOR] = value; } }
|
||||||
public PixelColor ThreeDFloor { get { return colors[THREEDFLOORCOLOR]; } internal set { colors[THREEDFLOORCOLOR] = value;} }
|
public PixelColor ThreeDFloor { get { return colors[THREEDFLOORCOLOR]; } internal set { colors[THREEDFLOORCOLOR] = value;} }
|
||||||
|
public PixelColor NiGHTSColor { get { return colors[NIGHTSCOLOR]; } internal set { colors[NIGHTSCOLOR] = value; } }
|
||||||
|
|
||||||
|
|
||||||
public PixelColor Crosshair3D { get { return colors[CROSSHAIR3D]; } internal set { colors[CROSSHAIR3D] = value; } }
|
public PixelColor Crosshair3D { get { return colors[CROSSHAIR3D]; } internal set { colors[CROSSHAIR3D] = value; } }
|
||||||
public PixelColor Highlight3D { get { return colors[HIGHLIGHT3D]; } internal set { colors[HIGHLIGHT3D] = value; } }
|
public PixelColor Highlight3D { get { return colors[HIGHLIGHT3D]; } internal set { colors[HIGHLIGHT3D] = value; } }
|
||||||
|
|
|
@ -1457,7 +1457,7 @@ namespace CodeImp.DoomBuilder.Rendering
|
||||||
|
|
||||||
if (iNext < size && axistransferlines[iNext].GetFlagsValue() == axistransferlines[i].GetFlagsValue() + 1)
|
if (iNext < size && axistransferlines[iNext].GetFlagsValue() == axistransferlines[i].GetFlagsValue() + 1)
|
||||||
{
|
{
|
||||||
RenderLine((Vector2D)axistransferlines[i].Position, (Vector2D)axistransferlines[iNext].Position, 1f, General.Colors.Highlight, true);
|
RenderLine((Vector2D)axistransferlines[i].Position, (Vector2D)axistransferlines[iNext].Position, 1f, General.Colors.NiGHTSColor, true);
|
||||||
/* Start looking for partners for the one beyond iNext. */
|
/* Start looking for partners for the one beyond iNext. */
|
||||||
i = iNext + 1;
|
i = iNext + 1;
|
||||||
}
|
}
|
||||||
|
@ -1471,7 +1471,7 @@ namespace CodeImp.DoomBuilder.Rendering
|
||||||
//Render axes.
|
//Render axes.
|
||||||
foreach (Thing axis in axes)
|
foreach (Thing axis in axes)
|
||||||
{
|
{
|
||||||
RenderCircle((Vector2D)axis.Position, (float)(axis.AngleDoom & 0x3FFF), 1f, General.Colors.Highlight, true);
|
RenderCircle((Vector2D)axis.Position, (float)(axis.AngleDoom & 0x3FFF), 1f, General.Colors.NiGHTSColor, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
22
Source/Core/Windows/PreferencesForm.Designer.cs
generated
22
Source/Core/Windows/PreferencesForm.Designer.cs
generated
|
@ -179,6 +179,7 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
this.pasteoptions = new CodeImp.DoomBuilder.Controls.PasteOptionsControl();
|
this.pasteoptions = new CodeImp.DoomBuilder.Controls.PasteOptionsControl();
|
||||||
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
|
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
|
||||||
this.browseScreenshotsFolderDialog = new System.Windows.Forms.FolderBrowserDialog();
|
this.browseScreenshotsFolderDialog = new System.Windows.Forms.FolderBrowserDialog();
|
||||||
|
this.colorNiGHTS = new CodeImp.DoomBuilder.Controls.ColorControl();
|
||||||
label7 = new System.Windows.Forms.Label();
|
label7 = new System.Windows.Forms.Label();
|
||||||
label6 = new System.Windows.Forms.Label();
|
label6 = new System.Windows.Forms.Label();
|
||||||
label5 = new System.Windows.Forms.Label();
|
label5 = new System.Windows.Forms.Label();
|
||||||
|
@ -612,6 +613,7 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
//
|
//
|
||||||
this.colorsgroup1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
this.colorsgroup1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||||
| System.Windows.Forms.AnchorStyles.Left)));
|
| System.Windows.Forms.AnchorStyles.Left)));
|
||||||
|
this.colorsgroup1.Controls.Add(this.colorNiGHTS);
|
||||||
this.colorsgroup1.Controls.Add(this.color3dFloors);
|
this.colorsgroup1.Controls.Add(this.color3dFloors);
|
||||||
this.colorsgroup1.Controls.Add(this.colorInfo);
|
this.colorsgroup1.Controls.Add(this.colorInfo);
|
||||||
this.colorsgroup1.Controls.Add(this.colorMD3);
|
this.colorsgroup1.Controls.Add(this.colorMD3);
|
||||||
|
@ -638,7 +640,7 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
//
|
//
|
||||||
this.color3dFloors.BackColor = System.Drawing.Color.Transparent;
|
this.color3dFloors.BackColor = System.Drawing.Color.Transparent;
|
||||||
this.color3dFloors.Label = "3D Floors:";
|
this.color3dFloors.Label = "3D Floors:";
|
||||||
this.color3dFloors.Location = new System.Drawing.Point(15, 286);
|
this.color3dFloors.Location = new System.Drawing.Point(15, 287);
|
||||||
this.color3dFloors.MaximumSize = new System.Drawing.Size(10000, 23);
|
this.color3dFloors.MaximumSize = new System.Drawing.Size(10000, 23);
|
||||||
this.color3dFloors.MinimumSize = new System.Drawing.Size(100, 23);
|
this.color3dFloors.MinimumSize = new System.Drawing.Size(100, 23);
|
||||||
this.color3dFloors.Name = "color3dFloors";
|
this.color3dFloors.Name = "color3dFloors";
|
||||||
|
@ -671,7 +673,7 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
//
|
//
|
||||||
this.doublesidedalpha.BackColor = System.Drawing.SystemColors.Window;
|
this.doublesidedalpha.BackColor = System.Drawing.SystemColors.Window;
|
||||||
this.doublesidedalpha.LargeChange = 3;
|
this.doublesidedalpha.LargeChange = 3;
|
||||||
this.doublesidedalpha.Location = new System.Drawing.Point(11, 349);
|
this.doublesidedalpha.Location = new System.Drawing.Point(11, 376);
|
||||||
this.doublesidedalpha.Name = "doublesidedalpha";
|
this.doublesidedalpha.Name = "doublesidedalpha";
|
||||||
this.doublesidedalpha.Size = new System.Drawing.Size(130, 45);
|
this.doublesidedalpha.Size = new System.Drawing.Size(130, 45);
|
||||||
this.doublesidedalpha.TabIndex = 2;
|
this.doublesidedalpha.TabIndex = 2;
|
||||||
|
@ -725,7 +727,7 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
// label2
|
// label2
|
||||||
//
|
//
|
||||||
this.label2.AutoSize = true;
|
this.label2.AutoSize = true;
|
||||||
this.label2.Location = new System.Drawing.Point(14, 328);
|
this.label2.Location = new System.Drawing.Point(14, 355);
|
||||||
this.label2.Name = "label2";
|
this.label2.Name = "label2";
|
||||||
this.label2.Size = new System.Drawing.Size(141, 13);
|
this.label2.Size = new System.Drawing.Size(141, 13);
|
||||||
this.label2.TabIndex = 14;
|
this.label2.TabIndex = 14;
|
||||||
|
@ -735,7 +737,7 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
// doublesidedalphalabel
|
// doublesidedalphalabel
|
||||||
//
|
//
|
||||||
this.doublesidedalphalabel.AutoSize = true;
|
this.doublesidedalphalabel.AutoSize = true;
|
||||||
this.doublesidedalphalabel.Location = new System.Drawing.Point(147, 361);
|
this.doublesidedalphalabel.Location = new System.Drawing.Point(147, 388);
|
||||||
this.doublesidedalphalabel.Name = "doublesidedalphalabel";
|
this.doublesidedalphalabel.Name = "doublesidedalphalabel";
|
||||||
this.doublesidedalphalabel.Size = new System.Drawing.Size(21, 13);
|
this.doublesidedalphalabel.Size = new System.Drawing.Size(21, 13);
|
||||||
this.doublesidedalphalabel.TabIndex = 16;
|
this.doublesidedalphalabel.TabIndex = 16;
|
||||||
|
@ -1953,6 +1955,17 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
//
|
//
|
||||||
this.browseScreenshotsFolderDialog.Description = "Select a Folder to Save Screenshots Into";
|
this.browseScreenshotsFolderDialog.Description = "Select a Folder to Save Screenshots Into";
|
||||||
//
|
//
|
||||||
|
// colorNiGHTS
|
||||||
|
//
|
||||||
|
this.colorNiGHTS.BackColor = System.Drawing.Color.Transparent;
|
||||||
|
this.colorNiGHTS.Label = "NiGHTS path:";
|
||||||
|
this.colorNiGHTS.Location = new System.Drawing.Point(15, 314);
|
||||||
|
this.colorNiGHTS.MaximumSize = new System.Drawing.Size(10000, 23);
|
||||||
|
this.colorNiGHTS.MinimumSize = new System.Drawing.Size(100, 23);
|
||||||
|
this.colorNiGHTS.Name = "colorNiGHTS";
|
||||||
|
this.colorNiGHTS.Size = new System.Drawing.Size(168, 23);
|
||||||
|
this.colorNiGHTS.TabIndex = 25;
|
||||||
|
//
|
||||||
// PreferencesForm
|
// PreferencesForm
|
||||||
//
|
//
|
||||||
this.AcceptButton = this.apply;
|
this.AcceptButton = this.apply;
|
||||||
|
@ -2160,5 +2173,6 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
private System.Windows.Forms.Label labelBackups;
|
private System.Windows.Forms.Label labelBackups;
|
||||||
private System.Windows.Forms.Label label27;
|
private System.Windows.Forms.Label label27;
|
||||||
private System.Windows.Forms.CheckBox cbDrawFullCrosshair;
|
private System.Windows.Forms.CheckBox cbDrawFullCrosshair;
|
||||||
|
private Controls.ColorControl colorNiGHTS;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -178,6 +178,7 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
colorMD3.Color = General.Colors.ModelWireframe;
|
colorMD3.Color = General.Colors.ModelWireframe;
|
||||||
colorInfo.Color = General.Colors.InfoLine;
|
colorInfo.Color = General.Colors.InfoLine;
|
||||||
color3dFloors.Color = General.Colors.ThreeDFloor;
|
color3dFloors.Color = General.Colors.ThreeDFloor;
|
||||||
|
colorNiGHTS.Color = General.Colors.NiGHTSColor;
|
||||||
|
|
||||||
colorscriptbackground.Color = General.Colors.ScriptBackground;
|
colorscriptbackground.Color = General.Colors.ScriptBackground;
|
||||||
colorlinenumbers.Color = General.Colors.LineNumbers;
|
colorlinenumbers.Color = General.Colors.LineNumbers;
|
||||||
|
@ -300,6 +301,7 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
General.Colors.ModelWireframe = colorMD3.Color;
|
General.Colors.ModelWireframe = colorMD3.Color;
|
||||||
General.Colors.InfoLine = colorInfo.Color;
|
General.Colors.InfoLine = colorInfo.Color;
|
||||||
General.Colors.ThreeDFloor = color3dFloors.Color;
|
General.Colors.ThreeDFloor = color3dFloors.Color;
|
||||||
|
General.Colors.NiGHTSColor = colorNiGHTS.Color;
|
||||||
|
|
||||||
General.Colors.CreateAssistColors();
|
General.Colors.CreateAssistColors();
|
||||||
General.Settings.BlackBrowsers = blackbrowsers.Checked;
|
General.Settings.BlackBrowsers = blackbrowsers.Checked;
|
||||||
|
|
Loading…
Reference in a new issue