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

Rename LineVertex to ColorVertex

Browse Source
This commit is contained in:
miku-666
2024-02-27 18:51:02 +01:00
parent 2cd3332a70
commit 073976a813
3 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PCK-Studio/PckStudio.csproj
View File

@@ -158,7 +158,7 @@
<Compile Include="Rendering\IndexBuffer.cs" />
<Compile Include="Rendering\IVertexLayout.cs" />
<Compile Include="Rendering\DrawContext.cs" />
<Compile Include="Rendering\LineVertex.cs" />
<Compile Include="Rendering\ColorVertex.cs" />
<Compile Include="Rendering\OutlineDefinition.cs" />
<Compile Include="Rendering\Renderer.cs" />
<Compile Include="Rendering\GenericMesh.cs" />

4
PCK-Studio/Rendering/LineVertex.cs → PCK-Studio/Rendering/ColorVertex.cs
View File

@@ -10,9 +10,9 @@ using OpenTK.Graphics;
namespace PckStudio.Rendering
{
[StructLayout(LayoutKind.Sequential, Size = 28)]
internal struct LineVertex
internal struct ColorVertex
{
public LineVertex(Vector3 position, Color4 color)
public ColorVertex(Vector3 position, Color4 color)
{
Position = position;
Color = color;

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

@@ -479,14 +479,14 @@ namespace PckStudio.Rendering
{
VertexArray lineVAO = new VertexArray();
void AddOutline(OutlineDefinition outline, ref List<LineVertex> vertices, ref List<int> indices)
void AddOutline(OutlineDefinition outline, ref List<ColorVertex> vertices, ref List<int> indices)
{
int offset = vertices.Count;
vertices.AddRange(outline.verticies.Select(pos => new LineVertex(pos, lineColor)));
vertices.AddRange(outline.verticies.Select(pos => new ColorVertex(pos, lineColor)));
indices.AddRange(outline.indicies.Select(i => i + offset));
}
List<LineVertex> vertices = new List<LineVertex>(8 * 6);
List<ColorVertex> vertices = new List<ColorVertex>(8 * 6);
List<int> indices = new List<int>(24 * 6);
AddOutline(head.GetOutline(0), ref vertices, ref indices);
AddOutline(body.GetOutline(0), ref vertices, ref indices);
@@ -512,25 +512,25 @@ namespace PckStudio.Rendering
VertexArray lineVAO = new VertexArray();
Vector3 bodyCenterTop = body.GetFaceCenter(0, CubeData.CubeFace.Top);
Vector3 bodyCenterBottom = body.GetFaceCenter(0, CubeData.CubeFace.Bottom);
LineVertex[] data = [
new LineVertex(head.GetFaceCenter(0, CubeData.CubeFace.Top), lineColor),
new LineVertex(bodyCenterBottom, lineColor),
ColorVertex[] data = [
new ColorVertex(head.GetFaceCenter(0, CubeData.CubeFace.Top), lineColor),
new ColorVertex(bodyCenterBottom, lineColor),
new LineVertex(rightArm.GetFaceCenter(0, CubeData.CubeFace.Bottom), lineColor),
new LineVertex(rightArm.GetFaceCenter(0, CubeData.CubeFace.Top), lineColor),
new LineVertex(rightArm.GetFaceCenter(0, CubeData.CubeFace.Top), lineColor),
new LineVertex(leftArm.GetFaceCenter(0, CubeData.CubeFace.Top), lineColor),
new ColorVertex(rightArm.GetFaceCenter(0, CubeData.CubeFace.Bottom), lineColor),
new ColorVertex(rightArm.GetFaceCenter(0, CubeData.CubeFace.Top), lineColor),
new ColorVertex(rightArm.GetFaceCenter(0, CubeData.CubeFace.Top), lineColor),
new ColorVertex(leftArm.GetFaceCenter(0, CubeData.CubeFace.Top), lineColor),
new LineVertex(leftArm.GetFaceCenter(0, CubeData.CubeFace.Bottom), lineColor),
new LineVertex(leftArm.GetFaceCenter(0, CubeData.CubeFace.Top), lineColor),
new ColorVertex(leftArm.GetFaceCenter(0, CubeData.CubeFace.Bottom), lineColor),
new ColorVertex(leftArm.GetFaceCenter(0, CubeData.CubeFace.Top), lineColor),
new LineVertex(rightLeg.GetFaceCenter(0, CubeData.CubeFace.Bottom), lineColor),
new LineVertex(rightLeg.GetFaceCenter(0, CubeData.CubeFace.Top), lineColor),
new LineVertex(rightLeg.GetFaceCenter(0, CubeData.CubeFace.Top), lineColor),
new LineVertex(leftLeg.GetFaceCenter(0, CubeData.CubeFace.Top), lineColor),
new ColorVertex(rightLeg.GetFaceCenter(0, CubeData.CubeFace.Bottom), lineColor),
new ColorVertex(rightLeg.GetFaceCenter(0, CubeData.CubeFace.Top), lineColor),
new ColorVertex(rightLeg.GetFaceCenter(0, CubeData.CubeFace.Top), lineColor),
new ColorVertex(leftLeg.GetFaceCenter(0, CubeData.CubeFace.Top), lineColor),
new LineVertex(leftLeg.GetFaceCenter(0, CubeData.CubeFace.Bottom), lineColor),
new LineVertex(leftLeg.GetFaceCenter(0, CubeData.CubeFace.Top), lineColor),
new ColorVertex(leftLeg.GetFaceCenter(0, CubeData.CubeFace.Bottom), lineColor),
new ColorVertex(leftLeg.GetFaceCenter(0, CubeData.CubeFace.Top), lineColor),
];
VertexBuffer buffer = new VertexBuffer();
buffer.SetData(data);
@@ -548,11 +548,11 @@ namespace PckStudio.Rendering
Vector3 center = Vector3.Zero;
Color planeColor = Color.CadetBlue;
LineVertex[] vertices = [
new LineVertex(new Vector3(center.X + 1f, 0f, center.Z + 1f), planeColor),
new LineVertex(new Vector3(center.X - 1f, 0f, center.Z + 1f), planeColor),
new LineVertex(new Vector3(center.X - 1f, 0f, center.Z - 1f), planeColor),
new LineVertex(new Vector3(center.X + 1f, 0f, center.Z - 1f), planeColor),
ColorVertex[] vertices = [
new ColorVertex(new Vector3(center.X + 1f, 0f, center.Z + 1f), planeColor),
new ColorVertex(new Vector3(center.X - 1f, 0f, center.Z + 1f), planeColor),
new ColorVertex(new Vector3(center.X - 1f, 0f, center.Z - 1f), planeColor),
new ColorVertex(new Vector3(center.X + 1f, 0f, center.Z - 1f), planeColor),
];
var planeVAO = new VertexArray();
VertexBuffer buffer = new VertexBuffer();
@@ -572,8 +572,8 @@ namespace PckStudio.Rendering
#if DEBUG
// Debug render
{
LineVertex[] vertices = [
new LineVertex(Vector3.Zero, Color.White)
ColorVertex[] vertices = [
new ColorVertex(Vector3.Zero, Color.White)
];
VertexArray vao = new VertexArray();
var debugVBO = new VertexBuffer();