From eb987e1fa262a8db83367bd54954b142ba0da406 Mon Sep 17 00:00:00 2001
From: gmueller <devnull@localhost>
Date: Mon, 10 Jan 2011 21:44:38 +0100
Subject: [PATCH] fixed lighting

---
 src/game.cpp |  2 --
 src/main.cpp | 27 +++++++++++++++------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 7b24a79..f0dfd3b 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -4,8 +4,6 @@
 #include <math.h>
 #include <stdlib.h>
 
-#include "MersenneTwister.h"
-
 double rand2() {
 	float u = (float) rand() / (float) RAND_MAX;
 	return 2.0 * (u - 0.5);
diff --git a/src/main.cpp b/src/main.cpp
index cc6b335..7595bfb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,6 +23,20 @@ void key_callback(int key, int state) {
 
 }
 
+void setup_light() {
+	GLfloat LightAmbient[] = { 0.1f, 0.1f, 0.1f, 1.0f };
+	GLfloat LightDiffuse[] = { 0.8f, 0.8f, 0.8f, 1.0f };
+	GLfloat LightPosition[] = { 1.0f, 1.0f, 1.0f, 0.0f };
+
+	// setup directional light
+	glLightfv(GL_LIGHT0, GL_AMBIENT, LightAmbient);
+	glLightfv(GL_LIGHT0, GL_DIFFUSE, LightDiffuse);
+	glLightfv(GL_LIGHT0, GL_POSITION, LightPosition);
+	glEnable( GL_LIGHT0);
+
+	glEnable( GL_LIGHTING);
+}
+
 void setup_opengl() {
 	// Initialise GLFW
 	if (!glfwInit()) {
@@ -52,17 +66,6 @@ void setup_opengl() {
 	glEnable( GL_DEPTH_TEST);
 	glDepthFunc( GL_LEQUAL);
 
-	GLfloat LightAmbient[] = { 0.1f, 0.1f, 0.1f, 1.0f };
-	GLfloat LightDiffuse[] = { 1.0f, 1.0f, 1.0f, 1.0f };
-	GLfloat LightPosition[] = { 0.0f, 0.0f, 2.0f, 1.0f };
-
-	// setup directional light
-	glLightfv(GL_LIGHT1, GL_AMBIENT, LightAmbient);
-	glLightfv(GL_LIGHT1, GL_DIFFUSE, LightDiffuse);
-	glLightfv(GL_LIGHT1, GL_POSITION, LightPosition);
-	glEnable( GL_LIGHT1);
-	glEnable( GL_LIGHTING);
-
 	// Enable vertical sync (on cards that support it)
 	glfwSwapInterval(1);
 }
@@ -672,7 +675,7 @@ void Application::update() {
 	}
 
 	prepareFrame(rx, ry, rz);
-
+	setup_light();
 	glEnable( GL_LIGHT0);
 	glEnable( GL_LIGHTING);
 	glEnable( GL_CULL_FACE);