# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1434162727 -10800
# Node ID d7fe157c402d9d4b23171ad928e68e041bab7004
# Parent  4ca4e3c5a754f9e4c4fbda799f2755ea449b41b5
fonts

diff -r 4ca4e3c5a754 -r d7fe157c402d android/manifest.xml.in
--- a/android/manifest.xml.in	Thu Jun 11 04:56:33 2015 +0300
+++ b/android/manifest.xml.in	Sat Jun 13 05:32:07 2015 +0300
@@ -14,7 +14,8 @@
 		<!-- android:icon="@drawable/ic_launcher" -->
 
 		<activity android:name="MainActivity" android:label="$APPTITLE"
-				android:screenOrientation="landscape">
+			android:screenOrientation="landscape"
+			android:theme="@android:style/Theme.Holo.NoActionBar.Fullscreen" >
 
 			<meta-data android:name="android.app.lib_name" android:value="$APPNAME"/>
 
diff -r 4ca4e3c5a754 -r d7fe157c402d libs/drawtext/drawtext.h
--- a/libs/drawtext/drawtext.h	Thu Jun 11 04:56:33 2015 +0300
+++ b/libs/drawtext/drawtext.h	Sat Jun 13 05:32:07 2015 +0300
@@ -20,6 +20,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include "assman.h"
 
 struct dtx_font;
 struct dtx_glyphmap;
@@ -90,7 +91,7 @@
  * freetype support.
  */
 struct dtx_glyphmap *dtx_load_glyphmap(const char *fname);
-struct dtx_glyphmap *dtx_load_glyphmap_stream(FILE *fp);
+struct dtx_glyphmap *dtx_load_glyphmap_stream(ass_file *fp);
 int dtx_save_glyphmap(const char *fname, const struct dtx_glyphmap *gmap);
 int dtx_save_glyphmap_stream(FILE *fp, const struct dtx_glyphmap *gmap);
 
diff -r 4ca4e3c5a754 -r d7fe157c402d libs/drawtext/font.c
--- a/libs/drawtext/font.c	Thu Jun 11 04:56:33 2015 +0300
+++ b/libs/drawtext/font.c	Sat Jun 13 05:32:07 2015 +0300
@@ -31,6 +31,7 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #endif
+#include "assman.h"
 #include "drawtext.h"
 #include "drawtext_impl.h"
 
