renamed namespace geometry -> math

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

diff --git a/src/graphics/Frame.h b/src/graphics/Frame.h
index 59aa1fb0c74486b99c05be713030cd5a9d7a9650..023b694785678123d6f93d10cc7e26523e2a778f 100644 (file)
--- a/src/graphics/Frame.h
+++ b/src/graphics/Frame.h
@@ -1,14 +1,7 @@
-/*
- * Frame.h
- *
- *  Created on: Aug 7, 2012
- *      Author: holy
- */
-
 #ifndef GRAPHICS_FRAME_H_
 #define GRAPHICS_FRAME_H_
 
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 
 #include <SDL.h>
 
@@ -16,6 +9,9 @@ namespace graphics {
 
 class Frame {
 
+public:
+       static const int TYPE_ID = 405;
+
 public:
        explicit Frame(SDL_Surface *s = 0, int borderWidth = 1, int borderHeight = 1, int repeatWidth = 1, int repeatHeight = 1, int xOffset = 0, int yOffset = 0)
        : surface(s), borderSize(borderWidth, borderHeight), repeatSize(repeatWidth, repeatHeight), offset(xOffset, yOffset) { }
@@ -25,23 +21,26 @@ public:
        int MinHeight() const { return 2 * BorderHeight(); }
        int BorderWidth() const { return BorderSize().X(); }
        int BorderHeight() const { return BorderSize().Y(); }
-       const geometry::Vector<int> BorderSize() const { return borderSize; }
+       const math::Vector<int> BorderSize() const { return borderSize; }
        int RepeatWidth() const { return RepeatSize().X(); }
        int RepeatHeight() const { return RepeatSize().Y(); }
-       const geometry::Vector<int> RepeatSize() const { return repeatSize; }
-       void Draw(SDL_Surface *dest, const geometry::Vector<int> &position, int width, int height) const;
+       const math::Vector<int> RepeatSize() const { return repeatSize; }
+       void Draw(SDL_Surface *dest, const math::Vector<int> &position, int width, int height) const;
 
 public:
        void SetSurface(SDL_Surface *s) { surface = s; }
-       void SetBorderSize(const geometry::Vector<int> &s) { borderSize = s; }
-       void SetRepeatSize(const geometry::Vector<int> &s) { repeatSize = s; }
-       void SetOffset(const geometry::Vector<int> &o) { offset = o; }
+       void SetBorderSize(const math::Vector<int> &s) { borderSize = s; }
+       void SetRepeatSize(const math::Vector<int> &s) { repeatSize = s; }
+       void SetOffset(const math::Vector<int> &o) { offset = o; }
+
+       static void CreateTypeDescription();
+       static void Construct(void *);
 
 private:
        SDL_Surface *surface;
-       geometry::Vector<int> borderSize;
-       geometry::Vector<int> repeatSize;
-       geometry::Vector<int> offset;
+       math::Vector<int> borderSize;
+       math::Vector<int> repeatSize;
+       math::Vector<int> offset;
 
 };