[Scummvm-cvs-logs] CVS: residual driver_tinygl.cpp,1.24,1.25

Pawel Kolodziejski aquadran at users.sourceforge.net
Wed Aug 10 14:08:39 CEST 2005


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

Modified Files:
	driver_tinygl.cpp 
Log Message:
partialy lighting with testure mapping mode in tinygl driver

Index: driver_tinygl.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_tinygl.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- driver_tinygl.cpp	10 Aug 2005 14:45:23 -0000	1.24
+++ driver_tinygl.cpp	10 Aug 2005 21:06:54 -0000	1.25
@@ -23,10 +23,6 @@
 #include "tinygl/gl.h"
 #include "tinygl/zgl.h"
 
-// enable define below to turn on lights without texture mapping,
-// TinyGL doesn't support texture mapping with lights currently
-//#define TURN_ON_LIGTHS_WITHOUT_TEXTURES
-
 // func below is from Mesa glu sources
 static void lookAt(TGLfloat eyex, TGLfloat eyey, TGLfloat eyez, TGLfloat centerx,
 		TGLfloat centery, TGLfloat centerz, TGLfloat upx, TGLfloat upy, TGLfloat upz) {
@@ -165,9 +161,7 @@
 }
 
 void DriverTinyGL::startActorDraw(Vector3d pos, float yaw, float pitch, float roll) {
-#ifndef TURN_ON_LIGTHS_WITHOUT_TEXTURES
 	tglEnable(TGL_TEXTURE_2D);
-#endif
 	tglMatrixMode(TGL_MODELVIEW);
 	tglPushMatrix();
 	tglTranslatef(pos.x(), pos.y(), pos.z());





More information about the Scummvm-git-logs mailing list