X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmain.c;h=28a9d3e8a71172dbbacaaece3a051699526ab03c;hb=c608ee9a7df130c64f195fd1e9af1f145cad207d;hp=7ce59cb1770085784425e01c46b6df3d00616a6c;hpb=721cbdcc5f52c2dda7eb03e645bb92521180a3fa;p=cyberay

diff --git a/src/main.c b/src/main.c
index 7ce59cb..28a9d3e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3,6 +3,7 @@
 #include <assert.h>
 #include <GL/glut.h>
 #include <cgmath/cgmath.h>
+#include "mesh.h"
 
 enum {
 	KEY_F1		= GLUT_KEY_F1 | 0x100,
@@ -46,7 +47,7 @@ static void motion(int x, int y);
 static long start_time;
 
 static float cam_theta, cam_phi;
-static cgm_vec3 cam_pos;
+static cgm_vec3 cam_pos = {0, -1.6, 0};
 static float pxform[16];
 
 static int mouse_x, mouse_y;
@@ -62,6 +63,8 @@ static int keymap[NUM_INPUTS][2] = {
 	{' ', 0}
 };
 
+static struct mesh mesh;
+
 int main(int argc, char **argv)
 {
 	glutInit(&argc, argv);
@@ -97,15 +100,20 @@ static int init(void)
 	glEnable(GL_LIGHTING);
 	glEnable(GL_LIGHT0);
 
+	if(load_mesh(&mesh, "data/testlvl.obj") == -1) {
+		return -1;
+	}
+
 	start_time = glutGet(GLUT_ELAPSED_TIME);
 	return 0;
 }
 
 static void cleanup(void)
 {
+	destroy_mesh(&mesh);
 }
 
-#define WALK_SPEED 1.0f
+#define WALK_SPEED 3.0f
 static void update(void)
 {
 	static unsigned int prev_upd;
@@ -153,6 +161,8 @@ static void display(void)
 	glutSolidTeapot(1.0);
 	glFrontFace(GL_CCW);
 
+	draw_mesh(&mesh);
+
 	glutSwapBuffers();
 	assert(glGetError() == GL_NO_ERROR);
 }