X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FFont.cpp;h=efaad1525611302446f7fd9f46479bfd62f19637;hb=4bc70f5311dcbcca4e6b9e852bbcb19602f50eeb;hp=0ff3d9d4d90360b997277ee20226920d1e4d6bb2;hpb=ca31ddeab37eebaa2de5e5b1c94974fac06d418b;p=l2e.git

diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
index 0ff3d9d..efaad15 100644
--- a/src/graphics/Font.cpp
+++ b/src/graphics/Font.cpp
@@ -7,33 +7,56 @@
 
 #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::DrawDigit(int digit, SDL_Surface *dest, Point<int> position) const {
-	sprite->Draw(dest, position, digitsCol + digit, digitsRow);
+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 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::DrawNumber(int numberIn, SDL_Surface *dest, Point<int> positionIn, int digits) 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 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) {
 		int i(digits - 1);
-		while (number < pow(10.0, i)) {
+		while (number < pow(10.0, i) && i > 0) {
 			position += step;
 			--i;
 		}
@@ -51,4 +74,29 @@ void Font::DrawNumber(int numberIn, SDL_Surface *dest, Point<int> positionIn, in
 	}
 }
 
+
+void Font::CreateTypeDescription() {
+	Font f;
+
+	int numberId(TypeDescription::GetTypeId("Number"));
+	int spriteId(TypeDescription::GetTypeId("Sprite"));
+
+	TypeDescription &td(TypeDescription::CreateOrGet("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), spriteId).SetReferenced().SetDescription("a sprite where each tile corresponds to a character"));
+	td.AddField("columnoffset", FieldDescription(((char *)&f.colOffset) - ((char *)&f), numberId).SetDescription("offset of the column of the first character"));
+	td.AddField("rowoffset", FieldDescription(((char *)&f.rowOffset) - ((char *)&f), numberId).SetDescription("offset of the row of the first character"));
+}
+
+void Font::Construct(void *data) {
+	new (data) Font;
+}
+
 }