[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl-common.cpp,1.92,1.93 sdl-common.h,1.41,1.42 sdl_gl.cpp,1.59,1.60

Max Horn fingolfin at users.sourceforge.net
Sat Oct 4 16:50:01 CEST 2003


Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1:/tmp/cvs-serv28310

Modified Files:
	sdl-common.cpp sdl-common.h sdl_gl.cpp 
Log Message:
revert the 'reverse Y axis' hack

Index: sdl-common.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- sdl-common.cpp	4 Oct 2003 11:50:20 -0000	1.92
+++ sdl-common.cpp	4 Oct 2003 23:49:04 -0000	1.93
@@ -564,13 +564,6 @@
 	event.mouse.x = x;
 	event.mouse.y = y;
 	
-	// FIXME: HACK HACK HACK. This works around an odd problem in the OpenGL
-	// variant of the SDL backend, where the mouse y coordinates are reversed.
-	// Since the OpenGL variants is quite hackish anyway, we have to hard code
-	// here a screen height of 480).
-	if (_mode_flags & DF_REVERSE_Y)
-		event.mouse.y = 480 - event.mouse.y;
-	
 	// Update the "keyboard mouse" coords
 	km.x = event.mouse.x;
 	km.y = event.mouse.y;

Index: sdl-common.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- sdl-common.h	4 Oct 2003 00:12:30 -0000	1.41
+++ sdl-common.h	4 Oct 2003 23:49:04 -0000	1.42
@@ -145,8 +145,7 @@
 
 	enum {
 		DF_WANT_RECT_OPTIM			= 1 << 0,
-		DF_UPDATE_EXPAND_1_PIXEL	= 1 << 1,
-		DF_REVERSE_Y				= 1 << 2
+		DF_UPDATE_EXPAND_1_PIXEL	= 1 << 1
 	};
 
 	bool _forceFull; // Force full redraw on next update_screen

Index: sdl_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl_gl.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- sdl_gl.cpp	4 Oct 2003 11:50:20 -0000	1.59
+++ sdl_gl.cpp	4 Oct 2003 23:49:04 -0000	1.60
@@ -102,7 +102,6 @@
 	switch(_mode) {
 	case GFX_BILINEAR:
 		_usingOpenGL = true;
-		_mode_flags |= DF_REVERSE_Y;
 		_mode = GFX_NORMAL;
 		break;
 
@@ -162,7 +161,6 @@
 	
 	if (_mode != GFX_NORMAL) {
 		_usingOpenGL = false;
-		_mode_flags &= ~DF_REVERSE_Y;
 	}
 
 	//
@@ -642,7 +640,6 @@
 			if (!_usingOpenGL) {
 				_usingOpenGL = true;
 				_mode = GFX_NORMAL;
-				_mode_flags |= DF_REVERSE_Y;
 				_scaleFactor = 1;
 				_scaler_proc = Normal1x;
 				hotswap_gfx_mode();
@@ -663,7 +660,6 @@
 				if (_usingOpenGL) {
 					_glBilinearFilter = false;
 					_usingOpenGL = false;
-					_mode_flags &= ~DF_REVERSE_Y;
 				}
 				
 				hotswap_gfx_mode();





More information about the Scummvm-git-logs mailing list