X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fitemdef.cpp;h=f7d366c8a5b8c0335806c5da9b91c0303ac0f4fa;hb=9eb163ab4f72fad234d47e9446f5608d1c5c02dc;hp=08ff887b2ff3c45798d36e751ce43d267009df54;hpb=34b7a147dcf9831f3b4d81599c473ba01ff5da00;p=oweals%2Fminetest.git diff --git a/src/itemdef.cpp b/src/itemdef.cpp index 08ff887b2..f7d366c8a 100644 --- a/src/itemdef.cpp +++ b/src/itemdef.cpp @@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "itemdef.h" -#include "gamedef.h" #include "nodedef.h" #include "tool.h" #include "inventory.h" @@ -29,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mesh.h" #include "wieldmesh.h" #include "client/tile.h" +#include "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; @@ -80,7 +82,10 @@ ItemDefinition& ItemDefinition::operator=(const ItemDefinition &def) groups = def.groups; node_placement_prediction = def.node_placement_prediction; 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; } @@ -102,18 +107,20 @@ 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(); range = -1; node_placement_prediction = ""; @@ -121,43 +128,43 @@ void ItemDefinition::reset() void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const { - if(protocol_version <= 17) - writeU8(os, 1); // version - else if(protocol_version <= 20) - writeU8(os, 2); // version - else - writeU8(os, 3); // version + // protocol_version >= 36 + u8 version = 5; + writeU8(os, version); writeU8(os, type); - os<serialize(tmp_os, protocol_version); tool_capabilities_s = tmp_os.str(); } - os<::const_iterator - i = groups.begin(); i != groups.end(); ++i){ - os<first); - writeS16(os, i->second); - } - os< 17){ - //serializeSimpleSoundSpec(sound_place, os); - os< 20){ - writeF1000(os, range); + for (const auto &group : groups) { + os << serializeString(group.first); + writeS16(os, group.second); } + os << serializeString(node_placement_prediction); + os << serializeString(sound_place.name); + writeF1000(os, sound_place.gain); + 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) @@ -167,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); @@ -192,27 +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{ - }catch(SerializationError &e) {}; + //try { + //} catch(SerializationError &e) {}; } /* @@ -227,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 @@ -241,7 +250,7 @@ public: { #ifndef SERVER - m_main_thread = get_current_thread_id(); + m_main_thread = std::this_thread::get_id(); #endif clear(); } @@ -249,20 +258,15 @@ public: { #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(); } @@ -278,27 +282,23 @@ public: 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 { @@ -311,13 +311,13 @@ public: #ifndef SERVER public: ClientCached* createClientCachedDirect(const std::string &name, - IGameDef *gamedef) const + Client *client) const { infostream<<"Lazily creating item texture and mesh for \"" <getTextureSource(); - INodeDefManager *nodedef = gamedef->getNodeDefManager(); + ITextureSource *tsrc = client->getTextureSource(); const ItemDefinition &def = get(name); // Create new ClientCached @@ -334,106 +333,15 @@ public: // Create an inventory texture cc->inventory_texture = NULL; - if(def.inventory_image != "") + if (!def.inventory_image.empty()) cc->inventory_texture = tsrc->getTexture(def.inventory_image); - // Additional processing for nodes: - // - Create a wield mesh if WieldMeshSceneNode can't render - // the node on its own. - // - If inventory_texture isn't set yet, create one using - // render-to-texture. - if (def.type == ITEM_NODE) { - // Get node properties - content_t id = nodedef->getId(name); - const ContentFeatures &f = nodedef->get(id); - - bool need_rtt_mesh = cc->inventory_texture == NULL; - - // Keep this in sync with WieldMeshSceneNode::setItem() - bool need_wield_mesh = - !(f.mesh_ptr[0] || - f.drawtype == NDT_NORMAL || - f.drawtype == NDT_ALLFACES || - f.drawtype == NDT_AIRLIKE); - - scene::IMesh *node_mesh = NULL; - - if (need_rtt_mesh || need_wield_mesh) { - u8 param1 = 0; - if (f.param_type == CPT_LIGHT) - param1 = 0xee; - - /* - Make a mesh from the node - */ - MeshMakeData mesh_make_data(gamedef, false); - u8 param2 = 0; - if (f.param_type_2 == CPT2_WALLMOUNTED) - param2 = 1; - MapNode mesh_make_node(id, param1, param2); - mesh_make_data.fillSingleNode(&mesh_make_node); - MapBlockMesh mapblock_mesh(&mesh_make_data, v3s16(0, 0, 0)); - node_mesh = mapblock_mesh.getMesh(); - node_mesh->grab(); - video::SColor c(255, 255, 255, 255); - setMeshColor(node_mesh, c); - - // scale and translate the mesh so it's a - // unit cube centered on the origin - scaleMesh(node_mesh, v3f(1.0/BS, 1.0/BS, 1.0/BS)); - translateMesh(node_mesh, v3f(-1.0, -1.0, -1.0)); - } - - /* - Draw node mesh into a render target texture - */ - if (need_rtt_mesh) { - TextureFromMeshParams params; - params.mesh = node_mesh; - params.dim.set(64, 64); - params.rtt_texture_name = "INVENTORY_" - + def.name + "_RTT"; - params.delete_texture_on_shutdown = true; - params.camera_position.set(0, 1.0, -1.5); - params.camera_position.rotateXZBy(45); - params.camera_lookat.set(0, 0, 0); - // Set orthogonal projection - params.camera_projection_matrix.buildProjectionMatrixOrthoLH( - 1.65, 1.65, 0, 100); - params.ambient_light.set(1.0, 0.2, 0.2, 0.2); - params.light_position.set(10, 100, -50); - params.light_color.set(1.0, 0.5, 0.5, 0.5); - params.light_radius = 1000; - -#ifdef __ANDROID__ - params.camera_position.set(0, -1.0, -1.5); - params.camera_position.rotateXZBy(45); - params.light_position.set(10, -100, -50); -#endif - cc->inventory_texture = - tsrc->generateTextureFromMesh(params); - - // render-to-target didn't work - if (cc->inventory_texture == NULL) { - cc->inventory_texture = - tsrc->getTexture(f.tiledef[0].name); - } - } + ItemStack item = ItemStack(); + item.name = def.name; - /* - Use the node mesh as the wield mesh - */ - if (need_wield_mesh) { - cc->wield_mesh = node_mesh; - cc->wield_mesh->grab(); + getItemMesh(client, item, &(cc->wield_mesh)); - // no way reference count can be smaller than 2 in this place! - assert(cc->wield_mesh->getReferenceCount() >= 2); - } - - if (node_mesh) - node_mesh->drop(); - } + cc->palette = tsrc->getPalette(def.palette_image); // Put in cache m_clientcached.set(name, cc); @@ -441,59 +349,82 @@ public: return cc; } ClientCached* getClientCached(const std::string &name, - IGameDef *gamedef) const + Client *client) const { ClientCached *cc = NULL; m_clientcached.get(name, &cc); - if(cc) + if (cc) return cc; - if(get_current_thread_id() == m_main_thread) - { - return createClientCachedDirect(name, gamedef); + 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, - IGameDef *gamedef) const + virtual ItemMesh* getWieldMesh(const std::string &name, + Client *client) const { - ClientCached *cc = getClientCached(name, gamedef); + 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() @@ -539,7 +470,7 @@ public: { verbosestream<<"ItemDefManager: registering \""< "<