X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fgame.c;h=2df0e3f9d4e2afc280059499abcd8b5f4b59a0d7;hb=e785b2f83fd3aba82cb07ca5dd8d590d817d376c;hp=eba4a2344456e3b4ba1719ccc56a4da88ee41d54;hpb=96757b3e8d4c7ad71ebcae67c40c5fed14c471ce;p=vrtris

diff --git a/src/game.c b/src/game.c
index eba4a23..2df0e3f 100644
--- a/src/game.c
+++ b/src/game.c
@@ -40,7 +40,6 @@ int game_init(int argc, char **argv)
 			return -1;
 		}
 		goatvr_set_origin_mode(GOATVR_HEAD);
-		goatvr_set_units_scale(10.0f);
 
 		goatvr_startvr();
 		should_swap = goatvr_should_swap();
@@ -52,6 +51,7 @@ int game_init(int argc, char **argv)
 	glEnable(GL_LIGHTING);
 	glEnable(GL_LIGHT0);
 
+	screen->start();
 	return 0;
 }
 
@@ -76,14 +76,14 @@ void game_display(void)
 	float dt = (float)(time_msec - prev_msec) / 1000.0f;
 	prev_msec = time_msec;
 
-	update(dt);
-
 #ifdef BUILD_VR
 	if(opt.flags & OPT_VR) {
 		int i;
 		goatvr_draw_start();
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
+		update(dt);
+
 		for(i=0; i<2; i++) {
 			/* for each eye */
 			goatvr_draw_eye(i);
@@ -113,6 +113,8 @@ void game_display(void)
 		/* non-VR mode */
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
+		update(dt);
+
 		cgm_mperspective(proj_matrix, cgm_deg_to_rad(40.0), win_aspect, 0.5, 500.0);
 		glMatrixMode(GL_PROJECTION);
 		glLoadMatrixf(proj_matrix);