]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/content_cao.cpp
projects / dragonfireclient.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Sky: Darker, bluer sky and improved horizon haze at night
[dragonfireclient.git] / src / content_cao.cpp
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 1b8e84c8fb4f8ec61a4c25ff25edb20437561dfa..eeb85c8a67063b0cf7f81c3bdca76d985bf9ecb9 100644 (file)
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -309,7 +309,7 @@ class ItemCAO : public ClientActiveObject
 
        void initialize(const std::string &data);
 
-       core::aabbox3d<f32>* getSelectionBox()
+       aabb3f *getSelectionBox()
                {return &m_selection_box;}
        v3f getPosition()
                {return m_position;}
@@ -319,7 +319,7 @@ class ItemCAO : public ClientActiveObject
 
        bool getCollisionBox(aabb3f *toset) { return false; }
 private:
-       core::aabbox3d<f32> m_selection_box;
+       aabb3f m_selection_box;
        scene::IMeshSceneNode *m_node;
        v3f m_position;
        std::string m_itemstring;
@@ -546,12 +546,13 @@ GenericCAO::GenericCAO(IGameDef *gamedef, ClientEnvironment *env):
                //
                m_smgr(NULL),
                m_irr(NULL),
+               m_gamedef(NULL),
                m_selection_box(-BS/3.,-BS/3.,-BS/3., BS/3.,BS/3.,BS/3.),
                m_meshnode(NULL),
                m_animated_meshnode(NULL),
                m_wield_meshnode(NULL),
                m_spritenode(NULL),
-               m_textnode(NULL),
+               m_nametag(NULL),
                m_position(v3f(0,10*BS,0)),
                m_velocity(v3f(0,0,0)),
                m_acceleration(v3f(0,0,0)),
@@ -580,8 +581,11 @@ GenericCAO::GenericCAO(IGameDef *gamedef, ClientEnvironment *env):
                m_last_light(255),
                m_is_visible(false)
 {
-       if(gamedef == NULL)
+       if (gamedef == NULL) {
                ClientActiveObject::registerType(getType(), create);
+       } else {
+               m_gamedef = gamedef;
+       }
 }
 
 bool GenericCAO::getCollisionBox(aabb3f *toset)
@@ -667,14 +671,13 @@ void GenericCAO::initialize(const std::string &data)
 
 GenericCAO::~GenericCAO()
 {
-       if(m_is_player)
-       {
+       if (m_is_player) {
                m_env->removePlayerName(m_name.c_str());
        }
        removeFromScene(true);
 }
 
-core::aabbox3d<f32>* GenericCAO::getSelectionBox()
+aabb3f *GenericCAO::getSelectionBox()
 {
        if(!m_prop.is_visible || !m_is_visible || m_is_local_player || getParent() != NULL)
                return NULL;
@@ -695,14 +698,15 @@ v3f GenericCAO::getPosition()
 
 scene::ISceneNode* GenericCAO::getSceneNode()
 {
-       if (m_meshnode)
+       if (m_meshnode) {
                return m_meshnode;
-       if (m_animated_meshnode)
+       } else if (m_animated_meshnode) {
                return m_animated_meshnode;
-       if (m_wield_meshnode)
+       } else if (m_wield_meshnode) {
                return m_wield_meshnode;
-       if (m_spritenode)
+       } else if (m_spritenode) {
                return m_spritenode;
+       }
        return NULL;
 }
 
@@ -775,56 +779,47 @@ void GenericCAO::removeFromScene(bool permanent)
                }
        }
 
