X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fapp.cc;h=6eb019aad7e3f47a3a1a09e8e08eaa18708fa566;hp=9e5eba30b240de9107654593e30793d9338293a3;hb=aed19512e3602d68e6316429695a244ad3a4cfaf;hpb=26c1717925471539b9745cce6275b218a47147cd

diff --git a/src/app.cc b/src/app.cc
index 9e5eba3..6eb019a 100644
--- a/src/app.cc
+++ b/src/app.cc
@@ -13,12 +13,16 @@
 #include "ui.h"
 #include "opt.h"
 #include "post.h"
+#include "renderer.h"
+#include "exman.h"
+#include "blob_exhibit.h"
 
 #define NEAR_CLIP	5.0
 #define FAR_CLIP	10000.0
 
 static void draw_scene();
 static void toggle_flight();
+static void calc_framerate();
 
 long time_msec;
 int win_width, win_height;
@@ -32,7 +36,7 @@ SceneSet sceneman;
 unsigned int sdr_ltmap, sdr_ltmap_notex;
 
 static float cam_dist = 0.0;
-static float cam_theta, cam_phi = 20;
+static float cam_theta, cam_phi;
 static Vec3 cam_pos;
 static float floor_y;	// last floor height
 static float user_eye_height = 165;
@@ -50,12 +54,20 @@ static bool gpad_bnstate[64];
 static Vec2 joy_move, joy_look;
 static float joy_deadzone = 0.01;
 
+static float framerate;
+
 static Mat4 view_matrix, mouse_view_matrix, proj_matrix;
 static MetaScene *mscn;
 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)
 {
@@ -97,7 +109,7 @@ 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);
 
 	mscn = new MetaScene;
 	if(!mscn->load(opt.scenefile ? opt.scenefile : "data/museum.scene")) {
@@ -105,22 +117,43 @@ bool app_init(int argc, char **argv)
 	}
 
 	cam_pos = mscn->start_pos;
-	// TODO use start_rot
+	Vec3 dir = rotate(Vec3(0, 0, 1), mscn->start_rot);
+	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(-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) {
@@ -136,6 +169,10 @@ void app_cleanup()
 		goatvr_shutdown();
 	}
 
+	delete rend;
+
+	delete exman;
+
 	texman.clear();
 	sceneman.clear();
 }
@@ -164,6 +201,7 @@ static void update(float dt)
 	sceneman.update();
 
 	mscn->update(dt);
+	exman->update(dt);
 
 	float speed = walk_speed * dt;
 	Vec3 dir;
@@ -317,6 +355,8 @@ void app_display()
 		app_swap_buffers();
 	}
 	assert(glGetError() == GL_NO_ERROR);
+
+	calc_framerate();
 }
 
 
@@ -327,7 +367,11 @@ 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();
+	}
 
 	if(show_walk_mesh && mscn->walk_mesh) {
 		glPushAttrib(GL_ENABLE_BIT);
@@ -349,6 +393,7 @@ static void draw_scene()
 		glPopAttrib();
 	}
 
+	print_text(Vec2(9 * win_width / 10, 20), Vec3(1, 1, 0), "fps: %.1f", framerate);
 	draw_ui();
 }
 
@@ -425,6 +470,16 @@ void app_keyboard(int key, bool pressed)
 			mouse_speed *= 0.8;
 			show_message("mouse speed: %g", mouse_speed);
 			break;
+
+		case 'b':
+			show_blobs = !show_blobs;
+			show_message("blobs: %s\n", show_blobs ? "on" : "off");
+			break;
+
+		case ' ':
+			goatvr_recenter();
+			show_message("VR recenter\n");
+			break;
 		}
 	}
 
@@ -511,6 +566,16 @@ void app_gamepad_button(int bn, bool pressed)
 			toggle_flight();
 			break;
 
+		case GPAD_X:
+			show_blobs = !show_blobs;
+			show_message("blobs: %s\n", show_blobs ? "on" : "off");
+			break;
+
+		case GPAD_START:
+			goatvr_recenter();
+			show_message("VR recenter\n");
+			break;
+
 		default:
 			break;
 		}
@@ -532,3 +597,24 @@ static void toggle_flight()
 		show_message("walk mode\n");
 	}
 }
+
+static void calc_framerate()
+{
+	static int ncalc;
+	static int nframes;
+	static long prev_upd;
+
+	long elapsed = time_msec - prev_upd;
+	if(elapsed >= 1000) {
+		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;
+	}
+}