Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2025-02-16 22:08:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve splatoon 2 texture mapping

Browse source
This commit is contained in:
KillzXGaming 2019-05-16 17:40:35 -04:00
parent e122714b41
commit fbb90ebdfa
6 changed files with 101 additions and 9 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.

54
Switch_FileFormatsMain/FileFormats/BFRES/BfresSwitch.cs
View file

@ -739,6 +739,55 @@ namespace FirstPlugin
m.HasLightMap = true;
texture.Type = MatTexture.TextureType.Light;
}
if (texture.SamplerName == "bake0")
{
m.HasShadowMap = true;
texture.Type = MatTexture.TextureType.Shadow;
}
}
else if (Runtime.activeGame == Runtime.ActiveGame.Splatoon2)
{
bool IsAlbedo0 = useSampler == "_a0";
bool IsNormal = useSampler == "_n0";
bool IsTeamColor = useSampler == "_cp0";
bool IsRoughness = useSampler == "_r0";
bool IsMetalness = useSampler == "_m0";
bool IsEmissive = useSampler == "_e0";
bool IsBake0 = useSampler == "_b0";
bool IsBake1 = useSampler == "_b1";
if (IsAlbedo) {
m.HasDiffuseMap = true;
texture.Type = MatTexture.TextureType.Diffuse;
}
if (IsNormal) {
m.HasNormalMap = true;
texture.Type = MatTexture.TextureType.Normal;
}
if (IsTeamColor) {
m.HasTeamColorMap = true;
texture.Type = MatTexture.TextureType.TeamColor;
}
if (IsRoughness) {
m.HasRoughnessMap = true;
texture.Type = MatTexture.TextureType.Roughness;
}
if (IsMetalness) {
m.HasMetalnessMap = true;
texture.Type = MatTexture.TextureType.Metalness;
}
if (IsMetalness) {
m.HasEmissionMap = true;
texture.Type = MatTexture.TextureType.Emission;
}
if (IsBake0) {
m.HasShadowMap = true;
texture.Type = MatTexture.TextureType.Shadow;
}
if (IsBake1) {
m.HasLightMap = true;
texture.Type = MatTexture.TextureType.Light;
}
}
else if (Runtime.activeGame == Runtime.ActiveGame.SMO)
{
@ -828,6 +877,11 @@ namespace FirstPlugin
m.HasLightMap = true;
texture.Type = MatTexture.TextureType.Light;
}
else if (texture.SamplerName == "bake0")
{
m.HasShadowMap = true;
texture.Type = MatTexture.TextureType.Shadow;
}
else if (TextureName.Contains("MRA")) //Metalness, Roughness, and Cavity Map in one
{
m.HasMRA = true;

28
Switch_FileFormatsMain/FileFormats/BFRES/BfresWiiU.cs
View file

@ -492,32 +492,37 @@ namespace FirstPlugin
texture.Type = MatTexture.TextureType.Diffuse;
}
}
if (useSampler == "_n0")
else if (useSampler == "_n0")
{
m.HasNormalMap = true;
texture.Type = MatTexture.TextureType.Normal;
}
if (useSampler == "_e0")
else if (useSampler == "_e0")
{
m.HasEmissionMap = true;
texture.Type = MatTexture.TextureType.Emission;
}
if (useSampler == "_s0")
else if (useSampler == "_s0")
{
m.HasSpecularMap = true;
texture.Type = MatTexture.TextureType.Specular;
}
if (useSampler == "_x0")
else if (useSampler == "_x0")
{
m.HasSphereMap = true;
texture.Type = MatTexture.TextureType.SphereMap;
}
if (useSampler == "_b0")
else if (useSampler == "_b0")
{
m.HasShadowMap = true;
texture.Type = MatTexture.TextureType.Shadow;
}
if (useSampler == "_b1")
else if (texture.SamplerName == "bake0")
{
m.HasShadowMap = true;
texture.Type = MatTexture.TextureType.Shadow;
}
else if (useSampler == "_b1")
{
m.HasLightMap = true;
texture.Type = MatTexture.TextureType.Light;
@ -539,17 +544,17 @@ namespace FirstPlugin
texture.Type = MatTexture.TextureType.Diffuse;
}
}
if (useSampler == "_n0")
else if (useSampler == "_n0")
{
m.HasNormalMap = true;
texture.Type = MatTexture.TextureType.Normal;
}
if (useSampler == "_e0")
else if (useSampler == "_e0")
{
m.HasEmissionMap = true;
texture.Type = MatTexture.TextureType.Emission;
}
if (TextureName.Contains("mtl"))
else if (TextureName.Contains("mtl"))
{
m.HasMetalnessMap = true;
texture.Type = MatTexture.TextureType.Metalness;
@ -599,6 +604,11 @@ namespace FirstPlugin
m.HasShadowMap = true;
texture.Type = MatTexture.TextureType.Shadow;
}
else if (texture.SamplerName == "bake0")
{
m.HasShadowMap = true;
texture.Type = MatTexture.TextureType.Shadow;
}
else if (TextureName.Contains("Moc") || TextureName.Contains("AO"))
{
m.HasAmbientOcclusionMap = true;

28
Toolbox/GUI/Settings.Designer.cs generated
View file

@ -110,6 +110,8 @@
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.radioButton1 = new System.Windows.Forms.RadioButton();
this.radioButton2 = new System.Windows.Forms.RadioButton();
this.contentContainer.SuspendLayout();
this.panel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cameraMaxSpeedUD)).BeginInit();
@ -184,6 +186,8 @@
//
// panel2
//
this.panel2.Controls.Add(this.radioButton2);
this.panel2.Controls.Add(this.radioButton1);
this.panel2.Controls.Add(this.displayBoundingBoxeChk);
this.panel2.Controls.Add(this.boneXRayChk);
this.panel2.Controls.Add(this.stLabel9);
@ -1157,6 +1161,28 @@
this.specularCubemapPathTB.Click += new System.EventHandler(this.cubemapPathTB_Click);
this.specularCubemapPathTB.TextChanged += new System.EventHandler(this.specularCubemapPathTB_TextChanged);
//
// radioButton1
//
this.radioButton1.AutoSize = true;
this.radioButton1.Location = new System.Drawing.Point(381, 54);
this.radioButton1.Name = "radioButton1";
this.radioButton1.Size = new System.Drawing.Size(85, 17);
this.radioButton1.TabIndex = 32;
this.radioButton1.TabStop = true;
this.radioButton1.Text = "radioButton1";
this.radioButton1.UseVisualStyleBackColor = true;
//
// 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
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -1282,5 +1308,7 @@
private Switch_Toolbox.Library.Forms.STCheckBox chkDiffyseSkybox;
private Switch_Toolbox.Library.Forms.STContextMenuStrip stContextMenuStrip1;
private System.Windows.Forms.ToolStripMenuItem clearSettingToolStripMenuItem;
private System.Windows.Forms.RadioButton radioButton2;
private System.Windows.Forms.RadioButton radioButton1;
}
}