LegacyConsole/PCK-Studio
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-05-30 14:46:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 3dSkinRenderer

Browse Source
This commit is contained in:
miku-666
2024-08-22 17:20:41 +02:00
parent 817c8faa7b 62c987ef26
commit f41ff0afa6
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PCK-Studio/Forms/Editor/CustomSkinEditor.cs
View File

@@ -76,7 +76,7 @@ namespace PckStudio.Forms.Editor
if (animeditor.ShowDialog() == DialogResult.OK)
{
renderer3D1.ANIM = _skin.Model.ANIM = animeditor.ResultAnim;
DrawDefaultUvAreas(_hightlightDefaultUvAreas);
skinPartListBox_SelectedIndexChanged(this, EventArgs.Empty);
}
return true;
}
@@ -311,13 +311,11 @@ namespace PckStudio.Forms.Editor
uvPictureBox.Image = new Bitmap(scaleSize.Width, scaleSize.Height);
using (Graphics g = Graphics.FromImage(uvPictureBox.Image))
{
float lineWidth = ((_skin.Model.Texture.Width / renderer3D1.TextureSize.Width) + (_skin.Model.Texture.Height / renderer3D1.TextureSize.Height)) / 2f;
GraphicsPath graphicsPath = box.GetUVGraphicsPath(new System.Numerics.Vector2(scaleSize.Width * renderer3D1.TillingFactor.X, scaleSize.Height * renderer3D1.TillingFactor.Y));
var brush = new SolidBrush(Color.FromArgb(127, avgColor.GreyScaled()));
g.ApplyConfig(_graphicsConfig);
g.DrawImage(_skin.Model.Texture, new Rectangle(Point.Empty, scaleSize), new Rectangle(Point.Empty, _skin.Model.Texture.Size), GraphicsUnit.Pixel);
g.FillPath(brush, graphicsPath);
//g.DrawPath(new Pen(brush), graphicsPath);
}
uvPictureBox.Invalidate();
}

1
PCK-Studio/MainForm.cs
View File

@@ -1730,6 +1730,7 @@ namespace PckStudio
return false;
}
[Obsolete("Refactor or remove this")]
private void importExtractedSkinsFolder(object sender, EventArgs e)
{
OpenFolderDialog contents = new OpenFolderDialog();