LegacyConsole/PCK-Studio
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-06-20 07:55:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

SkinRenderer - Add simple single selected box outline rendering

Browse Source
This commit is contained in:
miku-666
2024-03-01 15:19:33 +01:00
parent d71b8aed39
commit 8955828520
8 changed files with 252 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
PCK-Studio/Forms/Editor/CustomSkinEditor.Designer.cs generated
View File

@@ -47,7 +47,7 @@
this.outlineColorButton = new MetroFramework.Controls.MetroButton();
this.generateTextureCheckBox = new MetroFramework.Controls.MetroCheckBox();
this.checkGuide = new MetroFramework.Controls.MetroCheckBox();
this.checkBoxArmor = new MetroFramework.Controls.MetroCheckBox();
this.showArmorCheckbox = new MetroFramework.Controls.MetroCheckBox();
this.SizeXUpDown = new System.Windows.Forms.NumericUpDown();
this.SizeYUpDown = new System.Windows.Forms.NumericUpDown();
this.SizeZUpDown = new System.Windows.Forms.NumericUpDown();
@@ -214,12 +214,13 @@
this.checkGuide.UseSelectable = true;
this.checkGuide.CheckedChanged += new System.EventHandler(this.checkGuide_CheckedChanged);
//
// checkBoxArmor
// showArmorCheckbox
//
resources.ApplyResources(this.checkBoxArmor, "checkBoxArmor");
this.checkBoxArmor.Name = "checkBoxArmor";
this.checkBoxArmor.Theme = MetroFramework.MetroThemeStyle.Dark;
this.checkBoxArmor.UseSelectable = true;
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);
//
// SizeXUpDown
//
@@ -351,9 +352,9 @@
//
// metroTabControl1
//
resources.ApplyResources(this.metroTabControl1, "metroTabControl1");
this.metroTabControl1.Controls.Add(this.skinPartsTabPage);
this.metroTabControl1.Controls.Add(this.skinOffsetsTabPage);
resources.ApplyResources(this.metroTabControl1, "metroTabControl1");
this.metroTabControl1.Name = "metroTabControl1";
this.metroTabControl1.SelectedIndex = 0;
this.metroTabControl1.Style = MetroFramework.MetroColorStyle.Pink;
@@ -362,8 +363,8 @@
//
// skinPartsTabPage
//
resources.ApplyResources(this.skinPartsTabPage, "skinPartsTabPage");
this.skinPartsTabPage.Controls.Add(this.skinPartListBox);
resources.ApplyResources(this.skinPartsTabPage, "skinPartsTabPage");
this.skinPartsTabPage.Name = "skinPartsTabPage";
//
// skinOffsetsTabPage
@@ -380,12 +381,14 @@
//
// renderer3D1
//
resources.ApplyResources(this.renderer3D1, "renderer3D1");
this.renderer3D1.BackColor = System.Drawing.Color.DimGray;
this.renderer3D1.ClampModel = false;
resources.ApplyResources(this.renderer3D1, "renderer3D1");
this.renderer3D1.MouseSensetivity = 0.01F;
this.renderer3D1.Name = "renderer3D1";
this.renderer3D1.OutlineColor = System.Drawing.Color.Empty;
this.renderer3D1.RefreshRate = 50;
this.renderer3D1.ShowArmor = false;
this.renderer3D1.ShowGuideLines = false;
this.renderer3D1.Texture = null;
this.renderer3D1.VSync = true;
@@ -417,7 +420,7 @@
this.Controls.Add(this.SizeZUpDown);
this.Controls.Add(this.SizeYUpDown);
this.Controls.Add(this.SizeXUpDown);
this.Controls.Add(this.checkBoxArmor);
this.Controls.Add(this.showArmorCheckbox);
this.Controls.Add(this.checkGuide);
this.Controls.Add(this.generateTextureCheckBox);
this.Controls.Add(this.outlineColorButton);
@@ -468,7 +471,7 @@
private MetroFramework.Controls.MetroButton buttonEXPORT;
private MetroFramework.Controls.MetroCheckBox generateTextureCheckBox;
private MetroFramework.Controls.MetroCheckBox checkGuide;
private MetroFramework.Controls.MetroCheckBox checkBoxArmor;
private MetroFramework.Controls.MetroCheckBox showArmorCheckbox;
private System.Windows.Forms.NumericUpDown SizeXUpDown;
private System.Windows.Forms.NumericUpDown SizeYUpDown;
private System.Windows.Forms.NumericUpDown SizeZUpDown;

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

