From fd41bc9b3473d90988b9a667fa9f5990b2840aff Mon Sep 17 00:00:00 2001 From: igorseabra4 Date: Thu, 15 Nov 2018 11:50:37 -0300 Subject: [PATCH] minor fixes --- IndustrialPark/MainForm/MainForm.Designer.cs | 62 ++++++++++---------- IndustrialPark/MainForm/MainForm.cs | 2 + IndustrialPark/SharpDX/SharpRenderer.cs | 5 +- 3 files changed, 35 insertions(+), 34 deletions(-) diff --git a/IndustrialPark/MainForm/MainForm.Designer.cs b/IndustrialPark/MainForm/MainForm.Designer.cs index f0858879..d7b44879 100644 --- a/IndustrialPark/MainForm/MainForm.Designer.cs +++ b/IndustrialPark/MainForm/MainForm.Designer.cs @@ -71,8 +71,11 @@ private void InitializeComponent() this.cAMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dSTRToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dYNAToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.eGENToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.hANGToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mRKRToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mVPTToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pENDToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pKUPToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pLATToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pLYRToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -88,9 +91,6 @@ private void InitializeComponent() this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.renderPanel = new System.Windows.Forms.Panel(); - this.eGENToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.hANGToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pENDToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.SuspendLayout(); @@ -444,6 +444,24 @@ private void InitializeComponent() this.dYNAToolStripMenuItem.Text = "DYNA"; this.dYNAToolStripMenuItem.Click += new System.EventHandler(this.dYNAToolStripMenuItem_Click); // + // eGENToolStripMenuItem + // + this.eGENToolStripMenuItem.Checked = true; + this.eGENToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; + this.eGENToolStripMenuItem.Name = "eGENToolStripMenuItem"; + this.eGENToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.eGENToolStripMenuItem.Text = "EGEN"; + this.eGENToolStripMenuItem.Click += new System.EventHandler(this.eGENToolStripMenuItem_Click); + // + // hANGToolStripMenuItem + // + this.hANGToolStripMenuItem.Checked = true; + this.hANGToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; + this.hANGToolStripMenuItem.Name = "hANGToolStripMenuItem"; + this.hANGToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.hANGToolStripMenuItem.Text = "HANG"; + this.hANGToolStripMenuItem.Click += new System.EventHandler(this.hANGToolStripMenuItem_Click); + // // mRKRToolStripMenuItem // this.mRKRToolStripMenuItem.Checked = true; @@ -462,6 +480,15 @@ private void InitializeComponent() this.mVPTToolStripMenuItem.Text = "MVPT"; this.mVPTToolStripMenuItem.Click += new System.EventHandler(this.mVPTToolStripMenuItem_Click); // + // pENDToolStripMenuItem + // + this.pENDToolStripMenuItem.Checked = true; + this.pENDToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; + this.pENDToolStripMenuItem.Name = "pENDToolStripMenuItem"; + this.pENDToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.pENDToolStripMenuItem.Text = "PEND"; + this.pENDToolStripMenuItem.Click += new System.EventHandler(this.pENDToolStripMenuItem_Click); + // // pKUPToolStripMenuItem // this.pKUPToolStripMenuItem.Checked = true; @@ -552,7 +579,7 @@ private void InitializeComponent() // this.uIModeToolStripMenuItem.Name = "uIModeToolStripMenuItem"; this.uIModeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.uIModeToolStripMenuItem.Text = "UI Mode"; + this.uIModeToolStripMenuItem.Text = "UI Mode (U)"; this.uIModeToolStripMenuItem.Click += new System.EventHandler(this.uIToolStripMenuItem_Click); // // uIModeAutoSizeToolStripMenuItem @@ -593,33 +620,6 @@ private void InitializeComponent() this.renderPanel.MouseUp += new System.Windows.Forms.MouseEventHandler(this.renderPanel_MouseUp); this.renderPanel.Resize += new System.EventHandler(this.ResetMouseCenter); // - // eGENToolStripMenuItem - // - this.eGENToolStripMenuItem.Checked = true; - this.eGENToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; - this.eGENToolStripMenuItem.Name = "eGENToolStripMenuItem"; - this.eGENToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.eGENToolStripMenuItem.Text = "EGEN"; - this.eGENToolStripMenuItem.Click += new System.EventHandler(this.eGENToolStripMenuItem_Click); - // - // hANGToolStripMenuItem - // - this.hANGToolStripMenuItem.Checked = true; - this.hANGToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; - this.hANGToolStripMenuItem.Name = "hANGToolStripMenuItem"; - this.hANGToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.hANGToolStripMenuItem.Text = "HANG"; - this.hANGToolStripMenuItem.Click += new System.EventHandler(this.hANGToolStripMenuItem_Click); - // - // pENDToolStripMenuItem - // - this.pENDToolStripMenuItem.Checked = true; - this.pENDToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; - this.pENDToolStripMenuItem.Name = "pENDToolStripMenuItem"; - this.pENDToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.pENDToolStripMenuItem.Text = "PEND"; - this.pENDToolStripMenuItem.Click += new System.EventHandler(this.pENDToolStripMenuItem_Click); - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/IndustrialPark/MainForm/MainForm.cs b/IndustrialPark/MainForm/MainForm.cs index 9ce2885f..866cb8df 100644 --- a/IndustrialPark/MainForm/MainForm.cs +++ b/IndustrialPark/MainForm/MainForm.cs @@ -371,6 +371,8 @@ private void MainForm_KeyDown(object sender, KeyEventArgs e) ToggleWireFrame(); else if (e.KeyCode == Keys.G) OpenInternalEditors(); + else if (e.KeyCode == Keys.U) + uIToolStripMenuItem_Click(null, null); if (e.KeyCode == Keys.F1) Program.ViewConfig.Show(); diff --git a/IndustrialPark/SharpDX/SharpRenderer.cs b/IndustrialPark/SharpDX/SharpRenderer.cs index 918dbe6f..59224673 100644 --- a/IndustrialPark/SharpDX/SharpRenderer.cs +++ b/IndustrialPark/SharpDX/SharpRenderer.cs @@ -395,9 +395,6 @@ public void RunMainLoop(Panel Panel) foreach (IRenderableAsset a in renderCommon) { - if (a is AssetUI | a is AssetUIFT) - continue; - BoundingBox bb = a.GetBoundingBox(); if (bb.Width > 100) renderLarge.Add(a); @@ -448,6 +445,8 @@ public void RunMainLoop(Panel Panel) Cube.Dispose(); Pyramid.Dispose(); Cylinder.Dispose(); + Sphere.Dispose(); + Plane.Dispose(); basicBuffer.Dispose(); basicShader.Dispose();