X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fapp.cc;h=25c59b32edc994f169003110de01aff653db6d47;hp=d9d44c0ed9bb82b7f3be6f9abc2ed3ad7772a27f;hb=ebbb52cd0de8e27817a0770bd7bdb48a58348a02;hpb=c790c297ef925b7f2257ad41e2123cf86305822c

diff --git a/src/app.cc b/src/app.cc
index d9d44c0..25c59b3 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);
 
 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,28 @@ static ExhibitManager *exman;
 static BlobExhibit *blobs;
 static bool show_blobs;
 
+static ExSelection ex_sel;
+
 static Renderer *rend;
 
+static Ray last_pick_ray;
+
 
 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;
 	}
@@ -110,7 +130,6 @@ bool app_init(int argc, char **argv)
 	glEnable(GL_MULTISAMPLE);
 	glEnable(GL_DEPTH_TEST);
 	glEnable(GL_CULL_FACE);
-	glEnable(GL_LIGHTING);
 	glEnable(GL_NORMALIZE);
 
 	if(!init_debug_gui()) {
@@ -141,9 +160,11 @@ bool app_init(int argc, char **argv)
 	avatar.body_rot = rad_to_deg(acos(dot(dir, Vec3(0, 0, 1))));
 
 	exman = new ExhibitManager;
+	/*
 	if(!exman->load(mscn, "data/exhibits")) {
 		//return false;
 	}
+	*/
 
 	blobs = new BlobExhibit;
 	blobs->node = new SceneNode;
@@ -328,18 +349,6 @@ static void update(float dt)
 	}
 }
 
-static void set_light(int idx, const Vec3 &pos, const Vec3 &color)
-{
-	unsigned int lt = GL_LIGHT0 + idx;
-	float posv[] = { pos.x, pos.y, pos.z, 1 };
-	float colv[] = { color.x, color.y, color.z, 1 };
-
-	glEnable(lt);
-	glLightfv(lt, GL_POSITION, posv);
-	glLightfv(lt, GL_DIFFUSE, colv);
-	glLightfv(lt, GL_SPECULAR, colv);
-}
-
 void app_display()
 {
 	float dt = (float)(time_msec - prev_msec) / 1000.0f;
@@ -419,16 +428,8 @@ void app_display()
 
 static void draw_scene()
 {
-	static const Vec3 lpos[] = { Vec3(-50, 75, 100), Vec3(100, 0, 30), Vec3(-10, -10, 60) };
-	set_light(0, lpos[0], Vec3(1.0, 0.8, 0.7) * 0.8);
-	set_light(1, lpos[1], Vec3(0.6, 0.7, 1.0) * 0.6);
-	set_light(2, lpos[2], Vec3(0.8, 1.0, 0.8) * 0.3);
-
 	rend->draw();
-
-	if(show_blobs) {
-		blobs->draw();
-	}
+	exman->draw();
 
 	/*
 	if(have_handtracking) {
@@ -466,7 +467,6 @@ static void draw_scene()
 		glPushAttrib(GL_ENABLE_BIT);
 		glEnable(GL_BLEND);
 		glBlendFunc(GL_ONE, GL_ONE);
-		glDisable(GL_LIGHTING);
 		glEnable(GL_POLYGON_OFFSET_FILL);
 
 		glUseProgram(0);
@@ -580,6 +580,10 @@ void app_keyboard(int key, bool pressed)
 			goatvr_recenter();
 			show_message("VR recenter\n");
 			break;
+
+		case 'x':
+			exman->load(mscn, "data/exhibits");
+			break;
 		}
 	}
 
@@ -598,6 +602,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);
+				ex_sel = exman->select(ray);
+			}
+		}
+	}
 }
 
 static inline void mouse_look(float dx, float dy)
@@ -630,11 +645,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);
 	}
 }
 
@@ -717,7 +736,7 @@ static void toggle_flight()
 
 static void calc_framerate()
 {
-	static int ncalc;
+	//static int ncalc;
 	static int nframes;
 	static long prev_upd;
 
@@ -735,3 +754,12 @@ static void calc_framerate()
 		++nframes;
 	}
 }
+
+static Ray calc_pick_ray(int x, int y)
+{
+	float nx = (float)x / (float)win_width;
+	float ny = (float)(win_height - y) / (float)win_height;
+
+	last_pick_ray = mouse_pick_ray(nx, ny, view_matrix, proj_matrix);
+	return last_pick_ray;
+}