From 8fd5a7b48e56cafc78092240bb41f65850516bf3 Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Sun, 26 May 2024 19:16:34 +0200 Subject: [PATCH] CustomSkinEditor - Replace change color with (re)generate uv texture button --- .../Forms/Editor/CustomSkinEditor.Designer.cs | 13 ++++----- PCK-Studio/Forms/Editor/CustomSkinEditor.cs | 8 ++++++ PCK-Studio/Forms/Editor/CustomSkinEditor.resx | 27 +++++++++---------- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/PCK-Studio/Forms/Editor/CustomSkinEditor.Designer.cs b/PCK-Studio/Forms/Editor/CustomSkinEditor.Designer.cs index 654abfaa..490161df 100644 --- a/PCK-Studio/Forms/Editor/CustomSkinEditor.Designer.cs +++ b/PCK-Studio/Forms/Editor/CustomSkinEditor.Designer.cs @@ -41,7 +41,7 @@ this.createToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.cloneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.changeColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.generateUvTextureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.buttonDone = new MetroFramework.Controls.MetroButton(); this.importSkinButton = new MetroFramework.Controls.MetroButton(); this.exportSkinButton = new MetroFramework.Controls.MetroButton(); @@ -134,7 +134,7 @@ this.createToolStripMenuItem, this.cloneToolStripMenuItem, this.deleteToolStripMenuItem, - this.changeColorToolStripMenuItem}); + this.generateUvTextureToolStripMenuItem}); this.skinPartTabContextMenu.Name = "contextMenuStrip1"; resources.ApplyResources(this.skinPartTabContextMenu, "skinPartTabContextMenu"); // @@ -156,10 +156,11 @@ this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click); // - // changeColorToolStripMenuItem + // generateUvTextureToolStripMenuItem // - resources.ApplyResources(this.changeColorToolStripMenuItem, "changeColorToolStripMenuItem"); - this.changeColorToolStripMenuItem.Name = "changeColorToolStripMenuItem"; + resources.ApplyResources(this.generateUvTextureToolStripMenuItem, "generateUvTextureToolStripMenuItem"); + this.generateUvTextureToolStripMenuItem.Name = "generateUvTextureToolStripMenuItem"; + this.generateUvTextureToolStripMenuItem.Click += new System.EventHandler(this.generateUvTextureToolStripMenuItem_Click); // // buttonDone // @@ -405,7 +406,7 @@ private System.Windows.Forms.ToolStripMenuItem createToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem cloneToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem deleteToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem changeColorToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem generateUvTextureToolStripMenuItem; private MetroFramework.Controls.MetroButton buttonDone; private MetroFramework.Controls.MetroButton outlineColorButton; private MetroFramework.Controls.MetroButton exportSkinButton; diff --git a/PCK-Studio/Forms/Editor/CustomSkinEditor.cs b/PCK-Studio/Forms/Editor/CustomSkinEditor.cs index 1be6c12e..e9033f90 100644 --- a/PCK-Studio/Forms/Editor/CustomSkinEditor.cs +++ b/PCK-Studio/Forms/Editor/CustomSkinEditor.cs @@ -390,5 +390,13 @@ namespace PckStudio.Forms.Editor { renderer3D1.CenterOnSelect = centerSelectionCheckbox.Checked; } + + private void generateUvTextureToolStripMenuItem_Click(object sender, EventArgs e) + { + if (skinPartListBox.SelectedItem is SkinBOX skinBox) + { + GenerateUVTextureMap(skinBox); + } + } } } \ No newline at end of file diff --git a/PCK-Studio/Forms/Editor/CustomSkinEditor.resx b/PCK-Studio/Forms/Editor/CustomSkinEditor.resx index 200e4c86..ee1361e3 100644 --- a/PCK-Studio/Forms/Editor/CustomSkinEditor.resx +++ b/PCK-Studio/Forms/Editor/CustomSkinEditor.resx @@ -351,7 +351,7 @@ - 151, 26 + 201, 26 Add Cube @@ -372,7 +372,7 @@ - 151, 26 + 201, 26 Clone @@ -387,15 +387,12 @@ - 151, 26 + 201, 26 Delete - - False - - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAAFhSURBVFhH7ZY/ @@ -408,14 +405,14 @@ rkJggg== - - 151, 26 + + 201, 26 - - Change Color + + Re-generate UV Texture - 152, 108 + 202, 130 skinPartTabContextMenu @@ -3547,10 +3544,10 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - changeColorToolStripMenuItem + + generateUvTextureToolStripMenuItem - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089