X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=demo_prior;a=blobdiff_plain;f=src%2Fimtk%2Fdraw.c;fp=src%2Fimtk%2Fdraw.c;h=331eeaea8bbc1d4d7d1cc5bf72b37911eaf2a7ca;hp=e1c6fbf2a8bed1f448071e1f1d4ad80a601b1b76;hb=8e783a58d1e21ace04fd6d7ed00158e65bd78040;hpb=2f14a35e7d557da12f24056267b911f24774aa18

diff --git a/src/imtk/draw.c b/src/imtk/draw.c
index e1c6fbf..331eeae 100644
--- a/src/imtk/draw.c
+++ b/src/imtk/draw.c
@@ -3,6 +3,8 @@
 #include <assert.h>
 #include "draw.h"
 #include "imtk.h"
+#include "drawtext.h"
+#include "demo.h"
 
 #define COLOR_MASK	0xff
 
@@ -256,15 +258,21 @@ void imtk_draw_disc_frame(int x, int y, float inner, float outer, int subdiv, in
 
 void imtk_draw_string(int x, int y, const char *str)
 {
-	/*
-	glRasterPos2i(x, y);
-	while(*str) {
-		glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, *str++);
-	}
-	*/
+	dtx_use_font(fnt_ui, fnt_ui_size);
+
+	glMatrixMode(GL_MODELVIEW);
+	glPushMatrix();
+	glTranslatef(x, y + dtx_line_height() * 0.2, 0);
+	glScalef(1, -1, 1);
+
+	glColor4fv(colors[IMTK_TEXT_COLOR]);
+	dtx_string(str);
+
+	glPopMatrix();
 }
 
 int imtk_string_size(const char *str)
 {
-	return 0;
+	dtx_use_font(fnt_ui, fnt_ui_size);
+	return dtx_string_width(str);
 }