mirror of
https://github.com/minetest/minetest.git
synced 2024-08-18 20:44:16 +02:00
Gate disabling of fog or camera update behind 'debug' priv
This commit is contained in:
parent
af8cb63292
commit
d748c8c653
@ -381,7 +381,8 @@ crosshair_alpha (Crosshair alpha) int 255 0 255
|
|||||||
|
|
||||||
[**Fog]
|
[**Fog]
|
||||||
|
|
||||||
# Whether to fog out the end of the visible area.
|
# Whether to fog out the end of the visible area. This option only works
|
||||||
|
# with the 'debug' privilege.
|
||||||
enable_fog (Fog) bool true
|
enable_fog (Fog) bool true
|
||||||
|
|
||||||
# Make fog and sky colors depend on daytime (dawn/sunset) and view direction.
|
# Make fog and sky colors depend on daytime (dawn/sunset) and view direction.
|
||||||
@ -2507,10 +2508,10 @@ keymap_toggle_chat (Chat toggle key) key KEY_F2
|
|||||||
# Key for toggling the display of the large chat console.
|
# Key for toggling the display of the large chat console.
|
||||||
keymap_console (Large chat console key) key KEY_F10
|
keymap_console (Large chat console key) key KEY_F10
|
||||||
|
|
||||||
# Key for toggling the display of fog.
|
# Key for toggling the display of fog. Only usable with 'debug' privilege.
|
||||||
keymap_toggle_force_fog_off (Fog toggle key) key KEY_F3
|
keymap_toggle_fog (Fog toggle key) key KEY_F3
|
||||||
|
|
||||||
# Key for toggling the camera update. Only used for development
|
# Key for toggling the camera update. Only usable with 'debug' privilege.
|
||||||
keymap_toggle_update_camera (Camera update toggle key) key
|
keymap_toggle_update_camera (Camera update toggle key) key
|
||||||
|
|
||||||
# Key for toggling the display of debug info.
|
# Key for toggling the display of debug info.
|
||||||
|
@ -818,7 +818,6 @@ protected:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
struct Flags {
|
struct Flags {
|
||||||
bool force_fog_off = false;
|
|
||||||
bool disable_camera_update = false;
|
bool disable_camera_update = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -1899,8 +1898,10 @@ void Game::updateDebugState()
|
|||||||
}
|
}
|
||||||
if (!has_basic_debug)
|
if (!has_basic_debug)
|
||||||
hud->disableBlockBounds();
|
hud->disableBlockBounds();
|
||||||
if (!has_debug)
|
if (!has_debug) {
|
||||||
draw_control->show_wireframe = false;
|
draw_control->show_wireframe = false;
|
||||||
|
m_flags.disable_camera_update = false;
|
||||||
|
}
|
||||||
|
|
||||||
// noclip
|
// noclip
|
||||||
draw_control->allow_noclip = m_cache_enable_noclip && client->checkPrivilege("noclip");
|
draw_control->allow_noclip = m_cache_enable_noclip && client->checkPrivilege("noclip");
|
||||||
@ -2466,12 +2467,18 @@ void Game::toggleMinimap(bool shift_pressed)
|
|||||||
|
|
||||||
void Game::toggleFog()
|
void Game::toggleFog()
|
||||||
{
|
{
|
||||||
bool fog_enabled = g_settings->getBool("enable_fog");
|
bool flag;
|
||||||
g_settings->setBool("enable_fog", !fog_enabled);
|
// do not modify setting if no privilege
|
||||||
if (fog_enabled)
|
if (!client->checkPrivilege("debug")) {
|
||||||
m_game_ui->showTranslatedStatusText("Fog disabled");
|
flag = true;
|
||||||
else
|
} else {
|
||||||
|
flag = !g_settings->getBool("enable_fog");
|
||||||
|
g_settings->setBool("enable_fog", flag);
|
||||||
|
}
|
||||||
|
if (flag)
|
||||||
m_game_ui->showTranslatedStatusText("Fog enabled");
|
m_game_ui->showTranslatedStatusText("Fog enabled");
|
||||||
|
else
|
||||||
|
m_game_ui->showTranslatedStatusText("Fog disabled");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -2525,8 +2532,9 @@ void Game::toggleDebug()
|
|||||||
|
|
||||||
void Game::toggleUpdateCamera()
|
void Game::toggleUpdateCamera()
|
||||||
{
|
{
|
||||||
m_flags.disable_camera_update = !m_flags.disable_camera_update;
|
auto &flag = m_flags.disable_camera_update;
|
||||||
if (m_flags.disable_camera_update)
|
flag = client->checkPrivilege("debug") ? !flag : false;
|
||||||
|
if (flag)
|
||||||
m_game_ui->showTranslatedStatusText("Camera update disabled");
|
m_game_ui->showTranslatedStatusText("Camera update disabled");
|
||||||
else
|
else
|
||||||
m_game_ui->showTranslatedStatusText("Camera update enabled");
|
m_game_ui->showTranslatedStatusText("Camera update enabled");
|
||||||
@ -4222,7 +4230,8 @@ void Game::updateClouds(float dtime)
|
|||||||
camera_node_position.Y = camera_node_position.Y + camera_offset.Y * BS;
|
camera_node_position.Y = camera_node_position.Y + camera_offset.Y * BS;
|
||||||
camera_node_position.Z = camera_node_position.Z + camera_offset.Z * BS;
|
camera_node_position.Z = camera_node_position.Z + camera_offset.Z * BS;
|
||||||
this->clouds->update(camera_node_position, this->sky->getCloudColor());
|
this->clouds->update(camera_node_position, this->sky->getCloudColor());
|
||||||
if (this->clouds->isCameraInsideCloud() && this->m_cache_enable_fog) {
|
bool enable_fog = this->m_cache_enable_fog || !client->checkPrivilege("debug");
|
||||||
|
if (this->clouds->isCameraInsideCloud() && enable_fog) {
|
||||||
// If camera is inside cloud and fog is enabled, use cloud's colors as sky colors.
|
// If camera is inside cloud and fog is enabled, use cloud's colors as sky colors.
|
||||||
video::SColor clouds_dark = this->clouds->getColor().getInterpolated(
|
video::SColor clouds_dark = this->clouds->getColor().getInterpolated(
|
||||||
video::SColor(255, 0, 0, 0), 0.9);
|
video::SColor(255, 0, 0, 0), 0.9);
|
||||||
@ -4282,7 +4291,7 @@ void Game::drawScene(ProfilerGraph *graph, RunStats *stats)
|
|||||||
/*
|
/*
|
||||||
Fog
|
Fog
|
||||||
*/
|
*/
|
||||||
if (this->m_cache_enable_fog) {
|
if (this->m_cache_enable_fog || !client->checkPrivilege("debug")) {
|
||||||
this->driver->setFog(
|
this->driver->setFog(
|
||||||
fog_color,
|
fog_color,
|
||||||
video::EFT_FOG_LINEAR,
|
video::EFT_FOG_LINEAR,
|
||||||
|
@ -172,10 +172,11 @@ void set_default_settings()
|
|||||||
settings->setDefault("keymap_toggle_block_bounds", "");
|
settings->setDefault("keymap_toggle_block_bounds", "");
|
||||||
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_fog", "KEY_F3");
|
|
||||||
#ifndef NDEBUG
|
#ifndef NDEBUG
|
||||||
|
settings->setDefault("keymap_toggle_fog", "KEY_F3");
|
||||||
settings->setDefault("keymap_toggle_update_camera", "KEY_F4");
|
settings->setDefault("keymap_toggle_update_camera", "KEY_F4");
|
||||||
#else
|
#else
|
||||||
|
settings->setDefault("keymap_toggle_fog", "");
|
||||||
settings->setDefault("keymap_toggle_update_camera", "");
|
settings->setDefault("keymap_toggle_update_camera", "");
|
||||||
#endif
|
#endif
|
||||||
settings->setDefault("keymap_toggle_debug", "KEY_F5");
|
settings->setDefault("keymap_toggle_debug", "KEY_F5");
|
||||||
|
Loading…
Reference in New Issue
Block a user