Partial Stretch: This setting is needed on other devices too.

This commit is contained in:
Sacha 2013-11-28 14:59:17 +10:00
parent 10efbd5457
commit c71186b35a
5 changed files with 2 additions and 12 deletions

View file

@ -184,9 +184,7 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) {
#ifdef _WIN32 #ifdef _WIN32
graphics->Get("FullScreen", &bFullScreen, false); graphics->Get("FullScreen", &bFullScreen, false);
#endif #endif
#ifdef BLACKBERRY graphics->Get("PartialStretch", &bPartialStretch, pixel_xres < 1.3 * pixel_yres);
graphics->Get("PartialStretch", &bPartialStretch, pixel_xres == pixel_yres);
#endif
graphics->Get("StretchToDisplay", &bStretchToDisplay, false); graphics->Get("StretchToDisplay", &bStretchToDisplay, false);
graphics->Get("TrueColor", &bTrueColor, true); graphics->Get("TrueColor", &bTrueColor, true);
graphics->Get("MipMap", &bMipMap, true); graphics->Get("MipMap", &bMipMap, true);

View file

@ -77,9 +77,7 @@ public:
int iRenderingMode; // 0 = non-buffered rendering 1 = buffered rendering 2 = Read Framebuffer to memory (CPU) 3 = Read Framebuffer to memory (GPU) int iRenderingMode; // 0 = non-buffered rendering 1 = buffered rendering 2 = Read Framebuffer to memory (CPU) 3 = Read Framebuffer to memory (GPU)
int iTexFiltering; // 1 = off , 2 = nearest , 3 = linear , 4 = linear(CG) int iTexFiltering; // 1 = off , 2 = nearest , 3 = linear , 4 = linear(CG)
#ifdef BLACKBERRY
bool bPartialStretch; bool bPartialStretch;
#endif
bool bStretchToDisplay; bool bStretchToDisplay;
bool bVSync; bool bVSync;
int iFrameSkip; int iFrameSkip;

View file

@ -79,11 +79,9 @@ void CenterRect(float *x, float *y, float *w, float *h,
*x = 0.0f; *x = 0.0f;
*w = frameW; *w = frameW;
*h = frameW / origRatio; *h = frameW / origRatio;
#ifdef BLACKBERRY
// Stretch a little bit // Stretch a little bit
if (g_Config.bPartialStretch) if (g_Config.bPartialStretch)
*h = (frameH + *h) / 2.0f; // (408 + 720) / 2 = 564 *h = (frameH + *h) / 2.0f; // (408 + 720) / 2 = 564
#endif
*y = (frameH - *h) / 2.0f; *y = (frameH - *h) / 2.0f;
} }
else else

View file

@ -133,11 +133,9 @@ void CenterRect(float *x, float *y, float *w, float *h,
*x = 0.0f; *x = 0.0f;
*w = frameW; *w = frameW;
*h = frameW / origRatio; *h = frameW / origRatio;
#ifdef BLACKBERRY
// Stretch a little bit // Stretch a little bit
if (g_Config.bPartialStretch) if (g_Config.bPartialStretch)
*h = (frameH + *h) / 2.0f; // (408 + 720) / 2 = 564 *h = (frameH + *h) / 2.0f; // (408 + 720) / 2 = 564
#endif
*y = (frameH - *h) / 2.0f; *y = (frameH - *h) / 2.0f;
} else { } else {
// Image is taller than frame. Center horizontally. // Image is taller than frame. Center horizontally.

View file

@ -123,10 +123,8 @@ void GameSettingsScreen::CreateViews() {
graphicsSettings->Add(new CheckBox(&g_Config.bFullScreen, gs->T("FullScreen")))->OnClick.Handle(this, &GameSettingsScreen::OnFullscreenChange); graphicsSettings->Add(new CheckBox(&g_Config.bFullScreen, gs->T("FullScreen")))->OnClick.Handle(this, &GameSettingsScreen::OnFullscreenChange);
#endif #endif
graphicsSettings->Add(new CheckBox(&g_Config.bStretchToDisplay, gs->T("Stretch to Display"))); graphicsSettings->Add(new CheckBox(&g_Config.bStretchToDisplay, gs->T("Stretch to Display")));
#ifdef BLACKBERRY if (pixel_xres < pixel_yres * 1.3) // Smaller than 4:3
if (pixel_xres == pixel_yres)
graphicsSettings->Add(new CheckBox(&g_Config.bPartialStretch, gs->T("Partial Vertical Stretch"))); graphicsSettings->Add(new CheckBox(&g_Config.bPartialStretch, gs->T("Partial Vertical Stretch")));
#endif
graphicsSettings->Add(new CheckBox(&g_Config.bMipMap, gs->T("Mipmapping"))); graphicsSettings->Add(new CheckBox(&g_Config.bMipMap, gs->T("Mipmapping")));
graphicsSettings->Add(new ItemHeader(gs->T("Performance"))); graphicsSettings->Add(new ItemHeader(gs->T("Performance")));