Browse Source

linmath: use default ctor and assignment op for matrix classes

rdb 6 years ago
parent
commit
8932eec43b

+ 0 - 25
panda/src/linmath/lmatrix3_src.I

@@ -95,31 +95,6 @@ ident_mat() {
   return _ident_mat;
   return _ident_mat;
 }
 }
 
 
-/**
- *
- */
-INLINE_LINMATH FLOATNAME(LMatrix3)::
-FLOATNAME(LMatrix3)() {
-}
-
-/**
- *
- */
-INLINE_LINMATH FLOATNAME(LMatrix3)::
-FLOATNAME(LMatrix3)(const FLOATNAME(LMatrix3) &copy) : _m(copy._m) {
-}
-
-/**
- *
- */
-INLINE_LINMATH FLOATNAME(LMatrix3) &FLOATNAME(LMatrix3)::
-operator = (const FLOATNAME(LMatrix3) &copy) {
-  TAU_PROFILE("void LMatrix3::operator = (const LMatrix3 &)", " ", TAU_USER);
-
-  _m = copy._m;
-  return *this;
-}
-
 /**
 /**
  *
  *
  */
  */

+ 3 - 3
panda/src/linmath/lmatrix3_src.h

@@ -55,10 +55,10 @@ PUBLISHED:
     friend class FLOATNAME(LMatrix3);
     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 = (
   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) &operator = (FLOATTYPE fill_value);
   INLINE_LINMATH FLOATNAME(LMatrix3)(FLOATTYPE, FLOATTYPE, FLOATTYPE,
   INLINE_LINMATH FLOATNAME(LMatrix3)(FLOATTYPE, FLOATTYPE, FLOATTYPE,
                                      FLOATTYPE, FLOATTYPE, FLOATTYPE,
                                      FLOATTYPE, FLOATTYPE, FLOATTYPE,

+ 0 - 49
panda/src/linmath/lmatrix4_src.I

@@ -111,20 +111,6 @@ zeros_mat() {
   return _zeros_mat;
   return _zeros_mat;
 }
 }
 
 
-/**
- *
- */
-INLINE_LINMATH FLOATNAME(LMatrix4)::
-FLOATNAME(LMatrix4)() {
-}
-
-/**
- *
- */
-INLINE_LINMATH FLOATNAME(LMatrix4)::
-FLOATNAME(LMatrix4)(const FLOATNAME(LMatrix4) &copy) : _m(copy._m) {
-}
-
 /**
 /**
  *
  *
  */
  */
@@ -133,16 +119,6 @@ FLOATNAME(LMatrix4)(const FLOATNAME(UnalignedLMatrix4) &copy) {
   operator = (copy);
   operator = (copy);
 }
 }
 
 
-/**
- *
- */
-INLINE_LINMATH FLOATNAME(LMatrix4) &FLOATNAME(LMatrix4)::
-operator = (const FLOATNAME(LMatrix4) &copy) {
-  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;
   return result;
 }
 }
 
 
-
-/**
- *
- */
-INLINE_LINMATH FLOATNAME(UnalignedLMatrix4)::
-FLOATNAME(UnalignedLMatrix4)() {
-}
-
 /**
 /**
  *
  *
  */
  */
@@ -1643,13 +1611,6 @@ FLOATNAME(UnalignedLMatrix4)(const FLOATNAME(LMatrix4) &copy) {
   operator = (copy);
   operator = (copy);
 }
 }
 
 
-/**
- *
- */
-INLINE_LINMATH FLOATNAME(UnalignedLMatrix4)::
-FLOATNAME(UnalignedLMatrix4)(const FLOATNAME(UnalignedLMatrix4) &copy) : _m(copy._m) {
-}
-
 /**
 /**
  *
  *
  */
  */
@@ -1659,16 +1620,6 @@ operator = (const FLOATNAME(LMatrix4) &copy) {
   return *this;
   return *this;
 }
 }
 
 
