[Orxonox-commit 3997] r8671 - in code/branches/unity_build/src/libraries: core/input util

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-05-29 22:59:37 +0200 (Sun, 29 May 2011)
New Revision: 8671

Modified:
   code/branches/unity_build/src/libraries/core/input/InputHandler.h
   code/branches/unity_build/src/libraries/util/Math.h
   code/branches/unity_build/src/libraries/util/UtilPrereqs.h
Log:
Moved IntVector2 from util/Math.h to InputHandler.h because that class is a hack in itself.
Removed IntVector3 completely.

Modified: code/branches/unity_build/src/libraries/core/input/InputHandler.h
===================================================================
--- code/branches/unity_build/src/libraries/core/input/InputHandler.h	2011-05-29 20:58:28 UTC (rev 8670)
+++ code/branches/unity_build/src/libraries/core/input/InputHandler.h	2011-05-29 20:59:37 UTC (rev 8671)
@@ -30,10 +30,19 @@
 #define _InputHandler_H__
 
 #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
     {
         //! Helper enum to deploy events with the help of templates

Modified: code/branches/unity_build/src/libraries/util/Math.h
===================================================================
--- code/branches/unity_build/src/libraries/util/Math.h	2011-05-29 20:58:28 UTC (rev 8670)
+++ code/branches/unity_build/src/libraries/util/Math.h	2011-05-29 20:59:37 UTC (rev 8671)
@@ -295,31 +295,6 @@
     }
 
     _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;
-    };
 }
 
 #endif /* _Util_Math_H__ */

Modified: code/branches/unity_build/src/libraries/util/UtilPrereqs.h
===================================================================
--- code/branches/unity_build/src/libraries/util/UtilPrereqs.h	2011-05-29 20:58:28 UTC (rev 8670)
+++ code/branches/unity_build/src/libraries/util/UtilPrereqs.h	2011-05-29 20:59:37 UTC (rev 8671)
@@ -86,8 +86,6 @@
     class Clock;
     class Exception;
     class ExprParser;
-    class IntVector2;
-    class IntVector3;
     class MultiType;
     class OutputHandler;
     class OutputListener;