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

Applied video updates to SDL driver.

This commit is contained in:
mjbudd77 2021-05-29 22:02:00 -04:00
parent 96c569a652
commit 3788dc872e
1 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/drivers/Qt/ConsoleViewerSDL.cpp
View File

@ -121,20 +121,28 @@ void ConsoleViewSDL_t::setLinearFilterEnable( bool ena )
void ConsoleViewSDL_t::setScaleXY( double xs, double ys ) void ConsoleViewSDL_t::setScaleXY( double xs, double ys )
{ {
float xyRatio = (float)nes_shm->video.xyRatio; //float xyRatio = (float)nes_shm->video.xyRatio;
xscale = xs; xscale = xs;
yscale = ys; yscale = ys;
if ( forceAspect ) if ( forceAspect )
{ {
if ( (xscale*xyRatio) < yscale ) //if ( (xscale*xyRatio) < yscale )
//{
// yscale = (xscale*xyRatio);
//}
//else
//{
// xscale = (yscale/xyRatio);
//}
if ( xscale < yscale )
{ {
yscale = (xscale*xyRatio); yscale = xscale;
} }
else else
{ {
xscale = (yscale/xyRatio); xscale = yscale;
} }
} }
} }
@ -419,27 +427,42 @@ void ConsoleViewSDL_t::render(void)
{ {
int nesWidth = GL_NES_WIDTH; int nesWidth = GL_NES_WIDTH;
int nesHeight = GL_NES_HEIGHT; int nesHeight = GL_NES_HEIGHT;
float xyRatio = 1.0; //float xyRatio = 1.0;
float ixScale = 1.0;
float iyScale = 1.0;
if ( nes_shm != NULL ) if ( nes_shm != NULL )
{ {
nesWidth = nes_shm->video.ncol; nesWidth = nes_shm->video.ncol;
nesHeight = nes_shm->video.nrow; nesHeight = nes_shm->video.nrow;
xyRatio = (float)nes_shm->video.xyRatio; //xyRatio = (float)nes_shm->video.xyRatio;
ixScale = (float)nes_shm->video.xscale;
iyScale = (float)nes_shm->video.yscale;
} }
//printf(" %i x %i \n", nesWidth, nesHeight ); //printf(" %i x %i \n", nesWidth, nesHeight );
float xscaleTmp = (float)view_width / (float)nesWidth; float xscaleTmp = (float)view_width / (float)nesWidth;
float yscaleTmp = (float)view_height / (float)nesHeight; float yscaleTmp = (float)view_height / (float)nesHeight;
xscaleTmp *= ixScale;
yscaleTmp *= iyScale;
if ( forceAspect ) if ( forceAspect )
{ {
if ( (xscaleTmp*xyRatio) < yscaleTmp ) //if ( (xscaleTmp*xyRatio) < yscaleTmp )
//{
// yscaleTmp = (xscaleTmp*xyRatio);
//}
//else
//{
// xscaleTmp = (yscaleTmp/xyRatio);
//}
if ( xscaleTmp < yscaleTmp )
{ {
yscaleTmp = (xscaleTmp*xyRatio); yscaleTmp = xscaleTmp;
} }
else else
{ {
xscaleTmp = (yscaleTmp/xyRatio); xscaleTmp = yscaleTmp;
} }
} }
@ -460,8 +483,8 @@ void ConsoleViewSDL_t::render(void)
} }
} }
rw=(int)(nesWidth*xscaleTmp); rw=(int)(nesWidth*xscaleTmp/ixScale);
rh=(int)(nesHeight*yscaleTmp); rh=(int)(nesHeight*yscaleTmp/iyScale);
if ( forceAspect ) if ( forceAspect )
{ {