X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fapp.cc;h=615366ad63a1b3036829a129f78f2445cc6f5aba;hp=1c2768565d726db602b2df1c3faaf758b0d31454;hb=03085a16aa2fef785083fa3921be83015e08b290;hpb=b75b6703809abf0dc02f2e557ba73e9efbefa4d1

diff --git a/src/app.cc b/src/app.cc
index 1c27685..615366a 100644
--- a/src/app.cc
+++ b/src/app.cc
@@ -26,6 +26,7 @@
 static void draw_scene();
 static void toggle_flight();
 static void calc_framerate();
+static Ray calc_pick_ray(int x, int y, const Mat4 &view_mat, const Mat4 &proj_mat);
 
 long time_msec;
 int win_width, win_height;
@@ -38,6 +39,8 @@ SceneSet sceneman;
 
 unsigned int sdr_ltmap, sdr_ltmap_notex;
 
+int fpexcept_enabled;
+
 static Avatar avatar;
 
 static float cam_dist = 0.0;
@@ -69,11 +72,26 @@ static ExhibitManager *exman;
 static BlobExhibit *blobs;
 static bool show_blobs;
 
+static ExSelection ex_sel;
+
 static Renderer *rend;
 
 
 bool app_init(int argc, char **argv)
 {
+	set_log_file("demo.log");
+
+	char *env = getenv("FPEXCEPT");
+	if(env && atoi(env)) {
+		info_log("enabling floating point exceptions\n");
+		fpexcept_enabled = 1;
+		enable_fpexcept();
+	}
+
+	if(init_opengl() == -1) {
+		return false;
+	}
+
 	if(!init_options(argc, argv, "demo.conf")) {
 		return false;
 	}
@@ -581,7 +599,6 @@ void app_keyboard(int key, bool pressed)
 			break;
 
 		case 'x':
-			exman->clear();
 			exman->load(mscn, "data/exhibits");
 			break;
 		}
@@ -602,6 +619,17 @@ void app_mouse_button(int bn, bool pressed, int x, int y)
 	prev_mx = x;
 	prev_my = y;
 	bnstate[bn] = pressed;
+
+	if(bn == 0) {
+		if(!pressed) {
+			if(ex_sel.ex) {
+				ex_sel.ex = 0;
+			} else {
+				Ray ray = calc_pick_ray(x, y, view_matrix, proj_matrix);
+				ex_sel = exman->select(ray);
+			}
+		}
+	}
 }
 
 static inline void mouse_look(float dx, float dy)
@@ -634,11 +662,15 @@ void app_mouse_motion(int x, int y)
 
 	if(!dx && !dy) return;
 
-	if(bnstate[0]) {
-		mouse_look(dx, dy);
+	if(ex_sel.ex) {
+		Vec3 pos = ex_sel.ex->node->get_node_position();
+		Vec3 dir = transpose(view_matrix.upper3x3()) * Vec3(dx * 1.0, dy * -1.0, 0);
+
+		ex_sel.ex->node->set_position(pos + dir);
 	}
+
 	if(bnstate[2]) {
-		mouse_zoom(dx, dy);
+		mouse_look(dx, dy);
 	}
 }
 
@@ -739,3 +771,8 @@ static void calc_framerate()
 		++nframes;
 	}
 }
+
+static Ray calc_pick_ray(int x, int y, const Mat4 &view_mat, const Mat4 &proj_mat)
+{
+	return Ray();	// TODO
+}