From: John Tsiombikas <nuclear@mutantstargoat.com>
Date: Thu, 15 Dec 2016 02:49:47 +0000 (+0200)
Subject: final changes before dropping
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=ld37_one_room;a=commitdiff_plain

final changes before dropping
---

diff --git a/sdr/uber.p.glsl b/sdr/uber.p.glsl
index ee5c0f1..18b2ee7 100644
--- a/sdr/uber.p.glsl
+++ b/sdr/uber.p.glsl
@@ -91,7 +91,7 @@ void main()
 #endif	// USE_CUBEMAP
 
 	vec3 ambient = gl_LightModel.ambient.rgb * KD;
-	gl_FragColor.rgb = ambient + diffuse + specular;
+	gl_FragColor.rgb = ambient + diffuse;// + specular;
 #ifdef USE_TEXMAP
 	gl_FragColor.a = gl_FrontMaterial.diffuse.a * texel.a;
 #else
diff --git a/src/app.cc b/src/app.cc
index fbd8609..c98b779 100644
--- a/src/app.cc
+++ b/src/app.cc
@@ -356,8 +356,8 @@ static void draw_scene()
 {
 	static const Vec3 lpos[] = { Vec3(-50, 75, 100), Vec3(100, 0, 30), Vec3(-10, -10, 60) };
 	set_light(0, lpos[0], Vec3(1.0, 0.8, 0.7) * 0.8);
-	//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);
+	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();
 	if(show_blobs) {
@@ -602,7 +602,6 @@ static void calc_framerate()
 
 static void prebake_shaders()
 {
-	/*
 	unsigned int prog;
 
 	uber_clear();
@@ -618,5 +617,4 @@ static void prebake_shaders()
 	}
 
 	uber_clear();
-	*/
 }