Node highlighting.

[oweals/minetest.git] / src / itemdef.cpp

diff --git a/src/itemdef.cpp b/src/itemdef.cpp
index e7498ce55de580dbd4fcb7f95d717c01457284b8..10e1afe2dbaedcf160e1ad692a5030d0ffda3b8e 100644 (file)
--- 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 <map>
 #include <set>
 
+#ifdef __ANDROID__
+#include <GLES/gl.h>
+#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<<serializeString(name);
        os<<serializeString(description);
@@ -147,6 +155,9 @@ void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const
                os<<serializeString(sound_place.name);
                writeF1000(os, sound_place.gain);
        }
+       if(protocol_version > 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) {};
 }
 
@@ -381,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->getBool("enable_shaders"))
-                               c = MapBlock_LightColor(255, 0xffff, decode_light(f.light_source));
                        setMeshColor(node_mesh, c);
 
                        /*
@@ -422,6 +437,11 @@ public:
                                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);
 
@@ -446,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
@@ -468,21 +491,24 @@ public:
                else
                {
                        // We're gonna ask the result to be put into here
-                       ResultQueue<std::string, ClientCached*, u8, u8> result_queue;
+                       static ResultQueue<std::string, ClientCached*, u8, u8> result_queue;
+
                        // Throw a request in
                        m_get_clientcached_queue.add(name, 0, 0, &result_queue);
                        try{
-                               // Wait result for a second
-                               GetResult<std::string, ClientCached*, u8, u8>
+                               while(true) {
+                                       // Wait result for a second
+                                       GetResult<std::string, ClientCached*, u8, u8>
                                                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."<<std::endl;
+                               errorstream<<"Waiting for clientcached " << name << " timed out."<<std::endl;
                                return &m_dummy_clientcached;
                        }
                }
@@ -551,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
@@ -625,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<std::string, ClientCached*, u8, u8>
                                        request = m_get_clientcached_queue.pop();
-                       GetResult<std::string, ClientCached*, u8, u8>
-                                       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
        }