X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=vrfileman;a=blobdiff_plain;f=src%2Ffs.cc;h=5795cd0669be469814690358afc7be2f49e5d3e2;hp=a3e5b810533c48146733ce398c033a6e298c5131;hb=d5b4970b66b1d6b4726dd360a452a0b5b3160f22;hpb=f737a4688a44fa05c9a5ea7919819437fae85ae1

diff --git a/src/fs.cc b/src/fs.cc
index a3e5b81..5795cd0 100644
--- a/src/fs.cc
+++ b/src/fs.cc
@@ -14,6 +14,7 @@
 #include "opengl.h"
 #include "app.h"
 #include "drawtext.h"
+#include "sdr.h"
 
 static IconRenderer *iconrend;
 
@@ -23,6 +24,7 @@ static int start_child;
 
 static dtx_font *fat_font;
 #define FAT_FONT_SZ	32
+static unsigned int font_sdr;
 
 
 bool init_fs(const char *path)
@@ -32,12 +34,29 @@ bool init_fs(const char *path)
 		return false;
 	}
 
-	if(!(fat_font = dtx_open_font("data/fat.font", FAT_FONT_SZ))) {
-		fprintf(stderr, "failed to open font file data/fat.font\n");
+	if(!(fat_font = dtx_open_font_glyphmap("data/fat.glyphmap")) ||
+			dtx_get_glyphmap_ptsize(dtx_get_glyphmap(fat_font, 0)) != FAT_FONT_SZ) {
+
+		dtx_set(DTX_PADDING, 64);
+
+		if(!(fat_font = dtx_open_font("data/fat.font", 0))) {
+			fprintf(stderr, "failed to open font file data/fat.font\n");
+			return false;
+		}
+		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);
+
+	if(!(font_sdr = create_program_load("sdr/dfont.v.glsl", "sdr/dfont.p.glsl"))) {
 		return false;
 	}
+	set_uniform_float(font_sdr, "smoothness", 0.01);
 
-	cur_node = get_fsnode(path);
+	if(!(cur_node = get_fsnode(path))) {
+		return false;
+	}
 	cur_node->expand();
 	return true;
 }
@@ -50,6 +69,7 @@ void cleanup_fs()
 		delete node;
 	}
 	node_cache.clear();
+	dtx_close_font(fat_font);
 	delete iconrend;
 }
 
@@ -72,19 +92,18 @@ static float icon_angle(int col, int ncols, float max_angle = 0.0f)
 
 void draw_fs()
 {
-	static const float row_spacing = 2.0;
+	static const float row_spacing = 0.25;
 	static const float radius = 0.6;
 	static const float umax = 0.42;
 	static const float max_icon_angle = M_PI * 2.0 * umax;
 
-	int max_ncols = std::max<int>(1, umax * 16);
+	int max_ncols = std::max<int>(1, umax * 12);
 
 	Mat4 base_xform;
 	base_xform.rotate(time_sec, 0, 0);
 	base_xform.rotate(0, 0, time_sec * 0.5);
 	base_xform.translate(0, 1.65, 0);
 
-	glUseProgram(0);
 	glDisable(GL_TEXTURE_2D);
 
 	int nchildren = (int)cur_node->children.size();
@@ -101,6 +120,8 @@ void draw_fs()
 			continue;
 		}
 
+		glUseProgram(0);
+
 		float angle = icon_angle(col, ncols, max_icon_angle);
 
 		Mat4 xform = base_xform;
@@ -120,6 +141,8 @@ void draw_fs()
 		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();