medfall

commit 796634040bb95a1e9147a7055564e7447afaaffa
parent f47395491fbc1e8f7e686573592781cd22fb230d
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Sun Nov 27 00:33:03 +0200

Tiny bit of game.h cleanup

Diffstat:
game.h
 | 
16
+++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/game.h b/game.h
@@ -4,6 +4,7 @@
 // TODO: this whole file blows
 #include "intrinsics.h"
 #include "linear_algebra.h"
+#include "renderer.h"
 #include "benchmark.h"
 #include "assets.h"
 #include "terrain_manager.h"
@@ -35,31 +36,24 @@ struct GameState {
 
 	WorkQueue background_tasks;
 
-	GLuint test_shader;
+	Shader test_shader;
 	GLint test_at_position;
 	GLint test_at_colour;
 	GLint test_un_VP;
 
-	GLuint font_shader;
+	Shader font_shader;
 	GLint font_at_position;
 	GLint font_at_colour;
 	GLint font_at_uv;
 	GLint font_un_atlas;
 
-	GLuint test_tex_shader;
+	Shader test_tex_shader;
 	GLint test_tex_at_pos;
 	GLint test_tex_at_colour;
 	GLint test_tex_at_uv;
 	GLint test_tex_un_tex;
 
-	GLint test_at_normal;
-	GLint test_at_lit;
-	GLint test_un_sun;
-	GLint test_un_normals;
-	GLint test_un_horizons;
-	GLint test_un_dimensions;
-
-	GLuint test_outline_shader;
+	Shader test_outline_shader;
 	GLint test_outline_at_position;
 	GLint test_outline_at_colour;
 	GLint test_outline_un_vp;