MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
Code Issues Projects Releases Wiki Activity

Move 'aspect' setting from 'video' section to 'frameBufferEmulation'.

Browse Source
This commit is contained in:
Sergey Lipskiy 2015-02-03 14:41:38 +06:00
parent 64d97e72e0
commit 6afd0d922b
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Config.h
View File

@ -13,8 +13,8 @@ struct Config
u32 fullscreen;
u32 fullscreenWidth, fullscreenHeight, windowedWidth, windowedHeight;
u32 fullscreenBits, fullscreenRefresh;
u32 multisampling, verticalSync;
u32 aspect; // 0: stretch ; 1: 4/3 ; 2: 16/9
u32 multisampling, anisotropic;
u32 verticalSync;
} video;
struct
@ -39,6 +39,7 @@ struct Config
u32 copyFromRDRAM;
u32 ignoreCFB;
u32 N64DepthCompare;
u32 aspect; // 0: stretch ; 1: 4/3 ; 2: 16/9
} frameBufferEmulation;
struct

2
OpenGL.cpp
View File

@ -188,7 +188,7 @@ void OGLVideo::updateScale()
void OGLVideo::_setBufferSize()
{
if (config.frameBufferEmulation.enable) {
switch (config.video.aspect) {
switch (config.frameBufferEmulation.aspect) {
case 0: // stretch
m_width = m_screenWidth;
m_height = m_screenHeight;

2
mupenplus/Config_mupenplus.cpp
View File

@ -137,7 +137,7 @@ void Config_LoadConfig()
config.video.verticalSync = ConfigGetParamBool(g_configVideoGeneral, "VerticalSync");
config.video.multisampling = ConfigGetParamInt(g_configVideoGliden64, "MultiSampling");
config.video.aspect = ConfigGetParamInt(g_configVideoGliden64, "AspectRatio");
config.frameBufferEmulation.aspect = ConfigGetParamInt(g_configVideoGliden64, "AspectRatio");
//#Texture Settings
config.texture.forceBilinear = ConfigGetParamBool(g_configVideoGliden64, "ForceBilinear");

2
windows/Config_windows.cpp
View File

@ -110,7 +110,7 @@ void Config_LoadConfig()
config.generalEmulation.enableHWLighting = FALSE;
}
config.video.aspect = 1;
config.frameBufferEmulation.aspect = 1;
// manually set frame bufer emulation options
config.frameBufferEmulation.copyToRDRAM = FALSE;
config.frameBufferEmulation.copyFromRDRAM = FALSE;