X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fapp.cc;h=2927ce867fe37eeba19845360ac9ae166c545032;hp=ca750faef7457577bd91fa4a6978277043cff7a0;hb=b6285d483c8b55a52b6965271a3d3163b2e2f8fa;hpb=004eca3966c8cc7bed607311a90d56eecab1752f

diff --git a/src/app.cc b/src/app.cc
index ca750fa..2927ce8 100644
--- a/src/app.cc
+++ b/src/app.cc
@@ -13,6 +13,9 @@
 #include "ui.h"
 #include "opt.h"
 #include "post.h"
+#include "renderer.h"
+#include "vrinput.h"
+#include "exman.h"
 #include "blob_exhibit.h"
 
 #define NEAR_CLIP	5.0
@@ -43,7 +46,7 @@ static float walk_speed = 300.0f;
 static float mouse_speed = 0.5f;
 static bool show_walk_mesh, noclip = false;
 
-static bool have_headtracking, should_swap;
+static bool have_headtracking, have_handtracking, should_swap;
 
 static int prev_mx, prev_my;
 static bool bnstate[8];
@@ -60,9 +63,12 @@ static unsigned int sdr_post_gamma;
 
 static long prev_msec;
 
+static ExhibitManager *exman;
 static BlobExhibit *blobs;
 static bool show_blobs;
 
+static Renderer *rend;
+
 
 bool app_init(int argc, char **argv)
 {
@@ -83,6 +89,7 @@ bool app_init(int argc, char **argv)
 		should_swap = goatvr_should_swap() != 0;
 		user_eye_height = goatvr_get_eye_height();
 		have_headtracking = goatvr_have_headtracking();
+		have_handtracking = goatvr_have_handtracking();
 
 		goatvr_recenter();
 	}
@@ -104,7 +111,11 @@ bool app_init(int argc, char **argv)
 	float ambient[] = {0.0, 0.0, 0.0, 0.0};
 	glLightModelfv(GL_LIGHT_MODEL_AMBIENT, ambient);
 
-	glClearColor(0.2, 0.2, 0.2, 1.0);
+	glClearColor(1, 1, 1, 1);
+
+	if(!init_vrhands()) {
+		return false;
+	}
 
 	mscn = new MetaScene;
 	if(!mscn->load(opt.scenefile ? opt.scenefile : "data/museum.scene")) {
@@ -116,27 +127,39 @@ bool app_init(int argc, char **argv)
 	dir.y = 0;
 	cam_theta = 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;
 	blobs->init();
-	blobs->node->set_position(Vec3(-250, 150, 250));
-	blobs->node->set_scaling(Vec3(20, 20, 20));
+	blobs->node->set_position(Vec3(-680, 160, -100));
+	blobs->node->set_scaling(Vec3(28, 28, 28));
 	blobs->node->update(0);
 
+	exman->add(blobs);
+
 	if(!(sdr_ltmap_notex = create_program_load("sdr/lightmap.v.glsl", "sdr/lightmap-notex.p.glsl"))) {
 		return false;
 	}
+	set_uniform_int(sdr_ltmap_notex, "texmap", MTL_TEX_DIFFUSE);
+	set_uniform_int(sdr_ltmap_notex, "lightmap", MTL_TEX_LIGHTMAP);
 
 	if(!(sdr_ltmap = create_program_load("sdr/lightmap.v.glsl", "sdr/lightmap-tex.p.glsl"))) {
 		return false;
 	}
-	set_uniform_int(sdr_ltmap, "texmap", 0);
-	set_uniform_int(sdr_ltmap, "lightmap", 1);
+	set_uniform_int(sdr_ltmap, "texmap", MTL_TEX_DIFFUSE);
+	set_uniform_int(sdr_ltmap, "lightmap", MTL_TEX_LIGHTMAP);
 
 	if(!fb_srgb) {
 		sdr_post_gamma = create_program_load("sdr/post_gamma.v.glsl", "sdr/post_gamma.p.glsl");
 	}
 
+	rend = new Renderer;
+	rend->set_scene(mscn);
+
 	glUseProgram(0);
 
 	if(opt.vr || opt.fullscreen) {
@@ -151,10 +174,11 @@ void app_cleanup()
 	if(opt.vr) {
 		goatvr_shutdown();
 	}
+	destroy_vrhands();
 
-	blobs->destroy();
-	delete blobs->node;
-	delete blobs;
+	delete rend;
+
+	delete exman;
 
 	texman.clear();
 	sceneman.clear();
@@ -184,9 +208,7 @@ static void update(float dt)
 	sceneman.update();
 
 	mscn->update(dt);
-	if(show_blobs) {
-		blobs->update(dt);
-	}
+	exman->update(dt);
 
 	float speed = walk_speed * dt;
 	Vec3 dir;
@@ -274,6 +296,11 @@ static void update(float dt)
 	}
 	mouse_view_matrix.pre_rotate_y(deg_to_rad(cam_theta));
 	mouse_view_matrix.pre_translate(-cam_pos.x, -cam_pos.y, -cam_pos.z);
+
+	// update hand-tracking
+	if(have_handtracking) {
+		update_vrhands();
+	}
 }
 
 static void set_light(int idx, const Vec3 &pos, const Vec3 &color)
@@ -313,6 +340,7 @@ void app_display()
 			glLoadMatrixf(view_matrix[0]);
 
 			draw_scene();
+			draw_vrhands();
 		}
 		goatvr_draw_done();
 
@@ -352,7 +380,8 @@ static void draw_scene()
 	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);
 
-	mscn->draw();
+	rend->draw();
+
 	if(show_blobs) {
 		blobs->draw();
 	}
@@ -459,6 +488,11 @@ void app_keyboard(int key, bool pressed)
 			show_blobs = !show_blobs;
 			show_message("blobs: %s\n", show_blobs ? "on" : "off");
 			break;
+
+		case ' ':
+			goatvr_recenter();
+			show_message("VR recenter\n");
+			break;
 		}
 	}
 
@@ -550,6 +584,11 @@ void app_gamepad_button(int bn, bool pressed)
 			show_message("blobs: %s\n", show_blobs ? "on" : "off");
 			break;
 
+		case GPAD_START:
+			goatvr_recenter();
+			show_message("VR recenter\n");
+			break;
+
 		default:
 			break;
 		}
@@ -574,6 +613,7 @@ static void toggle_flight()
 
 static void calc_framerate()
 {
+	static int ncalc;
 	static int nframes;
 	static long prev_upd;
 
@@ -582,6 +622,11 @@ static void calc_framerate()
 		framerate = (float)nframes / (float)(elapsed * 0.001);
 		nframes = 1;
 		prev_upd = time_msec;
+
+		/*if(++ncalc >= 5) {
+			printf("fps: %f\n", framerate);
+			ncalc = 0;
+		}*/
 	} else {
 		++nframes;
 	}