[Scummvm-cvs-logs] CVS: residual bitmap.cpp,1.14,1.15 driver_gl.cpp,1.3,1.4 engine.cpp,1.14,1.15

[Pawel Kolodziejski]

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

Modified Files:
	bitmap.cpp driver_gl.cpp engine.cpp 
Log Message:
moved frame smush update to more proper place

Index: bitmap.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/bitmap.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- bitmap.cpp	21 Feb 2004 22:00:12 -0000	1.14
+++ bitmap.cpp	24 Feb 2004 07:04:50 -0000	1.15
@@ -20,7 +20,6 @@
 #include <cstring>
 #include "bitmap.h"
 #include "bits.h"
-#include "smush.h"
 #include "debug.h"
 
 #include "driver_gl.h"
@@ -149,13 +148,6 @@
       }
     }
 
-	if (g_smush->isPlaying()) {
-		if (g_smush->isUpdateNeeded()) {
-			g_driver->drawSMUSHframe(g_smush->getX(), g_smush->getY(), g_smush->getWidth(), g_smush->getHeight(), g_smush->getDstPtr());
-			g_smush->setUpdateNeeded();
-		}
-	}
-
     glDisable(GL_SCISSOR_TEST);
     glDisable(GL_TEXTURE_2D);
     glDepthMask(GL_TRUE);

Index: driver_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_gl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- driver_gl.cpp	21 Feb 2004 22:00:13 -0000	1.3
+++ driver_gl.cpp	24 Feb 2004 07:04:50 -0000	1.4
@@ -194,23 +194,23 @@
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
         // prepare view
-//        glMatrixMode(GL_PROJECTION);
-  //      glLoadIdentity();
-    //    glOrtho(0, 640, 480, 0, 0, 1);
- //       glMatrixMode(GL_MODELVIEW);
-   //     glLoadIdentity();
-     //   glMatrixMode(GL_TEXTURE);
-       // glLoadIdentity();
+        glMatrixMode(GL_PROJECTION);
+        glLoadIdentity();
+        glOrtho(0, 640, 480, 0, 0, 1);
+        glMatrixMode(GL_MODELVIEW);
+        glLoadIdentity();
+        glMatrixMode(GL_TEXTURE);
+        glLoadIdentity();
         // A lot more may need to be put there : disabling Alpha test, blending, ...
         // For now, just keep this here :-)
 
-//        glDisable(GL_LIGHTING);
-  //      glEnable(GL_TEXTURE_2D);
+        glDisable(GL_LIGHTING);
+        glEnable(GL_TEXTURE_2D);
 
         // draw
-//        glDisable(GL_DEPTH_TEST);
-//        glDepthMask(GL_FALSE);
-//        glEnable(GL_SCISSOR_TEST);
+        glDisable(GL_DEPTH_TEST);
+        glDepthMask(GL_FALSE);
+        glEnable(GL_SCISSOR_TEST);
 
         offsetY = 480 - offsetY - _height;
         cur_tex_idx = 0;
@@ -234,11 +234,10 @@
                         cur_tex_idx++;
                 }
         }
-//        glDisable(GL_SCISSOR_TEST);
-  //      glDisable(GL_TEXTURE_2D);
-    //    glDepthMask(GL_TRUE);
-  //      glEnable(GL_DEPTH_TEST);
-    //    SDL_GL_SwapBuffers();
+        glDisable(GL_SCISSOR_TEST);
+        glDisable(GL_TEXTURE_2D);
+        glDepthMask(GL_TRUE);
+        glEnable(GL_DEPTH_TEST);
 
         // remove
         glDeleteTextures(num_tex_, tex_ids_);

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/engine.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- engine.cpp	23 Jan 2004 11:10:21 -0000	1.14
+++ engine.cpp	24 Feb 2004 07:04:50 -0000	1.15
@@ -26,6 +26,7 @@
 #include <SDL_timer.h>
 #include <assert.h>
 #include "screen.h"
+#include "smush.h"
 #include "driver_gl.h"
 
 Engine *Engine::instance_ = NULL;
@@ -126,6 +127,13 @@
     if (currScene_ != NULL)
       currScene_->drawBackground();
 
+	if (g_smush->isPlaying()) {
+		if (g_smush->isUpdateNeeded()) {
+			g_driver->drawSMUSHframe(g_smush->getX(), g_smush->getY(), g_smush->getWidth(), g_smush->getHeight(), g_smush->getDstPtr());
+			g_smush->setUpdateNeeded();
+		}
+	}
+
     glEnable(GL_DEPTH_TEST);
     if (currScene_ != NULL)
     currScene_->setupCamera();