mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git
synced 2026-05-22 04:47:12 +00:00
SkinEditor now displays box dimensions in list
This commit is contained in:
30
PCK-Studio/Forms/Editor/CustomSkinEditor.Designer.cs
generated
30
PCK-Studio/Forms/Editor/CustomSkinEditor.Designer.cs
generated
@@ -47,7 +47,7 @@
|
||||
this.captureScreenshotButton = new MetroFramework.Controls.MetroButton();
|
||||
this.showToolsCheckBox = new MetroFramework.Controls.MetroCheckBox();
|
||||
this.skinNameLabel = new MetroFramework.Controls.MetroLabel();
|
||||
this.metroTabControl1 = new MetroFramework.Controls.MetroTabControl();
|
||||
this.parameterTabControl = new MetroFramework.Controls.MetroTabControl();
|
||||
this.skinPartsTabPage = new System.Windows.Forms.TabPage();
|
||||
this.skinOffsetsTabPage = new System.Windows.Forms.TabPage();
|
||||
this.offsetListBox = new System.Windows.Forms.ListBox();
|
||||
@@ -63,7 +63,7 @@
|
||||
this.boxEditorControl1 = new PckStudio.Controls.BoxEditorControl();
|
||||
this.skinAdjustmentsEditorControl1 = new PckStudio.Controls.SkinAdjustmentsEditorControl();
|
||||
this.skinPartTabContextMenu.SuspendLayout();
|
||||
this.metroTabControl1.SuspendLayout();
|
||||
this.parameterTabControl.SuspendLayout();
|
||||
this.skinPartsTabPage.SuspendLayout();
|
||||
this.skinOffsetsTabPage.SuspendLayout();
|
||||
this.offsetTabContextMenu.SuspendLayout();
|
||||
@@ -210,17 +210,17 @@
|
||||
this.skinNameLabel.Name = "skinNameLabel";
|
||||
this.skinNameLabel.Theme = MetroFramework.MetroThemeStyle.Dark;
|
||||
//
|
||||
// metroTabControl1
|
||||
// parameterTabControl
|
||||
//
|
||||
resources.ApplyResources(this.metroTabControl1, "metroTabControl1");
|
||||
this.metroTabControl1.Controls.Add(this.skinPartsTabPage);
|
||||
this.metroTabControl1.Controls.Add(this.skinOffsetsTabPage);
|
||||
this.metroTabControl1.Multiline = true;
|
||||
this.metroTabControl1.Name = "metroTabControl1";
|
||||
this.metroTabControl1.SelectedIndex = 0;
|
||||
this.metroTabControl1.Style = MetroFramework.MetroColorStyle.Pink;
|
||||
this.metroTabControl1.Theme = MetroFramework.MetroThemeStyle.Dark;
|
||||
this.metroTabControl1.UseSelectable = true;
|
||||
resources.ApplyResources(this.parameterTabControl, "parameterTabControl");
|
||||
this.parameterTabControl.Controls.Add(this.skinPartsTabPage);
|
||||
this.parameterTabControl.Controls.Add(this.skinOffsetsTabPage);
|
||||
this.parameterTabControl.Multiline = true;
|
||||
this.parameterTabControl.Name = "parameterTabControl";
|
||||
this.parameterTabControl.SelectedIndex = 0;
|
||||
this.parameterTabControl.Style = MetroFramework.MetroColorStyle.Pink;
|
||||
this.parameterTabControl.Theme = MetroFramework.MetroThemeStyle.Dark;
|
||||
this.parameterTabControl.UseSelectable = true;
|
||||
//
|
||||
// skinPartsTabPage
|
||||
//
|
||||
@@ -345,7 +345,7 @@
|
||||
resources.ApplyResources(this, "$this");
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.Controls.Add(this.skinAdjustmentsEditorControl1);
|
||||
this.Controls.Add(this.metroTabControl1);
|
||||
this.Controls.Add(this.parameterTabControl);
|
||||
this.Controls.Add(this.boxEditorControl1);
|
||||
this.Controls.Add(this.exportTextureButton);
|
||||
this.Controls.Add(this.importTextureButton);
|
||||
@@ -369,7 +369,7 @@
|
||||
this.Theme = MetroFramework.MetroThemeStyle.Dark;
|
||||
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.CustomSkinEditor_FormClosing);
|
||||
this.skinPartTabContextMenu.ResumeLayout(false);
|
||||
this.metroTabControl1.ResumeLayout(false);
|
||||
this.parameterTabControl.ResumeLayout(false);
|
||||
this.skinPartsTabPage.ResumeLayout(false);
|
||||
this.skinOffsetsTabPage.ResumeLayout(false);
|
||||
this.offsetTabContextMenu.ResumeLayout(false);
|
||||
@@ -399,7 +399,7 @@
|
||||
private MetroFramework.Controls.MetroButton captureScreenshotButton;
|
||||
private MetroFramework.Controls.MetroCheckBox showToolsCheckBox;
|
||||
private MetroFramework.Controls.MetroLabel skinNameLabel;
|
||||
private MetroFramework.Controls.MetroTabControl metroTabControl1;
|
||||
private MetroFramework.Controls.MetroTabControl parameterTabControl;
|
||||
private System.Windows.Forms.TabPage skinPartsTabPage;
|
||||
private System.Windows.Forms.TabPage skinOffsetsTabPage;
|
||||
private System.Windows.Forms.ListBox offsetListBox;
|
||||
|
||||
@@ -49,7 +49,7 @@ namespace PckStudio.Forms.Editor
|
||||
_rng = new Random();
|
||||
_skinPartListBindingSource = new BindingSource(renderer3D1.ModelData, null);
|
||||
skinPartListBox.DataSource = _skinPartListBindingSource;
|
||||
skinPartListBox.DisplayMember = "Type";
|
||||
skinPartListBox.DisplayMember = "DisplayInfo";
|
||||
_xmlVersion = xmlVersion;
|
||||
boxEditorControl1.SetBOXVersion(xmlVersion);
|
||||
_inflateOverlayParts = _xmlVersion > 0;
|
||||
|
||||
@@ -410,7 +410,7 @@
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="skinPartListBox.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>157, 114</value>
|
||||
<value>157, 113</value>
|
||||
</data>
|
||||
<data name="skinPartListBox.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
@@ -508,14 +508,14 @@
|
||||
<data name=">>skinNameLabel.ZOrder" xml:space="preserve">
|
||||
<value>16</value>
|
||||
</data>
|
||||
<data name="metroTabControl1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<data name="parameterTabControl.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Right</value>
|
||||
</data>
|
||||
<data name="skinPartsTabPage.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>4, 38</value>
|
||||
</data>
|
||||
<data name="skinPartsTabPage.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>157, 114</value>
|
||||
<value>157, 113</value>
|
||||
</data>
|
||||
<data name="skinPartsTabPage.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
@@ -530,7 +530,7 @@
|
||||
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>skinPartsTabPage.Parent" xml:space="preserve">
|
||||
<value>metroTabControl1</value>
|
||||
<value>parameterTabControl</value>
|
||||
</data>
|
||||
<data name=">>skinPartsTabPage.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
@@ -566,7 +566,7 @@
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="offsetListBox.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>157, 114</value>
|
||||
<value>157, 128</value>
|
||||
</data>
|
||||
<data name="offsetListBox.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
@@ -587,7 +587,7 @@
|
||||
<value>4, 38</value>
|
||||
</data>
|
||||
<data name="skinOffsetsTabPage.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>157, 114</value>
|
||||
<value>157, 128</value>
|
||||
</data>
|
||||
<data name="skinOffsetsTabPage.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
@@ -602,30 +602,30 @@
|
||||
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>skinOffsetsTabPage.Parent" xml:space="preserve">
|
||||
<value>metroTabControl1</value>
|
||||
<value>parameterTabControl</value>
|
||||
</data>
|
||||
<data name=">>skinOffsetsTabPage.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="metroTabControl1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>632, 21</value>
|
||||
<data name="parameterTabControl.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>632, 22</value>
|
||||
</data>
|
||||
<data name="metroTabControl1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>165, 156</value>
|
||||
<data name="parameterTabControl.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>165, 155</value>
|
||||
</data>
|
||||
<data name="metroTabControl1.TabIndex" type="System.Int32, mscorlib">
|
||||
<data name="parameterTabControl.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name=">>metroTabControl1.Name" xml:space="preserve">
|
||||
<value>metroTabControl1</value>
|
||||
<data name=">>parameterTabControl.Name" xml:space="preserve">
|
||||
<value>parameterTabControl</value>
|
||||
</data>
|
||||
<data name=">>metroTabControl1.Type" xml:space="preserve">
|
||||
<data name=">>parameterTabControl.Type" xml:space="preserve">
|
||||
<value>MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a</value>
|
||||
</data>
|
||||
<data name=">>metroTabControl1.Parent" xml:space="preserve">
|
||||
<data name=">>parameterTabControl.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>metroTabControl1.ZOrder" xml:space="preserve">
|
||||
<data name=">>parameterTabControl.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="renderer3D1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
|
||||
@@ -93,6 +93,11 @@ namespace PckStudio.Core.Skin
|
||||
public int ArmorMaskFlags { get; }
|
||||
public bool Mirror { get; }
|
||||
public float Scale { get; }
|
||||
// Simplified display info for the CustomSkinEditor
|
||||
public string DisplayInfo
|
||||
{
|
||||
get { return $"{Type} ({Size.X}x{Size.Y}x{Size.Z})".Replace(',', '.'); }
|
||||
}
|
||||
|
||||
public SkinBOX(string type, Vector3 pos, Vector3 size, Vector2 uv,
|
||||
int armorMaskFlags = 0, bool mirror = false, float scale = 0.0f)
|
||||
|
||||
Reference in New Issue
Block a user