-       if(m_meshnode)
-       {
+       if (m_meshnode) {
                m_meshnode->remove();
                m_meshnode->drop();
                m_meshnode = NULL;
-       }
-       if(m_animated_meshnode)
-       {
+       } else if (m_animated_meshnode) {
                m_animated_meshnode->remove();
                m_animated_meshnode->drop();
                m_animated_meshnode = NULL;
-       }
-       if(m_wield_meshnode)
-       {
+       } else if (m_wield_meshnode) {
                m_wield_meshnode->remove();
                m_wield_meshnode->drop();
                m_wield_meshnode = NULL;
-       }
-       if(m_spritenode)
-       {
+       } else if (m_spritenode) {
                m_spritenode->remove();
                m_spritenode->drop();
                m_spritenode = NULL;
        }
-       if (m_textnode)
-       {
-               m_textnode->remove();
-               m_textnode->drop();
-               m_textnode = NULL;
+
+       if (m_nametag) {
+               m_gamedef->getCamera()->removeNametag(m_nametag);
+               m_nametag = NULL;
        }
 }
 
-void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
-               IrrlichtDevice *irr)
+void GenericCAO::addToScene(scene::ISceneManager *smgr,
+               ITextureSource *tsrc, IrrlichtDevice *irr)
 {
        m_smgr = smgr;
        m_irr = irr;
 
-       if (getSceneNode() != NULL)
+       if (getSceneNode() != NULL) {
                return;
+       }
 
        m_visuals_expired = false;
 
-       if(!m_prop.is_visible)
+       if (!m_prop.is_visible) {
                return;
+       }
 
-       //video::IVideoDriver* driver = smgr->getVideoDriver();
-
-       if(m_prop.visual == "sprite")
-       {
+       if (m_prop.visual == "sprite") {
                infostream<<"GenericCAO::addToScene(): single_sprite"<<std::endl;
                m_spritenode = smgr->addBillboardSceneNode(
                                NULL, v2f(1, 1), v3f(0,0,0), -1);
@@ -972,18 +967,9 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
 
        scene::ISceneNode *node = getSceneNode();
        if (node && m_prop.nametag != "" && !m_is_local_player) {
-               // Add a text node for showing the name
-               gui::IGUIEnvironment* gui = irr->getGUIEnvironment();
-               std::wstring nametag_text = utf8_to_wide(m_prop.nametag);
-               m_textnode = smgr->addTextSceneNode(gui->getSkin()->getFont(),
-                               nametag_text.c_str(), m_prop.nametag_color, node);
-               m_textnode->grab();
-               m_textnode->setPosition(v3f(0, BS*1.1, 0));
-
-               // Enforce hiding nametag,
-               // because if freetype is enabled, a grey
-               // shadow can remain.
-               m_textnode->setVisible(m_prop.nametag_color.getAlpha() > 0);
+               // Add nametag
+               m_nametag = m_gamedef->getCamera()->addNametag(node,
+                       m_prop.nametag, m_prop.nametag_color);
        }
 
        updateNodePos();
@@ -1070,7 +1056,9 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)
                        PlayerControl controls = player->getPlayerControl();
 
                        bool walking = false;
-                       if(controls.up || controls.down || controls.left || controls.right)
+                       if (controls.up || controls.down || controls.left || controls.right ||
+                                       controls.forw_move_joystick_axis != 0.f ||
+                                       controls.sidew_move_joystick_axis != 0.f)
                                walking = true;
 
                        f32 new_speed = player->local_animation_speed;
@@ -1185,22 +1173,20 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)
 
                if(m_prop.physical)
                {
-                       core::aabbox3d<f32> box = m_prop.collisionbox;
+                       aabb3f box = m_prop.collisionbox;
                        box.MinEdge *= BS;
                        box.MaxEdge *= BS;
                        collisionMoveResult moveresult;
                        f32 pos_max_d = BS*0.125; // Distance per iteration
                        v3f p_pos = m_position;
                        v3f p_velocity = m_velocity;
-                       v3f p_acceleration = m_acceleration;
                        moveresult = collisionMoveSimple(env,env->getGameDef(),
                                        pos_max_d, box, m_prop.stepheight, dtime,
-                                       p_pos, p_velocity, p_acceleration,
+                                       &p_pos, &p_velocity, m_acceleration,
                                        this, m_prop.collideWithObjects);
                        // Apply results
                        m_position = p_pos;
                        m_velocity = p_velocity;
-                       m_acceleration = p_acceleration;
 
                        bool is_end_position = moveresult.collides;
                        pos_translator.update(m_position, is_end_position, dtime);
@@ -1787,12 +1773,8 @@ void GenericCAO::processMessage(const std::string &data)
                // Deprecated, for backwards compatibility only.
                readU8(is); // version
                m_prop.nametag_color = readARGB8(is);
-               if (m_textnode != NULL) {
-                       m_textnode->setTextColor(m_prop.nametag_color);
-
-                       // Enforce hiding nametag,
-                       // because if freetype is enabled, a grey shadow can remain.
-                       m_textnode->setVisible(m_prop.nametag_color.getAlpha() > 0);
+               if (m_nametag != NULL) {
+                       m_nametag->nametag_color = m_prop.nametag_color;
                }
        }
 }
Dragonfireclient is an utility client for the Voxelengine minetest (http://minetest.net/). The client was created by Elias Fleckenstein and is inspired by the Minecraft clients Liquid Bounce and Impact. Discord: https://discord.gg/kab99uu for more information.