Added dedicated display armor buttons to Skin Editor

This commit is contained in:
MayNL
2026-06-20 21:42:06 -04:00
parent 5ca01d43f3
commit afd6c604be
13 changed files with 449 additions and 210 deletions

View File

@@ -41,7 +41,6 @@
this.importSkinButton = new MetroFramework.Controls.MetroButton();
this.exportSkinButton = new MetroFramework.Controls.MetroButton();
this.generateTextureCheckBox = new MetroFramework.Controls.MetroCheckBox();
this.showArmorCheckbox = new MetroFramework.Controls.MetroCheckBox();
this.skinPartListBox = new System.Windows.Forms.ListBox();
this.captureScreenshotButton = new MetroFramework.Controls.MetroButton();
this.showToolsCheckBox = new MetroFramework.Controls.MetroCheckBox();
@@ -61,12 +60,20 @@
this.exportTemplateButton = new MetroFramework.Controls.MetroButton();
this.boxEditorControl1 = new PckStudio.Controls.BoxEditorControl();
this.skinAdjustmentsEditorControl1 = new PckStudio.Controls.SkinAdjustmentsEditorControl();
this.helmetButtonControl = new PckStudio.Controls.PictureButtonControl();
this.chestplateButtonControl = new PckStudio.Controls.PictureButtonControl();
this.leggingsButtonControl = new PckStudio.Controls.PictureButtonControl();
this.bootsButtonControl = new PckStudio.Controls.PictureButtonControl();
this.skinPartTabContextMenu.SuspendLayout();
this.parameterTabControl.SuspendLayout();
this.skinPartsTabPage.SuspendLayout();
this.skinOffsetsTabPage.SuspendLayout();
this.offsetTabContextMenu.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.uvPictureBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.helmetButtonControl)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.chestplateButtonControl)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.leggingsButtonControl)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bootsButtonControl)).BeginInit();
this.SuspendLayout();
//
// importTextureButton
@@ -157,14 +164,6 @@
this.generateTextureCheckBox.Theme = MetroFramework.MetroThemeStyle.Dark;
this.generateTextureCheckBox.UseSelectable = true;
//
// showArmorCheckbox
//
resources.ApplyResources(this.showArmorCheckbox, "showArmorCheckbox");
this.showArmorCheckbox.Name = "showArmorCheckbox";
this.showArmorCheckbox.Theme = MetroFramework.MetroThemeStyle.Dark;
this.showArmorCheckbox.UseSelectable = true;
this.showArmorCheckbox.CheckedChanged += new System.EventHandler(this.showArmorCheckbox_CheckedChanged);
//
// skinPartListBox
//
this.skinPartListBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
@@ -270,7 +269,7 @@
this.renderer3D1.SelectedIndex = -1;
this.renderer3D1.SelectedIndices = new int[] {
-1};
this.renderer3D1.ShowArmor = false;
this.renderer3D1.ShowArmorMask = null;
this.renderer3D1.ShowBoundingBox = false;
this.renderer3D1.ShowGuideLines = false;
this.renderer3D1.ShowTools = false;
@@ -332,10 +331,86 @@
this.skinAdjustmentsEditorControl1.Name = "skinAdjustmentsEditorControl1";
this.skinAdjustmentsEditorControl1.AdjustmentsChanged += new System.EventHandler(this.skinAdjustmentsEditorControl1_AdjustmentsChanged);
//
// helmetButtonControl
//
this.helmetButtonControl.BackColor = System.Drawing.Color.Transparent;
this.helmetButtonControl.DashStyle = System.Drawing.Drawing2D.DashStyle.Solid;
this.helmetButtonControl.ForceHidden = false;
this.helmetButtonControl.ForceShown = false;
this.helmetButtonControl.HiddenBorderColor = System.Drawing.Color.White;
this.helmetButtonControl.Image = global::PckStudio.Properties.Resources.helmet;
resources.ApplyResources(this.helmetButtonControl, "helmetButtonControl");
this.helmetButtonControl.Inverted = true;
this.helmetButtonControl.Name = "helmetButtonControl";
this.helmetButtonControl.SetDashStyle = System.Drawing.Drawing2D.DashStyle.Solid;
this.helmetButtonControl.ShownBorderColor = System.Drawing.Color.White;
this.helmetButtonControl.state = PckStudio.Controls.PictureButtonControl.DisplayState.Set;
this.helmetButtonControl.TabStop = false;
this.helmetButtonControl.Tag = PckStudio.Core.Skin.SkinArmorFlagsFlag.HELMET;
this.helmetButtonControl.Click += new System.EventHandler(this.armorButtonControl_Click);
//
// chestplateButtonControl
//
this.chestplateButtonControl.BackColor = System.Drawing.Color.Transparent;
this.chestplateButtonControl.DashStyle = System.Drawing.Drawing2D.DashStyle.Solid;
this.chestplateButtonControl.ForceHidden = false;
this.chestplateButtonControl.ForceShown = false;
this.chestplateButtonControl.HiddenBorderColor = System.Drawing.Color.White;
this.chestplateButtonControl.Image = global::PckStudio.Properties.Resources.chestplate;
resources.ApplyResources(this.chestplateButtonControl, "chestplateButtonControl");
this.chestplateButtonControl.Inverted = true;
this.chestplateButtonControl.Name = "chestplateButtonControl";
this.chestplateButtonControl.SetDashStyle = System.Drawing.Drawing2D.DashStyle.Solid;
this.chestplateButtonControl.ShownBorderColor = System.Drawing.Color.White;
this.chestplateButtonControl.state = PckStudio.Controls.PictureButtonControl.DisplayState.Set;
this.chestplateButtonControl.TabStop = false;
this.chestplateButtonControl.Tag = PckStudio.Core.Skin.SkinArmorFlagsFlag.CHESTPLATE;
this.chestplateButtonControl.Click += new System.EventHandler(this.armorButtonControl_Click);
//
// leggingsButtonControl
//
this.leggingsButtonControl.BackColor = System.Drawing.Color.Transparent;
this.leggingsButtonControl.DashStyle = System.Drawing.Drawing2D.DashStyle.Solid;
this.leggingsButtonControl.ForceHidden = false;
this.leggingsButtonControl.ForceShown = false;
this.leggingsButtonControl.HiddenBorderColor = System.Drawing.Color.White;
this.leggingsButtonControl.Image = global::PckStudio.Properties.Resources.leggings;
resources.ApplyResources(this.leggingsButtonControl, "leggingsButtonControl");
this.leggingsButtonControl.Inverted = true;
this.leggingsButtonControl.Name = "leggingsButtonControl";
this.leggingsButtonControl.SetDashStyle = System.Drawing.Drawing2D.DashStyle.Solid;
this.leggingsButtonControl.ShownBorderColor = System.Drawing.Color.White;
this.leggingsButtonControl.state = PckStudio.Controls.PictureButtonControl.DisplayState.Set;
this.leggingsButtonControl.TabStop = false;
this.leggingsButtonControl.Tag = PckStudio.Core.Skin.SkinArmorFlagsFlag.LEGGINGS;
this.leggingsButtonControl.Click += new System.EventHandler(this.armorButtonControl_Click);
//
// bootsButtonControl
//
this.bootsButtonControl.BackColor = System.Drawing.Color.Transparent;
this.bootsButtonControl.DashStyle = System.Drawing.Drawing2D.DashStyle.Solid;
this.bootsButtonControl.ForceHidden = false;
this.bootsButtonControl.ForceShown = false;
this.bootsButtonControl.HiddenBorderColor = System.Drawing.Color.White;
this.bootsButtonControl.Image = global::PckStudio.Properties.Resources.boots;
resources.ApplyResources(this.bootsButtonControl, "bootsButtonControl");
this.bootsButtonControl.Inverted = true;
this.bootsButtonControl.Name = "bootsButtonControl";
this.bootsButtonControl.SetDashStyle = System.Drawing.Drawing2D.DashStyle.Solid;
this.bootsButtonControl.ShownBorderColor = System.Drawing.Color.White;
this.bootsButtonControl.state = PckStudio.Controls.PictureButtonControl.DisplayState.Set;
this.bootsButtonControl.TabStop = false;
this.bootsButtonControl.Tag = PckStudio.Core.Skin.SkinArmorFlagsFlag.BOOTS;
this.bootsButtonControl.Click += new System.EventHandler(this.armorButtonControl_Click);
//
// CustomSkinEditor
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.bootsButtonControl);
this.Controls.Add(this.leggingsButtonControl);
this.Controls.Add(this.chestplateButtonControl);
this.Controls.Add(this.helmetButtonControl);
this.Controls.Add(this.skinAdjustmentsEditorControl1);
this.Controls.Add(this.parameterTabControl);
this.Controls.Add(this.boxEditorControl1);
@@ -344,7 +419,6 @@
this.Controls.Add(this.textureSizeLabel);
this.Controls.Add(this.showToolsCheckBox);
this.Controls.Add(this.centerSelectionCheckbox);
this.Controls.Add(this.showArmorCheckbox);
this.Controls.Add(this.generateTextureCheckBox);
this.Controls.Add(this.uvPictureBox);
this.Controls.Add(this.exportTemplateButton);
@@ -365,6 +439,10 @@
this.skinOffsetsTabPage.ResumeLayout(false);
this.offsetTabContextMenu.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.uvPictureBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.helmetButtonControl)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.chestplateButtonControl)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.leggingsButtonControl)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bootsButtonControl)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -383,7 +461,6 @@
private MetroFramework.Controls.MetroButton importTextureButton;
private MetroFramework.Controls.MetroButton exportTextureButton;
private MetroFramework.Controls.MetroCheckBox generateTextureCheckBox;
private MetroFramework.Controls.MetroCheckBox showArmorCheckbox;
private Rendering.SkinRenderer renderer3D1;
private System.Windows.Forms.ListBox skinPartListBox;
private MetroFramework.Controls.MetroButton captureScreenshotButton;
@@ -402,5 +479,9 @@
private MetroFramework.Controls.MetroButton exportTemplateButton;
private Controls.BoxEditorControl boxEditorControl1;
private Controls.SkinAdjustmentsEditorControl skinAdjustmentsEditorControl1;
private Controls.PictureButtonControl helmetButtonControl;
private Controls.PictureButtonControl chestplateButtonControl;
private Controls.PictureButtonControl leggingsButtonControl;
private Controls.PictureButtonControl bootsButtonControl;
}
}

