X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fapp.cc;h=ff95ee134161f98e2aebc7854b5c342ec668e0b9;hb=210e0808f65484b98af436587c46874695cf7453;hp=d126635e4e71ca17a97a180001a80a8cc1c9f6f3;hpb=227256d6c3c633982a7e7bc1dd224c4f43765b42;p=laserbrain_demo

diff --git a/src/app.cc b/src/app.cc
index d126635..ff95ee1 100644
--- a/src/app.cc
+++ b/src/app.cc
@@ -104,7 +104,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,19 +119,21 @@ bool app_init(int argc, char **argv)
 	blobs = new BlobExhibit;
 	blobs->node = new SceneNode;
 	blobs->init();
-	blobs->node->set_position(Vec3(-680, 150, -100));
-	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");