From 0cbc5faff3767fdf712292192188ae0af163840a Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Sat, 21 Sep 2024 10:58:07 +0200 Subject: [PATCH] GenericMesh - Made 'Transform' property abstract --- PCK-Studio/Rendering/CubeMesh.cs | 3 ++- PCK-Studio/Rendering/CubeMeshCollection.cs | 5 ++--- PCK-Studio/Rendering/GenericMesh.cs | 5 +---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/PCK-Studio/Rendering/CubeMesh.cs b/PCK-Studio/Rendering/CubeMesh.cs index 67444e68..e63d3c51 100644 --- a/PCK-Studio/Rendering/CubeMesh.cs +++ b/PCK-Studio/Rendering/CubeMesh.cs @@ -53,6 +53,8 @@ namespace PckStudio.Rendering 22, 23, 20 ]; + public override Matrix4 Transform => Matrix4.CreateScale(1f, -1f, -1f); + internal static VertexBufferLayout VertexBufferLayout { get; } = new VertexBufferLayout().Add(ShaderDataType.Float3).Add(ShaderDataType.Float2); public CubeMesh(Cube cube) : this(nameof(CubeMesh), cube, true) @@ -64,7 +66,6 @@ namespace PckStudio.Rendering { ShouldRender = visible; _cube = cube; - transform = Matrix4.CreateScale(1f, -1f, -1f); } public CubeMesh SetName(string name) diff --git a/PCK-Studio/Rendering/CubeMeshCollection.cs b/PCK-Studio/Rendering/CubeMeshCollection.cs index 3bb215da..c946eee0 100644 --- a/PCK-Studio/Rendering/CubeMeshCollection.cs +++ b/PCK-Studio/Rendering/CubeMeshCollection.cs @@ -65,11 +65,12 @@ namespace PckStudio.Rendering if (value != _offset) { _offset = value; - transform = Matrix4.CreateTranslation(Translation + _offset) * Matrix4.CreateScale(1f, -1f, -1f); } } } + public override Matrix4 Transform => Matrix4.CreateTranslation(Translation + _offset) * Matrix4.CreateScale(1f, -1f, -1f); + public int Count => cubes.Count; public bool IsReadOnly => false; @@ -79,7 +80,6 @@ namespace PckStudio.Rendering internal CubeMeshCollection(string name) : base(name, PrimitiveType.Triangles, CubeMesh.VertexBufferLayout) { cubes = new List(5); - transform = Matrix4.CreateTranslation(Vector3.Zero) * Matrix4.CreateScale(1f, -1f, -1f); } internal CubeMeshCollection(string name, Vector3 translation, Vector3 pivot) @@ -87,7 +87,6 @@ namespace PckStudio.Rendering { Translation = translation; Pivot = pivot; - transform = Matrix4.CreateTranslation(Translation) * Matrix4.CreateScale(1f, -1f, -1f); } internal override IEnumerable GetVertices() diff --git a/PCK-Studio/Rendering/GenericMesh.cs b/PCK-Studio/Rendering/GenericMesh.cs index 615e00a2..233f580c 100644 --- a/PCK-Studio/Rendering/GenericMesh.cs +++ b/PCK-Studio/Rendering/GenericMesh.cs @@ -17,10 +17,8 @@ **/ using System; using System.Collections.Generic; -using System.Diagnostics; using OpenTK; using OpenTK.Graphics.OpenGL; -using PckStudio.Rendering.Shader; namespace PckStudio.Rendering { @@ -30,8 +28,7 @@ namespace PckStudio.Rendering internal PrimitiveType DrawType { get; } internal VertexBufferLayout VertexLayout { get; } - protected Matrix4 transform { get; set; } - public Matrix4 Transform => transform; + public abstract Matrix4 Transform { get; } protected GenericMesh(string name, PrimitiveType type, VertexBufferLayout vertexLayout) {