Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / client / content_cao.h

diff --git a/src/client/content_cao.h b/src/client/content_cao.h
index 88aa4870c008a527e9c4773dd0a5b0eeb05d0bef..09c26bd9c12d69db4c539173dce24e2380094ce3 100644 (file)
--- a/src/client/content_cao.h
+++ b/src/client/content_cao.h
@@ -30,6 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class Camera;
 class Client;
 struct Nametag;
+struct MinimapMarker;
 
 /*
        SmoothTranslator
@@ -84,6 +85,7 @@ class GenericCAO : public ClientActiveObject
        scene::IBillboardSceneNode *m_spritenode = nullptr;
        scene::IDummyTransformationSceneNode *m_matrixnode = nullptr;
        Nametag *m_nametag = nullptr;
+       MinimapMarker *m_marker = nullptr;
        v3f m_position = v3f(0.0f, 10.0f * BS, 0);
        v3f m_velocity;
        v3f m_acceleration;
@@ -109,6 +111,7 @@ class GenericCAO : public ClientActiveObject
        v3f m_attachment_position;
        v3f m_attachment_rotation;
        bool m_attached_to_local = false;
+       bool m_force_visible = false;
 
        int m_anim_frame = 0;
        int m_anim_num_frames = 1;
@@ -169,6 +172,21 @@ class GenericCAO : public ClientActiveObject
 
        inline const v3f &getRotation() const { return m_rotation; }
 
+       inline const v3f getAcceleration() const
+       {
+               return m_acceleration;
+       }
+
+       inline const v3f getVelocity() const
+       {
+               return m_velocity;
+       }
+       
+       inline const u16 getHp() const
+       {
+               return m_hp;
+       }
+
        const bool isImmortal();
 
        scene::ISceneNode *getSceneNode() const;
@@ -205,6 +223,16 @@ class GenericCAO : public ClientActiveObject
                return m_is_local_player;
        }
 
+       inline std::string getName() const
+       {
+               return m_name;
+       }
+
+       inline bool isPlayer() const
+       {
+               return m_is_player;
+       }
+
        inline bool isVisible() const
        {
                return m_is_visible;
@@ -216,9 +244,10 @@ class GenericCAO : public ClientActiveObject
        }
 
        void setChildrenVisible(bool toset);
-       void setAttachment(int parent_id, const std::string &bone, v3f position, v3f rotation);
+       void setAttachment(int parent_id, const std::string &bone, v3f position,
+                       v3f rotation, bool force_visible);
        void getAttachment(int *parent_id, std::string *bone, v3f *position,
-                       v3f *rotation) const;
+                       v3f *rotation, bool *force_visible) const;
        void clearChildAttachments();
        void clearParentAttachment();
        void addAttachmentChild(int child_id);
@@ -249,6 +278,8 @@ class GenericCAO : public ClientActiveObject
 
        void updateNametag();
 
+       void updateMarker();
+
        void updateNodePos();
 
        void step(float dtime, ClientEnvironment *env);
@@ -278,4 +309,11 @@ class GenericCAO : public ClientActiveObject
        }
        
        float m_waiting_for_reattach;
+       
+       ObjectProperties *getProperties()
+       {
+               return &m_prop;
+       }
+
+       void updateMeshCulling();
 };