Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8671 for code/branches


Ignore:
Timestamp:
May 29, 2011, 10:59:37 PM (13 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:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/unity_build/src/libraries/core/input/InputHandler.h

    r6746 r8671  
    3131
    3232#include "InputPrereqs.h"
    33 #include "util/Math.h"
    3433
    3534namespace orxonox
    3635{
     36    /// A Vector class containing two integers @a x and @a y.
     37    class IntVector2
     38    {
     39    public:
     40        IntVector2() : x(0), y(0) { }
     41        IntVector2(int _x, int _y) : x(_x), y(_y) { }
     42        int x;
     43        int y;
     44    };
     45
    3746    namespace ButtonEvent
    3847    {
  • code/branches/unity_build/src/libraries/util/Math.h

    r8351 r8671  
    296296
    297297    _UtilExport unsigned long getUniqueNumber();
    298 
    299     /**
    300         @brief A Vector class containing two integers @a x and @a y.
    301     */
    302     class IntVector2
    303     {
    304     public:
    305         IntVector2() : x(0), y(0) { }
    306         IntVector2(int _x, int _y) : x(_x), y(_y) { }
    307         int x;
    308         int y;
    309     };
    310 
    311     /**
    312         @brief A Vector class containing three integers @a x, @a y, and @a z.
    313     */
    314     class IntVector3
    315     {
    316     public:
    317         IntVector3() : x(0), y(0), z(0) { }
    318         IntVector3(int _x, int _y, int _z) : x(_x), y(_y), z(_z) { }
    319         int x;
    320         int y;
    321         int z;
    322     };
    323298}
    324299
  • code/branches/unity_build/src/libraries/util/UtilPrereqs.h

    r8351 r8671  
    8787    class Exception;
    8888    class ExprParser;
    89     class IntVector2;
    90     class IntVector3;
    9189    class MultiType;
    9290    class OutputHandler;
Note: See TracChangeset for help on using the changeset viewer.