-/**
- *
- */
-INLINE_LINMATH FLOATNAME(UnalignedLMatrix4) &FLOATNAME(UnalignedLMatrix4)::
-operator = (const FLOATNAME(UnalignedLMatrix4) &copy) {
-  TAU_PROFILE("void UnalignedLMatrix4::operator =(UnalignedLMatrix4 &)", " ", TAU_USER);
-  _m = copy._m;
-  return *this;
-}
-
 /**
 /**
  *
  *
  */
  */

+ 6 - 6
panda/src/linmath/lmatrix4_src.h

@@ -53,11 +53,11 @@ PUBLISHED:
     friend class FLOATNAME(LMatrix4);
     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)(const FLOATNAME(UnalignedLMatrix4) &other);
   INLINE_LINMATH FLOATNAME(LMatrix4) &operator = (
   INLINE_LINMATH FLOATNAME(LMatrix4) &operator = (
-      const FLOATNAME(LMatrix4) &other);
+      const FLOATNAME(LMatrix4) &other) = default;
   INLINE_LINMATH FLOATNAME(LMatrix4) &operator = (
   INLINE_LINMATH FLOATNAME(LMatrix4) &operator = (
       const FLOATNAME(UnalignedLMatrix4) &other);
       const FLOATNAME(UnalignedLMatrix4) &other);
   INLINE_LINMATH FLOATNAME(LMatrix4) &operator = (FLOATTYPE fill_value);
   INLINE_LINMATH FLOATNAME(LMatrix4) &operator = (FLOATTYPE fill_value);
@@ -330,11 +330,11 @@ PUBLISHED:
     num_components = 16
     num_components = 16
   };
   };
 
 
-  INLINE_LINMATH FLOATNAME(UnalignedLMatrix4)();
+  INLINE_LINMATH FLOATNAME(UnalignedLMatrix4)() = default;
   INLINE_LINMATH FLOATNAME(UnalignedLMatrix4)(const FLOATNAME(LMatrix4) &copy);
   INLINE_LINMATH FLOATNAME(UnalignedLMatrix4)(const FLOATNAME(LMatrix4) &copy);
-  INLINE_LINMATH FLOATNAME(UnalignedLMatrix4)(const FLOATNAME(UnalignedLMatrix4) &copy);
+  INLINE_LINMATH FLOATNAME(UnalignedLMatrix4)(const FLOATNAME(UnalignedLMatrix4) &copy) = default;
   INLINE_LINMATH FLOATNAME(UnalignedLMatrix4) &operator = (const FLOATNAME(LMatrix4) &copy);
   INLINE_LINMATH FLOATNAME(UnalignedLMatrix4) &operator = (const FLOATNAME(LMatrix4) &copy);
-  INLINE_LINMATH FLOATNAME(UnalignedLMatrix4) &operator = (const FLOATNAME(UnalignedLMatrix4) &copy);
+  INLINE_LINMATH FLOATNAME(UnalignedLMatrix4) &operator = (const FLOATNAME(UnalignedLMatrix4) &copy) = default;
   INLINE_LINMATH FLOATNAME(UnalignedLMatrix4)(FLOATTYPE e00, FLOATTYPE e01, FLOATTYPE e02, FLOATTYPE e03,
   INLINE_LINMATH FLOATNAME(UnalignedLMatrix4)(FLOATTYPE e00, FLOATTYPE e01, FLOATTYPE e02, FLOATTYPE e03,
                                               FLOATTYPE e10, FLOATTYPE e11, FLOATTYPE e12, FLOATTYPE e13,
                                               FLOATTYPE e10, FLOATTYPE e11, FLOATTYPE e12, FLOATTYPE e13,
                                               FLOATTYPE e20, FLOATTYPE e21, FLOATTYPE e22, FLOATTYPE e23,
                                               FLOATTYPE e20, FLOATTYPE e21, FLOATTYPE e22, FLOATTYPE e23,