Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-10-12 11:14:22 +0000
committerStijn Buys <ingar@osirion.org>2008-10-12 11:14:22 +0000
commit18383a5fc596bf9546f14d7393ee66c57720b116 (patch)
tree5382c3b380a72149eabbc4f75a2c5744b895e48a /src/math/matrix4f.h
parent0d831968949b1119db48530a86c2d1651c6cbfc6 (diff)
libmath API cleanup
Diffstat (limited to 'src/math/matrix4f.h')
-rw-r--r--src/math/matrix4f.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/math/matrix4f.h b/src/math/matrix4f.h
index 0d7df90..e69ae05 100644
--- a/src/math/matrix4f.h
+++ b/src/math/matrix4f.h
@@ -7,12 +7,10 @@
#ifndef __INCLUDED_MATH_MATRIX4F_H__
#define __INCLUDED_MATH_MATRIX4F_H__
-// project headers
-#include "math/axis.h"
-
-// C++ headers
#include <iostream>
+#include "math/axis.h"
+
namespace math
{
@@ -23,31 +21,33 @@ public:
Matrix4f();
Matrix4f(const Matrix4f & other);
Matrix4f(const Axis & axis);
-
+
/// set all values to zero
void clear();
-
+
/// set the value to a 4x4 unity matrix
void unity();
-
+
/// assignment operator
void assign(const Matrix4f & other);
-
+
/// assignment operator
inline Matrix4f & operator=(const Matrix4f &other);
/// assign the matrix transformation equivalent to the coordinate system
void assign(const Axis & axis);
-
+
/// assign the matrix transformation equivalent to the coordinate system
Matrix4f & operator=(const Axis & axis);
-
+
/// return a pointer to the internal data
- inline float * ptr() const { return (float *) matrix; }
-
+ inline float * ptr() const {
+ return (float *) matrix;
+ }
+
/// return the transpose matrix
Matrix4f const transpose();
-
+
private:
float matrix[4][4];
};