Noise: Prevent unittest crash caused by division by zero

[oweals/minetest.git] / src / camera.h

diff --git a/src/camera.h b/src/camera.h
index cb0e9686dd7a94aaf93ac11298c8cacdf1967bf9..620e316de676c0c75c8451b29bbfc313daf63640 100644 (file)
--- a/src/camera.h
+++ b/src/camera.h
@@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 class LocalPlayer;
 struct MapDrawControl;
-class IGameDef;
+class Client;
 class WieldMeshSceneNode;
 
 struct Nametag {
@@ -60,26 +60,9 @@ enum CameraMode {CAMERA_MODE_FIRST, CAMERA_MODE_THIRD, CAMERA_MODE_THIRD_FRONT};
 class Camera
 {
 public:
-       Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
-                       IGameDef *gamedef);
+       Camera(MapDrawControl &draw_control, Client *client);
        ~Camera();
 
-       // Get player scene node.
-       // This node is positioned at the player's torso (without any view bobbing),
-       // as given by Player::m_position. Yaw is applied but not pitch.
-       inline scene::ISceneNode* getPlayerNode() const
-       {
-               return m_playernode;
-       }
-
-       // Get head scene node.
-       // It has the eye transformation and pitch applied,
-       // but no view bobbing.
-       inline scene::ISceneNode* getHeadNode() const
-       {
-               return m_headnode;
-       }
-
        // Get camera scene node.
        // It has the eye transformation, pitch and view bobbing applied.
        inline scene::ICameraSceneNode* getCameraNode() const
@@ -161,6 +144,12 @@ public:
                        m_camera_mode = CAMERA_MODE_FIRST;
        }
 
+       // Set the current camera mode
+       inline void setCameraMode(CameraMode mode)
+       {
+               m_camera_mode = mode;
+       }
+
        //read the current camera mode
        inline CameraMode getCameraMode()
        {
@@ -172,25 +161,25 @@ public:
 
        void removeNametag(Nametag *nametag);
 
-       std::list<Nametag *> *getNametags()
-       { return &m_nametags; }
+       const std::list<Nametag *> &getNametags() { return m_nametags; }
 
        void drawNametags();
 
+       inline void addArmInertia(f32 player_yaw);
+
 private:
        // Nodes
-       scene::ISceneNode* m_playernode;
-       scene::ISceneNode* m_headnode;
-       scene::ICameraSceneNode* m_cameranode;
+       scene::ISceneNode *m_playernode = nullptr;
+       scene::ISceneNode *m_headnode = nullptr;
+       scene::ICameraSceneNode *m_cameranode = nullptr;
 
-       scene::ISceneManager* m_wieldmgr;
-       WieldMeshSceneNode* m_wieldnode;
+       scene::ISceneManager *m_wieldmgr = nullptr;
+       WieldMeshSceneNode *m_wieldnode = nullptr;
 
        // draw control
        MapDrawControl& m_draw_control;
 
-       IGameDef *m_gamedef;
-       video::IVideoDriver *m_driver;
+       Client *m_client;
 
        // Absolute camera position
        v3f m_camera_position;
@@ -199,40 +188,46 @@ private:
        // Camera offset
        v3s16 m_camera_offset;
 
+       v2f m_wieldmesh_offset = v2f(55.0f, -35.0f);
+       v2f m_arm_dir;
+       v2f m_cam_vel;
+       v2f m_cam_vel_old;
+       v2f m_last_cam_pos;
+
        // Field of view and aspect ratio stuff
-       f32 m_aspect;
-       f32 m_fov_x;
-       f32 m_fov_y;
+       f32 m_aspect = 1.0f;
+       f32 m_fov_x = 1.0f;
+       f32 m_fov_y = 1.0f;
 
        // View bobbing animation frame (0 <= m_view_bobbing_anim < 1)
-       f32 m_view_bobbing_anim;
+       f32 m_view_bobbing_anim = 0.0f;
        // If 0, view bobbing is off (e.g. player is standing).
        // If 1, view bobbing is on (player is walking).
        // If 2, view bobbing is getting switched off.
-       s32 m_view_bobbing_state;
+       s32 m_view_bobbing_state = 0;
        // Speed of view bobbing animation
-       f32 m_view_bobbing_speed;
+       f32 m_view_bobbing_speed = 0.0f;
        // Fall view bobbing
-       f32 m_view_bobbing_fall;
+       f32 m_view_bobbing_fall = 0.0f;
 
        // Digging animation frame (0 <= m_digging_anim < 1)
-       f32 m_digging_anim;
+       f32 m_digging_anim = 0.0f;
        // If -1, no digging animation
        // If 0, left-click digging animation
        // If 1, right-click digging animation
-       s32 m_digging_button;
+       s32 m_digging_button = -1;
 
        // Animation when changing wielded item
-       f32 m_wield_change_timer;
+       f32 m_wield_change_timer = 0.125f;
        ItemStack m_wield_item_next;
 
-       CameraMode m_camera_mode;
+       CameraMode m_camera_mode = CAMERA_MODE_FIRST;
 
        f32 m_cache_fall_bobbing_amount;
        f32 m_cache_view_bobbing_amount;
        f32 m_cache_fov;
        f32 m_cache_zoom_fov;
-       bool m_cache_view_bobbing;
+       bool m_arm_inertia;
 
        std::list<Nametag *> m_nametags;
 };