font update, backlog fix

WickedEngine/wiBackLog.cpp

@@ -35,7 +35,7 @@ namespace wiBackLog
 	static State state = DISABLED;
 	static const float speed = 50.0f;
 	static unsigned int deletefromline = 100;
-	static float pos = 0;
+	static float pos = -FLT_MAX;
 	static int scroll = 0;
 	static stringstream inputArea;
 	static int historyPos = 0;
@@ -76,6 +76,11 @@ namespace wiBackLog
 			state = IDLE;
 			pos = 0;
 		}
+
+		if (scroll + font.textHeight() > int(wiRenderer::GetDevice()->GetScreenHeight() * 0.8f))
+		{
+			scroll -= 1;
+		}
 	}
 	void Draw() 
 	{
@@ -93,9 +98,10 @@ namespace wiBackLog
 			fx.opacity = wiMath::Lerp(1, 0, -pos / wiRenderer::GetDevice()->GetScreenHeight());
 			wiImage::Draw(backgroundTex, fx, GRAPHICSTHREAD_IMMEDIATE);
 			font.SetText(getText());
-			font.props.posY = wiRenderer::GetDevice()->GetScreenHeight() - 75 + (int)pos + (int)scroll;
+			font.props.posX = 50;
+			font.props.posY = (int)pos + (int)scroll;
 			font.Draw(GRAPHICSTHREAD_IMMEDIATE);
-			wiFont(inputArea.str().c_str(), wiFontProps(5, wiRenderer::GetDevice()->GetScreenHeight() - 10, -1, WIFALIGN_LEFT, WIFALIGN_BOTTOM)).Draw(GRAPHICSTHREAD_IMMEDIATE);
+			wiFont(inputArea.str().c_str(), wiFontProps(10, wiRenderer::GetDevice()->GetScreenHeight() - 10, -1, WIFALIGN_LEFT, WIFALIGN_BOTTOM)).Draw(GRAPHICSTHREAD_IMMEDIATE);
 		}
 	}
 

WickedEngine/wiFont.cpp

@@ -66,7 +66,7 @@ namespace wiFont_Internal
 				return;
 			}
 
-			const int textureWidth = 1024;
+			const int textureWidth = 2048;
 			const int textureHeight = lineHeight;
 
 			// create a bitmap for the phrase
@@ -84,36 +84,34 @@ namespace wiFont_Internal
 			ascent = int(float(ascent) * scale);
 			descent = int(float(descent) * scale);
 
-			ZeroMemory(lookup, sizeof(lookup));
-			const char text[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789<>(){}[]^&*%$!\"\\/?-_=+.,;:'@~#";
-			for (int i = 0; i < strlen(text); ++i)
+			for (int i = 0; i < ARRAYSIZE(lookup); ++i)
 			{
 				// get bounding box for character (may be offset to account for chars that dip above or below the line
 				int c_x1, c_y1, c_x2, c_y2;
-				stbtt_GetCodepointBitmapBox(&info, text[i], scale, scale, &c_x1, &c_y1, &c_x2, &c_y2);
+				stbtt_GetCodepointBitmapBox(&info, i, scale, scale, &c_x1, &c_y1, &c_x2, &c_y2);
 
 				// compute y (different characters have different heights
 				int y = ascent + c_y1;
 
 				// render character (stride and offset is important here)
 				int byteOffset = x + (y  * textureWidth);
-				stbtt_MakeCodepointBitmap(&info, bitmap + byteOffset, c_x2 - c_x1, c_y2 - c_y1, textureWidth, scale, scale, text[i]);
+				stbtt_MakeCodepointBitmap(&info, bitmap + byteOffset, c_x2 - c_x1, c_y2 - c_y1, textureWidth, scale, scale, i);
 
-				LookUp& lut = lookup[text[i]];
-				lut.character = text[i];
+				LookUp& lut = lookup[i];
+				lut.character = i;
 				lut.left = (float(x) + float(c_x1) - 0.5f) / float(textureWidth);
 				lut.right = (float(x) + float(c_x2) + 0.5f) / float(textureWidth);
 
 				// how wide is this character
 				int ax;
-				stbtt_GetCodepointHMetrics(&info, text[i], &ax, 0);
+				stbtt_GetCodepointHMetrics(&info, i, &ax, 0);
 				x += int(float(ax) * scale);
 
 				lut.pixelWidth = int(float(ax) * scale);
 
 				// add kerning
 				int kern;
-				kern = stbtt_GetCodepointKernAdvance(&info, text[i], text[i + 1]);
+				kern = stbtt_GetCodepointKernAdvance(&info, i, i + 1);
 				x += int(float(kern) * scale);
 
 				// add slight padding to atlas texture betwwen characters

WickedEngine/wiVersion.cpp

@@ -9,7 +9,7 @@ namespace wiVersion
 	// minor features, major updates
 	const int minor = 21;
 	// minor bug fixes, alterations, refactors, updates
-	const int revision = 28;
+	const int revision = 29;
 
 
 	long GetVersion()