Changeset 2442 for code/branches/physics_merge/src/util/Math.h

Timestamp:

Dec 14, 2008, 4:16:52 PM (16 years ago)

Author:

rgrieder

Message:

Finally merged physics stuff. Target is physics_merge because I'll have to do some testing first.

Location:

code/branches/physics_merge

Files:

• . (modified) (1 prop)
• src/util (modified) (1 prop)
• src/util/Math.h (modified) (2 diffs)

code/branches/physics_merge/src/util/Math.h

@@ -63 +63 @@
 namespace orxonox
 {
-    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::Matrix4 Matrix4;
-    typedef Ogre::Quaternion Quaternion;
-    typedef Ogre::ColourValue ColourValue;
+    using Ogre::Radian;
+    using Ogre::Degree;
+    using Ogre::Vector2;
+    using Ogre::Vector3;
+    using Ogre::Vector4;
+    using Ogre::Matrix3;
+    using Ogre::Matrix4;
+    using Ogre::Quaternion;
+    using Ogre::ColourValue;
+
+    // Also define our own transform space enum
+    namespace TransformSpace
+    {
+        /**
+        @brief
+            Enumeration denoting the spaces which a transform can be relative to.
+        */
+        enum Space
+        {
+            /// Transform is relative to the local space
+            Local,
+            /// Transform is relative to the space of the parent node
+            Parent,
+            /// Transform is relative to world space
+            World
+        };
+    }
 
     _UtilExport std::ostream& operator<<(std::ostream& out, const orxonox::Radian& radian);
@@ -174 +192 @@
     inline T zeroise()
     {
-        BOOST_STATIC_ASSERT(sizeof(T) == 0);
-        return T();
+        // Default, raise a compiler error without including large boost header cascade.
+        T temp();
+        *********temp; // If you reach this code, you abused zeroise()!
+        return temp;
     }