[Scummvm-cvs-logs] CVS: residual driver_gl.cpp,1.30,1.31
Pawel Kolodziejski
aquadran at users.sourceforge.net
Tue Jan 18 09:33:20 CET 2005
Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27464
Modified Files:
driver_gl.cpp
Log Message:
ops (again)
Index: driver_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_gl.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- driver_gl.cpp 18 Jan 2005 17:28:02 -0000 1.30
+++ driver_gl.cpp 18 Jan 2005 17:32:44 -0000 1.31
@@ -370,7 +370,6 @@
}
void DriverGL::selectMaterial(const Material *material) {
-return;
GLuint *textures;
textures = (GLuint *)material->_textures;
glBindTexture(GL_TEXTURE_2D, textures[material->_currImage]);
@@ -488,8 +487,6 @@
int curTexIdx = 0;
for (int y = 0; y < _smushHeight; y += BITMAP_TEXTURE_SIZE) {
for (int x = 0; x < _smushWidth; x += BITMAP_TEXTURE_SIZE) {
-// int t_width = (x + BITMAP_TEXTURE_SIZE >= _smushWidth) ? (_smushWidth - x) : BITMAP_TEXTURE_SIZE;
-// int t_height = (y + BITMAP_TEXTURE_SIZE >= _smushHeight) ? (_smushHeight - y) : BITMAP_TEXTURE_SIZE;
glBindTexture(GL_TEXTURE_2D, _smushTexIds[curTexIdx]);
glBegin(GL_QUADS);
glTexCoord2f(0, 0);
More information about the Scummvm-git-logs
mailing list