X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fitemdef.cpp;h=11a52f85c026a7098a40af96433d8e898e788241;hb=3d66622772e66154b7624957a27f9be54c4c7c28;hp=f43e5c970cb3d4212335a6b5e8dac11d4a1de7b4;hpb=f8ad01ab7c4cf012781bd4caa821544e676c9267;p=dragonfireclient.git diff --git a/src/itemdef.cpp b/src/itemdef.cpp index f43e5c970..11a52f85c 100644 --- a/src/itemdef.cpp +++ b/src/itemdef.cpp @@ -24,11 +24,11 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "tool.h" #include "inventory.h" #ifndef SERVER -#include "mapblock_mesh.h" -#include "mesh.h" -#include "wieldmesh.h" +#include "client/mapblock_mesh.h" +#include "client/mesh.h" +#include "client/wieldmesh.h" #include "client/tile.h" -#include "client.h" +#include "client/client.h" #endif #include "log.h" #include "settings.h" @@ -67,7 +67,9 @@ ItemDefinition& ItemDefinition::operator=(const ItemDefinition &def) name = def.name; description = def.description; inventory_image = def.inventory_image; + inventory_overlay = def.inventory_overlay; wield_image = def.wield_image; + wield_overlay = def.wield_overlay; wield_scale = def.wield_scale; stack_max = def.stack_max; usable = def.usable; @@ -82,6 +84,8 @@ ItemDefinition& ItemDefinition::operator=(const ItemDefinition &def) sound_place = def.sound_place; sound_place_failed = def.sound_place_failed; range = def.range; + palette_image = def.palette_image; + color = def.color; return *this; } @@ -103,16 +107,17 @@ void ItemDefinition::reset() name = ""; description = ""; inventory_image = ""; + inventory_overlay = ""; wield_image = ""; + wield_overlay = ""; + palette_image = ""; + color = video::SColor(0xFFFFFFFF); wield_scale = v3f(1.0, 1.0, 1.0); stack_max = 99; usable = false; liquids_pointable = false; - if(tool_capabilities) - { - delete tool_capabilities; - tool_capabilities = NULL; - } + delete tool_capabilities; + tool_capabilities = NULL; groups.clear(); sound_place = SimpleSoundSpec(); sound_place_failed = SimpleSoundSpec(); @@ -123,8 +128,9 @@ void ItemDefinition::reset() void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const { - - writeU8(os, 3); // version (proto > 20) + // protocol_version >= 36 + u8 version = 5; + writeU8(os, version); writeU8(os, type); os << serializeString(name); os << serializeString(description); @@ -134,7 +140,7 @@ void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const writeS16(os, stack_max); writeU8(os, usable); writeU8(os, liquids_pointable); - std::string tool_capabilities_s = ""; + std::string tool_capabilities_s; if(tool_capabilities){ std::ostringstream tmp_os(std::ios::binary); tool_capabilities->serialize(tmp_os, protocol_version); @@ -142,10 +148,9 @@ void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const } os << serializeString(tool_capabilities_s); writeU16(os, groups.size()); - for (ItemGroupList::const_iterator - i = groups.begin(); i != groups.end(); ++i){ - os << serializeString(i->first); - writeS16(os, i->second); + for (const auto &group : groups) { + os << serializeString(group.first); + writeS16(os, group.second); } os << serializeString(node_placement_prediction); os << serializeString(sound_place.name); @@ -153,6 +158,13 @@ void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const writeF1000(os, range); os << serializeString(sound_place_failed.name); writeF1000(os, sound_place_failed.gain); + os << serializeString(palette_image); + writeARGB8(os, color); + + writeF1000(os, sound_place.pitch); + writeF1000(os, sound_place_failed.pitch); + os << serializeString(inventory_overlay); + os << serializeString(wield_overlay); } void ItemDefinition::deSerialize(std::istream &is) @@ -162,8 +174,9 @@ void ItemDefinition::deSerialize(std::istream &is) // Deserialize int version = readU8(is); - if(version < 1 || version > 3) + if (version < 5) throw SerializationError("unsupported ItemDefinition version"); + type = (enum ItemType)readU8(is); name = deSerializeString(is); description = deSerializeString(is); @@ -187,29 +200,27 @@ void ItemDefinition::deSerialize(std::istream &is) int value = readS16(is); groups[name] = value; } - if(version == 1){ - // We cant be sure that node_placement_prediction is send in version 1 - try{ - node_placement_prediction = deSerializeString(is); - }catch(SerializationError &e) {}; - // Set the old default sound - sound_place.name = "default_place_node"; - sound_place.gain = 0.5; - } else if(version >= 2) { - node_placement_prediction = deSerializeString(is); - //deserializeSimpleSoundSpec(sound_place, is); - sound_place.name = deSerializeString(is); - sound_place.gain = readF1000(is); - } - if(version == 3) { - range = readF1000(is); - } + + node_placement_prediction = deSerializeString(is); + //deserializeSimpleSoundSpec(sound_place, is); + sound_place.name = deSerializeString(is); + sound_place.gain = readF1000(is); + range = readF1000(is); + + sound_place_failed.name = deSerializeString(is); + sound_place_failed.gain = readF1000(is); + palette_image = deSerializeString(is); + color = readARGB8(is); + + sound_place.pitch = readF1000(is); + sound_place_failed.pitch = readF1000(is); + inventory_overlay = deSerializeString(is); + wield_overlay = deSerializeString(is); + // If you add anything here, insert it primarily inside the try-catch // block to not need to increase the version. - try { - sound_place_failed.name = deSerializeString(is); - sound_place_failed.gain = readF1000(is); - } catch(SerializationError &e) {}; + //try { + //} catch(SerializationError &e) {}; } /* @@ -224,11 +235,12 @@ class CItemDefManager: public IWritableItemDefManager struct ClientCached { video::ITexture *inventory_texture; - scene::IMesh *wield_mesh; + ItemMesh wield_mesh; + Palette *palette; ClientCached(): inventory_texture(NULL), - wield_mesh(NULL) + palette(NULL) {} }; #endif @@ -238,7 +250,7 @@ class CItemDefManager: public IWritableItemDefManager { #ifndef SERVER - m_main_thread = thr_get_current_thread_id(); + m_main_thread = std::this_thread::get_id(); #endif clear(); } @@ -246,20 +258,15 @@ class CItemDefManager: public IWritableItemDefManager { #ifndef SERVER const std::vector &values = m_clientcached.getValues(); - for(std::vector::const_iterator - i = values.begin(); i != values.end(); ++i) - { - ClientCached *cc = *i; - if (cc->wield_mesh) - cc->wield_mesh->drop(); + for (ClientCached *cc : values) { + if (cc->wield_mesh.mesh) + cc->wield_mesh.mesh->drop(); delete cc; } #endif - for (std::map::iterator iter = - m_item_definitions.begin(); iter != m_item_definitions.end(); - ++iter) { - delete iter->second; + for (auto &item_definition : m_item_definitions) { + delete item_definition.second; } m_item_definitions.clear(); } @@ -275,27 +282,23 @@ class CItemDefManager: public IWritableItemDefManager assert(i != m_item_definitions.end()); return *(i->second); } - virtual std::string getAlias(const std::string &name) const + virtual const std::string &getAlias(const std::string &name) const { StringMap::const_iterator it = m_aliases.find(name); if (it != m_aliases.end()) return it->second; return name; } - virtual std::set getAll() const + virtual void getAll(std::set &result) const { - std::set result; - for(std::map::const_iterator - it = m_item_definitions.begin(); - it != m_item_definitions.end(); ++it) { - result.insert(it->first); + result.clear(); + for (const auto &item_definition : m_item_definitions) { + result.insert(item_definition.first); } - for (StringMap::const_iterator - it = m_aliases.begin(); - it != m_aliases.end(); ++it) { - result.insert(it->first); + + for (const auto &alias : m_aliases) { + result.insert(alias.first); } - return result; } virtual bool isKnown(const std::string &name_) const { @@ -314,7 +317,7 @@ class CItemDefManager: public IWritableItemDefManager <inventory_texture = NULL; - if(def.inventory_image != "") + if (!def.inventory_image.empty()) cc->inventory_texture = tsrc->getTexture(def.inventory_image); ItemStack item = ItemStack(); item.name = def.name; - scene::IMesh *mesh = getItemMesh(client, item); - cc->wield_mesh = mesh; + getItemMesh(client, item, &(cc->wield_mesh)); + + cc->palette = tsrc->getPalette(def.palette_image); // Put in cache m_clientcached.set(name, cc); @@ -349,36 +353,32 @@ class CItemDefManager: public IWritableItemDefManager { ClientCached *cc = NULL; m_clientcached.get(name, &cc); - if(cc) + if (cc) return cc; - if(thr_is_current_thread(m_main_thread)) - { + if (std::this_thread::get_id() == m_main_thread) { return createClientCachedDirect(name, client); } - else - { - // We're gonna ask the result to be put into here - static ResultQueue result_queue; - - // Throw a request in - m_get_clientcached_queue.add(name, 0, 0, &result_queue); - try{ - while(true) { - // Wait result for a second - GetResult - result = result_queue.pop_front(1000); - - if (result.key == name) { - return result.item; - } + + // We're gonna ask the result to be put into here + static ResultQueue result_queue; + + // Throw a request in + m_get_clientcached_queue.add(name, 0, 0, &result_queue); + try { + while(true) { + // Wait result for a second + GetResult + result = result_queue.pop_front(1000); + + if (result.key == name) { + return result.item; } } - catch(ItemNotFoundException &e) - { - errorstream<<"Waiting for clientcached " << name << " timed out."<inventory_texture; } // Get item wield mesh - virtual scene::IMesh* getWieldMesh(const std::string &name, + virtual ItemMesh* getWieldMesh(const std::string &name, Client *client) const { ClientCached *cc = getClientCached(name, client); if(!cc) return NULL; - return cc->wield_mesh; + return &(cc->wield_mesh); + } + + // Get item palette + virtual Palette* getPalette(const std::string &name, + Client *client) const + { + ClientCached *cc = getClientCached(name, client); + if(!cc) + return NULL; + return cc->palette; + } + + virtual video::SColor getItemstackColor(const ItemStack &stack, + Client *client) const + { + // Look for direct color definition + const std::string &colorstring = stack.metadata.getString("color", 0); + video::SColor directcolor; + if (!colorstring.empty() && parseColorString(colorstring, directcolor, true)) + return directcolor; + // See if there is a palette + Palette *palette = getPalette(stack.name, client); + const std::string &index = stack.metadata.getString("palette_index", 0); + if (palette && !index.empty()) + return (*palette)[mystoi(index, 0, 255)]; + // Fallback color + return get(stack.name).color; } #endif void clear() @@ -443,7 +470,7 @@ class CItemDefManager: public IWritableItemDefManager { verbosestream<<"ItemDefManager: registering \""<