Update to minetest 5.4.0-dev

1 files changed, 20 insertions, 1 deletions

diff --git a/src/client/camera.h b/src/client/camera.h
index 88de3570a..3a59637bc 100644
--- a/src/client/camera.h
+++ b/src/client/camera.h
@@ -75,6 +75,12 @@ public:
 		return m_camera_position;
 	}
 
+	// Returns the absolute position of the head SceneNode in the world
+	inline v3f getHeadPosition() const
+	{
+		return m_headnode->getAbsolutePosition();
+	}
+
 	// Get the camera direction (in absolute camera coordinates).
 	// This has view bobbing applied.
 	inline v3f getDirection() const
@@ -106,6 +112,9 @@ public:
 		return MYMAX(m_fov_x, m_fov_y);
 	}
 
+	// Notify about new server-sent FOV and initialize smooth FOV transition
+	void notifyFovChange();
+
 	// Checks if the constructor was able to create the scene nodes
 	bool successfullyCreated(std::string &error_message);
 
@@ -180,6 +189,9 @@ private:
 
 	Client *m_client;
 
+	// Default Client FOV (as defined by the "fov" setting)
+	f32 m_cache_fov;
+
 	// Absolute camera position
 	v3f m_camera_position;
 	// Absolute camera direction
@@ -187,6 +199,14 @@ private:
 	// Camera offset
 	v3s16 m_camera_offset;
 
+	// Server-sent FOV variables
+	bool m_server_sent_fov = false;
+	f32 m_curr_fov_degrees, m_old_fov_degrees, m_target_fov_degrees;
+
+	// FOV transition variables
+	bool m_fov_transition_active = false;
+	f32 m_fov_diff, m_transition_time;
+
 	v2f m_wieldmesh_offset = v2f(55.0f, -35.0f);
 	v2f m_arm_dir;
 	v2f m_cam_vel;
@@ -224,7 +244,6 @@ private:
 
 	f32 m_cache_fall_bobbing_amount;
 	f32 m_cache_view_bobbing_amount;
-	f32 m_cache_fov;
 	bool m_arm_inertia;
 
 	std::list<Nametag *> m_nametags;