diff --git a/Build/ZoneBuilder.default.cfg b/Build/ZoneBuilder.default.cfg index f347fd9..6a6a475 100644 --- a/Build/ZoneBuilder.default.cfg +++ b/Build/ZoneBuilder.default.cfg @@ -297,6 +297,7 @@ colors color38 = -4343957; color39 = -2448096; color40 = -17477; + color41 = -8688; } diff --git a/Source/Core/Rendering/ColorCollection.cs b/Source/Core/Rendering/ColorCollection.cs index 1b38263..7f76d5c 100644 --- a/Source/Core/Rendering/ColorCollection.cs +++ b/Source/Core/Rendering/ColorCollection.cs @@ -38,7 +38,7 @@ namespace CodeImp.DoomBuilder.Rendering private const float DARK_ADDITION = -0.2f; // Palette size - private const int NUM_COLORS = 41; + private const int NUM_COLORS = 42; public const int NUM_THING_COLORS = 20; public const int THING_COLORS_OFFSET = 20; @@ -84,6 +84,7 @@ namespace CodeImp.DoomBuilder.Rendering public const int THINGCOLOR18 = 38; public const int THINGCOLOR19 = 39; public const int THREEDFLOORCOLOR = 40; //mxd + public const int NIGHTSCOLOR = 41; #endregion @@ -119,8 +120,10 @@ namespace CodeImp.DoomBuilder.Rendering 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 ThreeDFloor { get { return colors[THREEDFLOORCOLOR]; } internal set { colors[THREEDFLOORCOLOR] = value;} } - - public PixelColor Crosshair3D { get { return colors[CROSSHAIR3D]; } internal set { colors[CROSSHAIR3D] = 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 Highlight3D { get { return colors[HIGHLIGHT3D]; } internal set { colors[HIGHLIGHT3D] = value; } } public PixelColor Selection3D { get { return colors[SELECTION3D]; } internal set { colors[SELECTION3D] = value; } } diff --git a/Source/Core/Rendering/Renderer2D.cs b/Source/Core/Rendering/Renderer2D.cs index 1ed1808..2bc55f7 100644 --- a/Source/Core/Rendering/Renderer2D.cs +++ b/Source/Core/Rendering/Renderer2D.cs @@ -1457,7 +1457,7 @@ namespace CodeImp.DoomBuilder.Rendering 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. */ i = iNext + 1; } @@ -1471,7 +1471,7 @@ namespace CodeImp.DoomBuilder.Rendering //Render 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 diff --git a/Source/Core/Windows/PreferencesForm.Designer.cs b/Source/Core/Windows/PreferencesForm.Designer.cs index 3d0e056..1b89c65 100644 --- a/Source/Core/Windows/PreferencesForm.Designer.cs +++ b/Source/Core/Windows/PreferencesForm.Designer.cs @@ -179,6 +179,7 @@ namespace CodeImp.DoomBuilder.Windows this.pasteoptions = new CodeImp.DoomBuilder.Controls.PasteOptionsControl(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.browseScreenshotsFolderDialog = new System.Windows.Forms.FolderBrowserDialog(); + this.colorNiGHTS = new CodeImp.DoomBuilder.Controls.ColorControl(); label7 = new System.Windows.Forms.Label(); label6 = 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) | System.Windows.Forms.AnchorStyles.Left))); + this.colorsgroup1.Controls.Add(this.colorNiGHTS); this.colorsgroup1.Controls.Add(this.color3dFloors); this.colorsgroup1.Controls.Add(this.colorInfo); this.colorsgroup1.Controls.Add(this.colorMD3); @@ -638,7 +640,7 @@ namespace CodeImp.DoomBuilder.Windows // this.color3dFloors.BackColor = System.Drawing.Color.Transparent; 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.MinimumSize = new System.Drawing.Size(100, 23); this.color3dFloors.Name = "color3dFloors"; @@ -671,7 +673,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, 376); this.doublesidedalpha.Name = "doublesidedalpha"; this.doublesidedalpha.Size = new System.Drawing.Size(130, 45); this.doublesidedalpha.TabIndex = 2; @@ -725,7 +727,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, 355); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(141, 13); this.label2.TabIndex = 14; @@ -735,7 +737,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, 388); this.doublesidedalphalabel.Name = "doublesidedalphalabel"; this.doublesidedalphalabel.Size = new System.Drawing.Size(21, 13); this.doublesidedalphalabel.TabIndex = 16; @@ -1953,6 +1955,17 @@ namespace CodeImp.DoomBuilder.Windows // 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 // this.AcceptButton = this.apply; @@ -2160,5 +2173,6 @@ namespace CodeImp.DoomBuilder.Windows private System.Windows.Forms.Label labelBackups; private System.Windows.Forms.Label label27; private System.Windows.Forms.CheckBox cbDrawFullCrosshair; + private Controls.ColorControl colorNiGHTS; } } \ No newline at end of file diff --git a/Source/Core/Windows/PreferencesForm.cs b/Source/Core/Windows/PreferencesForm.cs index 02a3060..82c7b9d 100644 --- a/Source/Core/Windows/PreferencesForm.cs +++ b/Source/Core/Windows/PreferencesForm.cs @@ -178,8 +178,9 @@ namespace CodeImp.DoomBuilder.Windows colorMD3.Color = General.Colors.ModelWireframe; colorInfo.Color = General.Colors.InfoLine; 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; colorplaintext.Color = General.Colors.PlainText; colorcomments.Color = General.Colors.Comments; @@ -300,8 +301,9 @@ namespace CodeImp.DoomBuilder.Windows General.Colors.ModelWireframe = colorMD3.Color; General.Colors.InfoLine = colorInfo.Color; General.Colors.ThreeDFloor = color3dFloors.Color; + General.Colors.NiGHTSColor = colorNiGHTS.Color; - General.Colors.CreateAssistColors(); + General.Colors.CreateAssistColors(); General.Settings.BlackBrowsers = blackbrowsers.Checked; General.Settings.CapitalizeTextureNames = capitalizetexturenames.Checked; //mxd General.Settings.ClassicBilinear = classicbilinear.Checked;