X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FFont.cpp;h=94d451ae7a9f7d272cc706599c9ce4b5b774849d;hb=9648fd7d258ae1a2baccb8dd5b6f7a9491e55803;hp=135775c1412061224b1e9434acc2d7f19245e80c;hpb=2f2dad58f3b9f7c98cf20211929ff31f5ebf5e5f;p=l2e.git

diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
index 135775c..94d451a 100644
--- a/src/graphics/Font.cpp
+++ b/src/graphics/Font.cpp
@@ -7,47 +7,81 @@
 
 #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, 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 maxWidth) const {
+	if (!sprite) return;
+
+	Vector<int> position(positionIn);
+	Vector<int> lineHead(positionIn);
 	Vector<int> step(CharWidth(), 0);
-	for (int i(0); s[i] && (maxChars <= 0 || i < maxChars); ++i, position += step) {
-		DrawChar(s[i], dest, position);
+	Vector<int> lineBreak(0, CharHeight());
+	for (int i(0), col(0); s[i] && (maxWidth <= 0 || col < maxWidth); ++i) {
+		if (s[i] == '\n') {
+			lineHead += lineBreak;
+			position = lineHead;
+			col = 0;
+		} else {
+			DrawChar(s[i], dest, position);
+			position += step;
+			++col;
+		}
 	}
 }
 
-void Font::DrawDigit(int digit, SDL_Surface *dest, Point<int> position) const {
-	sprite->Draw(dest, position, digitsCol + digit, digitsRow);
+void Font::DrawStringRight(const char *s, SDL_Surface *dest, const Vector<int> &positionIn, int maxWidth) const {
+	// NOTE: this does not handle line breaks
+	if (!sprite) return;
+
+	int length(0);
+	while (length < maxWidth && s[length] != '\0') {
+		++length;
+	}
+	Vector<int> position(positionIn.X() - length * CharWidth(), positionIn.Y());
+
+	DrawString(s, dest, position, length);
 }
 
-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;
 		}
@@ -65,4 +99,34 @@ void Font::DrawNumber(int numberIn, SDL_Surface *dest, Point<int> positionIn, in
 	}
 }
 
+void Font::DrawNumberRight(int number, SDL_Surface *dest, const Vector<int> &positionIn, int digits) const {
+	if (!sprite) return;
+
+	Vector<int> position(positionIn.X() - digits * CharWidth(), positionIn.Y());
+
+	DrawNumber(number, dest, position, digits);
+}
+
+
+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;
+}
+
 }