Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-30 03:23:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Footsteps without view bobbing (#5645)

Browse Source 
* Remove redundant view_bobbing setting

Also fixes bug where disabling view_bobbing disables footstep sounds.

* Removes redundant view_bobbing setting

Setting view_bobbing amount to 0 is now the only way to
turn view_bobbing on and off. Also fixed a bug where footstep
sounds would not play when view_bobbing was disabled.
This commit is contained in:
Louis Pearson 2017-04-25 06:11:51 -05:00 committed by Zeno-
parent a7e131f53e
commit db17225a97
39 changed files with 39 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/settingtypes.txt
View File

@ -492,10 +492,7 @@ cloud_height (Cloud height) int 120
# Values larger than 26 will start to produce sharp cutoffs at cloud area corners. # Values larger than 26 will start to produce sharp cutoffs at cloud area corners.
cloud_radius (Cloud radius) int 12 cloud_radius (Cloud radius) int 12
# Enables view bobbing when walking. # Enable view bobbing and amount of view bobbing.
view_bobbing (Enable view bobbing) bool true
# Multiplier for view bobbing.
# For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double. # For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double.
view_bobbing_amount (View bobbing factor) float 1.0 view_bobbing_amount (View bobbing factor) float 1.0

7
minetest.conf.example
View File

@ -569,11 +569,7 @@
# type: int # type: int
# cloud_radius = 12 # cloud_radius = 12
# Enables view bobbing when walking. # Enable view bobbing and amount of view bobbing.
# type: bool
# view_bobbing = true
# Multiplier for view bobbing.
# For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double. # For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double.
# type: float # type: float
# view_bobbing_amount = 1.0 # view_bobbing_amount = 1.0
@ -1815,4 +1811,3 @@
# Print the engine's profiling data in regular intervals (in seconds). 0 = disable. Useful for developers. # Print the engine's profiling data in regular intervals (in seconds). 0 = disable. Useful for developers.
# type: int # type: int
# profiler_print_interval = 0 # profiler_print_interval = 0

2
po/be/minetest.po
View File

@ -3670,7 +3670,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""
"Множнік калыхання пры праглядзе.\n" "Множнік калыхання пры праглядзе.\n"

2
po/ca/minetest.po
View File

@ -3465,7 +3465,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/cs/minetest.po
View File

@ -3383,7 +3383,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/da/minetest.po
View File

@ -3663,7 +3663,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/de/minetest.po
View File

@ -3746,7 +3746,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""
"Faktor für Auf- und Abbewegung (grafischer Effekt).\n" "Faktor für Auf- und Abbewegung (grafischer Effekt).\n"

2
po/eo/minetest.po
View File

@ -3387,7 +3387,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/es/minetest.po
View File

@ -3526,7 +3526,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/et/minetest.po
View File

@ -3403,7 +3403,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/fr/minetest.po
View File

@ -3709,7 +3709,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""
"Facteur de mouvement de bras.\n" "Facteur de mouvement de bras.\n"

2
po/he/minetest.po
View File

@ -3301,7 +3301,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/hu/minetest.po
View File

@ -3615,7 +3615,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/id/minetest.po
View File

@ -3580,7 +3580,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/it/minetest.po
View File

@ -3720,7 +3720,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""
"Moltiplicatore per l'ondeggiamento visivo.\n" "Moltiplicatore per l'ondeggiamento visivo.\n"

2
po/ja/minetest.po
View File

@ -3535,7 +3535,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/jbo/minetest.po
View File

@ -3348,7 +3348,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/ko/minetest.po
View File

@ -3507,7 +3507,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""
"화면 흔들림 멀티플라이어\n" "화면 흔들림 멀티플라이어\n"

2
po/ky/minetest.po
View File

@ -3403,7 +3403,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/lt/minetest.po
View File

@ -3383,7 +3383,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/minetest.pot
View File

@ -2279,7 +2279,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/ms/minetest.po
View File

@ -2481,7 +2481,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/nb/minetest.po
View File

@ -3314,7 +3314,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/nl/minetest.po
View File

@ -3719,7 +3719,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""
"Vermenigvuldigingsfactor van loopbeweging.\n" "Vermenigvuldigingsfactor van loopbeweging.\n"

2
po/pl/minetest.po
View File

@ -3674,7 +3674,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/pt/minetest.po
View File

@ -3509,7 +3509,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/pt_BR/minetest.po
View File

@ -3711,7 +3711,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""
"Multiplicador para sacudir a exibição.\n" "Multiplicador para sacudir a exibição.\n"

2
po/ro/minetest.po
View File

@ -3429,7 +3429,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/ru/minetest.po
View File

@ -3628,7 +3628,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/sr_Cyrl/minetest.po
View File

@ -3359,7 +3359,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/sw/minetest.po
View File

@ -3644,7 +3644,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""
"Mengi kwa ajili ya Mwoneko kando.\n" "Mengi kwa ajili ya Mwoneko kando.\n"

2
po/tr/minetest.po
View File

@ -3477,7 +3477,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/uk/minetest.po
View File

@ -3350,7 +3350,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/zh_CN/minetest.po
View File

@ -3421,7 +3421,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""

2
po/zh_TW/minetest.po
View File

@ -3608,7 +3608,7 @@ msgstr ""
#: src/settings_translation_file.cpp #: src/settings_translation_file.cpp
msgid "" msgid ""
"Multiplier for view bobbing.\n" "Enable view bobbing and amount of view bobbing.\n"
"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
msgstr "" msgstr ""
"視野晃動的倍數。\n" "視野晃動的倍數。\n"

9
src/camera.cpp
View File

@ -102,7 +102,6 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
m_cache_view_bobbing_amount = g_settings->getFloat("view_bobbing_amount"); m_cache_view_bobbing_amount = g_settings->getFloat("view_bobbing_amount");
m_cache_fov = g_settings->getFloat("fov"); m_cache_fov = g_settings->getFloat("fov");
m_cache_zoom_fov = g_settings->getFloat("zoom_fov"); m_cache_zoom_fov = g_settings->getFloat("zoom_fov");
m_cache_view_bobbing = g_settings->getBool("view_bobbing");
m_nametags.clear(); m_nametags.clear();
} }
@ -280,8 +279,8 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
v3f rel_cam_target = v3f(0,0,1); v3f rel_cam_target = v3f(0,0,1);
v3f rel_cam_up = v3f(0,1,0); v3f rel_cam_up = v3f(0,1,0);
if (m_view_bobbing_anim != 0 && m_camera_mode < CAMERA_MODE_THIRD) if (m_cache_view_bobbing_amount != 0.0f && m_view_bobbing_anim != 0.0f &&
{ m_camera_mode < CAMERA_MODE_THIRD) {
f32 bobfrac = my_modf(m_view_bobbing_anim * 2); f32 bobfrac = my_modf(m_view_bobbing_anim * 2);
f32 bobdir = (m_view_bobbing_anim < 0.5) ? 1.0 : -1.0; f32 bobdir = (m_view_bobbing_anim < 0.5) ? 1.0 : -1.0;
@ -467,9 +466,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
const bool swimming = (movement_XZ || player->swimming_vertical) && player->in_liquid; const bool swimming = (movement_XZ || player->swimming_vertical) && player->in_liquid;
const bool climbing = movement_Y && player->is_climbing; const bool climbing = movement_Y && player->is_climbing;
if ((walking || swimming || climbing) && if ((walking || swimming || climbing) &&
m_cache_view_bobbing && (!g_settings->getBool("free_move") || !m_client->checkLocalPrivilege("fly"))) {
(!g_settings->getBool("free_move") || !m_client->checkLocalPrivilege("fly")))
{
// Start animation // Start animation
m_view_bobbing_state = 1; m_view_bobbing_state = 1;
m_view_bobbing_speed = MYMIN(speed.getLength(), 70); m_view_bobbing_speed = MYMIN(speed.getLength(), 70);

1
src/camera.h
View File

@ -231,7 +231,6 @@ private:
f32 m_cache_view_bobbing_amount; f32 m_cache_view_bobbing_amount;
f32 m_cache_fov; f32 m_cache_fov;
f32 m_cache_zoom_fov; f32 m_cache_zoom_fov;
bool m_cache_view_bobbing;
std::list<Nametag *> m_nametags; std::list<Nametag *> m_nametags;
}; };

1
src/defaultsettings.cpp
View File

@ -171,7 +171,6 @@ void set_default_settings(Settings *settings)
// Effects // Effects
settings->setDefault("directional_colored_fog", "true"); settings->setDefault("directional_colored_fog", "true");
settings->setDefault("view_bobbing", "true");
settings->setDefault("inventory_items_animations", "false"); settings->setDefault("inventory_items_animations", "false");
settings->setDefault("mip_map", "false"); settings->setDefault("mip_map", "false");
settings->setDefault("anisotropic_filter", "false"); settings->setDefault("anisotropic_filter", "false");

2
src/settings_translation_file.cpp
View File

@ -242,7 +242,7 @@ fake_function() {
gettext("Enable view bobbing"); gettext("Enable view bobbing");
gettext("Enables view bobbing when walking."); gettext("Enables view bobbing when walking.");
gettext("View bobbing factor"); gettext("View bobbing factor");
gettext("Multiplier for view bobbing.\nFor example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."); gettext("Enable view bobbing and amount of view bobbing.\nFor example: 0 for no view bobbing; 1.0 for normal; 2.0 for double.");
gettext("Fall bobbing factor"); gettext("Fall bobbing factor");
gettext("Multiplier for fall bobbing.\nFor example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."); gettext("Multiplier for fall bobbing.\nFor example: 0 for no view bobbing; 1.0 for normal; 2.0 for double.");
gettext("3D mode"); gettext("3D mode");