Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2025-02-25 22:38:07 +01:00
Code Releases Wiki Activity

Add toggle between diffuse and specular cube map skybox

Browse Source
This commit is contained in:
KillzXGaming 2019-05-14 19:15:52 -04:00
parent 5c91e66c08
commit 82f1f54e16
8 changed files with 61 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Switch_Toolbox/v15/.suo
View File

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
View File

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
View File

Binary file not shown.

4
Switch_Toolbox_Library/Config.cs
View File

@ -208,6 +208,9 @@ namespace Switch_Toolbox.Library
case "UseSkybox":
bool.TryParse(node.InnerText, out Runtime.PBR.UseSkybox);
break;
case "UseDiffuseSkyTexture":
bool.TryParse(node.InnerText, out Runtime.PBR.UseDiffuseSkyTexture);
break;
}
}
}
@ -355,6 +358,7 @@ namespace Switch_Toolbox.Library
parentNode.AppendChild(SettingsNode);
SettingsNode.AppendChild(createNode(doc, "UseSkybox", Runtime.PBR.UseSkybox.ToString()));
SettingsNode.AppendChild(createNode(doc, "EnablePBR", Runtime.EnablePBR.ToString()));
SettingsNode.AppendChild(createNode(doc, "UseDiffuseSkyTexture", Runtime.PBR.UseDiffuseSkyTexture.ToString()));
}
private static void AppendEditorSettings(XmlDocument doc, XmlNode parentNode)
{

18
Switch_Toolbox_Library/Rendering/DrawableSkybox.cs
View File

@ -62,15 +62,23 @@ namespace Switch_Toolbox.Library.Rendering
GL.UniformMatrix4(defaultShaderProgram["projection"], false, ref proj);
GL.UniformMatrix4(defaultShaderProgram["rotView"], false, ref rot);
//Load Cubemap
if (RenderTools.diffusePbr != null)
if (Runtime.PBR.UseDiffuseSkyTexture)
{
GL.ActiveTexture(TextureUnit.Texture0);
RenderTools.diffusePbr.Bind();
//Load Cubemap
if (RenderTools.diffusePbr != null)
{
GL.ActiveTexture(TextureUnit.Texture0);
RenderTools.diffusePbr.Bind();
}
}
else
{
//Load Cubemap
if (RenderTools.specularPbr != null)
{
GL.ActiveTexture(TextureUnit.Texture0);
RenderTools.specularPbr.Bind();
}
}
int cubeVBO = 0;

2
Switch_Toolbox_Library/Runtime.cs
View File

@ -91,6 +91,8 @@ namespace Switch_Toolbox.Library
public class PBR
{
public static bool UseSkybox = false;
public static bool UseDiffuseSkyTexture = true;
public static string DiffuseCubeMapPath = "";
public static string SpecularCubeMapPath = "";
public static string BRSFMapPath = "";

55
Toolbox/GUI/Settings.Designer.cs generated
View File

@ -101,11 +101,12 @@
this.stLabel10 = new Switch_Toolbox.Library.Forms.STLabel();
this.mk8PathTB = new Switch_Toolbox.Library.Forms.STTextBox();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.stLabel16 = new Switch_Toolbox.Library.Forms.STLabel();
this.diffuseCubemapPathTB = new Switch_Toolbox.Library.Forms.STTextBox();
this.chkUseSkyobx = new Switch_Toolbox.Library.Forms.STCheckBox();
this.stLabel15 = new Switch_Toolbox.Library.Forms.STLabel();
this.specularCubemapPathTB = new Switch_Toolbox.Library.Forms.STTextBox();
this.stLabel16 = new Switch_Toolbox.Library.Forms.STLabel();
this.diffuseCubemapPathTB = new Switch_Toolbox.Library.Forms.STTextBox();
this.chkDiffyseSkybox = new Switch_Toolbox.Library.Forms.STCheckBox();
this.contentContainer.SuspendLayout();
this.panel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cameraMaxSpeedUD)).BeginInit();
@ -1056,6 +1057,7 @@
//
// tabPage4
//
this.tabPage4.Controls.Add(this.chkDiffyseSkybox);
this.tabPage4.Controls.Add(this.stLabel16);
this.tabPage4.Controls.Add(this.diffuseCubemapPathTB);
this.tabPage4.Controls.Add(this.chkUseSkyobx);
@ -1069,6 +1071,24 @@
this.tabPage4.Text = "PBR";
this.tabPage4.UseVisualStyleBackColor = true;
//
// stLabel16
//
this.stLabel16.AutoSize = true;
this.stLabel16.Location = new System.Drawing.Point(16, 73);
this.stLabel16.Name = "stLabel16";
this.stLabel16.Size = new System.Drawing.Size(129, 13);
this.stLabel16.TabIndex = 4;
this.stLabel16.Text = "Custom Diffuse Cubemap:";
//
// diffuseCubemapPathTB
//
this.diffuseCubemapPathTB.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.diffuseCubemapPathTB.Location = new System.Drawing.Point(160, 71);
this.diffuseCubemapPathTB.Name = "diffuseCubemapPathTB";
this.diffuseCubemapPathTB.Size = new System.Drawing.Size(197, 20);
this.diffuseCubemapPathTB.TabIndex = 3;
this.diffuseCubemapPathTB.Click += new System.EventHandler(this.diffuseCubemapPathTBB_Click);
//
// chkUseSkyobx
//
this.chkUseSkyobx.AutoSize = true;
@ -1083,7 +1103,7 @@
// stLabel15
//
this.stLabel15.AutoSize = true;
this.stLabel15.Location = new System.Drawing.Point(16, 43);
this.stLabel15.Location = new System.Drawing.Point(16, 47);
this.stLabel15.Name = "stLabel15";
this.stLabel15.Size = new System.Drawing.Size(138, 13);
this.stLabel15.TabIndex = 1;
@ -1092,29 +1112,23 @@
// specularCubemapPathTB
//
this.specularCubemapPathTB.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.specularCubemapPathTB.Location = new System.Drawing.Point(160, 41);
this.specularCubemapPathTB.Location = new System.Drawing.Point(160, 45);
this.specularCubemapPathTB.Name = "specularCubemapPathTB";
this.specularCubemapPathTB.Size = new System.Drawing.Size(197, 20);
this.specularCubemapPathTB.TabIndex = 0;
this.specularCubemapPathTB.Click += new System.EventHandler(this.cubemapPathTB_Click);
//
// stLabel16
// chkDiffyseSkybox
//
this.stLabel16.AutoSize = true;
this.stLabel16.Location = new System.Drawing.Point(16, 69);
this.stLabel16.Name = "stLabel16";
this.stLabel16.Size = new System.Drawing.Size(129, 13);
this.stLabel16.TabIndex = 4;
this.stLabel16.Text = "Custom Diffuse Cubemap:";
//
// diffuseCubemapPathTB
//
this.diffuseCubemapPathTB.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.diffuseCubemapPathTB.Location = new System.Drawing.Point(160, 67);
this.diffuseCubemapPathTB.Name = "diffuseCubemapPathTB";
this.diffuseCubemapPathTB.Size = new System.Drawing.Size(197, 20);
this.diffuseCubemapPathTB.TabIndex = 3;
this.diffuseCubemapPathTB.Click += new System.EventHandler(this.diffuseCubemapPathTBB_Click);
this.chkDiffyseSkybox.AutoSize = true;
this.chkDiffyseSkybox.Enabled = false;
this.chkDiffyseSkybox.Location = new System.Drawing.Point(108, 16);
this.chkDiffyseSkybox.Name = "chkDiffyseSkybox";
this.chkDiffyseSkybox.Size = new System.Drawing.Size(173, 17);
this.chkDiffyseSkybox.TabIndex = 5;
this.chkDiffyseSkybox.Text = "Display Diffuse Map on Skybox";
this.chkDiffyseSkybox.UseVisualStyleBackColor = true;
this.chkDiffyseSkybox.CheckedChanged += new System.EventHandler(this.chkDiffyseSkybox_CheckedChanged);
//
// Settings
//
@ -1236,5 +1250,6 @@
private Switch_Toolbox.Library.Forms.STTextBox specularCubemapPathTB;
private Switch_Toolbox.Library.Forms.STLabel stLabel16;
private Switch_Toolbox.Library.Forms.STTextBox diffuseCubemapPathTB;
private Switch_Toolbox.Library.Forms.STCheckBox chkDiffyseSkybox;
}
}

7
Toolbox/GUI/Settings.cs
View File

@ -78,6 +78,8 @@ namespace Toolbox
specularCubemapPathTB.Text = System.IO.Path.GetFileName(Runtime.PBR.SpecularCubeMapPath);
diffuseCubemapPathTB.Text = System.IO.Path.GetFileName(Runtime.PBR.DiffuseCubeMapPath);
chkUseSkyobx.Checked = Runtime.PBR.UseSkybox;
chkDiffyseSkybox.Checked = Runtime.PBR.UseDiffuseSkyTexture;
chkDiffyseSkybox.Enabled = chkUseSkyobx.Checked;
displayBoundingBoxeChk.Checked = Runtime.renderBoundingBoxes;
@ -462,6 +464,11 @@ namespace Toolbox
private void chkUseSkyobx_CheckedChanged(object sender, EventArgs e) {
Runtime.PBR.UseSkybox = chkUseSkyobx.Checked;
chkDiffyseSkybox.Enabled = chkUseSkyobx.Checked;
}
private void chkDiffyseSkybox_CheckedChanged(object sender, EventArgs e) {
Runtime.PBR.UseDiffuseSkyTexture = chkDiffyseSkybox.Checked;
}
}
}