Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2024-09-24 19:48:21 +02:00
Code Releases Wiki Activity

Add gamma correct preview and fixes for smash ultimate bntx

Browse Source
This commit is contained in:
KillzXGaming 2019-10-13 11:20:32 -04:00
parent ca390b977a
commit 7c7f714085
5 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
File_Format_Library/GUI/TextureUI/Importers/BNTX/BinaryTextureImporterList.Designer.cs generated
View File

@ -50,6 +50,7 @@
this.compressionModeCB = new Toolbox.Library.Forms.STComboBox();
this.compModeLbl = new Toolbox.Library.Forms.STLabel();
this.dataSizeLbl = new Toolbox.Library.Forms.STLabel();
this.cnkGammaFix = new Toolbox.Library.Forms.STCheckBox();
this.contentContainer.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.SwizzleNum)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.MipmapNum)).BeginInit();
@ -58,6 +59,7 @@
//
// contentContainer
//
this.contentContainer.Controls.Add(this.cnkGammaFix);
this.contentContainer.Controls.Add(this.dataSizeLbl);
this.contentContainer.Controls.Add(this.compressionModeCB);
this.contentContainer.Controls.Add(this.compModeLbl);
@ -97,6 +99,7 @@
this.contentContainer.Controls.SetChildIndex(this.compModeLbl, 0);
this.contentContainer.Controls.SetChildIndex(this.compressionModeCB, 0);
this.contentContainer.Controls.SetChildIndex(this.dataSizeLbl, 0);
this.contentContainer.Controls.SetChildIndex(this.cnkGammaFix, 0);
//
// button2
//
@ -159,7 +162,7 @@
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(754, 184);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(42, 13);
this.label5.Size = new System.Drawing.Size(45, 13);
this.label5.TabIndex = 27;
this.label5.Text = "Swizzle:";
//
@ -169,6 +172,7 @@
this.tileModeCB.BorderStyle = System.Windows.Forms.ButtonBorderStyle.Solid;
this.tileModeCB.ButtonColor = System.Drawing.Color.Empty;
this.tileModeCB.FormattingEnabled = true;
this.tileModeCB.IsReadOnly = false;
this.tileModeCB.Location = new System.Drawing.Point(851, 114);
this.tileModeCB.Name = "tileModeCB";
this.tileModeCB.Size = new System.Drawing.Size(230, 21);
@ -179,7 +183,7 @@
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(754, 117);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(54, 13);
this.label4.Size = new System.Drawing.Size(57, 13);
this.label4.TabIndex = 25;
this.label4.Text = "Tile Mode:";
//
@ -189,6 +193,7 @@
this.ImgDimComb.BorderStyle = System.Windows.Forms.ButtonBorderStyle.Solid;
this.ImgDimComb.ButtonColor = System.Drawing.Color.Empty;
this.ImgDimComb.FormattingEnabled = true;
this.ImgDimComb.IsReadOnly = false;
this.ImgDimComb.Location = new System.Drawing.Point(851, 87);
this.ImgDimComb.Name = "ImgDimComb";
this.ImgDimComb.Size = new System.Drawing.Size(232, 21);
@ -200,7 +205,7 @@
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(754, 90);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(96, 13);
this.label3.Size = new System.Drawing.Size(99, 13);
this.label3.TabIndex = 23;
this.label3.Text = "Surface Dimension:";
//
@ -209,7 +214,7 @@
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(754, 63);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(39, 13);
this.label2.Size = new System.Drawing.Size(42, 13);
this.label2.TabIndex = 22;
this.label2.Text = "Format:";
//
@ -235,7 +240,7 @@
this.WidthLabel.AutoSize = true;
this.WidthLabel.Location = new System.Drawing.Point(754, 260);
this.WidthLabel.Name = "WidthLabel";
this.WidthLabel.Size = new System.Drawing.Size(35, 13);
this.WidthLabel.Size = new System.Drawing.Size(38, 13);
this.WidthLabel.TabIndex = 19;
this.WidthLabel.Text = "Width:";
//
@ -244,7 +249,7 @@
this.HeightLabel.AutoSize = true;
this.HeightLabel.Location = new System.Drawing.Point(754, 224);
this.HeightLabel.Name = "HeightLabel";
this.HeightLabel.Size = new System.Drawing.Size(38, 13);
this.HeightLabel.Size = new System.Drawing.Size(41, 13);
this.HeightLabel.TabIndex = 18;
this.HeightLabel.Text = "Height:";
//
@ -266,6 +271,7 @@
this.formatComboBox.BorderStyle = System.Windows.Forms.ButtonBorderStyle.Solid;
this.formatComboBox.ButtonColor = System.Drawing.Color.Empty;
this.formatComboBox.FormattingEnabled = true;
this.formatComboBox.IsReadOnly = false;
this.formatComboBox.Location = new System.Drawing.Point(851, 60);
this.formatComboBox.Name = "formatComboBox";
this.formatComboBox.Size = new System.Drawing.Size(233, 21);
@ -278,6 +284,7 @@
this.compressionModeCB.BorderStyle = System.Windows.Forms.ButtonBorderStyle.Solid;
this.compressionModeCB.ButtonColor = System.Drawing.Color.Empty;
this.compressionModeCB.FormattingEnabled = true;
this.compressionModeCB.IsReadOnly = false;
this.compressionModeCB.Location = new System.Drawing.Point(851, 33);
this.compressionModeCB.Name = "compressionModeCB";
this.compressionModeCB.Size = new System.Drawing.Size(232, 21);
@ -302,6 +309,17 @@
this.dataSizeLbl.TabIndex = 31;
this.dataSizeLbl.Text = "Data Size:";
//
// cnkGammaFix
//
this.cnkGammaFix.AutoSize = true;
this.cnkGammaFix.Location = new System.Drawing.Point(757, 345);
this.cnkGammaFix.Name = "cnkGammaFix";
this.cnkGammaFix.Size = new System.Drawing.Size(160, 17);
this.cnkGammaFix.TabIndex = 32;
this.cnkGammaFix.Text = "Gamma Fix (Smash Ultimate)";
this.cnkGammaFix.UseVisualStyleBackColor = true;
this.cnkGammaFix.CheckedChanged += new System.EventHandler(this.cnkGammaFix_CheckedChanged);
//
// BinaryTextureImporterList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -342,5 +360,6 @@
private Toolbox.Library.Forms.STComboBox compressionModeCB;
private Toolbox.Library.Forms.STLabel dataSizeLbl;
private Toolbox.Library.Forms.STLabel compModeLbl;
private Toolbox.Library.Forms.STCheckBox cnkGammaFix;
}
}

