Zoom FOV: Reduce minimum zoom FOV to 7 degrees

paramat · paramat · commit 59fdf57134f6 · 2017-01-23T07:39:58.000Z
The default of 15 is unchanged.
7 degrees is x10 magnification which is common for binoculars.
Alter hardcoded limits in camera.cpp:
Minimum 7 degrees.
Maximum 160 degrees to match upper limits in advanced settings.
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
@@ -440,7 +440,7 @@ fov (Field of view) int 72 30 160
 
 #    Field of view while zooming in degrees.
 #    This requires the "zoom" privilege on the server.
-zoom_fov (Field of view for zoom) int 15 15 160
+zoom_fov (Field of view for zoom) int 15 7 160
 
 #    Adjust the gamma encoding for the light tables. Higher numbers are brighter.
 #    This setting is for the client only and is ignored by the server.
diff --git a/minetest.conf.example b/minetest.conf.example
@@ -502,7 +502,7 @@
 
 #    Field of view while zooming in degrees.
 #    This requires the "zoom" privilege on the server.
-#    type: int min: 15 max: 160
+#    type: int min: 7 max: 160
 # zoom_fov = 15
 
 #    Adjust the gamma encoding for the light tables. Higher numbers are brighter.
diff --git a/src/camera.cpp b/src/camera.cpp
@@ -393,8 +393,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
 	} else {
 		fov_degrees = m_cache_fov;
 	}
-	fov_degrees = MYMAX(fov_degrees, 10.0);
-	fov_degrees = MYMIN(fov_degrees, 170.0);
+	fov_degrees = rangelim(fov_degrees, 7.0, 160.0);
 
 	// FOV and aspect ratio
 	m_aspect = (f32) porting::getWindowSize().X / (f32) porting::getWindowSize().Y;

Original file line number	Diff line number	Diff line change
`@@ -393,8 +393,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,`
`393`	`393`	`} else {`
`394`	`394`	`fov_degrees = m_cache_fov;`
`395`	`395`	`}`
`396`		`- fov_degrees = MYMAX(fov_degrees, 10.0);`
`397`		`- fov_degrees = MYMIN(fov_degrees, 170.0);`
	`396`	`+ fov_degrees = rangelim(fov_degrees, 7.0, 160.0);`
`398`	`397`
`399`	`398`	`// FOV and aspect ratio`
`400`	`399`	`m_aspect = (f32) porting::getWindowSize().X / (f32) porting::getWindowSize().Y;`