@@ -285,6 +285,7 @@ namespace PckStudio.Forms.Editor
int scale = 4;
if (skinPartListBox.SelectedItem is SkinBOX box)
{
renderer3D1.SelectedIndex = skinPartListBox.SelectedIndex;
uvPictureBox.Image = new Bitmap(uvPictureBox.BackgroundImage.Width * scale, uvPictureBox.BackgroundImage.Height * scale);
using (Graphics g = Graphics.FromImage(uvPictureBox.Image))
{
@@ -322,6 +323,11 @@ namespace PckStudio.Forms.Editor
{
outlineColorButton.Visible = renderer3D1.ShowGuideLines = checkGuide.Checked;
}
private void showArmorCheckbox_CheckedChanged(object sender, EventArgs e)
{
renderer3D1.ShowArmor = showArmorCheckbox.Checked;
}
}
class CSMJObject

132
PCK-Studio/Forms/Editor/CustomSkinEditor.resx
View File

@@ -267,6 +267,15 @@
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="contextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 108</value>
</data>
<data name="&gt;&gt;contextMenuStrip1.Name" xml:space="preserve">
<value>contextMenuStrip1</value>
</data>
<data name="&gt;&gt;contextMenuStrip1.Type" xml:space="preserve">
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="createToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -339,15 +348,6 @@
<data name="changeColorToolStripMenuItem.Text" xml:space="preserve">
<value>Change Color</value>
</data>
<data name="contextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 108</value>
</data>
<data name="&gt;&gt;contextMenuStrip1.Name" xml:space="preserve">
<value>contextMenuStrip1</value>
</data>
<data name="&gt;&gt;contextMenuStrip1.Type" xml:space="preserve">
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="buttonDone.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
</data>
@@ -579,34 +579,34 @@
<data name="&gt;&gt;checkGuide.ZOrder" xml:space="preserve">
<value>16</value>
</data>
<data name="checkBoxArmor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<data name="showArmorCheckbox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
</data>
<data name="checkBoxArmor.AutoSize" type="System.Boolean, mscorlib">
<data name="showArmorCheckbox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="checkBoxArmor.Location" type="System.Drawing.Point, System.Drawing">
<data name="showArmorCheckbox.Location" type="System.Drawing.Point, System.Drawing">
<value>627, 503</value>
</data>
<data name="checkBoxArmor.Size" type="System.Drawing.Size, System.Drawing">
<value>129, 15</value>
<data name="showArmorCheckbox.Size" type="System.Drawing.Size, System.Drawing">
<value>89, 15</value>
</data>
<data name="checkBoxArmor.TabIndex" type="System.Int32, mscorlib">
<data name="showArmorCheckbox.TabIndex" type="System.Int32, mscorlib">
<value>149</value>
</data>
<data name="checkBoxArmor.Text" xml:space="preserve">
<value>Show Armor Offsets</value>
<data name="showArmorCheckbox.Text" xml:space="preserve">
<value>Show Armor</value>
</data>
<data name="&gt;&gt;checkBoxArmor.Name" xml:space="preserve">
<value>checkBoxArmor</value>
<data name="&gt;&gt;showArmorCheckbox.Name" xml:space="preserve">
<value>showArmorCheckbox</value>
</data>
<data name="&gt;&gt;checkBoxArmor.Type" xml:space="preserve">
<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;checkBoxArmor.Parent" xml:space="preserve">
<data name="&gt;&gt;showArmorCheckbox.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;checkBoxArmor.ZOrder" xml:space="preserve">
<data name="&gt;&gt;showArmorCheckbox.ZOrder" xml:space="preserve">
<value>15</value>
</data>
<data name="SizeXUpDown.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
@@ -960,6 +960,51 @@
<data name="&gt;&gt;skinNameLabel.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="&gt;&gt;skinPartsTabPage.Name" xml:space="preserve">
<value>skinPartsTabPage</value>
</data>
<data name="&gt;&gt;skinPartsTabPage.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;skinPartsTabPage.Parent" xml:space="preserve">
<value>metroTabControl1</value>
</data>
<data name="&gt;&gt;skinPartsTabPage.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;skinOffsetsTabPage.Name" xml:space="preserve">
<value>skinOffsetsTabPage</value>
</data>
<data name="&gt;&gt;skinOffsetsTabPage.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;skinOffsetsTabPage.Parent" xml:space="preserve">
<value>metroTabControl1</value>
</data>
<data name="&gt;&gt;skinOffsetsTabPage.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="metroTabControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>23, 59</value>
</data>
<data name="metroTabControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>161, 488</value>
</data>
<data name="metroTabControl1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;metroTabControl1.Name" xml:space="preserve">
<value>metroTabControl1</value>
</data>
<data name="&gt;&gt;metroTabControl1.Type" xml:space="preserve">
<value>MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a</value>
</data>
<data name="&gt;&gt;metroTabControl1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;metroTabControl1.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="skinPartsTabPage.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 38</value>
</data>
@@ -984,18 +1029,6 @@
<data name="&gt;&gt;skinPartsTabPage.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="offsetListBox.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="offsetListBox.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="offsetListBox.Size" type="System.Drawing.Size, System.Drawing">
<value>153, 446</value>
</data>
<data name="offsetListBox.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;offsetListBox.Name" xml:space="preserve">
<value>offsetListBox</value>
</data>
@@ -1032,26 +1065,29 @@
<data name="&gt;&gt;skinOffsetsTabPage.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="metroTabControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>23, 59</value>
<data name="offsetListBox.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="metroTabControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>161, 488</value>
<data name="offsetListBox.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="metroTabControl1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
<data name="offsetListBox.Size" type="System.Drawing.Size, System.Drawing">
<value>153, 446</value>
</data>
<data name="&gt;&gt;metroTabControl1.Name" xml:space="preserve">
<value>metroTabControl1</value>
<data name="offsetListBox.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;metroTabControl1.Type" xml:space="preserve">
<value>MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a</value>
<data name="&gt;&gt;offsetListBox.Name" xml:space="preserve">
<value>offsetListBox</value>
</data>
<data name="&gt;&gt;metroTabControl1.Parent" xml:space="preserve">
<value>$this</value>
<data name="&gt;&gt;offsetListBox.Type" xml:space="preserve">
<value>System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;metroTabControl1.ZOrder" xml:space="preserve">
<value>1</value>
<data name="&gt;&gt;offsetListBox.Parent" xml:space="preserve">
<value>skinOffsetsTabPage</value>
</data>
<data name="&gt;&gt;offsetListBox.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="renderer3D1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>

1
PCK-Studio/PckStudio.csproj
View File

@@ -150,6 +150,7 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Rendering\BoundingBox.cs" />
<Compile Include="Rendering\Camera\Camera.cs" />
<Compile Include="Rendering\Camera\PerspectiveCamera.cs" />
<Compile Include="Rendering\Cube.cs" />

21
PCK-Studio/Rendering/BoundingBox.cs Normal file
View File

@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using OpenTK;
namespace PckStudio.Rendering
{
internal struct BoundingBox
{
public readonly Vector3 Start;
public readonly Vector3 End;
public BoundingBox(Vector3 start, Vector3 end)
{
Start = start;
End = end;
}
}
}

5
PCK-Studio/Rendering/ColorVertex.cs
View File

@@ -17,6 +17,11 @@ namespace PckStudio.Rendering
Position = position;
Color = color;
}
public ColorVertex(Vector3 position)
: this(position, System.Drawing.Color.White)
{
}
public Vector3 Position { get; set; }
public Color4 Color { get; set; }

