ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated 'A-Team' PAL60 ROM properties. 

Fixed graphics corruption when toggling phosphor mode in OpenGL.

Made ROM launcher and debugger ignore the 'gl_fsmax' argument in
fullscreen mode, since it only scaled the text and made it hard to read.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1273 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2007-01-07 17:59:52 +00:00
parent c5bab0e56a
commit ff7595603e
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
stella/src/common/FrameBufferGL.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: FrameBufferGL.cxx,v 1.83 2007-01-05 17:54:06 stephena Exp $
// $Id: FrameBufferGL.cxx,v 1.84 2007-01-07 17:59:48 stephena Exp $
//============================================================================
#ifdef DISPLAY_OPENGL
@ -574,6 +574,8 @@ void FrameBufferGL::enablePhosphor(bool enable, int blend)
{
myUsePhosphor = enable;
myPhosphorBlend = blend;
theRedrawTIAIndicator = true;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -701,8 +703,13 @@ void FrameBufferGL::setDimensions(GLdouble* orthoWidth, GLdouble* orthoHeight)
float scaleX = 0.0f;
float scaleY = 0.0f;
if(myOSystem->settings().getBool("gl_fsmax") &&
myDesktopDim.w != 0 && myDesktopDim.h != 0)
// When in a fullscreen, most text mode, attempt to do 'nice' scaling
// This means scaling will only use integral values (1, 2, 3, ...)
bool gl_fsmax = myOSystem->settings().getBool("gl_fsmax");
bool nicescale = myOSystem->eventHandler().state() == EventHandler::S_LAUNCHER ||
myOSystem->eventHandler().state() == EventHandler::S_DEBUGGER;
if(gl_fsmax && myDesktopDim.w != 0 && myDesktopDim.h != 0)
{
// Use the largest available screen size
myScreenDim.w = myDesktopDim.w;
@ -716,11 +723,13 @@ void FrameBufferGL::setDimensions(GLdouble* orthoWidth, GLdouble* orthoHeight)
else
myFSScaleFactor = float(myScreenDim.h) / myImageDim.h;
if(nicescale)
myFSScaleFactor = (int)myFSScaleFactor;
myImageDim.w = (Uint16) (myFSScaleFactor * myImageDim.w);
myImageDim.h = (Uint16) (myFSScaleFactor * myImageDim.h);
}
else if(myOSystem->settings().getBool("gl_fsmax") &&
myScreenmode != (SDL_Rect**) -1)
else if(gl_fsmax && myScreenmode != (SDL_Rect**) -1)
{
// Use the largest available screen size
myScreenDim.w = myScreenmode[0]->w;
@ -734,6 +743,9 @@ void FrameBufferGL::setDimensions(GLdouble* orthoWidth, GLdouble* orthoHeight)
else
myFSScaleFactor = float(myScreenDim.h) / myImageDim.h;
if(nicescale)
myFSScaleFactor = (int)myFSScaleFactor;
myImageDim.w = (Uint16) (myFSScaleFactor * myImageDim.w);
myImageDim.h = (Uint16) (myFSScaleFactor * myImageDim.h);
}

2
stella/src/emucore/DefProps.hxx
View File

@ -449,7 +449,7 @@ static const char* DefProps[][23] = {
{ "bce93984b920e9b56cf24064f740fe78", "Atari", "", "Checkers (32-in-1) (Atari) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "be1922bd8e09d74da471287e1e968653", "", "", "Hangman Pacman Demo (Cropsy) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "bf6b753ec11acfec3b40f8a4c476e77d", "", "", "Image - Girl (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "c02e1afa0671e438fd526055c556d231", "", "", "A-Team, The (Atari) (Prototype) (PAL-60) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "c02e1afa0671e438fd526055c556d231", "", "", "A-Team, The (Atari) (Prototype) (PAL-60) [!]", "", "", "", "", "", "", "", "", "", "", "", "PAL60", "", "", "", "", "", "", "" },
{ "c1fdd44efda916414be3527a47752c75", "Parker Bros", "PB5920", "G.I. Joe - Cobra Strike (1983) (Parker Bros) [!]", "Uses the Paddle (left) and Joystick (right) Controllers", "Uncommon", "", "", "", "", "", "", "PADDLES", "", "", "", "", "", "30", "", "", "", "" },
{ "c2a37f1c7603c5fd97df47d6c562abfa", "", "", "Bar-Score Demo (2001) (Roger Williams)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "c3f53993ade534b0982ca3a286c85bb5", "", "", "Full Screen Bitmap Drawing System (12-02-2003) (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },

1
stella/src/emucore/stella.pro
View File

@ -11431,6 +11431,7 @@
"Cartridge.MD5" "c02e1afa0671e438fd526055c556d231"
"Cartridge.Name" "A-Team, The (Atari) (Prototype) (PAL-60) [!]"
"Display.Format" "PAL60"
""
"Cartridge.MD5" "c00734a2233ef683d9b6e622ac97a5c8"

4
stella/src/gp2x/FrameBufferGP2X.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: FrameBufferGP2X.cxx,v 1.20 2007-01-01 18:04:51 stephena Exp $
// $Id: FrameBufferGP2X.cxx,v 1.21 2007-01-07 17:59:52 stephena Exp $
//============================================================================
#include <SDL.h>
@ -324,6 +324,8 @@ void FrameBufferGP2X::enablePhosphor(bool enable, int blend)
{
myUsePhosphor = enable;
myPhosphorBlend = blend;
theRedrawTIAIndicator = true;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -