Changeset 716 for code/branches/FICN/src/misc

Timestamp:

Dec 28, 2007, 11:53:59 PM (17 years ago)

Author:

rgrieder

Message:

• merged all Vector3, etc. (incl. ColourValue) to misc/Math.h

Location:

code/branches/FICN/src/misc

Files:

• ColourValue.h (modified) (2 diffs)
• Math.h (modified) (2 diffs)
• Matrix3.h (modified) (2 diffs)
• Quaternion.h (modified) (2 diffs)
• Vector2.h (modified) (2 diffs)
• Vector3.h (modified) (2 diffs)
• Vector4.h (modified) (2 diffs)

code/branches/FICN/src/misc/ColourValue.h

@@ -1 @@
-#include <OgreColourValue.h>
 
 #include "Math.h"
@@ -5 +4 @@
 namespace orxonox
 {
-  typedef Ogre::ColourValue ColourValue;
 }

code/branches/FICN/src/misc/Math.h

@@ -1 +1 @@
 #include <OgreMath.h>
+#include <OgreVector2.h>
+#include <OgreVector3.h>
+#include <OgreVector4.h>
+#include <OgreMatrix3.h>
+#include <OgreQuaternion.h>
+#include <OgreColourValue.h>
 
 namespace orxonox
@@ -5 +11 @@
   typedef Ogre::Radian Radian;
   typedef Ogre::Degree Degree;
+  typedef Ogre::Vector2 Vector2;
+  typedef Ogre::Vector3 Vector3;
+  typedef Ogre::Vector4 Vector4;
+  typedef Ogre::Matrix3 Matrix3;
+  typedef Ogre::Quaternion Quaternion;
+  typedef Ogre::ColourValue ColourValue;
 }

code/branches/FICN/src/misc/Matrix3.h

@@ -1 @@
-#include <OgreMatrix3.h>
 
 #include "Math.h"
@@ -5 +4 @@
 namespace orxonox
 {
-  typedef Ogre::Matrix3 Matrix3;
 }

code/branches/FICN/src/misc/Quaternion.h

@@ -1 @@
-#include <OgreQuaternion.h>
 
 #include "Math.h"
@@ -5 +4 @@
 namespace orxonox
 {
-  typedef Ogre::Quaternion Quaternion;
 }

code/branches/FICN/src/misc/Vector2.h

@@ -1 @@
-#include <OgreVector2.h>
 
 #include "Math.h"
@@ -5 +4 @@
 namespace orxonox
 {
-  typedef Ogre::Vector2 Vector2;
 }

code/branches/FICN/src/misc/Vector3.h

@@ -1 @@
-#include <OgreVector3.h>
 
 #include "Math.h"
@@ -5 +4 @@
 namespace orxonox
 {
-  typedef Ogre::Vector3 Vector3;
 }

code/branches/FICN/src/misc/Vector4.h

@@ -1 @@
-#include <OgreVector4.h>
 
 #include "Math.h"
@@ -5 +4 @@
 namespace orxonox
 {
-  typedef Ogre::Vector4 Vector4;
 }