diff --git a/MinecraftUSkinEditor/Classes/Models/DefaultModels/CharacterModel.cs b/MinecraftUSkinEditor/Classes/Models/DefaultModels/CharacterModel.cs index 7d4be1e8..c958e919 100644 --- a/MinecraftUSkinEditor/Classes/Models/DefaultModels/CharacterModel.cs +++ b/MinecraftUSkinEditor/Classes/Models/DefaultModels/CharacterModel.cs @@ -14,22 +14,19 @@ namespace PckStudio.Models protected override Texture[] InitializeTextures() { - return new Texture[] - { - new Texture(PckStudio.Properties.Resources.man) - }; + return new Texture[0]; } public override void AddToModelView(MinecraftModelView modelView) { - System.Drawing.Image source = base.Textures[0].Source; - Object3D object3D = new Box(source, new System.Drawing.Rectangle(8, 0, 0x10, 8), new System.Drawing.Rectangle(0, 8, 0x20, 8), new Point3D(0f, 0f, 0f), Effects.None); - Object3D object3D2 = new Box(source, new System.Drawing.Rectangle(0x28, 0, 0x10, 8), new System.Drawing.Rectangle(0x20, 8, 0x20, 8), new Point3D(0f, 0f, 0f), Effects.None); - Object3D object3D3 = new Box(source, new System.Drawing.Rectangle(0x2C, 0x10, 8, 4), new System.Drawing.Rectangle(0x28, 0x14, 0x20, 0xC), new Point3D(0f, 4f, 0f), Effects.FlipHorizontally); - Object3D object3D4 = new Box(source, new System.Drawing.Rectangle(0x2C, 0x10, 8, 4), new System.Drawing.Rectangle(0x28, 0x14, 0x20, 0xC), new Point3D(0f, 4f, 0f), Effects.None); - Object3D object3D5 = new Box(source, new System.Drawing.Rectangle(4, 0x10, 8, 4), new System.Drawing.Rectangle(0, 0x14, 0x10, 0xC), new Point3D(0f, 6f, 0f), Effects.FlipHorizontally); - Object3D object3D6 = new Box(source, new System.Drawing.Rectangle(4, 0x10, 8, 4), new System.Drawing.Rectangle(0, 0x14, 0x10, 0xC), new Point3D(0f, 6f, 0f), Effects.None); - Object3D object3D7 = new Box(source, new System.Drawing.Rectangle(0x14, 0x10, 0x10, 4), new System.Drawing.Rectangle(0x10, 0x14, 0x18, 0xC), new Point3D(0f, 0f, 0f), Effects.None); + Image source = base.Textures[0].Source; + Object3D object3D = new Box(source, new Rectangle(8, 0, 0x10, 8), new Rectangle(0, 8, 0x20, 8), new Point3D(0f, 0f, 0f), Effects.None); + Object3D object3D2 = new Box(source, new Rectangle(0x28, 0, 0x10, 8), new Rectangle(0x20, 8, 0x20, 8), new Point3D(0f, 0f, 0f), Effects.None); + Object3D object3D3 = new Box(source, new Rectangle(0x2C, 0x10, 8, 4), new Rectangle(0x28, 0x14, 0x20, 0xC), new Point3D(0f, 4f, 0f), Effects.FlipHorizontally); + Object3D object3D4 = new Box(source, new Rectangle(0x2C, 0x10, 8, 4), new Rectangle(0x28, 0x14, 0x20, 0xC), new Point3D(0f, 4f, 0f), Effects.None); + Object3D object3D5 = new Box(source, new Rectangle(4, 0x10, 8, 4), new Rectangle(0, 0x14, 0x10, 0xC), new Point3D(0f, 6f, 0f), Effects.FlipHorizontally); + Object3D object3D6 = new Box(source, new Rectangle(4, 0x10, 8, 4), new Rectangle(0, 0x14, 0x10, 0xC), new Point3D(0f, 6f, 0f), Effects.None); + Object3D object3D7 = new Box(source, new Rectangle(0x14, 0x10, 0x10, 4), new Rectangle(0x10, 0x14, 0x18, 0xC), new Point3D(0f, 0f, 0f), Effects.None); Object3DGroup object3DGroup = new Object3DGroup(); object3D2.Scale = 1.16f; object3DGroup.RotationOrder = RotationOrders.XY; diff --git a/MinecraftUSkinEditor/Properties/Resources.Designer.cs b/MinecraftUSkinEditor/Properties/Resources.Designer.cs index c762222f..7635e80d 100644 --- a/MinecraftUSkinEditor/Properties/Resources.Designer.cs +++ b/MinecraftUSkinEditor/Properties/Resources.Designer.cs @@ -300,16 +300,6 @@ namespace PckStudio.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap man { - get { - object obj = ResourceManager.GetObject("man", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/MinecraftUSkinEditor/Properties/Resources.resx b/MinecraftUSkinEditor/Properties/Resources.resx index b31d6f95..32bb1da0 100644 --- a/MinecraftUSkinEditor/Properties/Resources.resx +++ b/MinecraftUSkinEditor/Properties/Resources.resx @@ -124,9 +124,6 @@ ..\Resources\youtube_PNG15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\man.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Replace.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/MinecraftUSkinEditor/Properties/Settings.Designer.cs b/MinecraftUSkinEditor/Properties/Settings.Designer.cs index f6b2f004..bebd7744 100644 --- a/MinecraftUSkinEditor/Properties/Settings.Designer.cs +++ b/MinecraftUSkinEditor/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace PckStudio.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/MinecraftUSkinEditor/Resources/man.png b/MinecraftUSkinEditor/Resources/man.png deleted file mode 100644 index 5e87bef9..00000000 Binary files a/MinecraftUSkinEditor/Resources/man.png and /dev/null differ