consistent naming of graphics drawing functions

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

diff --git a/src/graphics/Frame.cpp b/src/graphics/Frame.cpp
index 86b9cd25d5d7b5d06c0213aea81ef303db945b96..4ba8f4a57a6471ef93ef78968537e92a18a09076 100644 (file)
--- a/src/graphics/Frame.cpp
+++ b/src/graphics/Frame.cpp
@@ -1,17 +1,10 @@
-/*
- * Frame.cpp
- *
- *  Created on: Aug 7, 2012
- *      Author: holy
- */
-
 #include "Frame.h"
 
 #include "Texture.h"
 #include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
-using geometry::Vector;
+using math::Vector;
 using loader::FieldDescription;
 using loader::Interpreter;
 using loader::TypeDescription;
@@ -42,7 +35,7 @@ void Frame::Draw(SDL_Surface *dest, const Vector<int> &position, int width, int
 
        // top border
        Texture(surface, Vector<int>(RepeatWidth(), BorderHeight()), Vector<int>(offset.X() + BorderWidth(), offset.Y()))
-       .Render(dest, Vector<int>(position.X() + BorderWidth(), position.Y()), Vector<int>(position.X() + width - BorderWidth(), position.Y() + BorderHeight()));
+       .Draw(dest, Vector<int>(position.X() + BorderWidth(), position.Y()), Vector<int>(position.X() + width - BorderWidth(), position.Y() + BorderHeight()));
 
        // top-right corner
        srcRect.x = offset.X() + RepeatWidth() + BorderWidth();
@@ -52,15 +45,15 @@ void Frame::Draw(SDL_Surface *dest, const Vector<int> &position, int width, int
 
        // left border
        Texture(surface, Vector<int>(BorderWidth(), RepeatHeight()), Vector<int>(offset.X(), offset.Y() + BorderHeight()))
-       .Render(dest, Vector<int>(position.X(), position.Y() + BorderHeight()), Vector<int>(position.X() + BorderWidth(), position.Y() + height - BorderHeight()));
+       .Draw(dest, Vector<int>(position.X(), position.Y() + BorderHeight()), Vector<int>(position.X() + BorderWidth(), position.Y() + height - BorderHeight()));
 
        // center fill
        Texture(surface, RepeatSize(), Vector<int>(offset.X() + BorderWidth(), offset.Y() + BorderHeight()))
-       .Render(dest, position + BorderSize(), position + Vector<int>(width, height) - BorderSize());
+       .Draw(dest, position + BorderSize(), position + Vector<int>(width, height) - BorderSize());
 
        // right border
        Texture(surface, Vector<int>(BorderWidth(), RepeatHeight()), Vector<int>(offset.X() + BorderWidth() + RepeatWidth(), offset.Y() + BorderHeight()))
-       .Render(dest, Vector<int>(position.X() + width - BorderWidth(), position.Y() + BorderHeight()), Vector<int>(position.X() + width, position.Y() + height - BorderHeight()));
+       .Draw(dest, Vector<int>(position.X() + width - BorderWidth(), position.Y() + BorderHeight()), Vector<int>(position.X() + width, position.Y() + height - BorderHeight()));
 
        // bottom-left corner
        srcRect.x = offset.X();
@@ -73,7 +66,7 @@ void Frame::Draw(SDL_Surface *dest, const Vector<int> &position, int width, int
 
        // bottom border
        Texture(surface, Vector<int>(RepeatWidth(), BorderHeight()), Vector<int>(offset.X() + BorderWidth(), offset.Y() + BorderHeight() + RepeatHeight()))
-       .Render(dest, Vector<int>(position.X() + BorderWidth(), position.Y() + height - BorderHeight()), Vector<int>(position.X() + width - BorderWidth(), position.Y() + height));
+       .Draw(dest, Vector<int>(position.X() + BorderWidth(), position.Y() + height - BorderHeight()), Vector<int>(position.X() + width - BorderWidth(), position.Y() + height));
 
        // bottom-right corner
        srcRect.x = offset.X() + BorderWidth() + RepeatWidth();