Modified windows build parameters a bit to make it build

[dragonfireclient.git] / src / map.cpp

diff --git a/src/map.cpp b/src/map.cpp
index 0a1b65ace389f5be874f529d9e37c1f04a617e02..d644215be78911de0d56af9825eb684e98d94d3d 100644 (file)
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -940,20 +940,40 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
                n.setLight(bank, 0);
        }
 
+       /*
+               If node lets sunlight through and is under sunlight, it has
+               sunlight too.
+       */
+       if(node_under_sunlight && content_features(n.d).sunlight_propagates)
+       {
+               n.setLight(LIGHTBANK_DAY, LIGHT_SUN);
+       }
+       
        /*
                Set the node on the map
        */
        
        setNode(p, n);
+
+       /*
+               Add intial metadata
+       */
+
+       NodeMetadata *meta_proto = content_features(n.d).initial_metadata;
+       if(meta_proto)
+       {
+               NodeMetadata *meta = meta_proto->clone();
+               setNodeMetadata(p, meta);
+       }
        
        /*
-               If node is under sunlight, take all sunlighted nodes under
-               it and clear light from them and from where the light has
-               been spread.
+               If node is under sunlight and doesn't let sunlight through,
+               take all sunlighted nodes under it and clear light from them
+               and from where the light has been spread.
                TODO: This could be optimized by mass-unlighting instead
                      of looping
        */
-       if(node_under_sunlight)
+       if(node_under_sunlight && !content_features(n.d).sunlight_propagates)
        {
                s16 y = p.Y - 1;
                for(;; y--){
@@ -981,7 +1001,7 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
                                break;
                }
        }
-       
+
        for(s32 i=0; i<2; i++)
        {
                enum LightBank bank = banks[i];
@@ -1084,6 +1104,12 @@ void Map::removeNodeAndUpdate(v3s16 p,
                                light_sources, modified_blocks);
        }
 
+       /*
+               Remove node metadata
+       */
+
+       removeNodeMetadata(p);
+
        /*
                Remove the node.
                This also clears the lighting.
@@ -1687,6 +1713,49 @@ void Map::transformLiquids(core::map<v3s16, MapBlock*> & modified_blocks)
        //dstream<<"Map::transformLiquids(): loopcount="<<loopcount<<std::endl;
 }
 
+NodeMetadata* Map::getNodeMetadata(v3s16 p)
+{
+       v3s16 blockpos = getNodeBlockPos(p);
+       v3s16 p_rel = p - blockpos*MAP_BLOCKSIZE;
+       MapBlock *block = getBlockNoCreateNoEx(blockpos);
+       if(block == NULL)
+       {
+               dstream<<"WARNING: Map::setNodeMetadata(): Block not found"
+                               <<std::endl;
+               return NULL;
+       }
+       NodeMetadata *meta = block->m_node_metadata.get(p_rel);
+       return meta;
+}
+
+void Map::setNodeMetadata(v3s16 p, NodeMetadata *meta)
+{
+       v3s16 blockpos = getNodeBlockPos(p);
+       v3s16 p_rel = p - blockpos*MAP_BLOCKSIZE;
+       MapBlock *block = getBlockNoCreateNoEx(blockpos);
+       if(block == NULL)
+       {
+               dstream<<"WARNING: Map::setNodeMetadata(): Block not found"
+                               <<std::endl;
+               return;
+       }
+       block->m_node_metadata.set(p_rel, meta);
+}
+
+void Map::removeNodeMetadata(v3s16 p)
+{
+       v3s16 blockpos = getNodeBlockPos(p);
+       v3s16 p_rel = p - blockpos*MAP_BLOCKSIZE;
+       MapBlock *block = getBlockNoCreateNoEx(blockpos);
+       if(block == NULL)
+       {
+               dstream<<"WARNING: Map::removeNodeMetadata(): Block not found"
+                               <<std::endl;
+               return;
+       }
+       block->m_node_metadata.remove(p_rel);
+}
+
 /*
        ServerMap
 */
@@ -5315,7 +5384,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
        */
        int time1 = time(0);
 
-       u32 daynight_ratio = m_client->getDayNightRatio();
+       //u32 daynight_ratio = m_client->getDayNightRatio();
 
        m_camera_mutex.Lock();
        v3f camera_position = m_camera_position;
@@ -5418,7 +5487,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
                                continue;
                        }
                        
-                       // This is ugly
+                       // This is ugly (spherical distance limit?)
                        /*if(m_control.range_all == false &&
                                        d - 0.5*BS*MAP_BLOCKSIZE > range)
                                continue;*/
@@ -5426,6 +5495,9 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
 #if 1
                        /*
                                Update expired mesh (used for day/night change)
+
+                               It doesn't work exactly like it should now with the
+                               tasked mesh update but whatever.
                        */
 
                        bool mesh_expired = false;
@@ -5462,28 +5534,12 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
                                mesh_update_count++;
 
                                // Mesh has been expired: generate new mesh
-                               //block->updateMeshes(daynight_i);
-                               block->updateMesh(daynight_ratio);
+                               //block->updateMesh(daynight_ratio);
+                               m_client->addUpdateMeshTask(block->getPos());
 
                                mesh_expired = false;
                        }
                        
-                       /*
-                               Don't draw an expired mesh that is far away
-                       */
-                       /*if(mesh_expired && d >= faraway)
-                       //if(mesh_expired)
-                       {
-                               // Instead, delete it
-                               JMutexAutoLock lock(block->mesh_mutex);
-                               if(block->mesh)
-                               {
-                                       block->mesh->drop();
-                                       block->mesh = NULL;
-                               }
-                               // And continue to next block
-                               continue;
-                       }*/
 #endif
                        /*
                                Draw the faces of the block
@@ -5671,6 +5727,7 @@ void ClientMap::updateMeshes(v3s16 blockpos, u32 daynight_ratio)
                v3s16 p = blockpos + v3s16(0,0,0);
                MapBlock *b = getBlockNoCreate(p);
                b->updateMesh(daynight_ratio);
+               //b->setMeshExpired(true);
        }
        catch(InvalidPositionException &e){}
        // Leading edge
@@ -5678,18 +5735,21 @@ void ClientMap::updateMeshes(v3s16 blockpos, u32 daynight_ratio)
                v3s16 p = blockpos + v3s16(-1,0,0);
                MapBlock *b = getBlockNoCreate(p);
                b->updateMesh(daynight_ratio);
+               //b->setMeshExpired(true);
        }
        catch(InvalidPositionException &e){}
        try{
                v3s16 p = blockpos + v3s16(0,-1,0);
                MapBlock *b = getBlockNoCreate(p);
                b->updateMesh(daynight_ratio);
+               //b->setMeshExpired(true);
        }
        catch(InvalidPositionException &e){}
        try{
                v3s16 p = blockpos + v3s16(0,0,-1);
                MapBlock *b = getBlockNoCreate(p);
                b->updateMesh(daynight_ratio);
+               //b->setMeshExpired(true);
        }
        catch(InvalidPositionException &e){}
 }