[Scummvm-cvs-logs] CVS: residual driver_gl.cpp,1.32,1.33 driver_tinygl.cpp,1.4,1.5

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv797

Modified Files:
	driver_gl.cpp driver_tinygl.cpp 
Log Message:
added spot light

Index: driver_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_gl.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- driver_gl.cpp	18 Jan 2005 17:34:15 -0000	1.32
+++ driver_gl.cpp	19 Jan 2005 09:24:40 -0000	1.33
@@ -179,6 +179,20 @@
 //		glLightf(GL_LIGHT0 + lightId, GL_SPOT_EXPONENT, 2.0f);
 //		glLightf(GL_LIGHT0 + lightId, GL_LINEAR_ATTENUATION, light->_intensity);
 		glEnable(GL_LIGHT0 + lightId);
+	} else if (strcmp(light->_type.c_str(), "spot")) {
+		lightDir[0] = light->_dir.x();
+		lightDir[1] = light->_dir.y();
+		lightDir[2] = light->_dir.z();
+		lightDir[3] = 0.0f;
+//		glLightfv(GL_LIGHT0 + lightId, GL_AMBIENT, ambientLight);
+		glLightfv(GL_LIGHT0 + lightId, GL_DIFFUSE, diffuseLight);
+		glLightfv(GL_LIGHT0 + lightId, GL_SPECULAR, specularLight);
+		glLightfv(GL_LIGHT0 + lightId, GL_POSITION, lightPos);
+		glLightfv(GL_LIGHT0 + lightId, GL_SPOT_DIRECTION, lightDir);
+//		glLightf(GL_LIGHT0 + lightId, GL_SPOT_CUTOFF, 1.8f);
+//		glLightf(GL_LIGHT0 + lightId, GL_SPOT_EXPONENT, 2.0f);
+//		glLightf(GL_LIGHT0 + lightId, GL_LINEAR_ATTENUATION, light->_intensity);
+		glEnable(GL_LIGHT0 + lightId);
 	} else {
 		error("Scene::setupLights() Unknown type of light: %s", light->_type);
 	}

Index: driver_tinygl.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_tinygl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- driver_tinygl.cpp	18 Jan 2005 17:34:16 -0000	1.4
+++ driver_tinygl.cpp	19 Jan 2005 09:24:40 -0000	1.5
@@ -254,6 +254,20 @@
 //		tglLightf(TGL_LIGHT0 + lightId, TGL_SPOT_EXPONENT, 2.0f);
 //		tglLightf(TGL_LIGHT0 + lightId, TGL_LINEAR_ATTENUATION, light->_intensity);
 		tglEnable(TGL_LIGHT0 + lightId);
+	} else if (strcmp(light->_type.c_str(), "spot")) {
+		lightDir[0] = light->_dir.x();
+		lightDir[1] = light->_dir.y();
+		lightDir[2] = light->_dir.z();
+		lightDir[3] = 0.0f;
+//		tglLightfv(TGL_LIGHT0 + lightId, TGL_AMBIENT, ambientLight);
+		tglLightfv(TGL_LIGHT0 + lightId, TGL_DIFFUSE, diffuseLight);
+		tglLightfv(TGL_LIGHT0 + lightId, TGL_SPECULAR, specularLight);
+		tglLightfv(TGL_LIGHT0 + lightId, TGL_POSITION, lightPos);
+		tglLightfv(TGL_LIGHT0 + lightId, TGL_SPOT_DIRECTION, lightDir);
+//		tglLightf(TGL_LIGHT0 + lightId, TGL_SPOT_CUTOFF, 1.8f);
+//		tglLightf(TGL_LIGHT0 + lightId, TGL_SPOT_EXPONENT, 2.0f);
+//		tglLightf(TGL_LIGHT0 + lightId, TGL_LINEAR_ATTENUATION, light->_intensity);
+		tglEnable(TGL_LIGHT0 + lightId);
 	} else {
 		error("Scene::setupLights() Unknown type of light: %s", light->_type);
 	}