minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Switch F3 to use 'enable_fog' setting

This commit is contained in:
ThomasMonroe314 2018-01-29 11:21:49 -06:00 committed by sfan5
parent e87b410a33
commit 501f936b37
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/inputhandler.cpp
View File

@ -58,7 +58,7 @@ void KeyCache::populate()
key[KeyType::SCREENSHOT] = getKeySetting("keymap_screenshot"); key[KeyType::SCREENSHOT] = getKeySetting("keymap_screenshot");
key[KeyType::TOGGLE_HUD] = getKeySetting("keymap_toggle_hud"); key[KeyType::TOGGLE_HUD] = getKeySetting("keymap_toggle_hud");
key[KeyType::TOGGLE_CHAT] = getKeySetting("keymap_toggle_chat"); key[KeyType::TOGGLE_CHAT] = getKeySetting("keymap_toggle_chat");
key[KeyType::TOGGLE_FORCE_FOG_OFF] = getKeySetting("keymap_toggle_force_fog_off"); key[KeyType::TOGGLE_FOG] = getKeySetting("keymap_toggle_fog");
key[KeyType::TOGGLE_UPDATE_CAMERA] = getKeySetting("keymap_toggle_update_camera"); key[KeyType::TOGGLE_UPDATE_CAMERA] = getKeySetting("keymap_toggle_update_camera");
key[KeyType::TOGGLE_DEBUG] = getKeySetting("keymap_toggle_debug"); key[KeyType::TOGGLE_DEBUG] = getKeySetting("keymap_toggle_debug");
key[KeyType::TOGGLE_PROFILER] = getKeySetting("keymap_toggle_profiler"); key[KeyType::TOGGLE_PROFILER] = getKeySetting("keymap_toggle_profiler");

2
src/client/keys.h
View File

@ -58,7 +58,7 @@ public:
SCREENSHOT, SCREENSHOT,
TOGGLE_HUD, TOGGLE_HUD,
TOGGLE_CHAT, TOGGLE_CHAT,
TOGGLE_FORCE_FOG_OFF, TOGGLE_FOG,
TOGGLE_UPDATE_CAMERA, TOGGLE_UPDATE_CAMERA,
TOGGLE_DEBUG, TOGGLE_DEBUG,
TOGGLE_PROFILER, TOGGLE_PROFILER,

2
src/defaultsettings.cpp
View File

@ -90,7 +90,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("keymap_cinematic", ""); settings->setDefault("keymap_cinematic", "");
settings->setDefault("keymap_toggle_hud", "KEY_F1"); settings->setDefault("keymap_toggle_hud", "KEY_F1");
settings->setDefault("keymap_toggle_chat", "KEY_F2"); settings->setDefault("keymap_toggle_chat", "KEY_F2");
settings->setDefault("keymap_toggle_force_fog_off", "KEY_F3"); settings->setDefault("keymap_toggle_fog", "KEY_F3");
#if DEBUG #if DEBUG
settings->setDefault("keymap_toggle_update_camera", "KEY_F4"); settings->setDefault("keymap_toggle_update_camera", "KEY_F4");
#else #else

12
src/game.cpp
View File

@ -1915,7 +1915,7 @@ void Game::processKeyInput()
toggleMinimap(isKeyDown(KeyType::SNEAK)); toggleMinimap(isKeyDown(KeyType::SNEAK));
} else if (wasKeyDown(KeyType::TOGGLE_CHAT)) { } else if (wasKeyDown(KeyType::TOGGLE_CHAT)) {
m_game_ui->toggleChat(); m_game_ui->toggleChat();
} else if (wasKeyDown(KeyType::TOGGLE_FORCE_FOG_OFF)) { } else if (wasKeyDown(KeyType::TOGGLE_FOG)) {
toggleFog(); toggleFog();
} else if (wasKeyDown(KeyType::TOGGLE_UPDATE_CAMERA)) { } else if (wasKeyDown(KeyType::TOGGLE_UPDATE_CAMERA)) {
toggleUpdateCamera(); toggleUpdateCamera();
@ -2204,8 +2204,9 @@ void Game::toggleMinimap(bool shift_pressed)
void Game::toggleFog() void Game::toggleFog()
{ {
m_flags.force_fog_off = !m_flags.force_fog_off; bool fog_enabled = g_settings->getBool("enable_fog");
if (m_flags.force_fog_off) g_settings->setBool("enable_fog", !fog_enabled);
if (fog_enabled)
m_game_ui->showTranslatedStatusText("Fog disabled"); m_game_ui->showTranslatedStatusText("Fog disabled");
else else
m_game_ui->showTranslatedStatusText("Fog enabled"); m_game_ui->showTranslatedStatusText("Fog enabled");
@ -3672,8 +3673,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime,
camera_node_position.Z = camera_node_position.Z + camera_offset.Z * BS; camera_node_position.Z = camera_node_position.Z + camera_offset.Z * BS;
clouds->update(camera_node_position, clouds->update(camera_node_position,
sky->getCloudColor()); sky->getCloudColor());
if (clouds->isCameraInsideCloud() && m_cache_enable_fog && if (clouds->isCameraInsideCloud() && m_cache_enable_fog) {
!m_flags.force_fog_off) {
// if inside clouds, and fog enabled, use that as sky // if inside clouds, and fog enabled, use that as sky
// color(s) // color(s)
video::SColor clouds_dark = clouds->getColor() video::SColor clouds_dark = clouds->getColor()
@ -3698,7 +3698,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime,
Fog Fog
*/ */
if (m_cache_enable_fog && !m_flags.force_fog_off) { if (m_cache_enable_fog) {
driver->setFog( driver->setFog(
sky->getBgColor(), sky->getBgColor(),
video::EFT_FOG_LINEAR, video::EFT_FOG_LINEAR,