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

Cleaned up dead code.

This commit is contained in:
mjbudd77 2021-05-31 21:00:44 -04:00
parent 842aab44aa
commit bab53e8433
2 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/drivers/Qt/ConsoleViewerGL.cpp
View File

@ -343,21 +343,11 @@ void ConsoleViewGL_t::setLinearFilterEnable( bool ena )
void ConsoleViewGL_t::setScaleXY( double xs, double ys )
{
//float xyRatio = (float)nes_shm->video.xyRatio;
xscale = xs;
yscale = ys;
if ( forceAspect )
{
//if ( (xscale*xyRatio) < yscale )
//{
// yscale = (xscale*xyRatio);
//}
//else
//{
// xscale = (yscale/xyRatio);
//}
if ( xscale < yscale )
{
yscale = xscale;
@ -486,7 +476,6 @@ void ConsoleViewGL_t::paintGL(void)
float ixScale = (float)nes_shm->video.xscale;
float iyScale = (float)nes_shm->video.yscale;
//float xyRatio = (float)nes_shm->video.xyRatio;
float xscaleTmp = (float)(view_width) / (float)(texture_width);
float yscaleTmp = (float)(view_height) / (float)(texture_height);
@ -495,14 +484,6 @@ void ConsoleViewGL_t::paintGL(void)
if ( forceAspect )
{
//if ( (xscaleTmp*xyRatio) < yscaleTmp )
//{
// yscaleTmp = xscaleTmp * xyRatio;
//}
//else
//{
// xscaleTmp = yscaleTmp / xyRatio;
//}
if ( xscaleTmp < yscaleTmp )
{
yscaleTmp = xscaleTmp;

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

@ -126,21 +126,11 @@ void ConsoleViewSDL_t::setLinearFilterEnable( bool ena )
void ConsoleViewSDL_t::setScaleXY( double xs, double ys )
{
//float xyRatio = (float)nes_shm->video.xyRatio;
xscale = xs;
yscale = ys;
if ( forceAspect )
{
//if ( (xscale*xyRatio) < yscale )
//{
// yscale = (xscale*xyRatio);
//}
//else
//{
// xscale = (yscale/xyRatio);
//}
if ( xscale < yscale )
{
yscale = xscale;
@ -317,7 +307,7 @@ void ConsoleViewSDL_t::setCursor(const QCursor &c)
if (pm.format() != QImage::Format_ARGB32)
{
printf("Coverting Image to ARGB32\n");
//printf("Coverting Image to ARGB32\n");
pm = pm.convertToFormat(QImage::Format_ARGB32);
}
@ -358,7 +348,7 @@ void ConsoleViewSDL_t::setCursor(const QCursor &c)
}
else
{
printf("SDL Cursor Initialized at (%i,%i)\n", c.hotSpot().x(), c.hotSpot().y() );
//printf("SDL Cursor Initialized at (%i,%i)\n", c.hotSpot().x(), c.hotSpot().y() );
SDL_SetCursor(sdlCursor);
SDL_ShowCursor( SDL_ENABLE );
}
@ -397,7 +387,7 @@ void ConsoleViewSDL_t::setCursor( Qt::CursorShape s )
}
else
{
printf("SDL System Cursor Initialized\n");
//printf("SDL System Cursor Initialized\n");
SDL_SetCursor(sdlCursor);
}
@ -530,7 +520,6 @@ void ConsoleViewSDL_t::render(void)
{
int nesWidth = GL_NES_WIDTH;
int nesHeight = GL_NES_HEIGHT;
//float xyRatio = 1.0;
float ixScale = 1.0;
float iyScale = 1.0;
@ -538,7 +527,6 @@ void ConsoleViewSDL_t::render(void)
{
nesWidth = nes_shm->video.ncol;
nesHeight = nes_shm->video.nrow;
//xyRatio = (float)nes_shm->video.xyRatio;
ixScale = (float)nes_shm->video.xscale;
iyScale = (float)nes_shm->video.yscale;
}
@ -551,14 +539,6 @@ void ConsoleViewSDL_t::render(void)
if ( forceAspect )
{
//if ( (xscaleTmp*xyRatio) < yscaleTmp )
//{
// yscaleTmp = (xscaleTmp*xyRatio);
//}
//else
//{
// xscaleTmp = (yscaleTmp/xyRatio);
//}
if ( xscaleTmp < yscaleTmp )
{
yscaleTmp = xscaleTmp;