diff --git a/PCK-Studio/Forms/Skins-And-Textures/CustomSkinEditor.Designer.cs b/PCK-Studio/Forms/Skins-And-Textures/CustomSkinEditor.Designer.cs
index 090ff8ae..c6067df2 100644
--- a/PCK-Studio/Forms/Skins-And-Textures/CustomSkinEditor.Designer.cs
+++ b/PCK-Studio/Forms/Skins-And-Textures/CustomSkinEditor.Designer.cs
@@ -34,7 +34,6 @@
System.Windows.Forms.Label label3;
System.Windows.Forms.Label label7;
System.Windows.Forms.Label labelTextureMappingPreview;
- PckStudio.Internal.SkinANIM skinANIM2 = new PckStudio.Internal.SkinANIM();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.createToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.cloneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -43,7 +42,7 @@
this.buttonDone = new MetroFramework.Controls.MetroButton();
this.buttonEXPORT = new MetroFramework.Controls.MetroButton();
this.buttonIMPORT = new MetroFramework.Controls.MetroButton();
- this.buttonImportModel = new MetroFramework.Controls.MetroButton();
+ this.importCustomSkinButton = new MetroFramework.Controls.MetroButton();
this.buttonExportModel = new MetroFramework.Controls.MetroButton();
this.OpenJSONButton = new MetroFramework.Controls.MetroButton();
this.generateTextureCheckBox = new MetroFramework.Controls.MetroCheckBox();
@@ -173,14 +172,14 @@
this.buttonIMPORT.UseSelectable = true;
this.buttonIMPORT.Click += new System.EventHandler(this.buttonIMPORT_Click);
//
- // buttonImportModel
+ // importCustomSkinButton
//
- resources.ApplyResources(this.buttonImportModel, "buttonImportModel");
- this.buttonImportModel.ForeColor = System.Drawing.Color.White;
- this.buttonImportModel.Name = "buttonImportModel";
- this.buttonImportModel.Theme = MetroFramework.MetroThemeStyle.Dark;
- this.buttonImportModel.UseSelectable = true;
- this.buttonImportModel.Click += new System.EventHandler(this.buttonImportModel_Click);
+ resources.ApplyResources(this.importCustomSkinButton, "importCustomSkinButton");
+ this.importCustomSkinButton.ForeColor = System.Drawing.Color.White;
+ this.importCustomSkinButton.Name = "importCustomSkinButton";
+ this.importCustomSkinButton.Theme = MetroFramework.MetroThemeStyle.Dark;
+ this.importCustomSkinButton.UseSelectable = true;
+ this.importCustomSkinButton.Click += new System.EventHandler(this.importCustomSkinButton_Click);
//
// buttonExportModel
//
@@ -315,8 +314,8 @@
resources.ApplyResources(this.skinPartListBox, "skinPartListBox");
this.skinPartListBox.FormattingEnabled = true;
this.skinPartListBox.Name = "skinPartListBox";
- this.skinPartListBox.SelectedIndexChanged += new System.EventHandler(this.listBox1_SelectedIndexChanged);
- this.skinPartListBox.DoubleClick += new System.EventHandler(this.listBox1_DoubleClick);
+ this.skinPartListBox.SelectedIndexChanged += new System.EventHandler(this.skinPartListBox_SelectedIndexChanged);
+ this.skinPartListBox.DoubleClick += new System.EventHandler(this.skinPartListBox_DoubleClick);
//
// clampToViewCheckbox
//
@@ -345,7 +344,6 @@
// renderer3D1
//
resources.ApplyResources(this.renderer3D1, "renderer3D1");
- this.renderer3D1.ANIM = skinANIM2;
this.renderer3D1.BackColor = System.Drawing.Color.DimGray;
this.renderer3D1.ClampModel = false;
this.renderer3D1.Name = "renderer3D1";
@@ -420,7 +418,7 @@
this.Controls.Add(this.generateTextureCheckBox);
this.Controls.Add(this.OpenJSONButton);
this.Controls.Add(this.buttonExportModel);
- this.Controls.Add(this.buttonImportModel);
+ this.Controls.Add(this.importCustomSkinButton);
this.Controls.Add(this.buttonEXPORT);
this.Controls.Add(labelTextureMappingPreview);
this.Controls.Add(this.buttonIMPORT);
@@ -460,7 +458,7 @@
private MetroFramework.Controls.MetroButton buttonDone;
private MetroFramework.Controls.MetroButton OpenJSONButton;
private MetroFramework.Controls.MetroButton buttonExportModel;
- private MetroFramework.Controls.MetroButton buttonImportModel;
+ private MetroFramework.Controls.MetroButton importCustomSkinButton;
private PckStudio.ToolboxItems.InterpolationPictureBox uvPictureBox;
private MetroFramework.Controls.MetroButton buttonIMPORT;
private MetroFramework.Controls.MetroButton buttonEXPORT;
diff --git a/PCK-Studio/Forms/Skins-And-Textures/CustomSkinEditor.cs b/PCK-Studio/Forms/Skins-And-Textures/CustomSkinEditor.cs
index 4beb4dd9..0213d2c0 100644
--- a/PCK-Studio/Forms/Skins-And-Textures/CustomSkinEditor.cs
+++ b/PCK-Studio/Forms/Skins-And-Textures/CustomSkinEditor.cs
@@ -51,7 +51,7 @@ namespace PckStudio.Forms
{
renderer3D1.ANIM = properties.GetPropertyValue("ANIM", SkinANIM.FromString);
var boxProperties = properties.GetProperties("BOX");
- var offsetProperties = properties.GetProperties("OFFSETS");
+ var offsetProperties = properties.GetProperties("OFFSET");
skinNameLabel.Text = properties.HasProperty("DISPLAYNAME") ? properties.GetPropertyValue("DISPLAYNAME") : "";
@@ -317,7 +317,7 @@ namespace PckStudio.Forms
uvPictureBox.BackgroundImage = img;
}
- private void listBox1_DoubleClick(object sender, EventArgs e)
+ private void skinPartListBox_DoubleClick(object sender, EventArgs e)
{
if (skinPartListBox.SelectedItem is SkinBOX box)
{
@@ -330,7 +330,7 @@ namespace PckStudio.Forms
}
}
- private void listBox1_SelectedIndexChanged(object sender, EventArgs e)
+ private void skinPartListBox_SelectedIndexChanged(object sender, EventArgs e)
{
if (skinPartListBox.SelectedItem is SkinBOX box)
{
diff --git a/PCK-Studio/Forms/Skins-And-Textures/CustomSkinEditor.resx b/PCK-Studio/Forms/Skins-And-Textures/CustomSkinEditor.resx
index d5936e57..f40bbef0 100644
--- a/PCK-Studio/Forms/Skins-And-Textures/CustomSkinEditor.resx
+++ b/PCK-Studio/Forms/Skins-And-Textures/CustomSkinEditor.resx
@@ -133,7 +133,7 @@
- 629, 404
+ 624, 404
44, 13
@@ -169,7 +169,7 @@
NoControl
- 632, 374
+ 627, 374
27, 13
@@ -205,7 +205,7 @@
NoControl
- 684, 345
+ 679, 345
22, 13
@@ -241,7 +241,7 @@
NoControl
- 695, 41
+ 690, 41
128, 13
@@ -352,7 +352,7 @@
Bottom, Right
- 632, 547
+ 627, 557
250, 22
@@ -379,7 +379,7 @@
Top, Right
- 752, 315
+ 747, 315
61, 21
@@ -406,7 +406,7 @@
Top, Right
- 685, 315
+ 680, 315
61, 21
@@ -429,34 +429,34 @@
23
-
+
Bottom, Left
-
+
False
-
- 306, 547
+
+ 194, 558
-
+
106, 21
-
+
96
-
- OPEN CSM
+
+ Import Skin
-
- buttonImportModel
+
+ importCustomSkinButton
-
+
MetroFramework.Controls.MetroButton, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
-
+
$this
-
+
20
@@ -466,7 +466,7 @@
False
- 418, 548
+ 418, 558
89, 21
@@ -475,7 +475,7 @@
97
- EXPORT CSM
+ Export csmb
buttonExportModel
@@ -496,7 +496,7 @@
False
- 194, 547
+ 306, 558
106, 21
@@ -505,7 +505,7 @@
145
- OPEN JSON
+ Import json
OpenJSONButton
@@ -526,7 +526,7 @@
True
- 632, 440
+ 627, 440
140, 15
@@ -556,7 +556,7 @@
True
- 632, 461
+ 627, 461
84, 15
@@ -586,7 +586,7 @@
True
- 632, 503
+ 627, 503
129, 15
@@ -613,7 +613,7 @@
Top, Right
- 674, 371
+ 669, 371
53, 20
@@ -640,7 +640,7 @@
Top, Right
- 733, 371
+ 728, 371
53, 20
@@ -667,7 +667,7 @@
Top, Right
- 792, 371
+ 787, 371
58, 20
@@ -694,7 +694,7 @@
Top, Right
- 712, 342
+ 707, 342
43, 20
@@ -718,7 +718,7 @@
Top, Right
- 761, 342
+ 756, 342
43, 20
@@ -742,7 +742,7 @@
Top, Right
- 792, 403
+ 787, 403
58, 20
@@ -769,7 +769,7 @@
Top, Right
- 733, 403
+ 728, 403
53, 20
@@ -796,7 +796,7 @@
Top, Right
- 674, 403
+ 669, 403
53, 20
@@ -826,7 +826,7 @@
0, 0
- 157, 440
+ 157, 450
161
@@ -850,7 +850,7 @@
True
- 632, 482
+ 627, 482
137, 15
@@ -877,7 +877,7 @@
Bottom, Left
- 513, 548
+ 513, 558
113, 21
@@ -907,7 +907,7 @@
True
- 632, 524
+ 627, 524
82, 15
@@ -937,7 +937,7 @@
194, 59
- 432, 482
+ 427, 492
0
@@ -964,7 +964,7 @@
NoControl
- 632, 59
+ 627, 59
250, 250
@@ -994,7 +994,7 @@
True
- 23, 549
+ 23, 559
73, 19
@@ -1020,6 +1020,51 @@
Top, Bottom, Left
+
+ skinPartsTabPage
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ metroTabControl1
+
+
+ 0
+
+
+ skinOffsetsTabPage
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ metroTabControl1
+
+
+ 1
+
+
+ 23, 59
+
+
+ 165, 492
+
+
+ 166
+
+
+ metroTabControl1
+
+
+ MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ $this
+
+
+ 1
+
Center
@@ -1027,7 +1072,7 @@
4, 38
- 157, 440
+ 157, 450
0
@@ -1083,27 +1128,6 @@
1
-
- 23, 59
-
-
- 165, 482
-
-
- 166
-
-
- metroTabControl1
-
-
- MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
-
-
- $this
-
-
- 1
-
Fill
@@ -1138,7 +1162,7 @@
6, 13
- 905, 590
+ 900, 600
@@ -3647,7 +3671,7 @@
- 905, 590
+ 900, 600
CenterParent