mirror of
https://github.com/KillzXGaming/Switch-Toolbox
synced 2024-11-22 04:23:09 +00:00
Add toggles for grid and grid lines
This commit is contained in:
parent
9e87a5ce2a
commit
e57bdfb704
6 changed files with 65 additions and 14 deletions
|
@ -324,6 +324,12 @@ namespace Toolbox.Library
|
||||||
case "ShowCloseDialog":
|
case "ShowCloseDialog":
|
||||||
bool.TryParse(node.InnerText, out Runtime.ShowCloseDialog);
|
bool.TryParse(node.InnerText, out Runtime.ShowCloseDialog);
|
||||||
break;
|
break;
|
||||||
|
case "displayGrid":
|
||||||
|
bool.TryParse(node.InnerText, out Runtime.displayGrid);
|
||||||
|
break;
|
||||||
|
case "displayAxisLines":
|
||||||
|
bool.TryParse(node.InnerText, out Runtime.displayAxisLines);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -587,8 +593,11 @@ namespace Toolbox.Library
|
||||||
renderSettingsNode.AppendChild(createNode(doc, "MaxCameraSpeed", Runtime.MaxCameraSpeed.ToString()));
|
renderSettingsNode.AppendChild(createNode(doc, "MaxCameraSpeed", Runtime.MaxCameraSpeed.ToString()));
|
||||||
renderSettingsNode.AppendChild(createNode(doc, "FrameCamera", Runtime.FrameCamera.ToString()));
|
renderSettingsNode.AppendChild(createNode(doc, "FrameCamera", Runtime.FrameCamera.ToString()));
|
||||||
renderSettingsNode.AppendChild(createNode(doc, "cameraMovement", Runtime.cameraMovement.ToString()));
|
renderSettingsNode.AppendChild(createNode(doc, "cameraMovement", Runtime.cameraMovement.ToString()));
|
||||||
|
renderSettingsNode.AppendChild(createNode(doc, "displayAxisLines", Runtime.displayAxisLines.ToString()));
|
||||||
|
renderSettingsNode.AppendChild(createNode(doc, "displayGrid", Runtime.displayGrid.ToString()));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void AppendResourceTableSettings(XmlDocument doc, XmlNode parentNode)
|
private static void AppendResourceTableSettings(XmlDocument doc, XmlNode parentNode)
|
||||||
{
|
{
|
||||||
XmlNode resourceTableNode = doc.CreateElement("ResourceTables");
|
XmlNode resourceTableNode = doc.CreateElement("ResourceTables");
|
||||||
|
|
|
@ -74,7 +74,7 @@ namespace Toolbox.Library.Rendering
|
||||||
|
|
||||||
public override void Draw(GL_ControlModern control, Pass pass)
|
public override void Draw(GL_ControlModern control, Pass pass)
|
||||||
{
|
{
|
||||||
if (pass == Pass.TRANSPARENT || gridShaderProgram == null)
|
if (!Runtime.displayGrid || pass == Pass.TRANSPARENT || gridShaderProgram == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
bool buffersWereInitialized = vbo_position != 0;
|
bool buffersWereInitialized = vbo_position != 0;
|
||||||
|
|
|
@ -86,7 +86,7 @@ namespace Toolbox.Library.Rendering
|
||||||
|
|
||||||
public override void Draw(GL_ControlModern control, Pass pass)
|
public override void Draw(GL_ControlModern control, Pass pass)
|
||||||
{
|
{
|
||||||
if (!Runtime.OpenTKInitialized || pass == Pass.TRANSPARENT)
|
if (!Runtime.displayAxisLines || !Runtime.OpenTKInitialized || pass == Pass.TRANSPARENT)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
bool buffersWereInitialized = vbo_position != 0;
|
bool buffersWereInitialized = vbo_position != 0;
|
||||||
|
|
|
@ -1,11 +1,8 @@
|
||||||
using System;
|
using GL_EditorFramework.EditorDrawables;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Drawing;
|
|
||||||
using GL_EditorFramework.Interfaces;
|
using GL_EditorFramework.Interfaces;
|
||||||
using GL_EditorFramework.EditorDrawables;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Drawing;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
|
|
||||||
namespace Toolbox.Library
|
namespace Toolbox.Library
|
||||||
|
@ -295,6 +292,9 @@ namespace Toolbox.Library
|
||||||
public static bool renderBones = true;
|
public static bool renderBones = true;
|
||||||
public static bool renderFog = true;
|
public static bool renderFog = true;
|
||||||
|
|
||||||
|
public static bool displayAxisLines = true;
|
||||||
|
public static bool displayGrid = true;
|
||||||
|
|
||||||
public static bool FrameCamera = false;
|
public static bool FrameCamera = false;
|
||||||
|
|
||||||
public static float bonePointSize = 0.2f;
|
public static float bonePointSize = 0.2f;
|
||||||
|
|
36
Toolbox/GUI/Settings.Designer.cs
generated
36
Toolbox/GUI/Settings.Designer.cs
generated
|
@ -122,6 +122,8 @@
|
||||||
this.stLabel17 = new Toolbox.Library.Forms.STLabel();
|
this.stLabel17 = new Toolbox.Library.Forms.STLabel();
|
||||||
this.chkBotwFileTable = new Toolbox.Library.Forms.STCheckBox();
|
this.chkBotwFileTable = new Toolbox.Library.Forms.STCheckBox();
|
||||||
this.btnReset = new Toolbox.Library.Forms.STButton();
|
this.btnReset = new Toolbox.Library.Forms.STButton();
|
||||||
|
this.chkViewportGrid = new Toolbox.Library.Forms.STCheckBox();
|
||||||
|
this.chkViewportAxisLines = new Toolbox.Library.Forms.STCheckBox();
|
||||||
this.contentContainer.SuspendLayout();
|
this.contentContainer.SuspendLayout();
|
||||||
this.panel2.SuspendLayout();
|
this.panel2.SuspendLayout();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.cameraMaxSpeedUD)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.cameraMaxSpeedUD)).BeginInit();
|
||||||
|
@ -169,7 +171,7 @@
|
||||||
// chkBoxSpecular
|
// chkBoxSpecular
|
||||||
//
|
//
|
||||||
this.chkBoxSpecular.AutoSize = true;
|
this.chkBoxSpecular.AutoSize = true;
|
||||||
this.chkBoxSpecular.Location = new System.Drawing.Point(6, 114);
|
this.chkBoxSpecular.Location = new System.Drawing.Point(10, 160);
|
||||||
this.chkBoxSpecular.Name = "chkBoxSpecular";
|
this.chkBoxSpecular.Name = "chkBoxSpecular";
|
||||||
this.chkBoxSpecular.Size = new System.Drawing.Size(104, 17);
|
this.chkBoxSpecular.Size = new System.Drawing.Size(104, 17);
|
||||||
this.chkBoxSpecular.TabIndex = 3;
|
this.chkBoxSpecular.TabIndex = 3;
|
||||||
|
@ -179,7 +181,7 @@
|
||||||
// chkBoxNormalMap
|
// chkBoxNormalMap
|
||||||
//
|
//
|
||||||
this.chkBoxNormalMap.AutoSize = true;
|
this.chkBoxNormalMap.AutoSize = true;
|
||||||
this.chkBoxNormalMap.Location = new System.Drawing.Point(6, 91);
|
this.chkBoxNormalMap.Location = new System.Drawing.Point(10, 137);
|
||||||
this.chkBoxNormalMap.Name = "chkBoxNormalMap";
|
this.chkBoxNormalMap.Name = "chkBoxNormalMap";
|
||||||
this.chkBoxNormalMap.Size = new System.Drawing.Size(124, 17);
|
this.chkBoxNormalMap.Size = new System.Drawing.Size(124, 17);
|
||||||
this.chkBoxNormalMap.TabIndex = 2;
|
this.chkBoxNormalMap.TabIndex = 2;
|
||||||
|
@ -199,6 +201,8 @@
|
||||||
//
|
//
|
||||||
// panel2
|
// panel2
|
||||||
//
|
//
|
||||||
|
this.panel2.Controls.Add(this.chkViewportAxisLines);
|
||||||
|
this.panel2.Controls.Add(this.chkViewportGrid);
|
||||||
this.panel2.Controls.Add(this.uvChannelRB3);
|
this.panel2.Controls.Add(this.uvChannelRB3);
|
||||||
this.panel2.Controls.Add(this.uvChannelRB2);
|
this.panel2.Controls.Add(this.uvChannelRB2);
|
||||||
this.panel2.Controls.Add(this.uvChannelRB);
|
this.panel2.Controls.Add(this.uvChannelRB);
|
||||||
|
@ -483,7 +487,7 @@
|
||||||
// chkBoxEnablePBR
|
// chkBoxEnablePBR
|
||||||
//
|
//
|
||||||
this.chkBoxEnablePBR.AutoSize = true;
|
this.chkBoxEnablePBR.AutoSize = true;
|
||||||
this.chkBoxEnablePBR.Location = new System.Drawing.Point(6, 137);
|
this.chkBoxEnablePBR.Location = new System.Drawing.Point(10, 183);
|
||||||
this.chkBoxEnablePBR.Name = "chkBoxEnablePBR";
|
this.chkBoxEnablePBR.Name = "chkBoxEnablePBR";
|
||||||
this.chkBoxEnablePBR.Size = new System.Drawing.Size(84, 17);
|
this.chkBoxEnablePBR.Size = new System.Drawing.Size(84, 17);
|
||||||
this.chkBoxEnablePBR.TabIndex = 17;
|
this.chkBoxEnablePBR.TabIndex = 17;
|
||||||
|
@ -665,7 +669,7 @@
|
||||||
// chkBoxStereoscopy
|
// chkBoxStereoscopy
|
||||||
//
|
//
|
||||||
this.chkBoxStereoscopy.AutoSize = true;
|
this.chkBoxStereoscopy.AutoSize = true;
|
||||||
this.chkBoxStereoscopy.Location = new System.Drawing.Point(6, 68);
|
this.chkBoxStereoscopy.Location = new System.Drawing.Point(10, 114);
|
||||||
this.chkBoxStereoscopy.Name = "chkBoxStereoscopy";
|
this.chkBoxStereoscopy.Name = "chkBoxStereoscopy";
|
||||||
this.chkBoxStereoscopy.Size = new System.Drawing.Size(121, 17);
|
this.chkBoxStereoscopy.Size = new System.Drawing.Size(121, 17);
|
||||||
this.chkBoxStereoscopy.TabIndex = 4;
|
this.chkBoxStereoscopy.TabIndex = 4;
|
||||||
|
@ -1318,6 +1322,28 @@
|
||||||
this.btnReset.UseVisualStyleBackColor = true;
|
this.btnReset.UseVisualStyleBackColor = true;
|
||||||
this.btnReset.Click += new System.EventHandler(this.btnReset_Click);
|
this.btnReset.Click += new System.EventHandler(this.btnReset_Click);
|
||||||
//
|
//
|
||||||
|
// chkViewportGrid
|
||||||
|
//
|
||||||
|
this.chkViewportGrid.AutoSize = true;
|
||||||
|
this.chkViewportGrid.Location = new System.Drawing.Point(10, 68);
|
||||||
|
this.chkViewportGrid.Name = "chkViewportGrid";
|
||||||
|
this.chkViewportGrid.Size = new System.Drawing.Size(125, 17);
|
||||||
|
this.chkViewportGrid.TabIndex = 35;
|
||||||
|
this.chkViewportGrid.Text = "Enable Viewport Grid";
|
||||||
|
this.chkViewportGrid.UseVisualStyleBackColor = true;
|
||||||
|
this.chkViewportGrid.CheckedChanged += new System.EventHandler(this.chkViewportGrid_CheckedChanged);
|
||||||
|
//
|
||||||
|
// chkViewportAxisLines
|
||||||
|
//
|
||||||
|
this.chkViewportAxisLines.AutoSize = true;
|
||||||
|
this.chkViewportAxisLines.Location = new System.Drawing.Point(10, 91);
|
||||||
|
this.chkViewportAxisLines.Name = "chkViewportAxisLines";
|
||||||
|
this.chkViewportAxisLines.Size = new System.Drawing.Size(153, 17);
|
||||||
|
this.chkViewportAxisLines.TabIndex = 36;
|
||||||
|
this.chkViewportAxisLines.Text = "Enable Viewport Axis Lines";
|
||||||
|
this.chkViewportAxisLines.UseVisualStyleBackColor = true;
|
||||||
|
this.chkViewportAxisLines.CheckedChanged += new System.EventHandler(this.chkViewportAxisLines_CheckedChanged);
|
||||||
|
//
|
||||||
// Settings
|
// Settings
|
||||||
//
|
//
|
||||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||||
|
@ -1457,5 +1483,7 @@
|
||||||
private Library.Forms.STLabel stLabel18;
|
private Library.Forms.STLabel stLabel18;
|
||||||
private Library.Forms.STTextBox pathPokemonSwShTB;
|
private Library.Forms.STTextBox pathPokemonSwShTB;
|
||||||
private Library.Forms.STButton btnReset;
|
private Library.Forms.STButton btnReset;
|
||||||
|
private Library.Forms.STCheckBox chkViewportAxisLines;
|
||||||
|
private Library.Forms.STCheckBox chkViewportGrid;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -89,6 +89,8 @@ namespace Toolbox
|
||||||
chkTpFileTable.Checked = Runtime.ResourceTables.TpTable;
|
chkTpFileTable.Checked = Runtime.ResourceTables.TpTable;
|
||||||
chkFrameCamera.Checked = Runtime.FrameCamera;
|
chkFrameCamera.Checked = Runtime.FrameCamera;
|
||||||
chkAlwaysCompressOnSave.Checked = Runtime.AlwaysCompressOnSave;
|
chkAlwaysCompressOnSave.Checked = Runtime.AlwaysCompressOnSave;
|
||||||
|
chkViewportGrid.Checked = Runtime.displayGrid;
|
||||||
|
chkViewportAxisLines.Checked = Runtime.displayAxisLines;
|
||||||
|
|
||||||
displayBoundingBoxeChk.Checked = Runtime.renderBoundingBoxes;
|
displayBoundingBoxeChk.Checked = Runtime.renderBoundingBoxes;
|
||||||
|
|
||||||
|
@ -705,5 +707,17 @@ namespace Toolbox
|
||||||
Environment.Exit(0);
|
Environment.Exit(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void chkViewportGrid_CheckedChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
Runtime.displayGrid = chkViewportGrid.Checked;
|
||||||
|
UpdateViewportSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void chkViewportAxisLines_CheckedChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
Runtime.displayAxisLines = chkViewportAxisLines.Checked;
|
||||||
|
UpdateViewportSettings();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue