Changeset 8671 for code/branches/unity_build

Timestamp:

May 29, 2011, 10:59:37 PM (14 years ago)

Author:

rgrieder

Message:

Moved IntVector2 from util/Math.h to InputHandler.h because that class is a hack in itself.
Removed IntVector3 completely.

Location:

code/branches/unity_build/src/libraries

Files:

• core/input/InputHandler.h (modified) (1 diff)
• util/Math.h (modified) (1 diff)
• util/UtilPrereqs.h (modified) (1 diff)

code/branches/unity_build/src/libraries/core/input/InputHandler.h

@@ -31 +31 @@
 
 #include "InputPrereqs.h"
-#include "util/Math.h"
 
 namespace orxonox
 {
+    /// A Vector class containing two integers @a x and @a y.
+    class IntVector2
+    {
+    public:
+        IntVector2() : x(0), y(0) { }
+        IntVector2(int _x, int _y) : x(_x), y(_y) { }
+        int x;
+        int y;
+    };
+
     namespace ButtonEvent
     {

code/branches/unity_build/src/libraries/util/Math.h

@@ -296 +296 @@
 
     _UtilExport unsigned long getUniqueNumber();
-
-    /**
-        @brief A Vector class containing two integers @a x and @a y.
-    */
-    class IntVector2
-    {
-    public:
-        IntVector2() : x(0), y(0) { }
-        IntVector2(int _x, int _y) : x(_x), y(_y) { }
-        int x;
-        int y;
-    };
-
-    /**
-        @brief A Vector class containing three integers @a x, @a y, and @a z.
-    */
-    class IntVector3
-    {
-    public:
-        IntVector3() : x(0), y(0), z(0) { }
-        IntVector3(int _x, int _y, int _z) : x(_x), y(_y), z(_z) { }
-        int x;
-        int y;
-        int z;
-    };
 }
 

code/branches/unity_build/src/libraries/util/UtilPrereqs.h

@@ -87 +87 @@
     class Exception;
     class ExprParser;
-    class IntVector2;
-    class IntVector3;
     class MultiType;
     class OutputHandler;