View File

@@ -27,6 +27,7 @@ namespace PckStudio.Forms.Editor
private bool _inflateOverlayParts;
private int _xmlVersion;
private SkinGameFlags _gameFlags;
private SkinArmorFlags displayArmorFlags = SkinArmorFlags.Empty;
private BindingSource _skinPartListBindingSource;
private BindingSource _skinOffsetListBindingSource;
@@ -55,6 +56,7 @@ namespace PckStudio.Forms.Editor
boxEditorControl1.SetBOXVersion(xmlVersion);
_inflateOverlayParts = _xmlVersion > 0 && _xmlVersion < 3;
skinAdjustmentsEditorControl1.SetSkin(skin);
renderer3D1.ShowArmorMask = displayArmorFlags;
}
private void InitializeRenderSettings()
@@ -316,11 +318,6 @@ namespace PckStudio.Forms.Editor
}
}
private void showArmorCheckbox_CheckedChanged(object sender, EventArgs e)
{
renderer3D1.ShowArmor = showArmorCheckbox.Checked;
}
private void showToolsCheckBox_CheckedChanged(object sender, EventArgs e)
{
renderer3D1.ShowTools = showToolsCheckBox.Checked;
@@ -455,7 +452,7 @@ namespace PckStudio.Forms.Editor
if (index > -1)
{
renderer3D1.ModelData[index] = boxEditorControl1.GetBOX();
renderer3D1.ShowArmor = showArmorCheckbox.Checked;
renderer3D1.ShowArmorMask = displayArmorFlags;
_skinPartListBindingSource.ResetItem(index);
}
}
@@ -465,5 +462,19 @@ namespace PckStudio.Forms.Editor
renderer3D1.ANIM = skinAdjustmentsEditorControl1.GetAnim();
_gameFlags = skinAdjustmentsEditorControl1.GetGameFlags();
}
private void armorButtonControl_Click(object sender, EventArgs e)
{
PictureButtonControl btn = (PictureButtonControl)sender;
bool state = btn.state == PictureButtonControl.DisplayState.Set;
SkinArmorFlagsFlag flag = (SkinArmorFlagsFlag)btn.Tag;
btn.state = !state ? PictureButtonControl.DisplayState.Set : PictureButtonControl.DisplayState.Default;
displayArmorFlags = displayArmorFlags.SetFlag(flag, state);
renderer3D1.ShowArmorMask = displayArmorFlags;
btn.Refresh();
}
}
}

