X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fitemdef.cpp;h=10e1afe2dbaedcf160e1ad692a5030d0ffda3b8e;hb=58e6d25e033c76dc91aaac18fdeda92ac23fe0e1;hp=d660db77fd850de2f6bc4a78e14fa666d5606b2a;hpb=e0564d5de01dd26f7b4f4d188415f5cf5a47b5d0;p=oweals%2Fminetest.git diff --git a/src/itemdef.cpp b/src/itemdef.cpp index d660db77f..10e1afe2d 100644 --- a/src/itemdef.cpp +++ b/src/itemdef.cpp @@ -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,7 @@ 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; } @@ -109,6 +114,7 @@ void ItemDefinition::reset() } groups.clear(); sound_place = SimpleSoundSpec(); + range = -1; node_placement_prediction = ""; } @@ -117,8 +123,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< 20){ + writeF1000(os, range); + } } void ItemDefinition::deSerialize(std::istream &is) @@ -156,7 +167,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,16 +200,18 @@ 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) {}; } @@ -229,7 +242,6 @@ public: #ifndef SERVER m_main_thread = get_current_thread_id(); - m_driver = NULL; #endif clear(); } @@ -246,13 +258,6 @@ public: 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(); @@ -307,9 +312,6 @@ public: 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 @@ -341,7 +343,7 @@ public: cc->inventory_texture = NULL; if(def->inventory_image != "") { - cc->inventory_texture = tsrc->getTextureRaw(def->inventory_image); + cc->inventory_texture = tsrc->getTexture(def->inventory_image); } else if(def->type == ITEM_NODE) { @@ -365,7 +367,7 @@ public: imagename = def->inventory_image; cc->wield_mesh = createExtrudedMesh( - tsrc->getTextureRaw(imagename), + tsrc->getTexture(imagename), driver, def->wield_scale * v3f(40.0, 40.0, 4.0)); if(cc->wield_mesh == NULL) @@ -392,16 +394,18 @@ public: /* Make a mesh from the node */ + bool reenable_shaders = false; + if(g_settings->getBool("enable_shaders")){ + reenable_shaders = true; + g_settings->setBool("enable_shaders",false); + } 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); - + MapBlockMesh mapblock_mesh(&mesh_make_data, v3s16(0, 0, 0)); 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); /* @@ -416,46 +420,38 @@ public: */ if(cc->inventory_texture == NULL) { - core::dimension2d dim(64,64); - std::string rtt_texture_name = "INVENTORY_" + TextureFromMeshParams params; + params.mesh = node_mesh; + params.dim.set(64, 64); + params.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; + 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) { cc->inventory_texture = - tsrc->getTextureRaw(f.tiledef[0].name); + tsrc->getTexture(f.tiledef[0].name); } } - else - { - if (m_driver == 0) - m_driver = driver; - - m_extruded_textures.push_back(cc->inventory_texture); - } /* Use the node mesh as the wield mesh @@ -470,6 +466,9 @@ public: //no way reference count can be smaller than 2 in this place! assert(cc->wield_mesh->getReferenceCount() >= 2); + + if (reenable_shaders) + g_settings->setBool("enable_shaders",true); } // Put in cache @@ -492,21 +491,24 @@ public: 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)); @@ -573,7 +577,7 @@ public: // Ensure that the "" item (the hand) always has ToolCapabilities if(def.name == "") assert(def.tool_capabilities != NULL); - + if(m_item_definitions.count(def.name) == 0) m_item_definitions[def.name] = new ItemDefinition(def); else @@ -647,16 +651,14 @@ public: 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, gamedef)); } #endif } @@ -681,9 +683,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