X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fapp.cc;h=6c9f374fd68d93c29c7ea8dd4515d0801747e4f5;hp=46b0152aa84b9883885b3f9c9b083cd618c1af19;hb=9805564225de579d1f3a3d4942f22f08c5a947c0;hpb=e12a327cc0b4f1e59f4a66a80b170ec41ce97be6

diff --git a/src/app.cc b/src/app.cc
index 46b0152..6c9f374 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;
@@ -69,6 +70,8 @@ static ExhibitManager *exman;
 static BlobExhibit *blobs;
 static bool show_blobs;
 
+static ExSelection ex_sel;
+
 static Renderer *rend;
 
 
@@ -141,9 +144,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;
@@ -348,6 +353,8 @@ void app_display()
 	if(debug_gui) {
 		ImGui::GetIOPtr()->DeltaTime = dt;
 		ImGui::NewFrame();
+
+		ImGui::ShowTestWindow();
 	}
 
 	if(opt.vr) {
@@ -423,10 +430,7 @@ static void draw_scene()
 	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) {
@@ -578,6 +582,10 @@ void app_keyboard(int key, bool pressed)
 			goatvr_recenter();
 			show_message("VR recenter\n");
 			break;
+
+		case 'x':
+			exman->load(mscn, "data/exhibits");
+			break;
 		}
 	}
 
@@ -596,6 +604,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)
@@ -628,11 +647,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);
 	}
 }
 
@@ -733,3 +756,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
+}