Disable fall bobbing by default; enable using fall_bobbing_amount = 1.0

celeron55 · celeron55 · commit 36747794ab98 · 2013-04-23T23:19:36.000+03:00
diff --git a/minetest.conf.example b/minetest.conf.example
@@ -136,6 +136,8 @@
 #screenshot_path = .
 # Amount of view bobbing (0 = no view bobbing, 1.0 = normal, 2.0 = double)
 #view_bobbing_amount = 1.0
+# Amount of fall bobbing (0 = no fall bobbing, 1.0 = normal, 2.0 = double)
+#fall_bobbing_amount = 0.0
 # Anaglyph stereo
 #anaglyph = false
 #anaglyph_strength = 0.1
diff --git a/src/camera.cpp b/src/camera.cpp
@@ -263,6 +263,8 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize,
 		fall_bobbing = sin(fall_bobbing * 0.5 * M_PI) * -1;
 		// Amplify according to the intensity of the impact
 		fall_bobbing *= (1 - rangelim(50 / player->camera_impact, 0, 1)) * 5;
+
+		fall_bobbing *= g_settings->getFloat("fall_bobbing_amount");
 	}
 
 	// Set head node transformation
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
@@ -107,6 +107,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("enable_clouds", "true");
 	settings->setDefault("screenshot_path", ".");
 	settings->setDefault("view_bobbing_amount", "1.0");
+	settings->setDefault("fall_bobbing_amount", "0.0");
 	settings->setDefault("enable_3d_clouds", "true");
 	settings->setDefault("cloud_height", "120");
 	settings->setDefault("menu_clouds", "true");

Original file line number	Diff line number	Diff line change
`@@ -263,6 +263,8 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize,`
`263`	`263`	`fall_bobbing = sin(fall_bobbing * 0.5 * M_PI) * -1;`
`264`	`264`	`// Amplify according to the intensity of the impact`
`265`	`265`	`fall_bobbing = (1 - rangelim(50 / player->camera_impact, 0, 1)) 5;`
	`266`	`+`
	`267`	`+ fall_bobbing *= g_settings->getFloat("fall_bobbing_amount");`
`266`	`268`	`}`
`267`	`269`
`268`	`270`	`// Set head node transformation`