renamed namespace geometry -> math

[l2e.git] / src / graphics / Gauge.h

diff --git a/src/graphics/Gauge.h b/src/graphics/Gauge.h
index 3251ec2e0eccf0b7a9d11cce4966ae307964db32..383559e746add0ccfab0cb9617d50e7ca66546b3 100644 (file)
--- a/src/graphics/Gauge.h
+++ b/src/graphics/Gauge.h
@@ -1,14 +1,7 @@
-/*
- * Gauge.h
- *
- *  Created on: Aug 7, 2012
- *      Author: holy
- */
-
 #ifndef GRAPHICS_GAUGE_H_
 #define GRAPHICS_GAUGE_H_
 
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 
 #include <SDL.h>
 
@@ -16,6 +9,9 @@ namespace graphics {
 
 class Gauge {
 
+       public:
+               static const int TYPE_ID = 406;
+
 public:
        explicit Gauge(SDL_Surface *s = 0, int fullX = 0, int fullY = 0, int emptyX = 0, int emptyY = 0, int height = 1, int startWidth = 0, int repeatWidth = 1, int endWidth = 0)
        : surface(s), fullOffset(fullX, fullY), emptyOffset(emptyX, emptyY), height(height), startWidth(startWidth), repeatWidth(repeatWidth), endWidth(endWidth) { }
@@ -23,21 +19,24 @@ public:
 public:
        int MinWidth() const { return startWidth + endWidth; }
        int Height() const { return height; }
-       void Draw(SDL_Surface *dest, const geometry::Vector<int> &position, int width, Uint8 fill) const;
+       void Draw(SDL_Surface *dest, const math::Vector<int> &position, int width, Uint8 fill) const;
 
 public:
        void SetSurface(SDL_Surface *s) { surface = s; }
-       void SetFullOffset(const geometry::Vector<int> &o) { fullOffset = o; }
-       void SetEmptyOffset(const geometry::Vector<int> &o) { emptyOffset = o; }
+       void SetFullOffset(const math::Vector<int> &o) { fullOffset = o; }
+       void SetEmptyOffset(const math::Vector<int> &o) { emptyOffset = o; }
        void SetHeight(int h) { height = h; }
        void SetStartWidth(int w) { startWidth = w; }
        void SetRepeatWidth(int w) { repeatWidth = w; }
        void SetEndWidth(int w) { endWidth = w; }
 
+       static void CreateTypeDescription();
+       static void Construct(void *);
+
 private:
        SDL_Surface *surface;
-       geometry::Vector<int> fullOffset;
-       geometry::Vector<int> emptyOffset;
+       math::Vector<int> fullOffset;
+       math::Vector<int> emptyOffset;
        int height;
        int startWidth;
        int repeatWidth;