MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-06-25 22:09:35 +00:00
Code Issues Projects Releases Wiki Activity

Remove enableFog config option, since it has no use anymore.

Browse Source
This commit is contained in:
Sergey Lipskiy 2016-04-24 19:30:41 +06:00
parent 0e24e6d1e8
commit f48895c012
6 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Config.cpp
View File

@ -29,7 +29,6 @@ void Config::resetToDefaults()
texture.maxBytes = 500 * gc_uMegabyte;
texture.screenShotFormat = 0;
generalEmulation.enableFog = 1;
generalEmulation.enableLOD = 1;
generalEmulation.enableNoise = 1;
generalEmulation.enableHWLighting = 0;

3
src/Config.h
View File

@ -4,7 +4,7 @@
#include <string>
#include "Types.h"
#define CONFIG_VERSION_CURRENT 8U
#define CONFIG_VERSION_CURRENT 9U
#define BILINEAR_3POINT 0
#define BILINEAR_STANDARD 1
@ -42,7 +42,6 @@ struct Config
};
struct {
u32 enableFog;
u32 enableNoise;
u32 enableLOD;
u32 enableHWLighting;

2
src/GLideNUI/ConfigDialog.cpp
View File

@ -113,7 +113,6 @@ void ConfigDialog::_init()
// Emulation settings
ui->emulateLodCheckBox->setChecked(config.generalEmulation.enableLOD != 0);
ui->emulateNoiseCheckBox->setChecked(config.generalEmulation.enableNoise != 0);
ui->emulateFogCheckBox->setChecked(config.generalEmulation.enableFog != 0);
ui->enableHWLightingCheckBox->setChecked(config.generalEmulation.enableHWLighting != 0);
ui->enableShadersStorageCheckBox->setChecked(config.generalEmulation.enableShadersStorage != 0);
ui->customSettingsCheckBox->setChecked(config.generalEmulation.enableCustomSettings != 0);
@ -316,7 +315,6 @@ void ConfigDialog::accept()
// Emulation settings
config.generalEmulation.enableLOD = ui->emulateLodCheckBox->isChecked() ? 1 : 0;
config.generalEmulation.enableNoise = ui->emulateNoiseCheckBox->isChecked() ? 1 : 0;
config.generalEmulation.enableFog = ui->emulateFogCheckBox->isChecked() ? 1 : 0;
config.generalEmulation.enableHWLighting = ui->enableHWLightingCheckBox->isChecked() ? 1 : 0;
config.generalEmulation.enableShadersStorage = ui->enableShadersStorageCheckBox->isChecked() ? 1 : 0;
config.generalEmulation.enableCustomSettings = ui->customSettingsCheckBox->isChecked() ? 1 : 0;

2
src/GLideNUI/Settings.cpp
View File

@ -36,7 +36,6 @@ void _loadSettings(QSettings & settings)
settings.endGroup();
settings.beginGroup("generalEmulation");
config.generalEmulation.enableFog = settings.value("enableFog", config.generalEmulation.enableFog).toInt();
config.generalEmulation.enableNoise = settings.value("enableNoise", config.generalEmulation.enableNoise).toInt();
config.generalEmulation.enableLOD = settings.value("enableLOD", config.generalEmulation.enableLOD).toInt();
config.generalEmulation.enableHWLighting = settings.value("enableHWLighting", config.generalEmulation.enableHWLighting).toInt();
@ -152,7 +151,6 @@ void writeSettings(const QString & _strIniFolder)
settings.endGroup();
settings.beginGroup("generalEmulation");
settings.setValue("enableFog", config.generalEmulation.enableFog);
settings.setValue("enableNoise", config.generalEmulation.enableNoise);
settings.setValue("enableLOD", config.generalEmulation.enableLOD);
settings.setValue("enableHWLighting", config.generalEmulation.enableHWLighting);

18
src/GLideNUI/configDialog.ui
View File

@ -696,16 +696,6 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="emulateFogCheckBox">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Fog emulation:&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Sets fog emulation on//off.&lt;/p&gt;&lt;p&gt;[Recommended: &lt;span style=&quot; font-style:italic;&quot;&gt;on&lt;/span&gt;]&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Emulate fog</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="enableHWLightingCheckBox">
<property name="text">
@ -1861,10 +1851,10 @@
</connections>
<buttongroups>
<buttongroup name="screenshotButtonGroup"/>
<buttongroup name="aspectButtonGroup"/>
<buttongroup name="bilinearButtonGroup"/>
<buttongroup name="copyFrameBufferButtonGroup"/>
<buttongroup name="bloomBlendModeButtonGroup"/>
<buttongroup name="fixTexrectCoordsButtonGroup"/>
<buttongroup name="bilinearButtonGroup"/>
<buttongroup name="bloomBlendModeButtonGroup"/>
<buttongroup name="aspectButtonGroup"/>
<buttongroup name="copyFrameBufferButtonGroup"/>
</buttongroups>
</ui>

3
src/mupenplus/Config_mupenplus.cpp
View File

@ -62,8 +62,6 @@ bool Config_SetDefault()
res = ConfigSetDefaultInt(g_configVideoGliden64, "CacheSize", config.texture.maxBytes / uMegabyte, "Size of texture cache in megabytes. Good value is VRAM*3/4");
assert(res == M64ERR_SUCCESS);
//#Emulation Settings
res = ConfigSetDefaultBool(g_configVideoGliden64, "EnableFog", config.generalEmulation.enableFog, "Enable fog emulation.");
assert(res == M64ERR_SUCCESS);
res = ConfigSetDefaultBool(g_configVideoGliden64, "EnableNoise", config.generalEmulation.enableNoise, "Enable color noise emulation.");
assert(res == M64ERR_SUCCESS);
res = ConfigSetDefaultBool(g_configVideoGliden64, "EnableLOD", config.generalEmulation.enableLOD, "Enable LOD emulation.");
@ -199,7 +197,6 @@ void Config_LoadConfig()
config.texture.maxAnisotropy = ConfigGetParamInt(g_configVideoGliden64, "MaxAnisotropy");
config.texture.maxBytes = ConfigGetParamInt(g_configVideoGliden64, "CacheSize") * uMegabyte;
//#Emulation Settings
config.generalEmulation.enableFog = ConfigGetParamBool(g_configVideoGliden64, "EnableFog");
config.generalEmulation.enableNoise = ConfigGetParamBool(g_configVideoGliden64, "EnableNoise");
config.generalEmulation.enableLOD = ConfigGetParamBool(g_configVideoGliden64, "EnableLOD");
config.generalEmulation.enableHWLighting = ConfigGetParamBool(g_configVideoGliden64, "EnableHWLighting");