mirror of
https://github.com/KillzXGaming/Switch-Toolbox
synced 2024-11-26 14:30:26 +00:00
Add UV channel toggle for uv test pattern shading in settings window
This commit is contained in:
parent
2dc729018c
commit
b64e744d26
8 changed files with 84 additions and 26 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
69
Toolbox/GUI/Settings.Designer.cs
generated
69
Toolbox/GUI/Settings.Designer.cs
generated
|
@ -34,6 +34,8 @@
|
||||||
this.chkBoxNormalMap = new Switch_Toolbox.Library.Forms.STCheckBox();
|
this.chkBoxNormalMap = new Switch_Toolbox.Library.Forms.STCheckBox();
|
||||||
this.shadingComboBox = new System.Windows.Forms.ComboBox();
|
this.shadingComboBox = new System.Windows.Forms.ComboBox();
|
||||||
this.panel2 = new Switch_Toolbox.Library.Forms.STPanel();
|
this.panel2 = new Switch_Toolbox.Library.Forms.STPanel();
|
||||||
|
this.uvChannelRB2 = new System.Windows.Forms.RadioButton();
|
||||||
|
this.uvChannelRB = new System.Windows.Forms.RadioButton();
|
||||||
this.displayBoundingBoxeChk = new Switch_Toolbox.Library.Forms.STCheckBox();
|
this.displayBoundingBoxeChk = new Switch_Toolbox.Library.Forms.STCheckBox();
|
||||||
this.boneXRayChk = new Switch_Toolbox.Library.Forms.STCheckBox();
|
this.boneXRayChk = new Switch_Toolbox.Library.Forms.STCheckBox();
|
||||||
this.stLabel9 = new Switch_Toolbox.Library.Forms.STLabel();
|
this.stLabel9 = new Switch_Toolbox.Library.Forms.STLabel();
|
||||||
|
@ -110,8 +112,7 @@
|
||||||
this.chkUseSkyobx = new Switch_Toolbox.Library.Forms.STCheckBox();
|
this.chkUseSkyobx = new Switch_Toolbox.Library.Forms.STCheckBox();
|
||||||
this.stLabel15 = new Switch_Toolbox.Library.Forms.STLabel();
|
this.stLabel15 = new Switch_Toolbox.Library.Forms.STLabel();
|
||||||
this.specularCubemapPathTB = new Switch_Toolbox.Library.Forms.STTextBox();
|
this.specularCubemapPathTB = new Switch_Toolbox.Library.Forms.STTextBox();
|
||||||
this.radioButton1 = new System.Windows.Forms.RadioButton();
|
this.uvChannelRB3 = new System.Windows.Forms.RadioButton();
|
||||||
this.radioButton2 = new System.Windows.Forms.RadioButton();
|
|
||||||
this.contentContainer.SuspendLayout();
|
this.contentContainer.SuspendLayout();
|
||||||
this.panel2.SuspendLayout();
|
this.panel2.SuspendLayout();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.cameraMaxSpeedUD)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.cameraMaxSpeedUD)).BeginInit();
|
||||||
|
@ -186,8 +187,9 @@
|
||||||
//
|
//
|
||||||
// panel2
|
// panel2
|
||||||
//
|
//
|
||||||
this.panel2.Controls.Add(this.radioButton2);
|
this.panel2.Controls.Add(this.uvChannelRB3);
|
||||||
this.panel2.Controls.Add(this.radioButton1);
|
this.panel2.Controls.Add(this.uvChannelRB2);
|
||||||
|
this.panel2.Controls.Add(this.uvChannelRB);
|
||||||
this.panel2.Controls.Add(this.displayBoundingBoxeChk);
|
this.panel2.Controls.Add(this.displayBoundingBoxeChk);
|
||||||
this.panel2.Controls.Add(this.boneXRayChk);
|
this.panel2.Controls.Add(this.boneXRayChk);
|
||||||
this.panel2.Controls.Add(this.stLabel9);
|
this.panel2.Controls.Add(this.stLabel9);
|
||||||
|
@ -226,6 +228,30 @@
|
||||||
this.panel2.Size = new System.Drawing.Size(534, 293);
|
this.panel2.Size = new System.Drawing.Size(534, 293);
|
||||||
this.panel2.TabIndex = 4;
|
this.panel2.TabIndex = 4;
|
||||||
//
|
//
|
||||||
|
// uvChannelRB2
|
||||||
|
//
|
||||||
|
this.uvChannelRB2.AutoSize = true;
|
||||||
|
this.uvChannelRB2.Location = new System.Drawing.Point(425, 54);
|
||||||
|
this.uvChannelRB2.Name = "uvChannelRB2";
|
||||||
|
this.uvChannelRB2.Size = new System.Drawing.Size(49, 17);
|
||||||
|
this.uvChannelRB2.TabIndex = 33;
|
||||||
|
this.uvChannelRB2.TabStop = true;
|
||||||
|
this.uvChannelRB2.Text = "UV 2";
|
||||||
|
this.uvChannelRB2.UseVisualStyleBackColor = true;
|
||||||
|
this.uvChannelRB2.CheckedChanged += new System.EventHandler(this.uvChannelRB2_CheckedChanged);
|
||||||
|
//
|
||||||
|
// uvChannelRB
|
||||||
|
//
|
||||||
|
this.uvChannelRB.AutoSize = true;
|
||||||
|
this.uvChannelRB.Location = new System.Drawing.Point(372, 54);
|
||||||
|
this.uvChannelRB.Name = "uvChannelRB";
|
||||||
|
this.uvChannelRB.Size = new System.Drawing.Size(49, 17);
|
||||||
|
this.uvChannelRB.TabIndex = 32;
|
||||||
|
this.uvChannelRB.TabStop = true;
|
||||||
|
this.uvChannelRB.Text = "UV 1";
|
||||||
|
this.uvChannelRB.UseVisualStyleBackColor = true;
|
||||||
|
this.uvChannelRB.CheckedChanged += new System.EventHandler(this.uvChannelRB_CheckedChanged);
|
||||||
|
//
|
||||||
// displayBoundingBoxeChk
|
// displayBoundingBoxeChk
|
||||||
//
|
//
|
||||||
this.displayBoundingBoxeChk.AutoSize = true;
|
this.displayBoundingBoxeChk.AutoSize = true;
|
||||||
|
@ -1161,27 +1187,17 @@
|
||||||
this.specularCubemapPathTB.Click += new System.EventHandler(this.cubemapPathTB_Click);
|
this.specularCubemapPathTB.Click += new System.EventHandler(this.cubemapPathTB_Click);
|
||||||
this.specularCubemapPathTB.TextChanged += new System.EventHandler(this.specularCubemapPathTB_TextChanged);
|
this.specularCubemapPathTB.TextChanged += new System.EventHandler(this.specularCubemapPathTB_TextChanged);
|
||||||
//
|
//
|
||||||
// radioButton1
|
// uvChannelRB3
|
||||||
//
|
//
|
||||||
this.radioButton1.AutoSize = true;
|
this.uvChannelRB3.AutoSize = true;
|
||||||
this.radioButton1.Location = new System.Drawing.Point(381, 54);
|
this.uvChannelRB3.Location = new System.Drawing.Point(477, 54);
|
||||||
this.radioButton1.Name = "radioButton1";
|
this.uvChannelRB3.Name = "uvChannelRB3";
|
||||||
this.radioButton1.Size = new System.Drawing.Size(85, 17);
|
this.uvChannelRB3.Size = new System.Drawing.Size(49, 17);
|
||||||
this.radioButton1.TabIndex = 32;
|
this.uvChannelRB3.TabIndex = 34;
|
||||||
this.radioButton1.TabStop = true;
|
this.uvChannelRB3.TabStop = true;
|
||||||
this.radioButton1.Text = "radioButton1";
|
this.uvChannelRB3.Text = "UV 3";
|
||||||
this.radioButton1.UseVisualStyleBackColor = true;
|
this.uvChannelRB3.UseVisualStyleBackColor = true;
|
||||||
//
|
this.uvChannelRB3.CheckedChanged += new System.EventHandler(this.uvChannelRB3_CheckedChanged);
|
||||||
// radioButton2
|
|
||||||
//
|
|
||||||
this.radioButton2.AutoSize = true;
|
|
||||||
this.radioButton2.Location = new System.Drawing.Point(381, 77);
|
|
||||||
this.radioButton2.Name = "radioButton2";
|
|
||||||
this.radioButton2.Size = new System.Drawing.Size(85, 17);
|
|
||||||
this.radioButton2.TabIndex = 33;
|
|
||||||
this.radioButton2.TabStop = true;
|
|
||||||
this.radioButton2.Text = "radioButton2";
|
|
||||||
this.radioButton2.UseVisualStyleBackColor = true;
|
|
||||||
//
|
//
|
||||||
// Settings
|
// Settings
|
||||||
//
|
//
|
||||||
|
@ -1308,7 +1324,8 @@
|
||||||
private Switch_Toolbox.Library.Forms.STCheckBox chkDiffyseSkybox;
|
private Switch_Toolbox.Library.Forms.STCheckBox chkDiffyseSkybox;
|
||||||
private Switch_Toolbox.Library.Forms.STContextMenuStrip stContextMenuStrip1;
|
private Switch_Toolbox.Library.Forms.STContextMenuStrip stContextMenuStrip1;
|
||||||
private System.Windows.Forms.ToolStripMenuItem clearSettingToolStripMenuItem;
|
private System.Windows.Forms.ToolStripMenuItem clearSettingToolStripMenuItem;
|
||||||
private System.Windows.Forms.RadioButton radioButton2;
|
private System.Windows.Forms.RadioButton uvChannelRB2;
|
||||||
private System.Windows.Forms.RadioButton radioButton1;
|
private System.Windows.Forms.RadioButton uvChannelRB;
|
||||||
|
private System.Windows.Forms.RadioButton uvChannelRB3;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -42,6 +42,11 @@ namespace Toolbox
|
||||||
preferredTexFormatCB.Items.Add(format);
|
preferredTexFormatCB.Items.Add(format);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uvChannelRB.Checked = true;
|
||||||
|
uvChannelRB.Visible = false;
|
||||||
|
uvChannelRB2.Visible = false;
|
||||||
|
uvChannelRB3.Visible = false;
|
||||||
|
|
||||||
normalsLineUD.Value = (decimal)Runtime.normalsLineLength;
|
normalsLineUD.Value = (decimal)Runtime.normalsLineLength;
|
||||||
normalPointsCB.Checked = Runtime.renderNormalsPoints;
|
normalPointsCB.Checked = Runtime.renderNormalsPoints;
|
||||||
vtxColorCB.Checked = Runtime.renderVertColor;
|
vtxColorCB.Checked = Runtime.renderVertColor;
|
||||||
|
@ -99,6 +104,20 @@ namespace Toolbox
|
||||||
private void shadingComboBox_SelectedIndexChanged(object sender, EventArgs e)
|
private void shadingComboBox_SelectedIndexChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
Runtime.viewportShading = (Runtime.ViewportShading)shadingComboBox.SelectedIndex;
|
Runtime.viewportShading = (Runtime.ViewportShading)shadingComboBox.SelectedIndex;
|
||||||
|
if (Runtime.viewportShading == Runtime.ViewportShading.UVCoords ||
|
||||||
|
Runtime.viewportShading == Runtime.ViewportShading.UVTestPattern)
|
||||||
|
{
|
||||||
|
uvChannelRB.Visible = true;
|
||||||
|
uvChannelRB2.Visible = true;
|
||||||
|
uvChannelRB3.Visible = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
uvChannelRB.Visible = false;
|
||||||
|
uvChannelRB2.Visible = false;
|
||||||
|
uvChannelRB3.Visible = false;
|
||||||
|
}
|
||||||
|
|
||||||
UpdateViewportSettings();
|
UpdateViewportSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -558,5 +577,20 @@ namespace Toolbox
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void uvChannelRB_CheckedChanged(object sender, EventArgs e) {
|
||||||
|
Runtime.uvChannel = Runtime.UVChannel.Channel1;
|
||||||
|
UpdateViewportSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void uvChannelRB2_CheckedChanged(object sender, EventArgs e) {
|
||||||
|
Runtime.uvChannel = Runtime.UVChannel.Channel2;
|
||||||
|
UpdateViewportSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void uvChannelRB3_CheckedChanged(object sender, EventArgs e) {
|
||||||
|
Runtime.uvChannel = Runtime.UVChannel.Channel3;
|
||||||
|
UpdateViewportSettings();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -143,6 +143,13 @@ vec2 displayTexCoord = f_texcoord0;
|
||||||
|
|
||||||
void main()
|
void main()
|
||||||
{
|
{
|
||||||
|
if (uvChannel == 1)
|
||||||
|
displayTexCoord = f_texcoord0;
|
||||||
|
if (uvChannel == 2)
|
||||||
|
displayTexCoord = f_texcoord2;
|
||||||
|
if (uvChannel == 3)
|
||||||
|
displayTexCoord = f_texcoord3;
|
||||||
|
|
||||||
fragColor = vec4(vec3(0), 1);
|
fragColor = vec4(vec3(0), 1);
|
||||||
|
|
||||||
// Create a struct for passing all the vertex attributes to other functions.
|
// Create a struct for passing all the vertex attributes to other functions.
|
||||||
|
|
Loading…
Reference in a new issue