Changeset 239 for trunk/archive/pslib/include/psMatrix.h

Timestamp:

Mar 12, 2004, 6:03:48 PM (22 years ago)

Author:

Paul Price

Message:

Added transpose operation, and changed multiplication to a generic "op".
Also added conversion between a matrix and vector (for when you've got
a Nx1 or 1xN matrix).

File:

• trunk/archive/pslib/include/psMatrix.h (modified) (2 diffs)

trunk/archive/pslib/include/psMatrix.h

@@ -25 +25 @@
 /** Invert matrix.  Not using restrict, to allow inversion to be done in-place */
 psMatrix *
-psInvertMatrix(psMatrix *out,           //!< Matrix to return, or NULL
+psMatrixInvert(psMatrix *out,           //!< Matrix to return, or NULL
                const psMatrix *myMatrix, //!< Matrix to be inverted
                float *restrict determinant //!< Determinant to return, or NULL
@@ -32 +32 @@
 /** Matrix determinant */
 float
-psDeterminant(const psMatrix *restrict myMatrix //!< Matrix to get determinant for
-              );
+psMatrixDeterminant(const psMatrix *restrict myMatrix //!< Matrix to get determinant for
+                    );
 
-/** Matrix Multiplication.  Not using restrict, to allow matrix1 == matrix2, and to do multiplication
- * in-place
- */
-psMatrix
-psMatrixMultiply(psMatrix *out,         //!< Matrix to return, or NULL
-                 const psMatrix *matrix1, //!< Matrix 1
-                 const psMatrix *matrix2 //!< Matrix 2
-                 );
+/** Matrix operations */
+psMatrix *
+psMatrixOp(psMatrix *out,               //!< Matrix to return, or NULL
+           const psMatrix *matrix1,     //!< Matrix 1
+           const char *op,              //!< Operation to perform
+           const psMatrix *matrix2      //!< Matrix 2
+           );
+
+/** Transpose Matrix */
+psMatrix *
+psMatrixTranspose(psMatrix *out,        //!< Matrix to return, or NULL
+                  const psMatrix *myMatrix //!< Matrix to transpose
+                  );
+
+/** Convert matrix to vector.  Mainly for a 1-d matrix. */
+psVector *
+psMatrixToVector(psMatrix *myMatrix     //!< Matrix to convert
 
 #endif