X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcamera.h;h=8831257cc8c2df3b8d7bf51989785779203d31e8;hb=62ea342ad1b725ac44a787c60388cbc8a1c383c5;hp=d5789d807191527f533b69f9f3e4d6b72492751d;hpb=392485aa454e871566a67afc61e11331f9d27397;p=dragonfireclient.git diff --git a/src/camera.h b/src/camera.h index d5789d807..8831257cc 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,20 +20,21 @@ 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 + +#include "client.h" class LocalPlayer; struct MapDrawControl; -class ExtrudedSpriteSceneNode; class IGameDef; +enum CameraMode {CAMERA_MODE_FIRST, CAMERA_MODE_THIRD, CAMERA_MODE_THIRD_FRONT}; + /* Client camera class, manages the player and camera scene nodes, the viewing distance and performs view bobbing etc. It also displays the wielded tool in front of the @@ -42,7 +43,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. @@ -81,6 +83,12 @@ class Camera { return m_camera_direction; } + + // Get the camera offset + inline v3s16 getOffset() const + { + return m_camera_offset; + } // Horizontal field of view inline f32 getFovX() const @@ -107,49 +115,62 @@ class Camera void step(f32 dtime); // 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); + // busytime is used to adjust the viewing range. + void update(LocalPlayer* player, f32 frametime, f32 busytime, + f32 tool_reload_ratio, ClientEnvironment &c_env); // 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); + void updateViewingRange(f32 frametime_in, f32 busytime_in); // 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. - void drawWieldedTool(); + void drawWieldedTool(irr::core::matrix4* translation=NULL); + + // Toggle the current camera mode + void toggleCameraMode() { + if (m_camera_mode == CAMERA_MODE_FIRST) + m_camera_mode = CAMERA_MODE_THIRD; + else if (m_camera_mode == CAMERA_MODE_THIRD) + m_camera_mode = CAMERA_MODE_THIRD_FRONT; + else + m_camera_mode = CAMERA_MODE_FIRST; + } + + //read the current camera mode + inline CameraMode getCameraMode() + { + return m_camera_mode; + } private: - // Scene manager and nodes - scene::ISceneManager* m_smgr; + // Nodes scene::ISceneNode* m_playernode; scene::ISceneNode* m_headnode; 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; // Absolute camera direction v3f m_camera_direction; + // Camera offset + v3s16 m_camera_offset; // Field of view and aspect ratio stuff f32 m_aspect; @@ -157,11 +178,10 @@ class Camera f32 m_fov_y; // Stuff for viewing range calculations - f32 m_wanted_frametime; - f32 m_added_frametime; + f32 m_added_busytime; s16 m_added_frames; f32 m_range_old; - f32 m_frametime_old; + f32 m_busytime_old; f32 m_frametime_counter; f32 m_time_per_range; @@ -173,6 +193,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; @@ -180,48 +202,17 @@ class Camera // If 0, left-click digging animation // If 1, right-click digging animation 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]); - void updateLight(u8 light); + //dummymesh for camera + irr::scene::IAnimatedMesh* m_dummymesh; - void removeSpriteFromCache(video::ITexture* texture); - - virtual const core::aabbox3d& getBoundingBox() const; - virtual void OnRegisterSceneNode(); - virtual void render(); - -private: - scene::IMeshSceneNode* m_meshnode; - scene::IMesh* m_cubemesh; - bool m_is_cube; - u8 m_light; + // 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; - io::path getExtrudedName(video::ITexture* texture); + CameraMode m_camera_mode; }; #endif