diff options
| author | Dániel Juhász <juhdanad@gmail.com> | 2017-08-25 11:20:53 +0000 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-08-25 13:20:53 +0200 |
| commit | f6a33a1a7a298cb7d3fb18818bae97bd1b89d633 (patch) | |
| tree | 7bc7689e33895e5a6084129484f679caaed1cfc0 /src/wieldmesh.h | |
| parent | 6761e213836e902359c5d0acff277623dc3e1588 (diff) | |
| download | dragonfireclient-f6a33a1a7a298cb7d3fb18818bae97bd1b89d633.tar.xz | |
Overlays for wield and inventory images (#6107)
* Overlays for wield and inventory images
Diffstat (limited to 'src/wieldmesh.h')
| -rw-r--r-- | src/wieldmesh.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/wieldmesh.h b/src/wieldmesh.h index 828625075..23e3abf29 100644 --- a/src/wieldmesh.h +++ b/src/wieldmesh.h @@ -78,8 +78,8 @@ public: virtual ~WieldMeshSceneNode(); void setCube(const ContentFeatures &f, v3f wield_scale); - void setExtruded(const std::string &imagename, v3f wield_scale, - ITextureSource *tsrc, u8 num_frames); + void setExtruded(const std::string &imagename, const std::string &overlay_image, + v3f wield_scale, ITextureSource *tsrc, u8 num_frames); void setItem(const ItemStack &item, Client *client); // Sets the vertex color of the wield mesh. @@ -125,7 +125,8 @@ private: void getItemMesh(Client *client, const ItemStack &item, ItemMesh *result); -scene::SMesh *getExtrudedMesh(ITextureSource *tsrc, const std::string &imagename); +scene::SMesh *getExtrudedMesh(ITextureSource *tsrc, const std::string &imagename, + const std::string &overlay_name); /*! * Applies overlays, textures and optionally materials to the given mesh and |