X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FFont.cpp;h=be96a2c104b860f0e9dda819388c92c0fa206d81;hb=7e59a87ac7caf96ffa38f2595581a6009a20339a;hp=1dc90516ccae28455231d7d919b7ba650a891692;hpb=1162be37102b24df11f469495c0184f3f9a26ba0;p=l2e.git

diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
index 1dc9051..be96a2c 100644
--- a/src/graphics/Font.cpp
+++ b/src/graphics/Font.cpp
@@ -7,42 +7,53 @@
 
 #include "Font.h"
 
-#include "../geometry/operators.h"
-#include "../geometry/Vector.h"
+#include "../loader/Interpreter.h"
+#include "../loader/TypeDescription.h"
 
 #include <cmath>
+#include <iostream>
 
-using geometry::Point;
 using geometry::Vector;
+using loader::FieldDescription;
+using loader::Interpreter;
+using loader::TypeDescription;
 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 {
+	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, 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 {
+	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, const Point<int> &position) const {
+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, const 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 +76,26 @@ void Font::DrawNumber(int numberIn, SDL_Surface *dest, const Point<int> &positio
 	}
 }
 
+
+void Font::CreateTypeDescription() {
+	Font f;
+
+	TypeDescription &td(TypeDescription::Create(TYPE_ID, "Font"));
+	td.SetDescription(
+			"Simple font with fixed-width characters using a sprite for rendering.\n"
+			"Characters from strings are mapped as follows:\n"
+			"<pre>sprite column = column offset + (character % 16)\n"
+			"sprite row    = row    offset + (character / 16)</pre>");
+	td.SetConstructor(&Construct);
+	td.SetSize(sizeof(Font));
+
+	td.AddField("sprite", FieldDescription(((char *)&f.sprite) - ((char *)&f), Sprite::TYPE_ID).SetReferenced().SetDescription("a sprite where each tile corresponds to a character"));
+	td.AddField("columnoffset", FieldDescription(((char *)&f.colOffset) - ((char *)&f), Interpreter::NUMBER_ID).SetDescription("offset of the column of the first character"));
+	td.AddField("rowoffset", FieldDescription(((char *)&f.rowOffset) - ((char *)&f), Interpreter::NUMBER_ID).SetDescription("offset of the row of the first character"));
+}
+
+void Font::Construct(void *data) {
+	new (data) Font;
+}
+
 }