[Scummvm-cvs-logs] SF.net SVN: scummvm:[51599] scummvm/branches/gsoc2010-opengl/backends/ graphics/opengl

[vgvgf at users.sourceforge.net]

Revision: 51599
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51599&view=rev
Author:   vgvgf
Date:     2010-08-01 22:53:18 +0000 (Sun, 01 Aug 2010)

Log Message:
-----------
OPENGL: By default only enable None, Conserve and 4/3 aspect ratio corrections.

Modified Paths:
--------------
    scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/opengl-graphics.cpp
    scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/opengl-graphics.h

Modified: scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/opengl-graphics.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/opengl-graphics.cpp	2010-08-01 22:41:06 UTC (rev 51598)
+++ scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/opengl-graphics.cpp	2010-08-01 22:53:18 UTC (rev 51599)
@@ -1179,7 +1179,11 @@
 	if (_transactionMode == kTransactionActive) {
 		if (ratio == -1)
 			// If -1, switch to next mode
+#ifdef USE_ALL_ASR
 			_videoMode.aspectRatioCorrection = (_videoMode.aspectRatioCorrection + 1) % 5;
+#else
+			_videoMode.aspectRatioCorrection = (_videoMode.aspectRatioCorrection + 1) % 3;
+#endif
 		else
 			_videoMode.aspectRatioCorrection = ratio;
 		_transactionDetails.needHotswap = true;

Modified: scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/opengl-graphics.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/opengl-graphics.h	2010-08-01 22:41:06 UTC (rev 51598)
+++ scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/opengl-graphics.h	2010-08-01 22:53:18 UTC (rev 51599)
@@ -33,6 +33,9 @@
 // Uncomment this to enable the 'on screen display' code.
 #define USE_OSD	1
 
+// Uncomment this to enable all aspect ratio corrections (Will include 16/9 and 16/10)
+//#define USE_ALL_ASR 1
+
 namespace OpenGL {
 // The OpenGL GFX modes. They have to be inside the OpenGL namespace so they
 // do not clash with the SDL GFX modes.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.