X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcamera.h;h=c8a6e0bb80092b1817baca3cf8d9d18d2b2c4f47;hb=1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124;hp=973ae3f31006f76704d3f535ad2b107fc0afef13;hpb=96c30452f9d2e6085769baa5befbcbcf62a507c4;p=minetest.git diff --git a/src/camera.h b/src/camera.h index 973ae3f31..c8a6e0bb8 100644 --- a/src/camera.h +++ b/src/camera.h @@ -1,18 +1,18 @@ /* -Minetest-c55 -Copyright (C) 2010-2011 celeron55, Perttu Ahola +Minetest +Copyright (C) 2010-2013 celeron55, Perttu Ahola 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,17 +20,15 @@ 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 -#include -#include class LocalPlayer; struct MapDrawControl; -class ExtrudedSpriteSceneNode; class IGameDef; /* @@ -41,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. @@ -107,21 +106,19 @@ class Camera // Update the camera from the local player's position. // frametime is used to adjust the viewing range. - void update(LocalPlayer* player, f32 frametime, v2u32 screensize); + void update(LocalPlayer* player, f32 frametime, v2u32 screensize, + f32 tool_reload_ratio); // Render distance feedback loop void updateViewingRange(f32 frametime_in); - // Update settings from g_settings - void updateSettings(); - - // Replace the wielded item mesh - void wield(const InventoryItem* item, IGameDef *gamedef); - // Start digging animation // Pass 0 for left click, 1 for right click void setDigging(s32 button); + // Replace the wielded item mesh + void wield(const ItemStack &item, u16 playeritem); + // Draw the wielded tool. // This has to happen *after* the main scene is drawn. // Warning: This clears the Z buffer. @@ -135,15 +132,13 @@ class Camera scene::ICameraSceneNode* m_cameranode; scene::ISceneManager* m_wieldmgr; - ExtrudedSpriteSceneNode* m_wieldnode; + scene::IMeshSceneNode* m_wieldnode; + u8 m_wieldlight; // draw control MapDrawControl& m_draw_control; - - // viewing_range_min_nodes setting - f32 m_viewing_range_min; - // viewing_range_max_nodes setting - f32 m_viewing_range_max; + + IGameDef *m_gamedef; // Absolute camera position v3f m_camera_position; @@ -156,7 +151,6 @@ class Camera f32 m_fov_y; // Stuff for viewing range calculations - f32 m_wanted_frametime; f32 m_added_frametime; s16 m_added_frames; f32 m_range_old; @@ -172,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; @@ -179,56 +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; -/* - A scene node that displays a 2D mesh extruded into the third dimension, - to add an illusion of depth. - - Since this class was created to display the wielded tool of the local - player, and only tools and items are rendered like this (but not solid - content like stone and mud, which are shown as cubes), the option to - draw a textured cube instead is provided. - */ -class ExtrudedSpriteSceneNode: public scene::ISceneNode -{ -public: - ExtrudedSpriteSceneNode( - scene::ISceneNode* parent, - scene::ISceneManager* mgr, - s32 id = -1, - const v3f& position = v3f(0,0,0), - const v3f& rotation = v3f(0,0,0), - const v3f& scale = v3f(1,1,1)); - ~ExtrudedSpriteSceneNode(); - - void setSprite(video::ITexture* texture); - void setCube(const TileSpec tiles[6]); - - f32 getSpriteThickness() const { return m_thickness; } - void setSpriteThickness(f32 thickness); - - void updateLight(u8 light); - - void removeSpriteFromCache(video::ITexture* texture); - - virtual const core::aabbox3d& getBoundingBox() const; - virtual void OnRegisterSceneNode(); - virtual void render(); - -private: - scene::IMeshSceneNode* m_meshnode; - f32 m_thickness; - scene::IMesh* m_cubemesh; - bool m_is_cube; - u8 m_light; - - // internal extrusion helper methods - io::path getExtrudedName(video::ITexture* texture); - scene::IAnimatedMesh* extrudeARGB(u32 width, u32 height, u8* data); - scene::IAnimatedMesh* extrude(video::ITexture* texture); - scene::IMesh* createCubeMesh(); + // 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