73
PCK-Studio/Rendering/SceneViewport.cs
View File

@@ -26,9 +26,13 @@ https://github.com/KareemMAX/Minecraft-Skiner/blob/master/src/Minecraft%20skiner
*/
using System;
using System.Drawing;
using System.Windows.Forms;
using OpenTK;
using OpenTK.Graphics.OpenGL;
using PckStudio.Properties;
using PckStudio.Rendering.Camera;
using PckStudio.Rendering.Shader;
namespace PckStudio.Rendering
{
@@ -53,6 +57,37 @@ namespace PckStudio.Rendering
private int refreshRate = 60;
private Timer timer;
private VertexArray VAO;
private VertexBuffer VBO;
private IndexBuffer IBO;
private ShaderProgram colorShader;
protected void Init()
{
colorShader = ShaderProgram.Create(Resources.plainColorVertexShader, Resources.plainColorFragmentShader);
VAO = new VertexArray();
VBO = new VertexBuffer();
IBO = IndexBuffer.Create(
0, 1,
1, 2,
2, 3,
3, 0,
4, 5,
5, 6,
6, 7,
7, 4,
0, 4,
1, 5,
2, 6,
3, 7);
VertexBufferLayout layout = new VertexBufferLayout();
layout.Add(ShaderDataType.Float3);
layout.Add(ShaderDataType.Float4);
VAO.AddBuffer(VBO, layout);
}
public SceneViewport() : base()
{
timer = new Timer();
@@ -64,6 +99,44 @@ namespace PckStudio.Rendering
VSync = true;
}
protected void DrawBoundingBox(Matrix4 transform, BoundingBox boundingBox, Color color)
{
colorShader.Bind();
Matrix4 viewProjection = Camera.GetViewProjection();
colorShader.SetUniformMat4("ViewProjection", ref viewProjection);
colorShader.SetUniformMat4("Transform", ref transform);
colorShader.SetUniform4("baseColor", color);
colorShader.SetUniform1("intensity", 0.6f);
GL.Enable(EnableCap.LineSmooth);
GL.DepthFunc(DepthFunction.Always);
Renderer.SetLineWidth(2f);
Vector3 s = boundingBox.Start;
Vector3 e = boundingBox.End;
ColorVertex[] vertices = [
new ColorVertex(new Vector3(s.X, e.Y, e.Z)),
new ColorVertex(new Vector3(e.X, e.Y, e.Z)),
new ColorVertex(new Vector3(e.X, s.Y, e.Z)),
new ColorVertex(new Vector3(s.X, s.Y, e.Z)),
new ColorVertex(new Vector3(s.X, e.Y, s.Z)),
new ColorVertex(new Vector3(e.X, e.Y, s.Z)),
new ColorVertex(new Vector3(e.X, s.Y, s.Z)),
new ColorVertex(new Vector3(s.X, s.Y, s.Z)),
];
VAO.Bind();
VBO.SetData(vertices);
IBO.Bind();
GL.DrawElements(PrimitiveType.Lines, IBO.GetCount(), DrawElementsType.UnsignedInt, 0);
GL.DepthFunc(DepthFunction.Less);
Renderer.SetLineWidth(1f);
}
private void TimerTick(object sender, EventArgs e)
{
OnTimerTick?.Invoke(sender, e);

48
PCK-Studio/Rendering/SkinRenderer.cs
View File

@@ -77,6 +77,7 @@ namespace PckStudio.Rendering
}
public float MouseSensetivity { get; set; } = 0.01f;
public int SelectedIndex { get; set; } = -1;
public bool ClampModel { get; set; } = false;
public bool ShowArmor { get; set; } = false;
@@ -288,6 +289,8 @@ namespace PckStudio.Rendering
cubeMesh.UploadData();
}
GLErrorCheck();
base.Init();
GLErrorCheck();
initialized = true;
}
@@ -1029,10 +1032,55 @@ namespace PckStudio.Rendering
GL.BlendFunc(BlendingFactor.DstAlpha, BlendingFactor.OneMinusSrcAlpha);
GL.DepthFunc(DepthFunction.Less);
}
if (ModelData.IndexInRange(SelectedIndex))
{
SkinBOX box = ModelData[SelectedIndex];
var cubeBoundingBox = Cube.FromSkinBox(box).GetBoundingBox();
if (meshStorage.ContainsKey(box.Type))
{
var cubeMesh = meshStorage[box.Type];
Matrix4 GetGroupTransform(string type)
{
switch (type)
{
case "ARM0":
case "SLEEVE0":
return RightArmMatrix * armRightMatrix;
case "ARM1":
case "SLEEVE1":
return LeftArmMatrix * armLeftMatrix;
case "LEG0":
case "PANTS0":
return legRightMatrix;
case "LEG1":
case "PANTS1":
return legLeftMatrix;
default:
return Matrix4.Identity;
}
}
transform *= GetGroupTransform(box.Type);
Vector3 translation = cubeMesh.Translation - cubeMesh.Offset;
Vector3 pivot = cubeMesh.Pivot + cubeMesh.Offset;
transform = Pivot(translation, pivot, transform);
}
GL.BlendFunc(BlendingFactor.DstAlpha, BlendingFactor.OneMinusSrcAlpha);
base.DrawBoundingBox(transform, cubeBoundingBox, Color.Red);
GL.BlendFunc(BlendingFactor.SrcAlpha, BlendingFactor.OneMinusSrcAlpha);
}
}
// Ground plane
{
GL.Enable(EnableCap.DepthTest);
GL.Enable(EnableCap.AlphaTest); // Enable transparent
GL.AlphaFunc(AlphaFunction.Always, 0.0f);
GL.BlendFunc(BlendingFactor.DstAlpha, BlendingFactor.OneMinusSrcAlpha);
lineShader.Bind();
lineShader.SetUniformMat4("ViewProjection", ref viewProjection);