Anrdoid : Add option 'Anti-Aliasing'

This commit is contained in:
raven02 2013-07-30 21:18:49 +08:00
parent 08569eafa1
commit 766770a755
7 changed files with 10 additions and 9 deletions

View File

@ -101,7 +101,7 @@ void Config::Load(const char *iniFileName)
graphics->Get("RenderingMode", &iRenderingMode, 1); // default is buffered rendering mode
graphics->Get("HardwareTransform", &bHardwareTransform, true);
graphics->Get("TextureFiltering", &iTexFiltering, 1);
graphics->Get("SSAA", &SSAntiAliasing, 0);
graphics->Get("SSAA", &bAntiAliasing, 0);
graphics->Get("VBO", &bUseVBO, false);
graphics->Get("FrameSkip", &iFrameSkip, 0);
graphics->Get("FrameRate", &iFpsLimit, 0);
@ -230,7 +230,7 @@ void Config::Save()
graphics->Set("RenderingMode", iRenderingMode);
graphics->Set("HardwareTransform", bHardwareTransform);
graphics->Set("TextureFiltering", iTexFiltering);
graphics->Set("SSAA", SSAntiAliasing);
graphics->Set("SSAA", bAntiAliasing);
graphics->Set("VBO", bUseVBO);
graphics->Set("FrameSkip", iFrameSkip);
graphics->Set("FrameRate", iFpsLimit);

View File

@ -77,7 +77,7 @@ public:
int iWindowX;
int iWindowY;
int iWindowZoom; // for Windows
bool SSAntiAliasing; // for Windows, too
bool bAntiAliasing; // for Windows, too
bool bVertexCache;
bool bFullScreen;
#ifdef _WIN32

View File

@ -83,7 +83,7 @@ void EmuScreen::bootGame(const std::string &filename) {
coreParam.outputHeight = dp_yres;
coreParam.pixelWidth = pixel_xres;
coreParam.pixelHeight = pixel_yres;
if (g_Config.SSAntiAliasing) {
if (g_Config.bAntiAliasing) {
coreParam.renderWidth *= 2;
coreParam.renderHeight *= 2;
}

View File

@ -204,6 +204,7 @@ void GameSettingsScreen::CreateViews() {
static const char *renderingMode[] = { "Non-Buffered Rendering", "Buffered Rendering", "Read Framebuffers To Memory(GPU)"};
graphicsSettings->Add(new PopupMultiChoice(&g_Config.iRenderingMode, gs->T("Mode"), renderingMode, 0, 3, gs, screenManager()));
#endif
graphicsSettings->Add(new CheckBox(&g_Config.bAntiAliasing, gs->T("Anti-Aliasing")));
graphicsSettings->Add(new ItemHeader(gs->T("Features")));
graphicsSettings->Add(new CheckBox(&g_Config.bHardwareTransform, gs->T("Hardware Transform")));
graphicsSettings->Add(new CheckBox(&g_Config.bVertexCache, gs->T("Vertex Cache")));

View File

@ -948,7 +948,7 @@ void GraphicsScreenP1::render() {
#endif
UICheckBox(GEN_ID, x, y += stride, gs->T("Mipmapping"), ALIGN_TOPLEFT, &g_Config.bMipMap);
UICheckBox(GEN_ID, x, y += stride, gs->T("AA", "Anti-Aliasing"), ALIGN_TOPLEFT, &g_Config.SSAntiAliasing);
UICheckBox(GEN_ID, x, y += stride, gs->T("AA", "Anti-Aliasing"), ALIGN_TOPLEFT, &g_Config.bAntiAliasing);
#ifdef _WIN32
//bool Vsync = g_Config.iVSyncInterval != 0;

View File

@ -186,7 +186,7 @@ namespace MainWindow
// Round up to a zoom factor for the render size.
int zoom = (rc.right - rc.left + 479) / 480;
if (g_Config.SSAntiAliasing) zoom *= 2;
if (g_Config.bAntiAliasing) zoom *= 2;
PSP_CoreParameter().renderWidth = 480 * zoom;
PSP_CoreParameter().renderHeight = 272 * zoom;
PSP_CoreParameter().outputWidth = 480 * zoom;
@ -1007,7 +1007,7 @@ namespace MainWindow
break;
case ID_OPTIONS_SIMPLE2XSSAA:
g_Config.SSAntiAliasing = !g_Config.SSAntiAliasing;
g_Config.bAntiAliasing = !g_Config.bAntiAliasing;
ResizeDisplay(true);
break;
@ -1187,7 +1187,7 @@ namespace MainWindow
CHECKITEM(ID_OPTIONS_SHOWDEBUGSTATISTICS, g_Config.bShowDebugStats);
CHECKITEM(ID_OPTIONS_HARDWARETRANSFORM, g_Config.bHardwareTransform);
CHECKITEM(ID_OPTIONS_FASTMEMORY, g_Config.bFastMemory);
CHECKITEM(ID_OPTIONS_SIMPLE2XSSAA, g_Config.SSAntiAliasing);
CHECKITEM(ID_OPTIONS_SIMPLE2XSSAA, g_Config.bAntiAliasing);
CHECKITEM(ID_OPTIONS_STRETCHDISPLAY, g_Config.bStretchToDisplay);
CHECKITEM(ID_EMULATION_RUNONLOAD, g_Config.bAutoRun);
CHECKITEM(ID_OPTIONS_USEVBO, g_Config.bUseVBO);

View File

@ -407,7 +407,7 @@ BEGIN
MENUITEM "&Vertex Cache", ID_OPTIONS_VERTEXCACHE
MENUITEM "&Stream VBO", ID_OPTIONS_USEVBO
MENUITEM "&MipMapping", ID_OPTIONS_MIPMAP
MENUITEM "2x SSAA", ID_OPTIONS_SIMPLE2XSSAA
MENUITEM "Anti-Aliasing", ID_OPTIONS_SIMPLE2XSSAA
MENUITEM "VS&ync", ID_OPTIONS_VSYNC
MENUITEM SEPARATOR
MENUITEM "Show &FPS", ID_OPTIONS_SHOWFPS