X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FFont.cpp;h=c68031065b717486f55d06bb589d124b84d0228a;hb=e35b71bedb8c2424346d60c737020f1599438b74;hp=d3a3de06d5396677ace4b5007aa79475a9995976;hpb=fb10fbd4a72793048916557308772fdaa2afebc2;p=l2e.git

diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
index d3a3de0..c680310 100644
--- a/src/graphics/Font.cpp
+++ b/src/graphics/Font.cpp
@@ -7,42 +7,51 @@
 
 #include "Font.h"
 
-#include "../geometry/operators.h"
-#include "../geometry/Vector.h"
+#include "../loader/TypeDescription.h"
 
 #include <cmath>
+#include <iostream>
 
-using geometry::Point;
 using geometry::Vector;
+using loader::FieldDescription;
+using loader::TypeDescription;
 using std::pow;
 
 namespace graphics {
 
-void Font::DrawChar(char c, SDL_Surface *dest, Point<int> position) const {
-	if (!HasChar(c)) return;
-	const Mapping &m(map[(unsigned char)c]);
-	sprite->Draw(dest, position, m.col, m.row);
+void Font::DrawChar(char c, SDL_Surface *dest, const Vector<int> &position) const {
+	if (!sprite) return;
+
+	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, 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 {
+	if (!sprite) return;
+
+	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, Point<int> position) const {
-	sprite->Draw(dest, position, digitsCol + digit, digitsRow);
+void Font::DrawDigit(int digit, SDL_Surface *dest, const Vector<int> &position) const {
+	if (!sprite) return;
+
+	DrawChar(digit + 0x30, dest, position);
 }
 
-void Font::DrawNumber(int numberIn, SDL_Surface *dest, Point<int> positionIn, int digits) const {
+void Font::DrawNumber(int numberIn, SDL_Surface *dest, const Vector<int> &positionIn, int digits) const {
+	if (!sprite) return;
+
 	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) {
@@ -65,4 +74,19 @@ void Font::DrawNumber(int numberIn, SDL_Surface *dest, Point<int> positionIn, in
 	}
 }
 
+
+void Font::CreateTypeDescription() {
+	Font f;
+	TypeDescription &td(TypeDescription::CreateOrGet("Font"));
+
+	td.SetSize(sizeof(Font));
+
+	int numberId(TypeDescription::GetTypeId("Number"));
+	int spriteId(TypeDescription::GetTypeId("Sprite"));
+
+	td.AddField("sprite", FieldDescription(((char *)&f.sprite) - ((char *)&f), spriteId, true));
+	td.AddField("columnoffset", FieldDescription(((char *)&f.colOffset) - ((char *)&f), numberId, false));
+	td.AddField("rowoffset", FieldDescription(((char *)&f.rowOffset) - ((char *)&f), numberId, false));
+}
+
 }