switched some (x,y) and (w,h) pairs to vectors

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

diff --git a/src/graphics/Frame.h b/src/graphics/Frame.h
index 0f1287c06a3d2528b6f01c074ddda32f3c5ec75e..09674cc62d2f63a97dc50a327a2c6df2c33a0fd4 100644 (file)
--- a/src/graphics/Frame.h
+++ b/src/graphics/Frame.h
@@ -8,7 +8,7 @@
 #ifndef GRAPHICS_FRAME_H_
 #define GRAPHICS_FRAME_H_
 
-#include "../geometry/Point.h"
+#include "../geometry/Vector.h"
 
 #include <SDL.h>
 
@@ -18,21 +18,24 @@ class Frame {
 
 public:
        Frame(SDL_Surface *s, int borderWidth, int borderHeight, int repeatWidth = 1, int repeatHeight = 1, int xOffset = 0, int yOffset = 0)
-       : surface(s), borderWidth(borderWidth), borderHeight(borderHeight), repeatWidth(repeatWidth), repeatHeight(repeatHeight), xOffset(xOffset), yOffset(yOffset) { }
+       : surface(s), borderSize(borderWidth, borderHeight), repeatSize(repeatWidth, repeatHeight), offset(xOffset, yOffset) { }
 
 public:
-       int MinWidth() const { return 2 * borderWidth; }
-       int MinHeight() const { return 2 * borderHeight; }
-       void Draw(SDL_Surface *dest, geometry::Point<int> position, int width, int height) const;
+       int MinWidth() const { return 2 * BorderWidth(); }
+       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; }
+       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;
 
 private:
        SDL_Surface *surface;
-       int borderWidth;
-       int borderHeight;
-       int repeatWidth;
-       int repeatHeight;
-       int xOffset;
-       int yOffset;
+       geometry::Vector<int> borderSize;
+       geometry::Vector<int> repeatSize;
+       geometry::Vector<int> offset;
 
 };