#include "Font.h"
-#include "../geometry/operators.h"
-#include "../geometry/Vector.h"
-
#include <cmath>
-using geometry::Point;
using geometry::Vector;
using std::pow;
namespace graphics {
-void Font::DrawChar(char c, SDL_Surface *dest, const Point<int> &position) const {
+void Font::DrawChar(char c, SDL_Surface *dest, const Vector<int> &position) const {
int col(colOffset + (c % 0x10));
int row(rowOffset + (c / 0x10));
sprite->Draw(dest, position, col, row);
}
-void Font::DrawString(const char *s, SDL_Surface *dest, const Point<int> &positionIn, int maxChars) const {
- Point<int> position(positionIn);
+void Font::DrawString(const char *s, SDL_Surface *dest, const Vector<int> &positionIn, int maxChars) const {
+ Vector<int> position(positionIn);
Vector<int> step(CharWidth(), 0);
for (int i(0); s[i] && (maxChars <= 0 || i < maxChars); ++i, position += step) {
DrawChar(s[i], dest, position);
}
}
-void Font::DrawDigit(int digit, SDL_Surface *dest, const Point<int> &position) const {
+void Font::DrawDigit(int digit, SDL_Surface *dest, const Vector<int> &position) const {
DrawChar(digit + 0x30, dest, position);
}
-void Font::DrawNumber(int numberIn, SDL_Surface *dest, const Point<int> &positionIn, int digits) const {
+void Font::DrawNumber(int numberIn, SDL_Surface *dest, const Vector<int> &positionIn, int digits) const {
int number(numberIn);
if (digits > 0 && numberIn >= pow(10.0, digits)) {
numberIn = pow(10.0, digits) - 1;
}
- Point<int> position(positionIn);
+ Vector<int> position(positionIn);
Vector<int> step(sprite->Width(), 0);
if (digits > 0) {