From 8932eec43bba923cfe26317c8c79106266a1a069 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 15 Jul 2019 20:37:18 +0200 Subject: [PATCH] linmath: use default ctor and assignment op for matrix classes --- panda/src/linmath/lmatrix3_src.I | 25 ---------------- panda/src/linmath/lmatrix3_src.h | 6 ++-- panda/src/linmath/lmatrix4_src.I | 49 -------------------------------- panda/src/linmath/lmatrix4_src.h | 12 ++++---- 4 files changed, 9 insertions(+), 83 deletions(-) diff --git a/panda/src/linmath/lmatrix3_src.I b/panda/src/linmath/lmatrix3_src.I index 782c8599ee..ac63180f87 100644 --- a/panda/src/linmath/lmatrix3_src.I +++ b/panda/src/linmath/lmatrix3_src.I @@ -95,31 +95,6 @@ ident_mat() { return _ident_mat; } -/** - * - */ -INLINE_LINMATH FLOATNAME(LMatrix3):: -FLOATNAME(LMatrix3)() { -} - -/** - * - */ -INLINE_LINMATH FLOATNAME(LMatrix3):: -FLOATNAME(LMatrix3)(const FLOATNAME(LMatrix3) ©) : _m(copy._m) { -} - -/** - * - */ -INLINE_LINMATH FLOATNAME(LMatrix3) &FLOATNAME(LMatrix3):: -operator = (const FLOATNAME(LMatrix3) ©) { - TAU_PROFILE("void LMatrix3::operator = (const LMatrix3 &)", " ", TAU_USER); - - _m = copy._m; - return *this; -} - /** * */ diff --git a/panda/src/linmath/lmatrix3_src.h b/panda/src/linmath/lmatrix3_src.h index 2138f0fc39..2509471e9e 100644 --- a/panda/src/linmath/lmatrix3_src.h +++ b/panda/src/linmath/lmatrix3_src.h @@ -55,10 +55,10 @@ PUBLISHED: friend class FLOATNAME(LMatrix3); }; - INLINE_LINMATH FLOATNAME(LMatrix3)(); - INLINE_LINMATH FLOATNAME(LMatrix3)(const FLOATNAME(LMatrix3) &other); + INLINE_LINMATH FLOATNAME(LMatrix3)() = default; + INLINE_LINMATH FLOATNAME(LMatrix3)(const FLOATNAME(LMatrix3) &other) = default; INLINE_LINMATH FLOATNAME(LMatrix3) &operator = ( - const FLOATNAME(LMatrix3) &other); + const FLOATNAME(LMatrix3) &other) = default; INLINE_LINMATH FLOATNAME(LMatrix3) &operator = (FLOATTYPE fill_value); INLINE_LINMATH FLOATNAME(LMatrix3)(FLOATTYPE, FLOATTYPE, FLOATTYPE, FLOATTYPE, FLOATTYPE, FLOATTYPE, diff --git a/panda/src/linmath/lmatrix4_src.I b/panda/src/linmath/lmatrix4_src.I index fe8ba22bb7..ca3ff8eed6 100644 --- a/panda/src/linmath/lmatrix4_src.I +++ b/panda/src/linmath/lmatrix4_src.I @@ -111,20 +111,6 @@ zeros_mat() { return _zeros_mat; } -/** - * - */ -INLINE_LINMATH FLOATNAME(LMatrix4):: -FLOATNAME(LMatrix4)() { -} - -/** - * - */ -INLINE_LINMATH FLOATNAME(LMatrix4):: -FLOATNAME(LMatrix4)(const FLOATNAME(LMatrix4) ©) : _m(copy._m) { -} - /** * */ @@ -133,16 +119,6 @@ FLOATNAME(LMatrix4)(const FLOATNAME(UnalignedLMatrix4) ©) { operator = (copy); } -/** - * - */ -INLINE_LINMATH FLOATNAME(LMatrix4) &FLOATNAME(LMatrix4):: -operator = (const FLOATNAME(LMatrix4) ©) { - TAU_PROFILE("void LMatrix4::operator = (const LMatrix4 &)", " ", TAU_USER); - _m = copy._m; - return *this; -} - /** * */ @@ -1627,14 +1603,6 @@ invert(const FLOATNAME(LMatrix4) &a) { return result; } - -/** - * - */ -INLINE_LINMATH FLOATNAME(UnalignedLMatrix4):: -FLOATNAME(UnalignedLMatrix4)() { -} - /** * */ @@ -1643,13 +1611,6 @@ FLOATNAME(UnalignedLMatrix4)(const FLOATNAME(LMatrix4) ©) { operator = (copy); } -/** - * - */ -INLINE_LINMATH FLOATNAME(UnalignedLMatrix4):: -FLOATNAME(UnalignedLMatrix4)(const FLOATNAME(UnalignedLMatrix4) ©) : _m(copy._m) { -} - /** * */ @@ -1659,16 +1620,6 @@ operator = (const FLOATNAME(LMatrix4) ©) { return *this; } -/** - * - */ -INLINE_LINMATH FLOATNAME(UnalignedLMatrix4) &FLOATNAME(UnalignedLMatrix4):: -operator = (const FLOATNAME(UnalignedLMatrix4) ©) { - TAU_PROFILE("void UnalignedLMatrix4::operator =(UnalignedLMatrix4 &)", " ", TAU_USER); - _m = copy._m; - return *this; -} - /** * */ diff --git a/panda/src/linmath/lmatrix4_src.h b/panda/src/linmath/lmatrix4_src.h index a66a5ab45f..9fd695dbf6 100644 --- a/panda/src/linmath/lmatrix4_src.h +++ b/panda/src/linmath/lmatrix4_src.h @@ -53,11 +53,11 @@ PUBLISHED: friend class FLOATNAME(LMatrix4); }; - INLINE_LINMATH FLOATNAME(LMatrix4)(); - INLINE_LINMATH FLOATNAME(LMatrix4)(const FLOATNAME(LMatrix4) &other); + INLINE_LINMATH FLOATNAME(LMatrix4)() = default; + INLINE_LINMATH FLOATNAME(LMatrix4)(const FLOATNAME(LMatrix4) &other) = default; INLINE_LINMATH FLOATNAME(LMatrix4)(const FLOATNAME(UnalignedLMatrix4) &other); INLINE_LINMATH FLOATNAME(LMatrix4) &operator = ( - const FLOATNAME(LMatrix4) &other); + const FLOATNAME(LMatrix4) &other) = default; INLINE_LINMATH FLOATNAME(LMatrix4) &operator = ( const FLOATNAME(UnalignedLMatrix4) &other); INLINE_LINMATH FLOATNAME(LMatrix4) &operator = (FLOATTYPE fill_value); @@ -330,11 +330,11 @@ PUBLISHED: num_components = 16 }; - INLINE_LINMATH FLOATNAME(UnalignedLMatrix4)(); + INLINE_LINMATH FLOATNAME(UnalignedLMatrix4)() = default; INLINE_LINMATH FLOATNAME(UnalignedLMatrix4)(const FLOATNAME(LMatrix4) ©); - INLINE_LINMATH FLOATNAME(UnalignedLMatrix4)(const FLOATNAME(UnalignedLMatrix4) ©); + INLINE_LINMATH FLOATNAME(UnalignedLMatrix4)(const FLOATNAME(UnalignedLMatrix4) ©) = default; INLINE_LINMATH FLOATNAME(UnalignedLMatrix4) &operator = (const FLOATNAME(LMatrix4) ©); - INLINE_LINMATH FLOATNAME(UnalignedLMatrix4) &operator = (const FLOATNAME(UnalignedLMatrix4) ©); + INLINE_LINMATH FLOATNAME(UnalignedLMatrix4) &operator = (const FLOATNAME(UnalignedLMatrix4) ©) = default; INLINE_LINMATH FLOATNAME(UnalignedLMatrix4)(FLOATTYPE e00, FLOATTYPE e01, FLOATTYPE e02, FLOATTYPE e03, FLOATTYPE e10, FLOATTYPE e11, FLOATTYPE e12, FLOATTYPE e13, FLOATTYPE e20, FLOATTYPE e21, FLOATTYPE e22, FLOATTYPE e23,