Merge remote-tracking branch 'origin/master'

[minetest.git] / src / camera.h

diff --git a/src/camera.h b/src/camera.h
index 168863c3ec618af56693576c339c5af6de858d93..c8a6e0bb80092b1817baca3cf8d9d18d2b2c4f47 100644 (file)
--- a/src/camera.h
+++ b/src/camera.h
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -20,11 +20,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CAMERA_HEADER
 #define CAMERA_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "inventory.h"
 #include "mesh.h"
 #include "tile.h"
-#include "utility.h"
+#include "util/numeric.h"
 #include <ICameraSceneNode.h>
 
 class LocalPlayer;
@@ -39,7 +39,8 @@ class IGameDef;
 class Camera
 {
 public:
-       Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control);
+       Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
+                       IGameDef *gamedef);
        ~Camera();
 
        // Get player scene node.
@@ -116,7 +117,7 @@ class Camera
        void setDigging(s32 button);
 
        // Replace the wielded item mesh
-       void wield(const ItemStack &item, IGameDef *gamedef);
+       void wield(const ItemStack &item, u16 playeritem);
 
        // Draw the wielded tool.
        // This has to happen *after* the main scene is drawn.
@@ -136,6 +137,8 @@ class Camera
 
        // draw control
        MapDrawControl& m_draw_control;
+       
+       IGameDef *m_gamedef;
 
        // Absolute camera position
        v3f m_camera_position;
@@ -163,6 +166,8 @@ class Camera
        s32 m_view_bobbing_state;
        // Speed of view bobbing animation
        f32 m_view_bobbing_speed;
+       // Fall view bobbing
+       f32 m_view_bobbing_fall;
 
        // Digging animation frame (0 <= m_digging_anim < 1)
        f32 m_digging_anim;
@@ -170,6 +175,15 @@ class Camera
        // If 0, left-click digging animation
        // If 1, right-click digging animation
        s32 m_digging_button;
+
+       //dummymesh for camera
+       irr::scene::IAnimatedMesh* m_dummymesh;
+
+       // Animation when changing wielded item
+       f32 m_wield_change_timer;
+       scene::IMesh *m_wield_mesh_next;
+       u16 m_previous_playeritem;
+       std::string m_previous_itemname;
 };
 
 #endif