Make NodeMetaRef::getmeta a non-static member

[dragonfireclient.git] / src / wieldmesh.h

diff --git a/src/wieldmesh.h b/src/wieldmesh.h
index 0b3136bc1465d3f145cd82b872922fe43ebc6ec2..2e78232ae68daa322bf10e770ea455b3ae80b83f 100644 (file)
--- a/src/wieldmesh.h
+++ b/src/wieldmesh.h
@@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <string>
 
 struct ItemStack;
-class IGameDef;
+class Client;
 class ITextureSource;
 struct TileSpec;
 
@@ -42,7 +42,7 @@ class WieldMeshSceneNode: public scene::ISceneNode
                        v3f wield_scale, ITextureSource *tsrc);
        void setExtruded(const std::string &imagename,
                        v3f wield_scale, ITextureSource *tsrc, u8 num_frames);
-       void setItem(const ItemStack &item, IGameDef *gamedef);
+       void setItem(const ItemStack &item, Client *client);
 
        // Sets the vertex color of the wield mesh.
        // Must only be used if the constructor was called with lighting = false
@@ -70,6 +70,11 @@ class WieldMeshSceneNode: public scene::ISceneNode
        bool m_anisotropic_filter;
        bool m_bilinear_filter;
        bool m_trilinear_filter;
+       /*!
+        * Stores the colors of the mesh's mesh buffers.
+        * This does not include lighting.
+        */
+       std::vector<video::SColor> m_colors;
 
        // Bounding box culling is disabled for this type of scene node,
        // so this variable is just required so we can implement
@@ -77,7 +82,7 @@ class WieldMeshSceneNode: public scene::ISceneNode
        aabb3f m_bounding_box;
 };
 
-scene::IMesh *getItemMesh(IGameDef *gamedef, const ItemStack &item);
+scene::IMesh *getItemMesh(Client *client, const ItemStack &item);
 
 scene::IMesh *getExtrudedMesh(ITextureSource *tsrc,
                const std::string &imagename);