Merge pull request #2544 from raven02/filtering-ui

Consolildate Texture filtering option
This commit is contained in:
Henrik Rydgård committed 2013-06-30 00:11:12 -07:00
commit f5da5f4cf6
8 files changed
+51 -33

No files matched your search

+2 -6
View File
@@ -98,9 +98,7 @@ void Config::Load(const char *iniFileName)
#endif
graphics->Get("BufferedRendering", &bBufferedRendering, true);
graphics->Get("HardwareTransform", &bHardwareTransform, true);
graphics->Get("NearestFiltering", &bNearestFiltering, false);
graphics->Get("LinearFiltering", &bLinearFiltering, false);
graphics->Get("LinearFilteringCG", &bLinearFilteringCG, false);
graphics->Get("TextureFiltering", &iTexFiltering, false);
graphics->Get("SSAA", &SSAntiAliasing, 0);
graphics->Get("VBO", &bUseVBO, false);
graphics->Get("FrameSkip", &iFrameSkip, 0);
@@ -216,9 +214,7 @@ void Config::Save()
graphics->Set("ResolutionScale", iWindowZoom);
graphics->Set("BufferedRendering", bBufferedRendering);
graphics->Set("HardwareTransform", bHardwareTransform);
graphics->Set("NearestFiltering", bNearestFiltering);
graphics->Set("LinearFiltering", bLinearFiltering);
graphics->Set("LinearFilteringCG", bLinearFilteringCG);
graphics->Set("TextureFiltering", iTexFiltering);
graphics->Set("SSAA", SSAntiAliasing);
graphics->Set("VBO", bUseVBO);
graphics->Set("FrameSkip", iFrameSkip);