From 48ec7df0fd27fab05c9918e83a3a7da1cc32d7a0 Mon Sep 17 00:00:00 2001 From: vimene Date: Sun, 3 Dec 2023 09:27:32 +0100 Subject: renamed MathVector{2,3,4} to Vector{2,3,4} and Mat4 to Matrix4 in engine::math --- src/o3d/tri_vertex.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/o3d/tri_vertex.cpp') diff --git a/src/o3d/tri_vertex.cpp b/src/o3d/tri_vertex.cpp index 07185f6..bda219a 100644 --- a/src/o3d/tri_vertex.cpp +++ b/src/o3d/tri_vertex.cpp @@ -1,6 +1,6 @@ #include "o3d/tri_vertex.h" #include -#include "math/math_vector.h" +#include "math/vector.h" #include "o3d/vertex_data.h" #include "o3d/vertex.h" #include "o3d/tri_vertex.h" @@ -48,7 +48,7 @@ static void _crop_x(std::vector& tris, TriangleVertex3 t, int n q3 = &t.vertex1; break; } - engine::math::MathVector3 dq2 = q1->point - q2->point; + engine::math::Vector3 dq2 = q1->point - q2->point; float fac2 = (x - q2->point.x) / dq2.x; Vertex3 r2{ { @@ -58,7 +58,7 @@ static void _crop_x(std::vector& tris, TriangleVertex3 t, int n }, VertexData::lerp(q2->data, q1->data, fac2) }; - engine::math::MathVector3 dq3 = q1->point - q3->point; + engine::math::Vector3 dq3 = q1->point - q3->point; float fac3 = (x - q3->point.x) / dq3.x; Vertex3 r3{ { @@ -133,7 +133,7 @@ static void _crop_y(std::vector& tris, TriangleVertex3 t, int n q3 = &t.vertex1; break; } - engine::math::MathVector3 dq2 = q1->point - q2->point; + engine::math::Vector3 dq2 = q1->point - q2->point; float fac2 = (y - q2->point.y) / dq2.y; Vertex3 r2{ { @@ -143,7 +143,7 @@ static void _crop_y(std::vector& tris, TriangleVertex3 t, int n }, VertexData::lerp(q2->data, q1->data, fac2) }; - engine::math::MathVector3 dq3 = q1->point - q3->point; + engine::math::Vector3 dq3 = q1->point - q3->point; float fac3 = (y - q3->point.y) / dq3.y; Vertex3 r3{ { @@ -247,7 +247,7 @@ static void _crop_z(std::vector& tris, TriangleVertex4 t, int n q3 = &t.vertex1; break; } - engine::math::MathVector4 dq2 = q1->point - q2->point; + engine::math::Vector4 dq2 = q1->point - q2->point; float fac2 = (z - q2->point.z) / dq2.z; Vertex4 r2{ { @@ -258,7 +258,7 @@ static void _crop_z(std::vector& tris, TriangleVertex4 t, int n }, VertexData::lerp(q2->data, q1->data, fac2) }; - engine::math::MathVector4 dq3 = q1->point - q3->point; + engine::math::Vector4 dq3 = q1->point - q3->point; float fac3 = (z - q3->point.z) / dq3.z; Vertex4 r3{ { -- cgit v1.2.3