@@ -333,18 +334,18 @@
 
 struct dtx_glyphmap *dtx_load_glyphmap(const char *fname)
 {
-	FILE *fp;
+	ass_file *fp;
 	struct dtx_glyphmap *gmap;
 
-	if(!(fp = fopen(fname, "rb"))) {
+	if(!(fp = ass_fopen(fname, "rb"))) {
 		return 0;
 	}
 	gmap = dtx_load_glyphmap_stream(fp);
-	fclose(fp);
+	ass_fclose(fp);
 	return gmap;
 }
 
-struct dtx_glyphmap *dtx_load_glyphmap_stream(FILE *fp)
+struct dtx_glyphmap *dtx_load_glyphmap_stream(ass_file *fp)
 {
 	char buf[512];
 	int hdr_lines = 0;
@@ -364,7 +365,7 @@
 
 	while(hdr_lines < 3) {
 		char *line = buf;
-		if(!fgets(buf, sizeof buf, fp)) {
+		if(!ass_fgets(buf, sizeof buf, fp)) {
 			fperror("unexpected end of file");
 			goto err;
 		}
@@ -471,13 +472,13 @@
 	}
 
 	for(i=0; i<num_pixels; i++) {
-		long c = fgetc(fp);
+		long c = ass_fgetc(fp);
 		if(c == -1) {
 			fprintf(stderr, "unexpected end of file while reading pixels\n");
 			goto err;
 		}
 		gmap->pixels[i] = 255 * c / max_pixval;
-		fseek(fp, 2, SEEK_CUR);
+		ass_fseek(fp, 2, SEEK_CUR);
 	}
 
 	gmap->cstart = min_code;
diff -r 4ca4e3c5a754 -r d7fe157c402d sdr/font.p.glsl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sdr/font.p.glsl	Sat Jun 13 05:32:07 2015 +0300
@@ -0,0 +1,12 @@
+precision mediump float;
+
+uniform sampler2D tex;
+uniform vec4 color;
+
+varying vec4 tex_coords;
+
+void main()
+{
+	vec4 texel = texture2D(tex, tex_coords.xy);
+	gl_FragColor = vec4(color.xyz, texel.a);
+}
diff -r 4ca4e3c5a754 -r d7fe157c402d sdr/vertex.glsl
--- a/sdr/vertex.glsl	Thu Jun 11 04:56:33 2015 +0300
+++ b/sdr/vertex.glsl	Sat Jun 13 05:32:07 2015 +0300
@@ -1,12 +1,13 @@
-attribute vec4 attr_vertex, attr_texcoord;
+attribute vec4 attr_vertex, attr_texcoord, attr_color;
 
 uniform mat4 matrix_modelview, matrix_projection, matrix_texture;
 
-varying vec4 tex_coords;
+varying vec4 tex_coords, color;
 
 void main()
 {
 	mat4 mvp = matrix_projection * matrix_modelview;
 	gl_Position = mvp * attr_vertex;
 	tex_coords = matrix_texture * attr_texcoord;
+	color = attr_color;
 }
diff -r 4ca4e3c5a754 -r d7fe157c402d src/assman.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/assman.c	Sat Jun 13 05:32:07 2015 +0300
@@ -0,0 +1,30 @@
+#include "assman.h"
+
+int ass_fgetc(ass_file *fp)
+{
+	char c;
+
+	if(ass_fread(&c, 1, 1, fp) < 1) {
+		return -1;
+	}
+	return c;
+}
+
+char *ass_fgets(char *s, int size, ass_file *fp)
+{
+	int i, c;
+	char *ptr = s;
+
+	if(!size) return 0;
+
+	for(i=0; i<size - 1; i++) {
+		if((c = ass_fgetc(fp)) == -1) {
+			break;
+		}
+		*ptr++ = c;
+
+		if(c == '\n') break;
+	}
+	*ptr = 0;
+	return ptr == s ? 0 : s;
+}
diff -r 4ca4e3c5a754 -r d7fe157c402d src/assman.h
--- a/src/assman.h	Thu Jun 11 04:56:33 2015 +0300
+++ b/src/assman.h	Sat Jun 13 05:32:07 2015 +0300
@@ -5,6 +5,10 @@
 
 typedef void ass_file;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 ass_file *ass_fopen(const char *fname, const char *mode);
 void ass_fclose(ass_file *fp);
 long ass_fseek(ass_file *fp, long offs, int whence);
@@ -12,5 +16,12 @@
 
 size_t ass_fread(void *buf, size_t size, size_t count, ass_file *fp);
 
+/* convenience functions, derived from the above */
+int ass_fgetc(ass_file *fp);
+char *ass_fgets(char *s, int size, ass_file *fp);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif	/* ASSMAN_H_ */
diff -r 4ca4e3c5a754 -r d7fe157c402d src/game.cc
--- a/src/game.cc	Thu Jun 11 04:56:33 2015 +0300
+++ b/src/game.cc	Sat Jun 13 05:32:07 2015 +0300
@@ -8,10 +8,12 @@
 #include "sanegl.h"
 #include "texture.h"
 #include "shader.h"
+#include "text.h"
 
 static void draw_quad(float hsz, float vsz);
 
-static int win_width, win_height;
+int win_width, win_height;
+
 static float win_aspect;
 static int video_width, video_height;
 static float video_aspect;
@@ -21,10 +23,8 @@
 
 extern "C" int game_init(void)
 {
-	unsigned int vsdr, psdr_cam, psdr_tex;
-
 	//glEnable(GL_DEPTH_TEST);
-	glEnable(GL_CULL_FACE);
+	//glEnable(GL_CULL_FACE);
 
 	glClearColor(0.4, 0.4, 0.4, 1);
 
@@ -102,10 +102,19 @@
 
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	draw_quad(0.5, 0.5);
+	glDisable(GL_BLEND);
 
-	draw_quad(0.5, 0.5);
+	gl_matrix_mode(GL_TEXTURE);
+	gl_load_identity();
 
-	glDisable(GL_BLEND);
+
+	// draw some text
+	text_color(1, 1, 1, 1);
+	for(int i=0; i<25; i++) {
+		text_position(0, i);
+		text_printf("%d%s line of text", i, i == 1 ? "st" : (i == 2 ? "nd" : (i == 3 ? "rd" : "th")));
+	}
 }
 
 static void draw_quad(float hsz, float vsz)
diff -r 4ca4e3c5a754 -r d7fe157c402d src/game.h
--- a/src/game.h	Thu Jun 11 04:56:33 2015 +0300
+++ b/src/game.h	Sat Jun 13 05:32:07 2015 +0300
@@ -1,6 +1,8 @@
 #ifndef GAME_H_
 #define GAME_H_
 
+extern int win_width, win_height;
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff -r 4ca4e3c5a754 -r d7fe157c402d src/shader.cc
--- a/src/shader.cc	Thu Jun 11 04:56:33 2015 +0300
+++ b/src/shader.cc	Sat Jun 13 05:32:07 2015 +0300
@@ -187,6 +187,122 @@
 	return true;
 }
 
+void SdrProg::set_uniform(const char *name, int count, const int *val) const
+{
+	if(!bind()) return;
+
+	int loc = glGetUniformLocation(prog, name);
+	if(loc == -1) return;
+
+	switch(count) {
+	case 1:
+		glUniform1iv(loc, 1, val);
+		break;
+	case 2:
+		glUniform2iv(loc, 1, val);
+		break;
+	case 3:
+		glUniform3iv(loc, 1, val);
+	case 4:
+		glUniform4iv(loc, 1, val);
+	default:
+		break;
+	}
+}
+
+void SdrProg::set_uniform(const char *name, int count, const float *val) const
+{
+	if(!bind()) return;
+
+	int loc = glGetUniformLocation(prog, name);
+	if(loc == -1) return;
+
+	switch(count) {
+	case 1:
+		glUniform1fv(loc, 1, val);
+		break;
+	case 2:
+		glUniform2fv(loc, 1, val);
+		break;
+	case 3:
+		glUniform3fv(loc, 1, val);
+	case 4:
+		glUniform4fv(loc, 1, val);
+	default:
+		break;
+	}
+}
+
+void SdrProg::set_uniform(const char *name, const Vector4 &v) const
+{
+	set_uniform(name, 4, &v.x);
+}
+
+
+void SdrProg::set_uniform1i(const char *name, int x) const
+{
+	set_uniform(name, 1, &x);
+}
+
+void SdrProg::set_uniform2i(const char *name, int x, int y) const
+{
+	int v[] = {x, y};
+	set_uniform(name, 2, v);
+}
+
+void SdrProg::set_uniform3i(const char *name, int x, int y, int z) const
+{
+	int v[] = {x, y, z};
+	set_uniform(name, 3, v);
+}
+
+void SdrProg::set_uniform4i(const char *name, int x, int y, int z, int w) const
+{
+	int v[] = {x, y, z, w};
+	set_uniform(name, 4, v);
+}
+
+void SdrProg::set_uniform1f(const char *name, float x) const
+{
+	set_uniform(name, 1, &x);
+}
+
+void SdrProg::set_uniform2f(const char *name, float x, float y) const
+{
+	float v[] = {x, y};
+	set_uniform(name, 2, v);
+}
+
+void SdrProg::set_uniform3f(const char *name, float x, float y, float z) const
+{
+	float v[] = {x, y, z};
+	set_uniform(name, 3, v);
+}
+
+void SdrProg::set_uniform4f(const char *name, float x, float y, float z, float w) const
+{
+	float v[] = {x, y, z, w};
+	set_uniform(name, 4, v);
+}
+
+void SdrProg::set_uniform_matrix(const char *name, const float *m) const
+{
+	if(!bind()) return;
+
+	int loc = glGetUniformLocation(prog, name);
+	if(loc == -1) return;
+
+	glUniformMatrix4fv(loc, 1, 0, m);
+}
+
+void SdrProg::set_uniform_matrix(const char *name, const Matrix4x4 &m) const
+{
+	Matrix4x4 tmp = m.transposed();
+	set_uniform_matrix(name, tmp[0]);
+}
+
+
+
 unsigned int get_shader(const char *name, unsigned int type)
 {
 	std::map<std::string, unsigned int>::const_iterator it = sdrdb.find(name);
diff -r 4ca4e3c5a754 -r d7fe157c402d src/shader.h
--- a/src/shader.h	Thu Jun 11 04:56:33 2015 +0300
+++ b/src/shader.h	Sat Jun 13 05:32:07 2015 +0300
@@ -2,6 +2,7 @@
 #define SHADER_H_
 
 #include <vector>
+#include "vmath/vmath.h"
 
 enum SdrDefaultAttrib {
 	SDR_ATTR_VERTEX,
@@ -42,6 +43,25 @@
 
 	bool bind() const;
 
+	// helper functions for setting uniforms
+	void set_uniform(const char *name, int count, const int *val) const;
+	void set_uniform(const char *name, int count, const float *val) const;
+	void set_uniform(const char *name, const Vector4 &v) const;
+
+	void set_uniform1i(const char *name, int x) const;
+	void set_uniform2i(const char *name, int x, int y) const;
+	void set_uniform3i(const char *name, int x, int y, int z) const;
+	void set_uniform4i(const char *name, int x, int y, int z, int w) const;
+
+	void set_uniform1f(const char *name, float x) const;
+	void set_uniform2f(const char *name, float x, float y) const;
+	void set_uniform3f(const char *name, float x, float y, float z) const;
+	void set_uniform4f(const char *name, float x, float y, float z, float w) const;
+
+	void set_uniform_matrix(const char *name, const float *m) const;
+	void set_uniform_matrix(const char *name, const Matrix4x4 &m) const;
+
+
 	unsigned int get_globj() const { return prog; }
 };
 
diff -r 4ca4e3c5a754 -r d7fe157c402d src/text.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/text.c	Sat Jun 13 05:32:07 2015 +0300
@@ -0,0 +1,135 @@
+#include <stdio.h>
+#include <stdarg.h>
+#include <alloca.h>
+#include "game.h"
+#include "text.h"
+#include "sdr.h"
+#include "opengl.h"
+#include "sanegl.h"
+#include "drawtext/drawtext.h"
+
+#define FONT_NAME	"consolas_s24.glyphmap"
+#define FONT_SIZE	24
+
+static struct dtx_font *font;
+static unsigned int prog;
+static int uloc_color = -1;
+static int aloc_vertex, aloc_texcoords;
+static float color[4];
+static int cpos[2];
+static int line_height;
+
+static int init(void)
+{
+	if(font) return 0;	/* already initialized */
+
+	if(!(font = dtx_open_font_glyphmap("data/" FONT_NAME))) {
+		fprintf(stderr, "failed to open font\n");
+		return -1;
+	}
+	line_height = dtx_line_height();
+
+	if(!(prog = create_program_load("sdr/vertex.glsl", "sdr/font.p.glsl"))) {
+		dtx_close_font(font);
+		font = 0;
+		return -1;
+	}
+	aloc_vertex = glGetAttribLocation(prog, "attr_vertex");
+	aloc_texcoords = glGetAttribLocation(prog, "attr_texcoord");
+	uloc_color = glGetUniformLocation(prog, "color");
+
+	return 0;
+}
+
+void text_color(float r, float g, float b, float a)
+{
+	color[0] = r;
+	color[1] = g;
+	color[2] = b;
+	color[3] = a;
+}
+
+void text_position(int x, int y)
+{
+	cpos[0] = x;
+	cpos[1] = y;
+}
+
+static int pre_print(void)
+{
+	int top = win_height - line_height;
+
+	if(init() == -1) {
+		return -1;
+	}
+
+	gl_matrix_mode(GL_TEXTURE);
+	gl_push_matrix();
+	gl_load_identity();
+	gl_matrix_mode(GL_PROJECTION);
+	gl_push_matrix();
+	gl_load_identity();
+	gl_ortho(0, win_width, 0, win_height, -1, 1);
+	gl_matrix_mode(GL_MODELVIEW);
+	gl_push_matrix();
+	gl_load_identity();
+	gl_translatef(cpos[0] * dtx_glyph_width(' '), top - cpos[1] * line_height, 0);
+
+	glUseProgram(prog);
+	glUniform4fv(uloc_color, 1, color);
+
+	gl_apply_xform(prog);
+
+	dtx_use_font(font, FONT_SIZE);
+	dtx_vertex_attribs(aloc_vertex, aloc_texcoords);
+	return 0;
+}
+
+static void post_print(void)
+{
+	gl_matrix_mode(GL_TEXTURE);
+	gl_pop_matrix();
+	gl_matrix_mode(GL_PROJECTION);
+	gl_pop_matrix();
+	gl_matrix_mode(GL_MODELVIEW);
+	gl_pop_matrix();
+}
+
+void text_print(const char *s)
+{
+	if(pre_print() == -1) {
+		return;
+	}
+
+	dtx_string(s);
+
+	post_print();
+}
+
+void text_printf(const char *fmt, ...)
+{
+	va_list ap;
+	int buf_size;
+	char *buf, tmp;
+
+	if(pre_print() == -1) {
+		return;
+	}
+
+	va_start(ap, fmt);
+	buf_size = vsnprintf(&tmp, 0, fmt, ap);
+	va_end(ap);
+
+	if(buf_size == -1) {
+		buf_size = 512;
+	}
+
+	buf = alloca(buf_size + 1);
+	va_start(ap, fmt);
+	vsnprintf(buf, buf_size + 1, fmt, ap);
+	va_end(ap);
+
+	dtx_string(buf);
+
+	post_print();
+}
diff -r 4ca4e3c5a754 -r d7fe157c402d src/text.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/text.h	Sat Jun 13 05:32:07 2015 +0300
@@ -0,0 +1,17 @@
+#ifndef TEXT_H_
+#define TEXT_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void text_color(float r, float g, float b, float a);
+void text_position(int x, int y);
+void text_print(const char *s);
+void text_printf(const char *fmt, ...);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* TEXT_H_ */