Changeset 2459 for code/branches/presentation/src/util

Timestamp:

Dec 15, 2008, 12:53:05 AM (16 years ago)

Author:

rgrieder

Message:

Merged physics_merge back to presentation branch.

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/util (modified) (1 prop)
• src/util/Exception.cc (modified) (1 prop)
• src/util/Exception.h (modified) (3 diffs, 1 prop)
• src/util/Integers.h (modified) (1 diff)
• src/util/Math.h (modified) (2 diffs)
• src/util/SignalHandler.cc (modified) (1 prop)
• src/util/SignalHandler.h (modified) (1 prop)

code/branches/presentation/src/util/Exception.h

@@ -82 +82 @@
                   const char* filename, const char* functionName)                   \
                   : Exception(description, lineNumber, filename, functionName)      \
-        {                                                                           \
-            /* Let the catcher decide whether to display the message below level 4  \
-               Note: Don't place this code in Exception c'tor because getTypeName() \
-               is still pure virtual at that time. */                               \
-            COUT(4) << this->getFullDescription() << std::endl;                     \
-        }                                                                           \
+        { }                                                                         \
                                                                                     \
         ExceptionName##Exception(const std::string& description)                    \
                   : Exception(description)                                          \
-        { COUT(4) << this->getFullDescription() << std::endl; }                     \
+        { }                                                                         \
                                                                                     \
         ~ExceptionName##Exception() throw() { }                                     \
@@ -103 +98 @@
     CREATE_ORXONOX_EXCEPTION(FileNotFound);
     CREATE_ORXONOX_EXCEPTION(Argument);
+    CREATE_ORXONOX_EXCEPTION(PhysicsViolation);
+    CREATE_ORXONOX_EXCEPTION(ParseError);
     CREATE_ORXONOX_EXCEPTION(PluginsNotFound);
     CREATE_ORXONOX_EXCEPTION(InitialisationFailed);
@@ -111 +108 @@
 }
 
-#define ThrowException(Type, Description) \
-    throw Type##Exception(Description, __LINE__, __FILE__, __FUNCTIONNAME__)
+    /**
+    @brief
+        Helper function that creates an exception, displays the message, but doesn't throw it.
+    */
+    template <class T>
+    inline const T& InternalHandleException(const T& exception)
+    {
+        // let the catcher decide whether to display the message below level 4
+        COUT(4) << exception.getFullDescription() << std::endl;
+        return exception;
+    }
+
+#define ThrowException(type, description) \
+    throw InternalHandleException(type##Exception(description, __LINE__, __FILE__, __FUNCTIONNAME__))
 
     // define an assert macro that can display a message

code/branches/presentation/src/util/Integers.h

@@ -49 +49 @@
 typedef unsigned __int32  uint32_t;
 typedef unsigned __int64  uint64_t;
-#elif ORXONOX_COMPILER == ORXONOX_COMPILER_GCC
-# include "inttypes.h"
+#else
+# include <inttypes.h>
 #endif
 

code/branches/presentation/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;
     }