From 9da8addeb263ed00ac047121176797d9bcf64117 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sat, 1 Jun 2019 20:39:06 +0200 Subject: [PATCH] include/Spectre/Math/Matrix4.inl: gcc complains about multiple definitions of Identity. just template the type instead of only allow float. --- include/Spectre/Math/Matrix4.inl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/Spectre/Math/Matrix4.inl b/include/Spectre/Math/Matrix4.inl index c348b0b..87b7d91 100644 --- a/include/Spectre/Math/Matrix4.inl +++ b/include/Spectre/Math/Matrix4.inl @@ -4,12 +4,12 @@ #include #include "Matrix4.h" -template<> -const Matrix4f Matrix4f::Identity( - 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f +template +const Matrix4 Matrix4::Identity( + 1, 0, 0, 0, + 0, 1, 0, 0, + 0, 0, 1, 0, + 0, 0, 0, 1 ); template