Browse Source

Fix ordering of methods relative to MAKE_SEQ

rdb 10 years ago
parent
commit
6ccd64d99e
2 changed files with 8 additions and 8 deletions
  1. 4 4
      panda/src/linmath/lmatrix3_src.h
  2. 4 4
      panda/src/linmath/lmatrix4_src.h

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

@@ -76,6 +76,10 @@ PUBLISHED:
     FLOATTYPE e10, FLOATTYPE e11, FLOATTYPE e12,
     FLOATTYPE e10, FLOATTYPE e11, FLOATTYPE e12,
     FLOATTYPE e20, FLOATTYPE e21, FLOATTYPE e22);
     FLOATTYPE e20, FLOATTYPE e21, FLOATTYPE e22);
 
 
+  INLINE_LINMATH CRow operator [](int i) const;
+  INLINE_LINMATH Row operator [](int i);
+  INLINE_LINMATH static int size();
+
   INLINE_LINMATH void set_row(int row, const FLOATNAME(LVecBase3) &v);
   INLINE_LINMATH void set_row(int row, const FLOATNAME(LVecBase3) &v);
   INLINE_LINMATH void set_col(int col, const FLOATNAME(LVecBase3) &v);
   INLINE_LINMATH void set_col(int col, const FLOATNAME(LVecBase3) &v);
 
 
@@ -99,10 +103,6 @@ PUBLISHED:
   INLINE_LINMATH FLOATTYPE &operator () (int row, int col);
   INLINE_LINMATH FLOATTYPE &operator () (int row, int col);
   INLINE_LINMATH FLOATTYPE operator () (int row, int col) const;
   INLINE_LINMATH FLOATTYPE operator () (int row, int col) const;
 
 
-  INLINE_LINMATH CRow operator [](int i) const;
-  INLINE_LINMATH Row operator [](int i);
-  INLINE_LINMATH static int size();
-
   INLINE_LINMATH bool is_nan() const;
   INLINE_LINMATH bool is_nan() const;
   INLINE_LINMATH bool is_identity() const;
   INLINE_LINMATH bool is_identity() const;
 
 

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

@@ -85,6 +85,10 @@ PUBLISHED:
   INLINE_LINMATH void set_upper_3(const FLOATNAME(LMatrix3) &upper3);
   INLINE_LINMATH void set_upper_3(const FLOATNAME(LMatrix3) &upper3);
   INLINE_LINMATH FLOATNAME(LMatrix3) get_upper_3() const;
   INLINE_LINMATH FLOATNAME(LMatrix3) get_upper_3() const;
 
 
+  INLINE_LINMATH CRow operator [](int i) const;
+  INLINE_LINMATH Row operator [](int i);
+  INLINE_LINMATH static int size();
+
   INLINE_LINMATH void set_row(int row, const FLOATNAME(LVecBase4) &v);
   INLINE_LINMATH void set_row(int row, const FLOATNAME(LVecBase4) &v);
   INLINE_LINMATH void set_col(int col, const FLOATNAME(LVecBase4) &v);
   INLINE_LINMATH void set_col(int col, const FLOATNAME(LVecBase4) &v);
 
 
@@ -107,10 +111,6 @@ PUBLISHED:
   INLINE_LINMATH FLOATTYPE &operator () (int row, int col);
   INLINE_LINMATH FLOATTYPE &operator () (int row, int col);
   INLINE_LINMATH FLOATTYPE operator () (int row, int col) const;
   INLINE_LINMATH FLOATTYPE operator () (int row, int col) const;
 
 
-  INLINE_LINMATH CRow operator [](int i) const;
-  INLINE_LINMATH Row operator [](int i);
-  INLINE_LINMATH static int size();
-
   INLINE_LINMATH bool is_nan() const;
   INLINE_LINMATH bool is_nan() const;
   INLINE_LINMATH bool is_identity() const;
   INLINE_LINMATH bool is_identity() const;