[Scummvm-cvs-logs] CVS: residual driver_gl.cpp,1.1,1.2

James Brown ender at users.sourceforge.net
Tue Jan 27 22:18:59 CET 2004


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

Modified Files:
	driver_gl.cpp 
Log Message:
Fix parameter order


Index: driver_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_gl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- driver_gl.cpp	23 Jan 2004 11:10:21 -0000	1.1
+++ driver_gl.cpp	28 Jan 2004 06:16:33 -0000	1.2
@@ -57,7 +57,7 @@
 
 }
 
-void Driver::setupCamera(float fov, float fclip, float nclip) {
+void Driver::setupCamera(float fov, float nclip, float fclip, float roll) {
   // Set perspective transformation
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
@@ -68,12 +68,13 @@
 
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
-}
 
-void Driver::positionCamera(float roll, Vector3d pos, Vector3d interest) {
   Vector3d up_vec(0, 0, 1);
-
   glRotatef(roll, 0, 0, -1);
+}
+
+void Driver::positionCamera(Vector3d pos, Vector3d interest) {
+  Vector3d up_vec(0, 0, 1);
 
   if (pos.x() == interest.x() && pos.y() == interest.y())
     up_vec = Vector3d(0, 1, 0);
@@ -102,7 +103,7 @@
 }
 
 void Driver::finishActorDraw() {
-	    glPopMatrix();
+    glPopMatrix();
 }
 
 void Driver::drawDepthBitmap(int num, int x, int y, int w, int h, char **data) {
@@ -121,7 +122,7 @@
     */
     for (int row = 0; row < h; row++) {
       glRasterPos2i(x, y + row + 1);
-      glDrawPixels(w, 1, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, data[num] + (2 * row * w));
+//      glDrawPixels(w, 1, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, data[num] + (2 * row * w));
     }
     glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
     glDepthFunc(GL_LESS);





More information about the Scummvm-git-logs mailing list