X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcamera.h;h=642b8d2d041e197ed89baec5e0f05cff32c8749e;hb=318669327e84d8fc7498e32c5bacfad658d8ba87;hp=fbee4a3786af523b9a78779f2d8ea395c3a627b8;hpb=36af9bb027ed6846227282587e3414ea3d30f6c5;p=oweals%2Fminetest.git diff --git a/src/camera.h b/src/camera.h index fbee4a378..642b8d2d0 100644 --- a/src/camera.h +++ b/src/camera.h @@ -3,16 +3,16 @@ Minetest-c55 Copyright (C) 2010-2011 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,14 +20,16 @@ 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 class LocalPlayer; -class MapDrawControl; -class ExtrudedSpriteSceneNode; +struct MapDrawControl; +class IGameDef; /* Client camera class, manages the player and camera scene nodes, the viewing distance @@ -37,7 +39,8 @@ class ExtrudedSpriteSceneNode; class Camera { public: - Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control); + Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control, + IGameDef *gamedef); ~Camera(); // Get player scene node. @@ -103,21 +106,19 @@ public: // 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); - // 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); + // Draw the wielded tool. // This has to happen *after* the main scene is drawn. // Warning: This clears the Z buffer. @@ -131,15 +132,13 @@ private: 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; @@ -152,7 +151,6 @@ private: 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; @@ -177,51 +175,4 @@ private: s32 m_digging_button; }; - -/* - 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 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; - - // 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(); -}; - #endif