8
File_Format_Library/GUI/TextureUI/Importers/BNTX/BinaryTextureImporterList.cs
View File

@ -323,5 +323,13 @@ namespace FirstPlugin
SetupSettings(SelectedTexSettings);
}
}
private void cnkGammaFix_CheckedChanged(object sender, EventArgs e) {
if (SelectedTexSettings != null)
{
SelectedTexSettings.GammaFix = cnkGammaFix.Checked;
SetupSettings(SelectedTexSettings);
}
}
}
}

5
File_Format_Library/GUI/TextureUI/Importers/BNTX/TextureImporterSettings.cs
View File

@ -22,6 +22,7 @@ namespace FirstPlugin
{
}
public bool GammaFix = false;
public string TexName;
public uint AccessFlags = 0x20;
public uint MipCount;
@ -161,6 +162,8 @@ namespace FirstPlugin
public List<byte[]> GenerateMipList(STCompressionMode CompressionMode, int SurfaceLevel = 0)
{
Bitmap Image = BitmapExtension.GetBitmap(DecompressedData[SurfaceLevel], (int)TexWidth, (int)TexHeight);
if (GammaFix)
Image = BitmapExtension.AdjustGamma(Image, 2.2f);
List<byte[]> mipmaps = new List<byte[]>();
for (int mipLevel = 0; mipLevel < MipCount; mipLevel++)
@ -182,6 +185,8 @@ namespace FirstPlugin
public byte[] GenerateMips(STCompressionMode CompressionMode, int SurfaceLevel = 0)
{
Bitmap Image = BitmapExtension.GetBitmap(DecompressedData[SurfaceLevel], (int)TexWidth, (int)TexHeight);
if (GammaFix)
Image = BitmapExtension.AdjustGamma(Image, 2.2f);
List<byte[]> mipmaps = new List<byte[]>();
for (int mipLevel = 0; mipLevel < MipCount; mipLevel++)

4
Switch_Toolbox_Library/Config.cs
View File

@ -282,6 +282,9 @@ namespace Toolbox.Library
case "ProdKeys":
Runtime.SwitchKeys.ProdKeys = node.InnerText;
break;
case "PreviewGammaFix":
bool.TryParse(node.InnerText, out Runtime.ImageEditor.PreviewGammaFix);
break;
case "PartsAsNullPanes":
bool.TryParse(node.InnerText, out Runtime.LayoutEditor.PartsAsNullPanes);
break;
@ -449,6 +452,7 @@ namespace Toolbox.Library
PathsNode.AppendChild(createNode(doc, "EnablePixelGrid", Runtime.ImageEditor.EnablePixelGrid.ToString()));
PathsNode.AppendChild(createNode(doc, "EnableImageZoom", Runtime.ImageEditor.EnableImageZoom.ToString()));
parentNode.AppendChild(createNode(doc, "CustomPicureBoxBGColor", ColorTranslator.ToHtml(Runtime.CustomPicureBoxBGColor)));
PathsNode.AppendChild(createNode(doc, "PreviewGammaFix", Runtime.ImageEditor.PreviewGammaFix.ToString()));
}
private static void AppendPathSettings(XmlDocument doc, XmlNode parentNode)

10
Switch_Toolbox_Library/Runtime.cs
View File

@ -74,6 +74,14 @@ namespace Toolbox.Library
public static bool DisplayAlignmentPane = true;
public static bool DisplayScissorPane = true;
//Index for which tab to choose when selected
//Defaults to last tab used
public static int PicturePaneTabIndex = 0;
public static int NullPaneTabIndex = 0;
public static int WindowPaneTabIndex = 0;
public static int TextPaneTabIndex = 0;
public static int MaterialTabIndex = 0;
public static bool DisplayGrid = true;
public static bool UseOrthographicView = true;
@ -93,6 +101,8 @@ namespace Toolbox.Library
public class ImageEditor
{
public static bool PreviewGammaFix = false;
public static bool ShowPropertiesPanel = true;
public static bool DisplayVertical = false;