X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fitemdef.cpp;h=0133b1b3f2a288940709f354df04ff1a99cb12a1;hb=79e2647556773d46cc0299e73ca23c41a153ff2a;hp=6c3bdb5e368befeadc1408f7473a6b1223aa7d76;hpb=497ff1ecd64c8908f988e15ca879824f2781e3fd;p=minetest.git diff --git a/src/itemdef.cpp b/src/itemdef.cpp index 6c3bdb5e3..0133b1b3f 100644 --- a/src/itemdef.cpp +++ b/src/itemdef.cpp @@ -1,7 +1,7 @@ /* Minetest -Copyright (C) 2010-2011 celeron55, Perttu Ahola -Copyright (C) 2011 Kahrl +Copyright (C) 2010-2013 celeron55, Perttu Ahola +Copyright (C) 2013 Kahrl This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -27,10 +27,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef SERVER #include "mapblock_mesh.h" #include "mesh.h" -#include "tile.h" +#include "wieldmesh.h" +#include "client/tile.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 */ @@ -75,6 +79,8 @@ ItemDefinition& ItemDefinition::operator=(const ItemDefinition &def) } groups = def.groups; node_placement_prediction = def.node_placement_prediction; + sound_place = def.sound_place; + range = def.range; return *this; } @@ -100,7 +106,6 @@ void ItemDefinition::reset() wield_scale = v3f(1.0, 1.0, 1.0); stack_max = 99; usable = false; - rightclickable = false; liquids_pointable = false; if(tool_capabilities) { @@ -108,13 +113,20 @@ void ItemDefinition::reset() tool_capabilities = NULL; } groups.clear(); + sound_place = SimpleSoundSpec(); + range = -1; node_placement_prediction = ""; } -void ItemDefinition::serialize(std::ostream &os) const +void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const { - writeU8(os, 1); // version + if(protocol_version <= 17) + writeU8(os, 1); // version + else if(protocol_version <= 20) + writeU8(os, 2); // version + else + writeU8(os, 3); // version writeU8(os, type); os<serialize(tmp_os); + tool_capabilities->serialize(tmp_os, protocol_version); tool_capabilities_s = tmp_os.str(); } os<second); } os< 17){ + //serializeSimpleSoundSpec(sound_place, os); + os< 20){ + writeF1000(os, range); + } } void ItemDefinition::deSerialize(std::istream &is) @@ -147,7 +167,7 @@ void ItemDefinition::deSerialize(std::istream &is) // Deserialize int version = readU8(is); - if(version != 1) + if(version < 1 || version > 3) throw SerializationError("unsupported ItemDefinition version"); type = (enum ItemType)readU8(is); name = deSerializeString(is); @@ -172,10 +192,26 @@ 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); + } // If you add anything here, insert it primarily inside the try-catch // block to not need to increase the version. try{ - node_placement_prediction = deSerializeString(is); }catch(SerializationError &e) {}; } @@ -203,23 +239,32 @@ class CItemDefManager: public IWritableItemDefManager public: CItemDefManager() { + #ifndef SERVER m_main_thread = get_current_thread_id(); #endif - clear(); } virtual ~CItemDefManager() { #ifndef SERVER - const core::list &values = m_clientcached.getValues(); - for(core::list::ConstIterator + 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; } + #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 { @@ -235,26 +280,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; } @@ -267,6 +309,7 @@ class CItemDefManager: public IWritableItemDefManager return m_item_definitions.find(name) != m_item_definitions.end(); } #ifndef SERVER +public: ClientCached* createClientCachedDirect(const std::string &name, IGameDef *gamedef) const { @@ -274,7 +317,7 @@ class CItemDefManager: public IWritableItemDefManager <getTextureSource(); INodeDefManager *nodedef = gamedef->getNodeDefManager(); - IrrlichtDevice *device = tsrc->getDevice(); - video::IVideoDriver *driver = device->getVideoDriver(); - const ItemDefinition *def = &get(name); + 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 - if(cc->wield_mesh != NULL) - { - cc->wield_mesh->drop(); - 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<getId(def->name); + if(def.inventory_image != "") + 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); - 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)); + 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(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; + 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 - camera_projection_matrix.buildProjectionMatrixOrthoLH( + params.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); + 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) - { + if (cc->inventory_texture == NULL) { cc->inventory_texture = - tsrc->getTextureRaw(f.tiledef[0].name); + tsrc->getTexture(f.tiledef[0].name); } } /* Use the node mesh as the wield mesh */ - if(cc->wield_mesh == NULL) - { - // Scale to proper wield mesh proportions - scaleMesh(node_mesh, v3f(30.0, 30.0, 30.0) - * def->wield_scale); + if (need_wield_mesh) { 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); } - // falling outside of here deletes node_mesh + if (node_mesh) + node_mesh->drop(); } // Put in cache @@ -445,21 +455,24 @@ class CItemDefManager: public IWritableItemDefManager 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."<type = ITEM_NODE; unknown_def->name = "unknown"; m_item_definitions.insert(std::make_pair("unknown", unknown_def)); @@ -525,8 +540,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); - os<serialize(tmp_os, protocol_version); + os << serializeString(tmp_os.str()); } + writeU16(os, m_aliases.size()); - for(std::map::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) @@ -600,16 +617,14 @@ class CItemDefManager: public IWritableItemDefManager void processQueue(IGameDef *gamedef) { #ifndef SERVER - while(m_get_clientcached_queue.size() > 0) + //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, gamedef)); } #endif } @@ -617,7 +632,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; @@ -634,4 +649,3 @@ IWritableItemDefManager* createItemDefManager() { return new CItemDefManager(); } -