From 436bc14a86314a5ee433fd89e1e45c95c2c02ef3 Mon Sep 17 00:00:00 2001 From: MaxED Date: Sun, 11 Nov 2012 21:52:08 +0000 Subject: [PATCH] Line angle is now displayed when a line is drawn in Draw Geometry mode. TranslucentLine (208) action's "additive" property values were inverted. --- .../Includes/ZDoom_linedefs.cfg | 2 +- Source/Core/Rendering/TextLabel.cs | 6 +- Source/Core/Windows/AboutForm.Designer.cs | 471 +++++++++--------- Source/Core/Windows/AboutForm.cs | 2 +- .../ClassicModes/DrawGeometryMode.cs | 2 +- .../ClassicModes/DrawRectangleMode.cs | 2 +- .../Plugins/BuilderModes/General/HintLabel.cs | 2 +- .../BuilderModes/General/LineLengthLabel.cs | 16 +- 8 files changed, 257 insertions(+), 246 deletions(-) diff --git a/Build/Configurations/Includes/ZDoom_linedefs.cfg b/Build/Configurations/Includes/ZDoom_linedefs.cfg index 7a07ad18..adb69470 100644 --- a/Build/Configurations/Includes/ZDoom_linedefs.cfg +++ b/Build/Configurations/Includes/ZDoom_linedefs.cfg @@ -3499,7 +3499,7 @@ zdoom { title = "Additive"; type = 11; - enum = "yesno"; + enum = "noyes"; } } } diff --git a/Source/Core/Rendering/TextLabel.cs b/Source/Core/Rendering/TextLabel.cs index f55893ce..c4000c59 100644 --- a/Source/Core/Rendering/TextLabel.cs +++ b/Source/Core/Rendering/TextLabel.cs @@ -149,12 +149,12 @@ namespace CodeImp.DoomBuilder.Rendering // This updates the text if needed internal void Update(float translatex, float translatey, float scalex, float scaley) { - FlatVertex[] verts; + //FlatVertex[] verts; RectangleF absview; float beginx = 0; float beginy = 0; - bool colorcode = false; - int characters = 0; + //bool colorcode = false; + //int characters = 0; byte[] textbytes; DataStream stream; diff --git a/Source/Core/Windows/AboutForm.Designer.cs b/Source/Core/Windows/AboutForm.Designer.cs index 72e22a0d..b48d19cd 100644 --- a/Source/Core/Windows/AboutForm.Designer.cs +++ b/Source/Core/Windows/AboutForm.Designer.cs @@ -28,241 +28,242 @@ namespace CodeImp.DoomBuilder.Windows /// private void InitializeComponent() { - System.Windows.Forms.Label label1; - System.Windows.Forms.PictureBox pictureBox1; - System.Windows.Forms.PictureBox pictureBox3; - System.Windows.Forms.Label label2; - this.close = new System.Windows.Forms.Button(); - this.builderlink = new System.Windows.Forms.LinkLabel(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.codeimplink = new System.Windows.Forms.LinkLabel(); - this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.pictureBox4 = new System.Windows.Forms.PictureBox(); - this.gzdbLink = new System.Windows.Forms.LinkLabel(); - this.copyversion = new System.Windows.Forms.Button(); - this.version = new System.Windows.Forms.Label(); - this.tabPage2 = new System.Windows.Forms.TabPage(); - label1 = new System.Windows.Forms.Label(); - pictureBox1 = new System.Windows.Forms.PictureBox(); - pictureBox3 = new System.Windows.Forms.PictureBox(); - label2 = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(pictureBox1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(pictureBox3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); - this.tabControl1.SuspendLayout(); - this.tabPage1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); - this.tabPage2.SuspendLayout(); - this.SuspendLayout(); - // - // label1 - // - label1.FlatStyle = System.Windows.Forms.FlatStyle.System; - label1.Location = new System.Drawing.Point(11, 98); - label1.Name = "label1"; - label1.Size = new System.Drawing.Size(349, 50); - label1.TabIndex = 2; - label1.Text = "Doom Builder is designed and programmed by Pascal vd Heiden.\r\nSeveral game config" + - "urations were written by various members of the Doom community. See the website " + - "for a complete list of credits."; - // - // pictureBox1 - // - pictureBox1.Image = global::CodeImp.DoomBuilder.Properties.Resources.Splash3_small; - pictureBox1.Location = new System.Drawing.Point(6, 6); - pictureBox1.Name = "pictureBox1"; - pictureBox1.Size = new System.Drawing.Size(226, 80); - pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - pictureBox1.TabIndex = 0; - pictureBox1.TabStop = false; - // - // pictureBox3 - // - pictureBox3.Image = global::CodeImp.DoomBuilder.Properties.Resources.GZDB_Logo_small; - pictureBox3.Location = new System.Drawing.Point(6, 6); - pictureBox3.Name = "pictureBox3"; - pictureBox3.Size = new System.Drawing.Size(226, 80); - pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - pictureBox3.TabIndex = 12; - pictureBox3.TabStop = false; - // - // label2 - // - label2.BackColor = System.Drawing.Color.White; - label2.FlatStyle = System.Windows.Forms.FlatStyle.System; - label2.Location = new System.Drawing.Point(11, 152); - label2.Name = "label2"; - label2.Size = new System.Drawing.Size(349, 23); - label2.TabIndex = 14; - label2.Text = "GZDoom Builder is designed and programmed by MaxED.\r\n"; - // - // close - // - this.close.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.close.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.close.Location = new System.Drawing.Point(285, 245); - this.close.Name = "close"; - this.close.Size = new System.Drawing.Size(116, 25); - this.close.TabIndex = 5; - this.close.Text = "Close"; - this.close.UseVisualStyleBackColor = true; - // - // builderlink - // - this.builderlink.ActiveLinkColor = System.Drawing.Color.Firebrick; - this.builderlink.AutoSize = true; - this.builderlink.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; - this.builderlink.LinkColor = System.Drawing.Color.Firebrick; - this.builderlink.Location = new System.Drawing.Point(8, 156); - this.builderlink.Name = "builderlink"; - this.builderlink.Size = new System.Drawing.Size(119, 14); - this.builderlink.TabIndex = 3; - this.builderlink.TabStop = true; - this.builderlink.Text = "www.doombuilder.com"; - this.builderlink.VisitedLinkColor = System.Drawing.Color.Firebrick; - this.builderlink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.builderlink_LinkClicked); - // - // pictureBox2 - // - this.pictureBox2.Image = global::CodeImp.DoomBuilder.Properties.Resources.CLogo; - this.pictureBox2.Location = new System.Drawing.Point(289, 6); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(88, 80); - this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox2.TabIndex = 10; - this.pictureBox2.TabStop = false; - // - // codeimplink - // - this.codeimplink.ActiveLinkColor = System.Drawing.Color.Firebrick; - this.codeimplink.AutoSize = true; - this.codeimplink.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; - this.codeimplink.LinkColor = System.Drawing.Color.Firebrick; - this.codeimplink.Location = new System.Drawing.Point(8, 176); - this.codeimplink.Name = "codeimplink"; - this.codeimplink.Size = new System.Drawing.Size(102, 14); - this.codeimplink.TabIndex = 4; - this.codeimplink.TabStop = true; - this.codeimplink.Text = "www.codeimp.com"; - this.codeimplink.VisitedLinkColor = System.Drawing.Color.Firebrick; - this.codeimplink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.codeimplink_LinkClicked); - // - // tabControl1 - // - this.tabControl1.Controls.Add(this.tabPage1); - this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Location = new System.Drawing.Point(12, 12); - this.tabControl1.Name = "tabControl1"; - this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(391, 227); - this.tabControl1.TabIndex = 11; - // - // tabPage1 - // - this.tabPage1.Controls.Add(pictureBox3); - this.tabPage1.Controls.Add(label2); - this.tabPage1.Controls.Add(this.pictureBox4); - this.tabPage1.Controls.Add(this.gzdbLink); - this.tabPage1.Controls.Add(this.copyversion); - this.tabPage1.Controls.Add(this.version); - this.tabPage1.Location = new System.Drawing.Point(4, 23); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(383, 200); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "About GZDoom Builder"; - this.tabPage1.UseVisualStyleBackColor = true; - // - // pictureBox4 - // - this.pictureBox4.Image = global::CodeImp.DoomBuilder.Properties.Resources.MLogo; - this.pictureBox4.Location = new System.Drawing.Point(289, 6); - this.pictureBox4.Name = "pictureBox4"; - this.pictureBox4.Size = new System.Drawing.Size(88, 80); - this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox4.TabIndex = 16; - this.pictureBox4.TabStop = false; - // - // gzdbLink - // - this.gzdbLink.ActiveLinkColor = System.Drawing.Color.Firebrick; - this.gzdbLink.AutoSize = true; - this.gzdbLink.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; - this.gzdbLink.LinkColor = System.Drawing.Color.Firebrick; - this.gzdbLink.Location = new System.Drawing.Point(8, 175); - this.gzdbLink.Name = "gzdbLink"; - this.gzdbLink.Size = new System.Drawing.Size(143, 14); - this.gzdbLink.TabIndex = 15; - this.gzdbLink.TabStop = true; - this.gzdbLink.Text = "Official thread at ZDoom.org"; - this.gzdbLink.VisitedLinkColor = System.Drawing.Color.Firebrick; - this.gzdbLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.gzdbLink_LinkClicked); - // - // copyversion - // - this.copyversion.Location = new System.Drawing.Point(269, 97); - this.copyversion.Name = "copyversion"; - this.copyversion.Size = new System.Drawing.Size(108, 25); - this.copyversion.TabIndex = 13; - this.copyversion.Text = "Copy Version"; - this.copyversion.UseVisualStyleBackColor = true; - this.copyversion.Click += new System.EventHandler(this.copyversion_Click); - // - // version - // - this.version.AutoSize = true; - this.version.FlatStyle = System.Windows.Forms.FlatStyle.System; - this.version.Location = new System.Drawing.Point(11, 102); - this.version.Name = "version"; - this.version.Size = new System.Drawing.Size(153, 14); - this.version.TabIndex = 11; - this.version.Text = "GZDoom Builder some version"; - // - // tabPage2 - // - this.tabPage2.Controls.Add(pictureBox1); - this.tabPage2.Controls.Add(this.codeimplink); - this.tabPage2.Controls.Add(label1); - this.tabPage2.Controls.Add(this.pictureBox2); - this.tabPage2.Controls.Add(this.builderlink); - this.tabPage2.Location = new System.Drawing.Point(4, 23); - this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(383, 200); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "About Doom Builder"; - this.tabPage2.UseVisualStyleBackColor = true; - // - // AboutForm - // - this.AcceptButton = this.close; - this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.CancelButton = this.close; - this.ClientSize = new System.Drawing.Size(413, 277); - this.Controls.Add(this.tabControl1); - this.Controls.Add(this.close); - this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "AboutForm"; - this.Opacity = 0; - this.ShowIcon = false; - this.ShowInTaskbar = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "About"; - ((System.ComponentModel.ISupportInitialize)(pictureBox1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(pictureBox3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); - this.tabControl1.ResumeLayout(false); - this.tabPage1.ResumeLayout(false); - this.tabPage1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); - this.tabPage2.ResumeLayout(false); - this.tabPage2.PerformLayout(); - this.ResumeLayout(false); + System.Windows.Forms.Label label1; + System.Windows.Forms.PictureBox pictureBox1; + System.Windows.Forms.PictureBox pictureBox3; + System.Windows.Forms.Label label2; + this.close = new System.Windows.Forms.Button(); + this.builderlink = new System.Windows.Forms.LinkLabel(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.codeimplink = new System.Windows.Forms.LinkLabel(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.pictureBox4 = new System.Windows.Forms.PictureBox(); + this.gzdbLink = new System.Windows.Forms.LinkLabel(); + this.copyversion = new System.Windows.Forms.Button(); + this.version = new System.Windows.Forms.Label(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + label1 = new System.Windows.Forms.Label(); + pictureBox1 = new System.Windows.Forms.PictureBox(); + pictureBox3 = new System.Windows.Forms.PictureBox(); + label2 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(pictureBox3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); + this.tabPage2.SuspendLayout(); + this.SuspendLayout(); + // + // label1 + // + label1.FlatStyle = System.Windows.Forms.FlatStyle.System; + label1.Location = new System.Drawing.Point(11, 98); + label1.Name = "label1"; + label1.Size = new System.Drawing.Size(349, 50); + label1.TabIndex = 2; + label1.Text = "Doom Builder is designed and programmed by Pascal vd Heiden.\r\nSeveral game config" + + "urations were written by various members of the Doom community. See the website " + + "for a complete list of credits."; + // + // pictureBox1 + // + pictureBox1.Image = global::CodeImp.DoomBuilder.Properties.Resources.Splash3_small; + pictureBox1.Location = new System.Drawing.Point(6, 6); + pictureBox1.Name = "pictureBox1"; + pictureBox1.Size = new System.Drawing.Size(226, 80); + pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + pictureBox1.TabIndex = 0; + pictureBox1.TabStop = false; + // + // pictureBox3 + // + pictureBox3.Image = global::CodeImp.DoomBuilder.Properties.Resources.GZDB_Logo_small; + pictureBox3.Location = new System.Drawing.Point(6, 6); + pictureBox3.Name = "pictureBox3"; + pictureBox3.Size = new System.Drawing.Size(226, 80); + pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + pictureBox3.TabIndex = 12; + pictureBox3.TabStop = false; + // + // label2 + // + label2.BackColor = System.Drawing.Color.White; + label2.FlatStyle = System.Windows.Forms.FlatStyle.System; + label2.Location = new System.Drawing.Point(11, 143); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(366, 32); + label2.TabIndex = 14; + label2.Text = "GZDoom Builder is designed and programmed by MaxED.\r\nGZDoom Builder uses game con" + + "figurations based on ones created by Gez."; + // + // close + // + this.close.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.close.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.close.Location = new System.Drawing.Point(285, 245); + this.close.Name = "close"; + this.close.Size = new System.Drawing.Size(116, 25); + this.close.TabIndex = 5; + this.close.Text = "Close"; + this.close.UseVisualStyleBackColor = true; + // + // builderlink + // + this.builderlink.ActiveLinkColor = System.Drawing.Color.Firebrick; + this.builderlink.AutoSize = true; + this.builderlink.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; + this.builderlink.LinkColor = System.Drawing.Color.Firebrick; + this.builderlink.Location = new System.Drawing.Point(8, 156); + this.builderlink.Name = "builderlink"; + this.builderlink.Size = new System.Drawing.Size(119, 14); + this.builderlink.TabIndex = 3; + this.builderlink.TabStop = true; + this.builderlink.Text = "www.doombuilder.com"; + this.builderlink.VisitedLinkColor = System.Drawing.Color.Firebrick; + this.builderlink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.builderlink_LinkClicked); + // + // pictureBox2 + // + this.pictureBox2.Image = global::CodeImp.DoomBuilder.Properties.Resources.CLogo; + this.pictureBox2.Location = new System.Drawing.Point(289, 6); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(88, 80); + this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox2.TabIndex = 10; + this.pictureBox2.TabStop = false; + // + // codeimplink + // + this.codeimplink.ActiveLinkColor = System.Drawing.Color.Firebrick; + this.codeimplink.AutoSize = true; + this.codeimplink.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; + this.codeimplink.LinkColor = System.Drawing.Color.Firebrick; + this.codeimplink.Location = new System.Drawing.Point(8, 176); + this.codeimplink.Name = "codeimplink"; + this.codeimplink.Size = new System.Drawing.Size(102, 14); + this.codeimplink.TabIndex = 4; + this.codeimplink.TabStop = true; + this.codeimplink.Text = "www.codeimp.com"; + this.codeimplink.VisitedLinkColor = System.Drawing.Color.Firebrick; + this.codeimplink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.codeimplink_LinkClicked); + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Location = new System.Drawing.Point(12, 12); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(391, 227); + this.tabControl1.TabIndex = 11; + // + // tabPage1 + // + this.tabPage1.Controls.Add(pictureBox3); + this.tabPage1.Controls.Add(label2); + this.tabPage1.Controls.Add(this.pictureBox4); + this.tabPage1.Controls.Add(this.gzdbLink); + this.tabPage1.Controls.Add(this.copyversion); + this.tabPage1.Controls.Add(this.version); + this.tabPage1.Location = new System.Drawing.Point(4, 23); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(383, 200); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "About GZDoom Builder"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // pictureBox4 + // + this.pictureBox4.Image = global::CodeImp.DoomBuilder.Properties.Resources.MLogo; + this.pictureBox4.Location = new System.Drawing.Point(289, 6); + this.pictureBox4.Name = "pictureBox4"; + this.pictureBox4.Size = new System.Drawing.Size(88, 80); + this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox4.TabIndex = 16; + this.pictureBox4.TabStop = false; + // + // gzdbLink + // + this.gzdbLink.ActiveLinkColor = System.Drawing.Color.Firebrick; + this.gzdbLink.AutoSize = true; + this.gzdbLink.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; + this.gzdbLink.LinkColor = System.Drawing.Color.Firebrick; + this.gzdbLink.Location = new System.Drawing.Point(8, 175); + this.gzdbLink.Name = "gzdbLink"; + this.gzdbLink.Size = new System.Drawing.Size(143, 14); + this.gzdbLink.TabIndex = 15; + this.gzdbLink.TabStop = true; + this.gzdbLink.Text = "Official thread at ZDoom.org"; + this.gzdbLink.VisitedLinkColor = System.Drawing.Color.Firebrick; + this.gzdbLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.gzdbLink_LinkClicked); + // + // copyversion + // + this.copyversion.Location = new System.Drawing.Point(269, 97); + this.copyversion.Name = "copyversion"; + this.copyversion.Size = new System.Drawing.Size(108, 25); + this.copyversion.TabIndex = 13; + this.copyversion.Text = "Copy Version"; + this.copyversion.UseVisualStyleBackColor = true; + this.copyversion.Click += new System.EventHandler(this.copyversion_Click); + // + // version + // + this.version.AutoSize = true; + this.version.FlatStyle = System.Windows.Forms.FlatStyle.System; + this.version.Location = new System.Drawing.Point(11, 102); + this.version.Name = "version"; + this.version.Size = new System.Drawing.Size(153, 14); + this.version.TabIndex = 11; + this.version.Text = "GZDoom Builder some version"; + // + // tabPage2 + // + this.tabPage2.Controls.Add(pictureBox1); + this.tabPage2.Controls.Add(this.codeimplink); + this.tabPage2.Controls.Add(label1); + this.tabPage2.Controls.Add(this.pictureBox2); + this.tabPage2.Controls.Add(this.builderlink); + this.tabPage2.Location = new System.Drawing.Point(4, 23); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(383, 200); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "About Doom Builder"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // AboutForm + // + this.AcceptButton = this.close; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.CancelButton = this.close; + this.ClientSize = new System.Drawing.Size(413, 277); + this.Controls.Add(this.tabControl1); + this.Controls.Add(this.close); + this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "AboutForm"; + this.Opacity = 0; + this.ShowIcon = false; + this.ShowInTaskbar = false; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "About"; + ((System.ComponentModel.ISupportInitialize)(pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(pictureBox3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.tabPage1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); + this.tabPage2.ResumeLayout(false); + this.tabPage2.PerformLayout(); + this.ResumeLayout(false); } diff --git a/Source/Core/Windows/AboutForm.cs b/Source/Core/Windows/AboutForm.cs index f521ac5e..addb771d 100644 --- a/Source/Core/Windows/AboutForm.cs +++ b/Source/Core/Windows/AboutForm.cs @@ -65,6 +65,6 @@ namespace CodeImp.DoomBuilder.Windows { Clipboard.Clear(); Clipboard.SetText(CodeImp.DoomBuilder.GZBuilder.GZGeneral.Version.ToString() + CodeImp.DoomBuilder.GZBuilder.GZGeneral.Revision); - } + } } } \ No newline at end of file diff --git a/Source/Plugins/BuilderModes/ClassicModes/DrawGeometryMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DrawGeometryMode.cs index 2e22f600..4b86bc3c 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/DrawGeometryMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/DrawGeometryMode.cs @@ -393,7 +393,7 @@ namespace CodeImp.DoomBuilder.BuilderModes newpoint.stitch = stitch; newpoint.stitchline = stitchline; points.Add(newpoint); - labels.Add(new LineLengthLabel()); + labels.Add(new LineLengthLabel(true)); labels[labels.Count - 1].Start = newpoint.pos; if(labels.Count > 1) labels[labels.Count - 2].End = newpoint.pos; Update(); diff --git a/Source/Plugins/BuilderModes/ClassicModes/DrawRectangleMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DrawRectangleMode.cs index cea5d95a..c7c596f8 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/DrawRectangleMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/DrawRectangleMode.cs @@ -215,7 +215,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.ClassicModes points.Add(newpoint); if (points.Count == 1) { //add point and labels - labels.AddRange(new LineLengthLabel[] { new LineLengthLabel(), new LineLengthLabel(), new LineLengthLabel(), new LineLengthLabel() }); + labels.AddRange(new LineLengthLabel[] { new LineLengthLabel(false), new LineLengthLabel(false), new LineLengthLabel(false), new LineLengthLabel(false) }); hintLabel = new HintLabel(); Update(); } else if (points[0].pos == points[1].pos) { //nothing is drawn diff --git a/Source/Plugins/BuilderModes/General/HintLabel.cs b/Source/Plugins/BuilderModes/General/HintLabel.cs index 3a7c1d86..0f87f48a 100644 --- a/Source/Plugins/BuilderModes/General/HintLabel.cs +++ b/Source/Plugins/BuilderModes/General/HintLabel.cs @@ -24,7 +24,7 @@ namespace CodeImp.DoomBuilder.BuilderModes } } - public HintLabel() : base() { + public HintLabel() : base(false) { label.Color = General.Colors.BrightColors[new Random().Next(General.Colors.BrightColors.Length - 1)]; } diff --git a/Source/Plugins/BuilderModes/General/LineLengthLabel.cs b/Source/Plugins/BuilderModes/General/LineLengthLabel.cs index 82f2be78..68041f96 100644 --- a/Source/Plugins/BuilderModes/General/LineLengthLabel.cs +++ b/Source/Plugins/BuilderModes/General/LineLengthLabel.cs @@ -40,7 +40,7 @@ namespace CodeImp.DoomBuilder.BuilderModes { #region ================== Constants - private const int TEXT_CAPACITY = 10; + private const int TEXT_CAPACITY = 15; private const float TEXT_SCALE = 14f; private const string VALUE_FORMAT = "0"; @@ -51,6 +51,7 @@ namespace CodeImp.DoomBuilder.BuilderModes protected TextLabel label; protected Vector2D start; protected Vector2D end; + private bool showAngle; //mxd #endregion @@ -65,8 +66,9 @@ namespace CodeImp.DoomBuilder.BuilderModes #region ================== Constructor / Disposer // Constructor - public LineLengthLabel() + public LineLengthLabel(bool showAngle) { + this.showAngle = showAngle; //mxd // Initialize Initialize(); } @@ -106,7 +108,15 @@ namespace CodeImp.DoomBuilder.BuilderModes { Vector2D delta = end - start; float length = delta.GetLength(); - label.Text = length.ToString(VALUE_FORMAT); + + //mxd + if(showAngle) { + int angle = (int)Math.Round(delta.GetAngle() * 180 / Math.PI); + label.Text = "l:" + length.ToString(VALUE_FORMAT) + "; a:" + angle; + } else { + label.Text = length.ToString(VALUE_FORMAT); + } + label.Rectangle = new RectangleF(start.x + delta.x * 0.5f, start.y + delta.y * 0.5f, 0f, 0f); }