View File

@@ -141,7 +141,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;importTextureButton.ZOrder" xml:space="preserve">
<value>6</value>
<value>10</value>
</data>
<data name="exportTextureButton.Location" type="System.Drawing.Point, System.Drawing">
<value>97, 249</value>
@@ -165,7 +165,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;exportTextureButton.ZOrder" xml:space="preserve">
<value>5</value>
<value>9</value>
</data>
<metadata name="skinPartTabContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
@@ -272,7 +272,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;buttonDone.ZOrder" xml:space="preserve">
<value>20</value>
<value>23</value>
</data>
<data name="importSkinButton.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 396</value>
@@ -296,7 +296,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;importSkinButton.ZOrder" xml:space="preserve">
<value>19</value>
<value>22</value>
</data>
<data name="exportSkinButton.Location" type="System.Drawing.Point, System.Drawing">
<value>97, 396</value>
@@ -320,7 +320,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;exportSkinButton.ZOrder" xml:space="preserve">
<value>18</value>
<value>21</value>
</data>
<data name="generateTextureCheckBox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -347,34 +347,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;generateTextureCheckBox.ZOrder" xml:space="preserve">
<value>11</value>
</data>
<data name="showArmorCheckbox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="showArmorCheckbox.Location" type="System.Drawing.Point, System.Drawing">
<value>49, 375</value>
</data>
<data name="showArmorCheckbox.Size" type="System.Drawing.Size, System.Drawing">
<value>89, 15</value>
</data>
<data name="showArmorCheckbox.TabIndex" type="System.Int32, mscorlib">
<value>149</value>
</data>
<data name="showArmorCheckbox.Text" xml:space="preserve">
<value>Show Armor</value>
</data>
<data name="&gt;&gt;showArmorCheckbox.Name" xml:space="preserve">
<value>showArmorCheckbox</value>
</data>
<data name="&gt;&gt;showArmorCheckbox.Type" xml:space="preserve">
<value>MetroFramework.Controls.MetroCheckBox, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a</value>
</data>
<data name="&gt;&gt;showArmorCheckbox.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;showArmorCheckbox.ZOrder" xml:space="preserve">
<value>10</value>
<value>14</value>
</data>
<data name="skinPartListBox.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@@ -422,13 +395,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;captureScreenshotButton.ZOrder" xml:space="preserve">
<value>16</value>
<value>19</value>
</data>
<data name="showToolsCheckBox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="showToolsCheckBox.Location" type="System.Drawing.Point, System.Drawing">
<value>49, 354</value>
<value>56, 375</value>
</data>
<data name="showToolsCheckBox.Size" type="System.Drawing.Size, System.Drawing">
<value>83, 15</value>
@@ -449,7 +422,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;showToolsCheckBox.ZOrder" xml:space="preserve">
<value>8</value>
<value>12</value>
</data>
<data name="skinNameLabel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -479,7 +452,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;skinNameLabel.ZOrder" xml:space="preserve">
<value>15</value>
<value>18</value>
</data>
<data name="parameterTabControl.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
@@ -599,7 +572,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;parameterTabControl.ZOrder" xml:space="preserve">
<value>3</value>
<value>7</value>
</data>
<data name="renderer3D1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
@@ -623,7 +596,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;renderer3D1.ZOrder" xml:space="preserve">
<value>17</value>
<value>20</value>
</data>
<data name="uvPictureBox.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Zoom</value>
@@ -653,7 +626,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;uvPictureBox.ZOrder" xml:space="preserve">
<value>12</value>
<value>15</value>
</data>
<data name="centerSelectionCheckbox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -680,7 +653,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;centerSelectionCheckbox.ZOrder" xml:space="preserve">
<value>9</value>
<value>13</value>
</data>
<data name="textureSizeLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -710,7 +683,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;textureSizeLabel.ZOrder" xml:space="preserve">
<value>7</value>
<value>11</value>
</data>
<data name="renderSettingsButton.Location" type="System.Drawing.Point, System.Drawing">
<value>97, 423</value>
@@ -734,7 +707,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;renderSettingsButton.ZOrder" xml:space="preserve">
<value>14</value>
<value>17</value>
</data>
<data name="exportTemplateButton.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 423</value>
@@ -758,7 +731,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;exportTemplateButton.ZOrder" xml:space="preserve">
<value>13</value>
<value>16</value>
</data>
<data name="boxEditorControl1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
@@ -785,7 +758,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;boxEditorControl1.ZOrder" xml:space="preserve">
<value>4</value>
<value>8</value>
</data>
<data name="skinAdjustmentsEditorControl1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
@@ -809,6 +782,114 @@
<value>$this</value>
</data>
<data name="&gt;&gt;skinAdjustmentsEditorControl1.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="helmetButtonControl.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="helmetButtonControl.Location" type="System.Drawing.Point, System.Drawing">
<value>27, 339</value>
</data>
<data name="helmetButtonControl.Size" type="System.Drawing.Size, System.Drawing">
<value>30, 30</value>
</data>
<data name="helmetButtonControl.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
<value>StretchImage</value>
</data>
<data name="helmetButtonControl.TabIndex" type="System.Int32, mscorlib">
<value>180</value>
</data>
<data name="&gt;&gt;helmetButtonControl.Name" xml:space="preserve">
<value>helmetButtonControl</value>
</data>
<data name="&gt;&gt;helmetButtonControl.Type" xml:space="preserve">
<value>PckStudio.Controls.PictureButtonControl, PCK-Studio, Version=7.0.1.2, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;helmetButtonControl.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;helmetButtonControl.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="chestplateButtonControl.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="chestplateButtonControl.Location" type="System.Drawing.Point, System.Drawing">
<value>62, 339</value>
</data>
<data name="chestplateButtonControl.Size" type="System.Drawing.Size, System.Drawing">
<value>30, 30</value>
</data>
<data name="chestplateButtonControl.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
<value>StretchImage</value>
</data>
<data name="chestplateButtonControl.TabIndex" type="System.Int32, mscorlib">
<value>181</value>
</data>
<data name="&gt;&gt;chestplateButtonControl.Name" xml:space="preserve">
<value>chestplateButtonControl</value>
</data>
<data name="&gt;&gt;chestplateButtonControl.Type" xml:space="preserve">
<value>PckStudio.Controls.PictureButtonControl, PCK-Studio, Version=7.0.1.2, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;chestplateButtonControl.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;chestplateButtonControl.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="leggingsButtonControl.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="leggingsButtonControl.Location" type="System.Drawing.Point, System.Drawing">
<value>97, 339</value>
</data>
<data name="leggingsButtonControl.Size" type="System.Drawing.Size, System.Drawing">
<value>30, 30</value>
</data>
<data name="leggingsButtonControl.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
<value>StretchImage</value>
</data>
<data name="leggingsButtonControl.TabIndex" type="System.Int32, mscorlib">
<value>182</value>
</data>
<data name="&gt;&gt;leggingsButtonControl.Name" xml:space="preserve">
<value>leggingsButtonControl</value>
</data>
<data name="&gt;&gt;leggingsButtonControl.Type" xml:space="preserve">
<value>PckStudio.Controls.PictureButtonControl, PCK-Studio, Version=7.0.1.2, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;leggingsButtonControl.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;leggingsButtonControl.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="bootsButtonControl.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="bootsButtonControl.Location" type="System.Drawing.Point, System.Drawing">
<value>132, 339</value>
</data>
<data name="bootsButtonControl.Size" type="System.Drawing.Size, System.Drawing">
<value>30, 30</value>
</data>
<data name="bootsButtonControl.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
<value>StretchImage</value>
</data>
<data name="bootsButtonControl.TabIndex" type="System.Int32, mscorlib">
<value>183</value>
</data>
<data name="&gt;&gt;bootsButtonControl.Name" xml:space="preserve">
<value>bootsButtonControl</value>
</data>
<data name="&gt;&gt;bootsButtonControl.Type" xml:space="preserve">
<value>PckStudio.Controls.PictureButtonControl, PCK-Studio, Version=7.0.1.2, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;bootsButtonControl.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;bootsButtonControl.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

