X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fgamescr.c;h=6e69c21758508aa47a8d72f77e6b1dba183d7177;hb=efc9f6e45a0485d7955fa04b262f256de2b1a706;hp=de314ae927255f27cd55849d0f0707ca1e5d9a62;hpb=6ad6cf2cb2e82d8dcc1535a031a38eb991d2b396;p=vrtris

diff --git a/src/gamescr.c b/src/gamescr.c
index de314ae..6e69c21 100644
--- a/src/gamescr.c
+++ b/src/gamescr.c
@@ -1,4 +1,6 @@
+#include "opengl.h"
 #include "screen.h"
+#include "cmesh.h"
 
 static int init(void);
 static void cleanup(void);
@@ -29,14 +31,26 @@ struct game_screen game_screen = {
 	wheel
 };
 
+static struct cmesh *blkmesh;
+static float cam_theta, cam_phi, cam_dist = 6;
+static int bnstate[16];
+static int prev_mx, prev_my;
 
 static int init(void)
 {
+	if(!(blkmesh = cmesh_alloc())) {
+		return -1;
+	}
+	if(cmesh_load(blkmesh, "data/noisecube.obj") == -1) {
+		fprintf(stderr, "failed to load block model\n");
+		return -1;
+	}
 	return 0;
 }
 
 static void cleanup(void)
 {
+	cmesh_free(blkmesh);
 }
 
 static void start(void)
@@ -53,6 +67,11 @@ static void update(float dt)
 
 static void draw(void)
 {
+	glTranslatef(0, 0, -cam_dist);
+	glRotatef(cam_phi, 1, 0, 0);
+	glRotatef(cam_theta, 0, 1, 0);
+
+	cmesh_draw(blkmesh);
 }
 
 static void reshape(int x, int y)
@@ -65,10 +84,29 @@ static void keyboard(int key, int pressed)
 
 static void mouse(int bn, int pressed, int x, int y)
 {
+	bnstate[bn] = pressed;
+	prev_mx = x;
+	prev_my = y;
 }
 
 static void motion(int x, int y)
 {
+	float dx = x - prev_mx;
+	float dy = y - prev_my;
+	prev_mx = x;
+	prev_my = y;
+
+	if(bnstate[0]) {
+		cam_theta += dx * 0.5;
+		cam_phi += dy * 0.5;
+
+		if(cam_phi < -90) cam_phi = -90;
+		if(cam_phi > 90) cam_phi = 90;
+	}
+	if(bnstate[2]) {
+		cam_dist += dy * 0.1;
+		if(cam_dist < 0) cam_dist = 0;
+	}
 }
 
 static void wheel(int dir)