X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=vrfileman;a=blobdiff_plain;f=src%2Ffs.cc;h=1d3b46d2fd5be7df8c6f5a7ccbf6a4630868b079;hp=57f51708fc01112df79de981637eb08a61bf6c21;hb=1da838078e253bc99892802a2ba6df66cf2cafb1;hpb=d032f000a796aab8654fa13bcb84f2393f16cb65

diff --git a/src/fs.cc b/src/fs.cc
index 57f5170..1d3b46d 100644
--- a/src/fs.cc
+++ b/src/fs.cc
@@ -46,8 +46,8 @@ bool init_fs(const char *path)
 		dtx_prepare_range(fat_font, FAT_FONT_SZ * 8, 32, 127);
 		dtx_calc_font_distfield(fat_font, 1, 8);
 		dtx_save_glyphmap("data/fat.glyphmap", dtx_get_glyphmap(fat_font, 0));
-		dtx_use_font(fat_font, FAT_FONT_SZ);
 	}
+	dtx_use_font(fat_font, FAT_FONT_SZ);
 
 	if(!(font_sdr = create_program_load("sdr/dfont.v.glsl", "sdr/dfont.p.glsl"))) {
 		return false;
@@ -136,12 +136,13 @@ void draw_fs()
 		glPushMatrix();
 		xform = Mat4::identity;
 		xform.translate(-dtx_string_width(node->path.get_name()) / 2.0, 0, 0);
-		xform.scale(0.001);
+		xform.scale(0.0012);
 		xform.translate(0, 1.54 + row * row_spacing, -radius);
 		xform.rotate_y(angle);
 		glMultMatrixf(xform[0]);
 
 		glUseProgram(font_sdr);
+		set_uniform_float(font_sdr, "height", dtx_line_height());
 		dtx_string(node->path.get_name());
 		glPopMatrix();