View File

@@ -585,6 +585,10 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\skin_editor\leggings.png" />
<None Include="Resources\skin_editor\helmet.png" />
<None Include="Resources\skin_editor\chestplate.png" />
<None Include="Resources\skin_editor\boots.png" />
<None Include="Resources\atlases\bannerData.json" />
<None Include="Resources\atlases\blockData.json" />
<None Include="Resources\atlases\entityBehavioursData.json" />

View File

@@ -150,6 +150,16 @@ namespace PckStudio.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap boots {
get {
object obj = ResourceManager.GetObject("boots", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@@ -192,6 +202,16 @@ namespace PckStudio.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap chestplate {
get {
object obj = ResourceManager.GetObject("chestplate", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@@ -553,6 +573,16 @@ namespace PckStudio.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap helmet {
get {
object obj = ResourceManager.GetObject("helmet", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@@ -573,6 +603,16 @@ namespace PckStudio.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap leggings {
get {
object obj = ResourceManager.GetObject("leggings", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

View File

@@ -130,11 +130,8 @@
<data name="NoImageFound" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\NoImageFound.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skyboxVertexShader" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\shader\skyboxVertexShader.glsl;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
</data>
<data name="ProjectLogo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\ProjectLogo.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="skinAdjustments_wide_head" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\wide_head.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="HamburgerMenuIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\HamburgerMenuIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -145,6 +142,12 @@
<data name="tu51colours" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fileTemplates\tu51colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Save" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons\Save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DefaultSkyTexture" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\skybox_texture.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ZZFolder" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\ZZFolder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -157,24 +160,33 @@
<data name="file_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons\file_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_armor_right_arm" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\armor_right_arm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_wide_right_arm" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\wide_right_arm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="PCK_ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\PCK ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="changeTile" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\changeTile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="framebufferVertexShader" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\shader\framebufferVertexShader.glsl;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
<data name="texturedCubeGeometryShader" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\shader\texturedCubeGeometryShader.glsl;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
</data>
<data name="tu32colours" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fileTemplates\tu32colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="skinAdjustments_slim_left_leg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\slim_left_leg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="BEHAVIOURS_ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\BEHAVIOURS ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ZUnknown" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\ZUnknown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="WiiU" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\external\WiiU.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ARROW" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\ARROW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -184,23 +196,41 @@
<data name="SKINS_ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\SKINS ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Discord" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\external\Discord.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="skinAdjustments_armor_left_arm" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\armor_left_arm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="empty" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\empty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_armor_head" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\armor_head.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="framebufferVertexShader" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\shader\framebufferVertexShader.glsl;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
</data>
<data name="tu13colours" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fileTemplates\tu13colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="entityBehavioursData" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\entityBehavioursData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
</data>
<data name="Replace" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons\Replace.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_wide_legs" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\wide_legs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="tu19colours" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fileTemplates\tu19colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="pckClosed" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pckClosed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="texturedCubeVertexShader" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\shader\texturedCubeVertexShader.glsl;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
</data>
<data name="file_export" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons\file_export.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="tu53colours" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fileTemplates\tu53colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="Discord" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\external\Discord.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skyboxFragmentShader" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\shader\skyboxFragmentShader.glsl;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
@@ -208,11 +238,8 @@
<data name="plainColorVertexShader" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\shader\plainColorVertexShader.glsl;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
</data>
<data name="slim_template" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\slim_template.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="COL_ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\COL ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="file_export" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons\file_export.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="entities_atlas" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\atlases\entities.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -220,9 +247,15 @@
<data name="AddTexture" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\AddTexture.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_slim_body" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\slim_body.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="music" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons\music.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_slim_head" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\slim_head.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="blank" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -232,12 +265,15 @@
<data name="ENTITY_MATERIALS_ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\ENTITY MATERIALS ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Replace" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons\Replace.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="entityMaterialsData" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\entityMaterialsData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
</data>
<data name="IMAGE_ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\IMAGE ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skyboxVertexShader" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\shader\skyboxVertexShader.glsl;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
</data>
<data name="BINKA_ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\BINKA ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -253,6 +289,15 @@
<data name="GRF_ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\GRF ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_slim_right_arm" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\slim_right_arm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SLIM SKIN ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\SLIM SKIN ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="framebufferFragmentShader" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\shader\framebufferFragmentShader.glsl;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
</data>
<data name="mss32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\binka\mss32.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@@ -262,8 +307,17 @@
<data name="ranch" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons\ranch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="WiiU" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\external\WiiU.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="tools" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tools.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_armor_right_leg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\armor_right_leg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_wide_body" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\wide_body.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="changeTile" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\changeTile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="CAPE_ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\CAPE ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -274,26 +328,32 @@
<data name="file_empty" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons\file_empty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="tu19colours" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fileTemplates\tu19colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="skinAdjustments_slim_left_arm" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\slim_left_arm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="tu53colours" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fileTemplates\tu53colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="_1_91_colours" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fileTemplates\1.91_colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="MODERN SKIN ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\MODERN SKIN ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="MODELS_ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\MODELS ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="INFO_ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\INFO ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_wide_left_arm" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\wide_left_arm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="file_paste" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons\file_paste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="armor" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\armor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="texturedCubeGeometryShader" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\shader\texturedCubeGeometryShader.glsl;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
<data name="COL_ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\COL ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="file_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons\file_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -304,18 +364,27 @@
<data name="texturedCubeFragmentShader" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\shader\texturedCubeFragmentShader.glsl;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
</data>
<data name="CHANGELOG" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\CHANGELOG.md;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="binkawin" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\binka\binkawin.asi;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="ProjectLogo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\ProjectLogo.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="pack" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pack.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_slim_right_leg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\slim_right_leg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="CLASSIC_SKIN_ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\CLASSIC SKIN ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="tu43colours" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fileTemplates\tu43colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="CHANGELOG" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\CHANGELOG.md;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="tu46colours" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fileTemplates\tu46colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@@ -328,106 +397,49 @@
<data name="tu14colours" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fileTemplates\tu14colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="entityModelsData" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\entityModelsData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
</data>
<data name="tu69colours" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fileTemplates\tu69colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Youtube" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\external\Youtube.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="file_restore" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons\file_restore.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DefaultSkyTexture" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\skybox_texture.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="framebufferFragmentShader" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\shader\framebufferFragmentShader.glsl;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
</data>
<data name="pckOpen" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pckOpen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Save" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons\Save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="entityBehavioursData" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\entityBehavioursData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
</data>
<data name="entityMaterialsData" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\entityMaterialsData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
</data>
<data name="entityModelsData" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\entityModelsData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
<data name="armor" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\armor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_armor_body" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\armor_body.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_armor_head" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\armor_head.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="CUSTOM SKIN ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\CUSTOM SKIN ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_armor_left_arm" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\armor_left_arm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="file_restore" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons\file_restore.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_armor_left_leg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\armor_left_leg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_armor_right_arm" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\armor_right_arm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_armor_right_leg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\armor_right_leg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="slim_template" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\slim_template.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_classic_head" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\classic_head.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_wide_body" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\wide_body.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="pckOpen" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pckOpen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_wide_head" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\wide_head.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="skinAdjustments_armor_left_leg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\armor_left_leg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_slim_body" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\slim_body.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="boots" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\skin_editor\boots.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_slim_head" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\slim_head.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="chestplate" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\skin_editor\chestplate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_slim_left_arm" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\slim_left_arm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="helmet" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\skin_editor\helmet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_slim_left_leg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\slim_left_leg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_slim_right_arm" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\slim_right_arm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_slim_right_leg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\slim_right_leg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_wide_left_arm" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\wide_left_arm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_wide_legs" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\wide_legs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="skinAdjustments_wide_right_arm" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\anim_editor\wide_right_arm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="CLASSIC_SKIN_ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\CLASSIC SKIN ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="MODERN SKIN ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\MODERN SKIN ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SLIM SKIN ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\SLIM SKIN ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="CUSTOM SKIN ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\CUSTOM SKIN ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="empty" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconImageList\empty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="tools" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tools.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="leggings" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\skin_editor\leggings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

View File

@@ -113,7 +113,7 @@ namespace PckStudio.Rendering
public bool CenterOnSelect { get; set; } = false;
public bool ShowBoundingBox { get; set; }
public bool ShowArmor
public SkinArmorFlags ShowArmorMask
{
get;
set
@@ -121,23 +121,23 @@ namespace PckStudio.Rendering
field = value;
// set box armor visibility appropriately
head.HandleArmorFlags(ShowArmor);
waist.HandleArmorFlags(ShowArmor);
bodyArmor.HandleArmorFlags(ShowArmor);
belt.HandleArmorFlags(ShowArmor);
body.HandleArmorFlags(ShowArmor);
rightArm.HandleArmorFlags(ShowArmor);
rightArmArmor.HandleArmorFlags(ShowArmor);
leftArm.HandleArmorFlags(ShowArmor);
leftArmArmor.HandleArmorFlags(ShowArmor);
rightLeg.HandleArmorFlags(ShowArmor);
rightLegging.HandleArmorFlags(ShowArmor);
rightSock.HandleArmorFlags(ShowArmor);
rightBoot.HandleArmorFlags(ShowArmor);
leftLeg.HandleArmorFlags(ShowArmor);
leftLegging.HandleArmorFlags(ShowArmor);
leftSock.HandleArmorFlags(ShowArmor);
leftBoot.HandleArmorFlags(ShowArmor);
head.HandleArmorFlags(ShowArmorMask);
waist.HandleArmorFlags(ShowArmorMask);
bodyArmor.HandleArmorFlags(ShowArmorMask);
belt.HandleArmorFlags(ShowArmorMask);
body.HandleArmorFlags(ShowArmorMask);
rightArm.HandleArmorFlags(ShowArmorMask);
rightArmArmor.HandleArmorFlags(ShowArmorMask);
leftArm.HandleArmorFlags(ShowArmorMask);
leftArmArmor.HandleArmorFlags(ShowArmorMask);
rightLeg.HandleArmorFlags(ShowArmorMask);
rightLegging.HandleArmorFlags(ShowArmorMask);
rightSock.HandleArmorFlags(ShowArmorMask);
rightBoot.HandleArmorFlags(ShowArmorMask);
leftLeg.HandleArmorFlags(ShowArmorMask);
leftLegging.HandleArmorFlags(ShowArmorMask);
leftSock.HandleArmorFlags(ShowArmorMask);
leftBoot.HandleArmorFlags(ShowArmorMask);
}
}
public bool ShowTools { get; set; } = false;
@@ -1007,33 +1007,45 @@ namespace PckStudio.Rendering
}
// Armor rendering
if (ShowArmor && !ANIM.GetFlag(SkinAnimFlag.ALL_ARMOR_DISABLED))
if (!ANIM.GetFlag(SkinAnimFlag.ALL_ARMOR_DISABLED))
{
armorTexture.Bind();
cubeShader.SetUniform2("TexSize", new Vector2(64, 64));
if (!ANIM.GetFlag(SkinAnimFlag.HEAD_DISABLED) || ANIM.GetFlag(SkinAnimFlag.SHOW_HEAD_ARMOR))
if (ShowArmorMask.GetFlag(SkinArmorFlagsFlag.HELMET) && (!ANIM.GetFlag(SkinAnimFlag.HEAD_DISABLED) || ANIM.GetFlag(SkinAnimFlag.SHOW_HEAD_ARMOR)))
RenderArmorPart(cubeShader, offsetSpecificMeshStorage["HELMET"], Matrix4.Identity, renderTransform, "HEAD");
if (!ANIM.GetFlag(SkinAnimFlag.TORSO_DISABLED) || ANIM.GetFlag(SkinAnimFlag.SHOW_CHESTPLATE_CENTER))
bool chestplateEnabled = ShowArmorMask.GetFlag(SkinArmorFlagsFlag.CHESTPLATE);
if (chestplateEnabled && (!ANIM.GetFlag(SkinAnimFlag.TORSO_DISABLED) || ANIM.GetFlag(SkinAnimFlag.SHOW_CHESTPLATE_CENTER)))
RenderArmorPart(cubeShader, offsetSpecificMeshStorage["CHEST"], Matrix4.Identity, renderTransform, "BODY");
if (!ANIM.GetFlag(SkinAnimFlag.RIGHT_ARM_DISABLED) || ANIM.GetFlag(SkinAnimFlag.SHOW_CHESTPLATE_LEFT))
if (chestplateEnabled && (!ANIM.GetFlag(SkinAnimFlag.RIGHT_ARM_DISABLED) || ANIM.GetFlag(SkinAnimFlag.SHOW_CHESTPLATE_RIGHT)))
RenderArmorPart(cubeShader, offsetSpecificMeshStorage["SHOULDER0"], armRightMatrix, renderTransform, "ARM0");
if (!ANIM.GetFlag(SkinAnimFlag.LEFT_ARM_DISABLED) || ANIM.GetFlag(SkinAnimFlag.SHOW_CHESTPLATE_LEFT))
if (chestplateEnabled && (!ANIM.GetFlag(SkinAnimFlag.LEFT_ARM_DISABLED) || ANIM.GetFlag(SkinAnimFlag.SHOW_CHESTPLATE_LEFT)))
RenderArmorPart(cubeShader, offsetSpecificMeshStorage["SHOULDER1"], armLeftMatrix, renderTransform, "ARM1");
bool showRightLegArmor = !ANIM.GetFlag(SkinAnimFlag.RIGHT_LEG_DISABLED) || ANIM.GetFlag(SkinAnimFlag.SHOW_RIGHT_LEG_ARMOR);
bool showRightLegArmor = ShowArmorMask.GetFlag(SkinArmorFlagsFlag.LEGGINGS) && (!ANIM.GetFlag(SkinAnimFlag.RIGHT_LEG_DISABLED) || ANIM.GetFlag(SkinAnimFlag.SHOW_RIGHT_LEG_ARMOR));
if (showRightLegArmor)
{
RenderArmorPart(cubeShader, offsetSpecificMeshStorage["PANTS0"], legRightMatrix, renderTransform, "LEG0");
}
if (ShowArmorMask.GetFlag(SkinArmorFlagsFlag.BOOTS) && (!ANIM.GetFlag(SkinAnimFlag.RIGHT_LEG_DISABLED) || ANIM.GetFlag(SkinAnimFlag.SHOW_RIGHT_LEG_ARMOR)))
{
RenderArmorPart(cubeShader, offsetSpecificMeshStorage["BOOT0"], legRightMatrix, renderTransform, "LEG0");
}
bool showLeftLegArmor = !ANIM.GetFlag(SkinAnimFlag.LEFT_LEG_DISABLED) || ANIM.GetFlag(SkinAnimFlag.SHOW_LEFT_LEG_ARMOR);
bool showLeftLegArmor = ShowArmorMask.GetFlag(SkinArmorFlagsFlag.LEGGINGS) && (!ANIM.GetFlag(SkinAnimFlag.LEFT_LEG_DISABLED) || ANIM.GetFlag(SkinAnimFlag.SHOW_LEFT_LEG_ARMOR));
if (showLeftLegArmor)
{
RenderArmorPart(cubeShader, offsetSpecificMeshStorage["PANTS1"], legLeftMatrix, renderTransform, "LEG1");
}
if (ShowArmorMask.GetFlag(SkinArmorFlagsFlag.BOOTS) && (!ANIM.GetFlag(SkinAnimFlag.LEFT_LEG_DISABLED) || ANIM.GetFlag(SkinAnimFlag.SHOW_LEFT_LEG_ARMOR)))
{
RenderArmorPart(cubeShader, offsetSpecificMeshStorage["BOOT1"], legLeftMatrix, renderTransform, "LEG1");
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 891 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 879 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 887 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 785 B

View File

@@ -150,7 +150,7 @@ namespace PckStudio.Rendering
cubes.RemoveAt(index);
}
public void HandleArmorFlags(bool showArmor)
public void HandleArmorFlags(SkinArmorFlags showArmorMask)
{
for (int i = 0; i < cubes.Count; i++)
{
@@ -160,9 +160,7 @@ namespace PckStudio.Rendering
if (cubeMesh.Name.StartsWith("Default"))
continue;
bool hasArmorFlags = cubeMesh.GetCube().ArmorFlags != 0;
bool visible = !(showArmor && hasArmorFlags);
bool visible = (showArmorMask.ToValue() & cubeMesh.GetCube().ArmorFlags) == 0;
cubes[i] = cubes[i].SetVisible(visible);
}