From cc6fb8c33637566a7b116d46440e6063f016deea Mon Sep 17 00:00:00 2001 From: vimene Date: Tue, 31 Dec 2024 03:40:14 +0100 Subject: various improvements - added quaternions and rewrote all rotations to use them - added transforms to put all object transforms in a single place - added Wavefront .obj file parser - removed frame buffer's abstract class - improved vectors, matrices, triangles, vertices and vertices data by putting all code in header file - added vector's operations - changed from NULL to nullptr - miscellaneous improvements --- src/o3d/tri.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/o3d/tri.h') diff --git a/src/o3d/tri.h b/src/o3d/tri.h index 7fa37fe..4b50f91 100644 --- a/src/o3d/tri.h +++ b/src/o3d/tri.h @@ -3,19 +3,18 @@ #include #include "o3d/vertex.h" -#include "o3d/tri.h" #include "o3d/tri_deriv.h" namespace engine::o3d { -class Triangle { - public: - Vertex vertex1; - Vertex vertex2; - Vertex vertex3; +struct Triangle { + Vertex vertex1; + Vertex vertex2; + Vertex vertex3; - Triangle(Vertex vertex1, Vertex vertex2, Vertex vertex3); - TriangleDerived to_derived() const; + constexpr TriangleDerived to_derived() const & { + return {{vertex1.vertex, 1.f, 0.f}, {vertex2.vertex, 0.f, 1.f}, {vertex3.vertex, 0.f, 0.f}}; + } }; } -- cgit v1.2.3