X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fitemdef.cpp;h=5ba9d8f9a970bf2af39833b34e1a155d89e859fd;hb=3e30731c1ac313b504ff15eb7f40ce6a387d3da2;hp=784919ae2deb371732118e6943511519c2be6c1d;hpb=58fd39de35fc541ee6f50cc7b85ff29ab749778a;p=minetest.git diff --git a/src/itemdef.cpp b/src/itemdef.cpp index 784919ae2..5ba9d8f9a 100644 --- a/src/itemdef.cpp +++ b/src/itemdef.cpp @@ -20,17 +20,17 @@ 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" #ifndef SERVER #include "mapblock_mesh.h" #include "mesh.h" -#include "tile.h" +#include "wieldmesh.h" +#include "client/tile.h" +#include "client.h" #endif #include "log.h" -#include "main.h" // g_settings #include "settings.h" #include "util/serialize.h" #include "util/container.h" @@ -38,6 +38,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include +#ifdef __ANDROID__ +#include +#endif + /* ItemDefinition */ @@ -76,6 +80,8 @@ 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; return *this; } @@ -109,6 +115,8 @@ void ItemDefinition::reset() } groups.clear(); sound_place = SimpleSoundSpec(); + sound_place_failed = SimpleSoundSpec(); + range = -1; node_placement_prediction = ""; } @@ -117,8 +125,10 @@ void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const { if(protocol_version <= 17) writeU8(os, 1); // version - else + else if(protocol_version <= 20) writeU8(os, 2); // version + else + writeU8(os, 3); // version writeU8(os, type); os<::const_iterator - i = groups.begin(); i != groups.end(); i++){ - os<first); + for (ItemGroupList::const_iterator + i = groups.begin(); i != groups.end(); ++i){ + os << serializeString(i->first); writeS16(os, i->second); } os< 20) { + writeF1000(os, range); + os << serializeString(sound_place_failed.name); + writeF1000(os, sound_place_failed.gain); + } } void ItemDefinition::deSerialize(std::istream &is) @@ -156,7 +171,7 @@ void ItemDefinition::deSerialize(std::istream &is) // Deserialize int version = readU8(is); - if(version != 1 && version != 2) + if(version < 1 || version > 3) throw SerializationError("unsupported ItemDefinition version"); type = (enum ItemType)readU8(is); name = deSerializeString(is); @@ -189,17 +204,21 @@ void ItemDefinition::deSerialize(std::istream &is) // Set the old default sound sound_place.name = "default_place_node"; sound_place.gain = 0.5; - } else if(version == 2) { + } 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); + } // 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 { + sound_place_failed.name = deSerializeString(is); + sound_place_failed.gain = readF1000(is); + } catch(SerializationError &e) {}; } /* @@ -226,39 +245,32 @@ class CItemDefManager: public IWritableItemDefManager public: CItemDefManager() { - for (std::map::iterator iter = - m_item_definitions.begin(); iter != m_item_definitions.end(); - iter ++) { - delete iter->second; - } - m_item_definitions.clear(); + #ifndef SERVER - m_main_thread = get_current_thread_id(); - m_driver = NULL; + m_main_thread = thr_get_current_thread_id(); #endif - clear(); } virtual ~CItemDefManager() { #ifndef SERVER - const std::list &values = m_clientcached.getValues(); - for(std::list::const_iterator + const std::vector &values = m_clientcached.getValues(); + for(std::vector::const_iterator i = values.begin(); i != values.end(); ++i) { ClientCached *cc = *i; - cc->wield_mesh->drop(); + if (cc->wield_mesh) + cc->wield_mesh->drop(); delete cc; } - if (m_driver != NULL) { - for (unsigned int i = 0; i < m_extruded_textures.size(); i++) { - m_driver->removeTexture(m_extruded_textures[i]); - } - m_extruded_textures.clear(); - } - m_driver = NULL; #endif + for (std::map::iterator iter = + m_item_definitions.begin(); iter != m_item_definitions.end(); + ++iter) { + delete iter->second; + } + m_item_definitions.clear(); } virtual const ItemDefinition& get(const std::string &name_) const { @@ -274,26 +286,23 @@ class CItemDefManager: public IWritableItemDefManager } virtual std::string getAlias(const std::string &name) const { - std::map::const_iterator i; - i = m_aliases.find(name); - if(i != m_aliases.end()) - return i->second; + StringMap::const_iterator it = m_aliases.find(name); + if (it != m_aliases.end()) + return it->second; return name; } virtual std::set getAll() const { std::set result; - for(std::map::const_iterator - i = m_item_definitions.begin(); - i != m_item_definitions.end(); i++) - { - result.insert(i->first); + for(std::map::const_iterator + it = m_item_definitions.begin(); + it != m_item_definitions.end(); ++it) { + result.insert(it->first); } - for(std::map::const_iterator - i = m_aliases.begin(); - i != m_aliases.end(); i++) - { - result.insert(i->first); + for (StringMap::const_iterator + it = m_aliases.begin(); + it != m_aliases.end(); ++it) { + result.insert(it->first); } return result; } @@ -306,18 +315,15 @@ class CItemDefManager: public IWritableItemDefManager return m_item_definitions.find(name) != m_item_definitions.end(); } #ifndef SERVER -private: - static video::IVideoDriver * m_driver; - static std::vector m_extruded_textures; 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(); - IrrlichtDevice *device = tsrc->getDevice(); - video::IVideoDriver *driver = device->getVideoDriver(); - const ItemDefinition *def = &get(name); + ITextureSource *tsrc = client->getTextureSource(); + const ItemDefinition &def = get(name); // Create new ClientCached cc = new ClientCached(); - bool need_node_mesh = false; - // Create an inventory texture cc->inventory_texture = NULL; - if(def->inventory_image != "") - { - cc->inventory_texture = tsrc->getTextureRaw(def->inventory_image); - } - else if(def->type == ITEM_NODE) - { - need_node_mesh = true; - } - - // Create a wield mesh - assert(cc->wield_mesh == NULL); - if(def->type == ITEM_NODE && def->wield_image == "") - { - need_node_mesh = true; - } - else if(def->wield_image != "" || def->inventory_image != "") - { - // Extrude the wield image into a mesh - - std::string imagename; - if(def->wield_image != "") - imagename = def->wield_image; - else - imagename = def->inventory_image; - - cc->wield_mesh = createExtrudedMesh( - tsrc->getTextureRaw(imagename), - driver, - def->wield_scale * v3f(40.0, 40.0, 4.0)); - if(cc->wield_mesh == NULL) - { - infostream<<"ItemDefManager: WARNING: " - <<"updateTexturesAndMeshes(): " - <<"Unable to create extruded mesh for item " - <name<inventory_texture = tsrc->getTexture(def.inventory_image); - if(need_node_mesh) - { - /* - Get node properties - */ - content_t id = nodedef->getId(def->name); - const ContentFeatures &f = nodedef->get(id); - - u8 param1 = 0; - if(f.param_type == CPT_LIGHT) - param1 = 0xee; - - /* - Make a mesh from the node - */ - MeshMakeData mesh_make_data(gamedef); - MapNode mesh_make_node(id, param1, 0); - mesh_make_data.fillSingleNode(&mesh_make_node); - MapBlockMesh mapblock_mesh(&mesh_make_data); - - scene::IMesh *node_mesh = mapblock_mesh.getMesh(); - assert(node_mesh); - video::SColor c(255, 255, 255, 255); - if(g_settings->getS32("enable_shaders") != 0) - c = MapBlock_LightColor(255, 0xffff, decode_light(f.light_source)); - 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(cc->inventory_texture == NULL) - { - core::dimension2d dim(64,64); - std::string rtt_texture_name = "INVENTORY_" - + def->name + "_RTT"; - v3f camera_position(0, 1.0, -1.5); - camera_position.rotateXZBy(45); - v3f camera_lookat(0, 0, 0); - core::CMatrix4 camera_projection_matrix; - // Set orthogonal projection - camera_projection_matrix.buildProjectionMatrixOrthoLH( - 1.65, 1.65, 0, 100); - - video::SColorf ambient_light(0.2,0.2,0.2); - v3f light_position(10, 100, -50); - video::SColorf light_color(0.5,0.5,0.5); - f32 light_radius = 1000; - - cc->inventory_texture = generateTextureFromMesh( - node_mesh, device, dim, rtt_texture_name, - camera_position, - camera_lookat, - camera_projection_matrix, - ambient_light, - light_position, - light_color, - light_radius); - - // render-to-target didn't work - if(cc->inventory_texture == NULL) - { - cc->inventory_texture = - tsrc->getTextureRaw(f.tiledef[0].name); - } - } - else - { - if (m_driver == 0) - m_driver = driver; + ItemStack item = ItemStack(); + item.name = def.name; - m_extruded_textures.push_back(cc->inventory_texture); - } - - /* - Use the node mesh as the wield mesh - */ - - // Scale to proper wield mesh proportions - scaleMesh(node_mesh, v3f(30.0, 30.0, 30.0) - * def->wield_scale); - - cc->wield_mesh = node_mesh; - cc->wield_mesh->grab(); - - //no way reference count can be smaller than 2 in this place! - assert(cc->wield_mesh->getReferenceCount() >= 2); - } + scene::IMesh *mesh = getItemMesh(client, item); + cc->wield_mesh = mesh; // Put in cache m_clientcached.set(name, cc); @@ -477,53 +354,56 @@ class CItemDefManager: public IWritableItemDefManager return cc; } ClientCached* getClientCached(const std::string &name, - IGameDef *gamedef) const + Client *client) const { ClientCached *cc = NULL; m_clientcached.get(name, &cc); if(cc) return cc; - if(get_current_thread_id() == m_main_thread) + if(thr_is_current_thread(m_main_thread)) { - return createClientCachedDirect(name, gamedef); + return createClientCachedDirect(name, client); } else { // We're gonna ask the result to be put into here - ResultQueue result_queue; + static ResultQueue result_queue; + // Throw a request in m_get_clientcached_queue.add(name, 0, 0, &result_queue); try{ - // Wait result for a second - GetResult + while(true) { + // Wait result for a second + GetResult result = result_queue.pop_front(1000); - // Check that at least something worked OK - assert(result.key == name); - // Return it - return result.item; + + if (result.key == name) { + return result.item; + } + } } catch(ItemNotFoundException &e) { - errorstream<<"Waiting for clientcached timed out."<inventory_texture; } // Get item wield mesh virtual scene::IMesh* getWieldMesh(const std::string &name, - IGameDef *gamedef) const + Client *client) const { - ClientCached *cc = getClientCached(name, gamedef); + ClientCached *cc = getClientCached(name, client); if(!cc) return NULL; return cc->wield_mesh; @@ -533,7 +413,7 @@ class CItemDefManager: public IWritableItemDefManager { for(std::map::const_iterator i = m_item_definitions.begin(); - i != m_item_definitions.end(); i++) + i != m_item_definitions.end(); ++i) { delete i->second; } @@ -542,7 +422,8 @@ class CItemDefManager: public IWritableItemDefManager // Add the four builtin items: // "" is the hand - // "unknown" is returned whenever an undefined item is accessed + // "unknown" is returned whenever an undefined item + // is accessed (is also the unknown node) // "air" is the air node // "ignore" is the ignore node @@ -553,6 +434,7 @@ class CItemDefManager: public IWritableItemDefManager m_item_definitions.insert(std::make_pair("", hand_def)); ItemDefinition* unknown_def = new ItemDefinition; + unknown_def->type = ITEM_NODE; unknown_def->name = "unknown"; m_item_definitions.insert(std::make_pair("unknown", unknown_def)); @@ -571,8 +453,8 @@ class CItemDefManager: public IWritableItemDefManager verbosestream<<"ItemDefManager: registering \""< "<::const_iterator - i = m_item_definitions.begin(); - i != m_item_definitions.end(); i++) - { - ItemDefinition *def = i->second; + + for (std::map::const_iterator + it = m_item_definitions.begin(); + it != m_item_definitions.end(); ++it) { + ItemDefinition *def = it->second; // Serialize ItemDefinition and write wrapped in a string std::ostringstream tmp_os(std::ios::binary); def->serialize(tmp_os, protocol_version); - os<::const_iterator - i = m_aliases.begin(); i != m_aliases.end(); i++) - { - os<first); - os<second); + + for (StringMap::const_iterator + it = m_aliases.begin(); + it != m_aliases.end(); ++it) { + os << serializeString(it->first); + os << serializeString(it->second); } } void deSerialize(std::istream &is) @@ -646,16 +536,14 @@ class CItemDefManager: public IWritableItemDefManager void processQueue(IGameDef *gamedef) { #ifndef SERVER + //NOTE this is only thread safe for ONE consumer thread! while(!m_get_clientcached_queue.empty()) { GetRequest request = m_get_clientcached_queue.pop(); - GetResult - result; - result.key = request.key; - result.callers = request.callers; - result.item = createClientCachedDirect(request.key, gamedef); - request.dest->push_back(result); + + m_get_clientcached_queue.pushResult(request, + createClientCachedDirect(request.key, (Client *)gamedef)); } #endif } @@ -663,7 +551,7 @@ class CItemDefManager: public IWritableItemDefManager // Key is name std::map m_item_definitions; // Aliases - std::map m_aliases; + StringMap m_aliases; #ifndef SERVER // The id of the thread that is allowed to use irrlicht directly threadid_t m_main_thread; @@ -680,9 +568,3 @@ IWritableItemDefManager* createItemDefManager() { return new CItemDefManager(); } - -#ifndef SERVER -//TODO very very very dirty hack! -video::IVideoDriver * CItemDefManager::m_driver = 0; -std::vector CItemDefManager::m_extruded_textures; -#endif