X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=vrfileman;a=blobdiff_plain;f=src%2Fapp.cc;h=08f6e8adb146cdfb00bb49b0d74d6c66648d4162;hp=0c82972c41dcade3befd6ff811daf9c90bddc4cc;hb=1c2b18e725db9e066d5dcb11123fc2019aec2ee7;hpb=172da567dcbb634b13069e5c12ae8b6a9b3a29dc

diff --git a/src/app.cc b/src/app.cc
index 0c82972..08f6e8a 100644
--- a/src/app.cc
+++ b/src/app.cc
@@ -18,17 +18,19 @@ long time_msec;
 double time_sec;
 Mat4 view_matrix;
 
-static bool should_swap;
+float cam_height = 1.65;
 
 static float cam_theta, cam_phi;
-static float cam_height = 1.65;
+static bool should_swap;
 
 static bool bnstate[16];
 static int prev_x, prev_y;
 
+static float fov = 60.0;
+
 bool app_init(int argc, char **argv)
 {
-	if(!init_options(argc, argv, 0)) {
+	if(!init_options(argc, argv, "vrfileman.conf")) {
 		return false;
 	}
 	app_resize(opt.width, opt.height);
@@ -71,7 +73,7 @@ bool app_init(int argc, char **argv)
 		return false;
 	}
 
-	if(!init_fs()) {
+	if(!init_fs(opt.path)) {
 		return false;
 	}
 
@@ -97,7 +99,7 @@ void app_draw()
 			goatvr_draw_eye(i);
 
 			glMatrixMode(GL_PROJECTION);
-			glLoadMatrixf(goatvr_projection_matrix(i, 0.5, 1000.0));
+			glLoadMatrixf(goatvr_projection_matrix(i, 0.1, 200.0));
 
 			view_matrix = goatvr_view_matrix(i);
 			view_matrix.pre_rotate_x(deg_to_rad(cam_phi));
@@ -120,6 +122,11 @@ void app_draw()
 		// regular monoscopic mode
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
+		Mat4 mat;
+		mat.perspective(deg_to_rad(fov), win_aspect, 0.1, 200.0);
+		glMatrixMode(GL_PROJECTION);
+		glLoadMatrixf(mat[0]);
+
 		view_matrix = Mat4::identity;
 		view_matrix.pre_rotate_x(deg_to_rad(cam_phi));
 		view_matrix.pre_rotate_y(deg_to_rad(cam_theta));
@@ -146,12 +153,6 @@ void app_reshape(int x, int y)
 {
 	glViewport(0, 0, x, y);
 
-	Mat4 mat;
-	mat.perspective(deg_to_rad(50), win_aspect, 0.5, 500.0);
-
-	glMatrixMode(GL_PROJECTION);
-	glLoadMatrixf(mat[0]);
-
 	if(opt.vr) {
 		goatvr_set_fb_size(x, y, 1.0);
 	}
@@ -181,6 +182,16 @@ void app_keyboard(int key, bool pressed)
 				goatvr_recenter();
 			}
 			break;
+
+		case '-':
+			fov += 1.0;
+			if(fov > 160.0) fov = 160.0;
+			break;
+
+		case '=':
+			fov -= 1.0;
+			if(fov < 0.0) fov = 0.0;
+			break;
 		}
 	}
 }