Browse Source

define matrix_components

David Rose 22 years ago
parent
commit
06808bf5f2
2 changed files with 10 additions and 2 deletions
  1. 2 1
      panda/src/linmath/compose_matrix.cxx
  2. 8 1
      panda/src/linmath/compose_matrix.h

+ 2 - 1
panda/src/linmath/compose_matrix.cxx

@@ -27,4 +27,5 @@
 #include "compose_matrix_src.cxx"
 #include "compose_matrix_src.cxx"
 
 
 
 
-
+const char * const matrix_components = "ijkhprxyz";
+const int num_matrix_components = 9;

+ 8 - 1
panda/src/linmath/compose_matrix.h

@@ -32,8 +32,9 @@
 //
 //
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 
 
-#include <pandabase.h>
+#include "pandabase.h"
 #include <math.h>
 #include <math.h>
+
 #include "lmatrix.h"
 #include "lmatrix.h"
 #include "lvector3.h"
 #include "lvector3.h"
 #include "lvector2.h"
 #include "lvector2.h"
@@ -49,5 +50,11 @@
 #include "dblnames.h"
 #include "dblnames.h"
 #include "compose_matrix_src.h"
 #include "compose_matrix_src.h"
 
 
+// These define the standard one-letter names for the components in
+// the array-accepting forms of compose_matrix() and
+// decompose_matrix().
+EXPCL_PANDA extern const char * const matrix_components;
+EXPCL_PANDA extern const int num_matrix_components;
+
 #endif
 #endif