X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fapp.cc;h=1cf21bd27914dde7cf159c05b20566aa046510a8;hb=51fde62020614e8d942f28572efe1ba4fefd6a50;hp=e135ddfddc5bf2ea17b8f22a0178dbee63377237;hpb=e6e1e5deb60ccbb4fa175066820d81ad1bf1cefa;p=laserbrain_demo

diff --git a/src/app.cc b/src/app.cc
index e135ddf..1cf21bd 100644
--- a/src/app.cc
+++ b/src/app.cc
@@ -13,6 +13,7 @@
 #include "ui.h"
 #include "opt.h"
 #include "post.h"
+#include "renderer.h"
 #include "blob_exhibit.h"
 
 #define NEAR_CLIP	5.0
@@ -63,6 +64,8 @@ static long prev_msec;
 static BlobExhibit *blobs;
 static bool show_blobs;
 
+static Renderer *rend;
+
 
 bool app_init(int argc, char **argv)
 {
@@ -104,7 +107,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")) {
@@ -119,24 +122,29 @@ bool app_init(int argc, char **argv)
 	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);
 
 	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) {
@@ -152,6 +160,8 @@ void app_cleanup()
 		goatvr_shutdown();
 	}
 
+	delete rend;
+
 	blobs->destroy();
 	delete blobs->node;
 	delete blobs;
@@ -352,7 +362,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 +470,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 +566,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;
 		}
@@ -584,10 +605,10 @@ static void calc_framerate()
 		nframes = 1;
 		prev_upd = time_msec;
 
-		if(++ncalc >= 5) {
+		/*if(++ncalc >= 5) {
 			printf("fps: %f\n", framerate);
 			ncalc = 0;
-		}
+		}*/
 	} else {
 		++nframes;
 	}