Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2024-11-30 18:24:39 +01:00
Code Releases Wiki Activity

Disable property change even on load to speed up image loading

Browse Source
This commit is contained in:
KillzXGaming 2019-05-04 16:48:45 -04:00
parent 4fe9860945
commit 52cddcac75
10 changed files with 56 additions and 33 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-shm
View File

Binary file not shown.

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

Binary file not shown.

2
Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FTEX.cs
View File

@ -690,7 +690,7 @@ namespace Bfres.Structs
LibraryGUI.Instance.LoadEditor(editor);
}
editor.Text = Text;
editor.LoadProperties(this.texture, OnPropertyChanged);
editor.LoadProperties(this.texture);
editor.LoadImage(this);
if (texture.UserData != null)

4
Switch_FileFormatsMain/FileFormats/Texture/BNTX.cs
View File

@ -967,8 +967,6 @@ namespace FirstPlugin
public void UpdateEditor()
{
OnPropertyChanged();
if (Parent != null && Parent.Parent != null && Parent.Parent is BFRES)
{
((BFRES)Parent.Parent).LoadEditors(this);
@ -996,7 +994,7 @@ namespace FirstPlugin
editor.Text = Text;
editor.LoadProperties(Texture, OnPropertyChanged);
editor.LoadProperties(Texture);
editor.LoadImage(this);
}

BIN
Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache
View File

Binary file not shown.

81
Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.cs
View File

@ -84,7 +84,7 @@ namespace Switch_Toolbox.Library.Forms
public bool CanModify = true;
//Instead of disabling/enabling channels, this will only show the selected channel
public bool UseChannelToggle = false;
public bool UseChannelToggle = false;
private bool hasBeenEdited = false;
public bool HasBeenEdited
@ -191,9 +191,6 @@ namespace Switch_Toolbox.Library.Forms
else
HidePropertyGrid(false);
if (ShowChannelEditor)
LoadChannelEditor(null);
OnDataAcquiredEvent += new DataAcquired(ThreadReportsDataAquiredEvent);
SetUpFileSystemWatcher();
@ -338,11 +335,22 @@ namespace Switch_Toolbox.Library.Forms
var image = ActiveTexture.GetBitmap(CurArrayDisplayLevel, CurMipDisplayLevel);
if (propertiesEditor.InvokeRequired)
{
propertiesEditor.Invoke(new MethodInvoker(
delegate ()
{
LoadChannelEditor(image);
}));
}
else
{
LoadChannelEditor(image);
}
if (image != null)
{
if (ShowChannelEditor)
LoadChannelEditor(image);
if (ChannelIndex == 1)
BitmapExtension.SetChannel(image, STChannelType.Red, STChannelType.Red, STChannelType.Red, STChannelType.One);
else if (ChannelIndex == 2)
@ -362,9 +370,7 @@ namespace Switch_Toolbox.Library.Forms
}
else
{
if (Runtime.ImageEditor.DisplayAlpha)
BitmapExtension.SetChannel(image, STChannelType.Red, STChannelType.Green, STChannelType.Blue, STChannelType.Alpha);
else
if (!Runtime.ImageEditor.DisplayAlpha)
BitmapExtension.SetChannel(image, STChannelType.Red, STChannelType.Green, STChannelType.Blue, STChannelType.One);
}
}
@ -627,8 +633,8 @@ namespace Switch_Toolbox.Library.Forms
private void UpdateEditCached(Image image)
{
// ImageCache.Add(new Bitmap(image));
UpdateEdit(image);
if (IsFinished)
UpdateEdit(image);
}
private void UpdateEdit(Image image)
@ -672,9 +678,10 @@ namespace Switch_Toolbox.Library.Forms
CurMipDisplayLevel = 0;
HasBeenEdited = false;
if (ActiveTexture.EditedImages != null && ActiveTexture.EditedImages[CurArrayDisplayLevel] != null) {
ActiveTexture.EditedImages[CurArrayDisplayLevel].bitmap.Dispose();
ActiveTexture.EditedImages[CurArrayDisplayLevel] = null;
if (ActiveTexture.EditedImages != null && ActiveTexture.EditedImages[CurArrayDisplayLevel] != null)
{
ActiveTexture.EditedImages[CurArrayDisplayLevel].bitmap.Dispose();
ActiveTexture.EditedImages[CurArrayDisplayLevel] = null;
}
progressBar.Value = 100;
@ -698,6 +705,8 @@ namespace Switch_Toolbox.Library.Forms
private void reEncodeToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!IsFinished)
return;
ImageReEncodeDialog encodingEditor = new ImageReEncodeDialog();
encodingEditor.LoadImage(pictureBoxCustom1.Image, ActiveTexture);
@ -712,6 +721,9 @@ namespace Switch_Toolbox.Library.Forms
private void hueToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!IsFinished)
return;
HueSaturationAdjuster hsvEditor = new HueSaturationAdjuster();
hsvEditor.LoadBitmap(pictureBoxCustom1);
@ -722,6 +734,9 @@ namespace Switch_Toolbox.Library.Forms
private void toggleAlphaChk_CheckedChanged(object sender, EventArgs e)
{
if (!IsFinished)
return;
UpdatePictureBox();
}
@ -767,22 +782,26 @@ namespace Switch_Toolbox.Library.Forms
{
if (Hide)
{
if (splitContainer1.Panel1.Controls.Contains(propertiesEditor)) {
if (splitContainer1.Panel1.Controls.Contains(propertiesEditor))
{
splitContainer1.Panel1Collapsed = true;
splitContainer1.Panel1.Hide();
}
if (splitContainer1.Panel2.Controls.Contains(propertiesEditor)) {
if (splitContainer1.Panel2.Controls.Contains(propertiesEditor))
{
splitContainer1.Panel2Collapsed = true;
splitContainer1.Panel2.Hide();
}
}
else
{
if (splitContainer1.Panel1.Controls.Contains(propertiesEditor)) {
if (splitContainer1.Panel1.Controls.Contains(propertiesEditor))
{
splitContainer1.Panel1Collapsed = false;
splitContainer1.Panel1.Show();
}
if (splitContainer1.Panel2.Controls.Contains(propertiesEditor)) {
if (splitContainer1.Panel2.Controls.Contains(propertiesEditor))
{
splitContainer1.Panel2Collapsed = false;
splitContainer1.Panel2.Show();
}
@ -832,14 +851,15 @@ namespace Switch_Toolbox.Library.Forms
}
private void editBtn_Click(object sender, EventArgs e) {
private void editBtn_Click(object sender, EventArgs e)
{
EditInExternalProgram();
}
private TEX_FORMAT FormatToChange = TEX_FORMAT.UNKNOWN;
private void EditInExternalProgram(bool UseDefaultEditor = true)
{
if (!ActiveTexture.CanEdit)
if (!ActiveTexture.CanEdit || !IsFinished)
return;
ImageProgramSettings settings = new ImageProgramSettings();
@ -907,7 +927,7 @@ namespace Switch_Toolbox.Library.Forms
}
if (FileName.EndsWith(".dds"))
{
{
DDS dds = new DDS(FileName);
if (dds.Format != ActiveTexture.Format)
DecodeTextureBack = true;
@ -967,15 +987,18 @@ namespace Switch_Toolbox.Library.Forms
}
}
private void copyImageToolStripMenuItem_Click(object sender, EventArgs e) {
private void copyImageToolStripMenuItem_Click(object sender, EventArgs e)
{
Clipboard.SetImage(pictureBoxCustom1.Image);
}
private void copyToolStripMenuItem_Click(object sender, EventArgs e) {
private void copyToolStripMenuItem_Click(object sender, EventArgs e)
{
Clipboard.SetImage(pictureBoxCustom1.Image);
}
private void editInExternalProgramToolStripMenuItem_Click(object sender, EventArgs e) {
private void editInExternalProgramToolStripMenuItem_Click(object sender, EventArgs e)
{
EditInExternalProgram();
}
@ -1033,7 +1056,7 @@ namespace Switch_Toolbox.Library.Forms
else
displayAlphaToolStripMenuItem.Checked = true;
SetAlphaEnableUI(displayAlphaToolStripMenuItem.Checked );
SetAlphaEnableUI(displayAlphaToolStripMenuItem.Checked);
Runtime.ImageEditor.DisplayAlpha = displayAlphaToolStripMenuItem.Checked;
UpdateMipDisplay();
@ -1047,11 +1070,13 @@ namespace Switch_Toolbox.Library.Forms
alphaBtn.BackgroundImage = Properties.Resources.AlphaIconDisabled;
}
private void displayAlphaToolStripMenuItem_Click(object sender, EventArgs e) {
private void displayAlphaToolStripMenuItem_Click(object sender, EventArgs e)
{
UpdateAlphaEnable();
}
private void alphaBtn_Click(object sender, EventArgs e) {
private void alphaBtn_Click(object sender, EventArgs e)
{
UpdateAlphaEnable();
}
}

2
Switch_Toolbox_Library/Forms/Editors/ObjectEditor.cs
View File

@ -186,7 +186,7 @@ namespace Switch_Toolbox.Library.Forms
{
//Check if the object was previously selected
//This will disable selection view and other things
if (RenderedObjectWasSelected == true)
if (RenderedObjectWasSelected)
{
LibraryGUI.Instance.UpdateViewport();
RenderedObjectWasSelected = false;