From 0ee5872e01318ec31e890f1efb9f2f7c56b05841 Mon Sep 17 00:00:00 2001 From: Alvaro Date: Mon, 6 Feb 2023 19:48:34 +0100 Subject: [PATCH] Fixed type mismatch in some Matrix4 constructors from Vec3 or Vec4 --- include/asl/Matrix4.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/asl/Matrix4.h b/include/asl/Matrix4.h index 050ca4f..84cb275 100644 --- a/include/asl/Matrix4.h +++ b/include/asl/Matrix4.h @@ -1,4 +1,4 @@ -// Copyright(c) 1999-2022 aslze +// Copyright(c) 1999-2023 aslze // Licensed under the MIT License (http://opensource.org/licenses/MIT) #ifndef ASL_MATRIX4_H @@ -80,7 +80,7 @@ class Matrix4_ /** Constructs a matrix from 4 3D vectors used as columns, setting the last row as [0 0 0 1] */ - Matrix4_(const Vec3& v1, const Vec3& v2, const Vec3& v3, const Vec3& v4=Vec3(0,0,0)) + Matrix4_(const Vec3_& v1, const Vec3_& v2, const Vec3_& v3, const Vec3_& v4 = Vec3_(0, 0, 0)) { a[0][0] = v1.x; a[0][1] = v2.x; a[0][2] = v3.x; a[0][3] = v4.x; a[1][0] = v1.y; a[1][1] = v2.y; a[1][2] = v3.y; a[1][3] = v4.y; @@ -91,7 +91,7 @@ class Matrix4_ /** Constructs a matrix from 4 4D vectors used as columns */ - Matrix4_(const Vec4& v1, const Vec4& v2, const Vec4& v3, const Vec4& v4) + Matrix4_(const Vec4_& v1, const Vec4_& v2, const Vec4_& v3, const Vec4_& v4) { a[0][0] = v1.x; a[0][1] = v2.x; a[0][2] = v3.x; a[0][3] = v4.x; a[1][0] = v1.y; a[1][1] = v2.y; a[1][2] = v3.y; a[1][3] = v4.y;