From 073976a813be26573b7e2fc8195fc936034b265b Mon Sep 17 00:00:00 2001
From: miku-666 <74728189+NessieHax@users.noreply.github.com>
Date: Tue, 27 Feb 2024 18:51:02 +0100
Subject: [PATCH] Rename LineVertex to ColorVertex
---
PCK-Studio/PckStudio.csproj | 2 +-
.../{LineVertex.cs => ColorVertex.cs} | 4 +-
PCK-Studio/Rendering/SkinRenderer.cs | 50 +++++++++----------
3 files changed, 28 insertions(+), 28 deletions(-)
rename PCK-Studio/Rendering/{LineVertex.cs => ColorVertex.cs} (83%)
diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj
index 0a7d1e8c..306bb478 100644
--- a/PCK-Studio/PckStudio.csproj
+++ b/PCK-Studio/PckStudio.csproj
@@ -158,7 +158,7 @@
-
+
diff --git a/PCK-Studio/Rendering/LineVertex.cs b/PCK-Studio/Rendering/ColorVertex.cs
similarity index 83%
rename from PCK-Studio/Rendering/LineVertex.cs
rename to PCK-Studio/Rendering/ColorVertex.cs
index 3950cfa4..d465e846 100644
--- a/PCK-Studio/Rendering/LineVertex.cs
+++ b/PCK-Studio/Rendering/ColorVertex.cs
@@ -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;
diff --git a/PCK-Studio/Rendering/SkinRenderer.cs b/PCK-Studio/Rendering/SkinRenderer.cs
index 1941a4b0..d9de7cb5 100644
--- a/PCK-Studio/Rendering/SkinRenderer.cs
+++ b/PCK-Studio/Rendering/SkinRenderer.cs
@@ -479,14 +479,14 @@ namespace PckStudio.Rendering
{
VertexArray lineVAO = new VertexArray();
- void AddOutline(OutlineDefinition outline, ref List vertices, ref List indices)
+ void AddOutline(OutlineDefinition outline, ref List vertices, ref List 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 vertices = new List(8 * 6);
+ List vertices = new List(8 * 6);
List indices = new List(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();