Improved appearance of fallback fonts with the software renderer

runninggamesstudios · Feb 14, 2014 · 5643f09 · 5643f09
1 parent cee2547
commit 5643f09
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/Sources/Client/Fonts.cpp b/Sources/Client/Fonts.cpp
@@ -52,7 +52,7 @@ namespace spades {
 										  20,
 										  4,
 										  true);
-			font->SetGlyphYRange(3.f, 17.f);
+			font->SetGlyphYRange(2.f, 15.f);
 			SPLog("Font 'CMUSansCondensed' Loaded");
 			return font;
 		}

diff --git a/Sources/Client/IFont.cpp b/Sources/Client/IFont.cpp
@@ -249,14 +249,16 @@ namespace spades {
 
 			// margin to make the border completely transparent
 			// (considering the OpenGL's linear interpolation)
-			inRect.min.x -= 0.5f;
-			inRect.min.y -= 0.5f;
-			outRect.min.x -= 0.5f;
-			outRect.min.y -= 0.5f;
-			inRect.max.x += 0.5f;
-			inRect.max.y += 0.5f;
-			outRect.max.x += 0.5f;
-			outRect.max.y += 0.5f;
+			if(!roundSize){
+				inRect.min.x -= 0.5f;
+				inRect.min.y -= 0.5f;
+				outRect.min.x -= 0.5f;
+				outRect.min.y -= 0.5f;
+				inRect.max.x += 0.5f;
+				inRect.max.y += 0.5f;
+				outRect.max.x += 0.5f;
+				outRect.max.y += 0.5f;
+			}
 
 			outRect.min *= scale;
 			outRect.max *= scale;