projects / oweals / minetest.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Make getters of the Settings class const
[oweals/minetest.git] / src / content_mapblock.cpp
diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index f5b49c662e77d6dd8bb62330267d9ded9d8add58..b7a48d57ec53830f5b83f2d481d849ae75f59a79 100644 (file)
--- a/src/content_mapblock.cpp
+++ b/src/content_mapblock.cpp
@@ -169,6 +169,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                MeshCollector &collector)
 {
        INodeDefManager *nodedef = data->m_gamedef->ndef();
+       ITextureSource *tsrc = data->m_gamedef->tsrc();
 
        // 0ms
        //TimeTaker timer("mapblock_mesh_generate_special()");
@@ -177,26 +178,74 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                Some settings
        */
        bool new_style_water = g_settings->getBool("new_style_water");
-       
+
        float node_liquid_level = 1.0;
-       if(new_style_water)
+       if (new_style_water)
                node_liquid_level = 0.85;
-       
+
        v3s16 blockpos_nodes = data->m_blockpos*MAP_BLOCKSIZE;
 
-       for(s16 z=0; z<MAP_BLOCKSIZE; z++)
-       for(s16 y=0; y<MAP_BLOCKSIZE; y++)
-       for(s16 x=0; x<MAP_BLOCKSIZE; x++)
+       // Create selection mesh
+       v3s16 p = data->m_highlighted_pos_relative;
+       if (data->m_show_hud & 
+                       (p.X >= 0) & (p.X < MAP_BLOCKSIZE) &
+                       (p.Y >= 0) & (p.Y < MAP_BLOCKSIZE) &
+                       (p.Z >= 0) & (p.Z < MAP_BLOCKSIZE)) {
+
+               MapNode n = data->m_vmanip.getNodeNoEx(blockpos_nodes + p);
+               if(n.getContent() != CONTENT_AIR) {
+                       // Get selection mesh light level
+                       static const v3s16 dirs[7] = {
+                                       v3s16( 0, 0, 0),
+                                       v3s16( 0, 1, 0),
+                                       v3s16( 0,-1, 0),
+                                       v3s16( 1, 0, 0),
+                                       v3s16(-1, 0, 0),
+                                       v3s16( 0, 0, 1),
+                                       v3s16( 0, 0,-1)
+                       };
+
+                       u16 l = 0;
+                       u16 l1 = 0;
+                       for (u8 i = 0; i < 7; i++) {
+                               MapNode n1 = data->m_vmanip.getNodeNoEx(blockpos_nodes + p + dirs[i]);  
+                               l1 = getInteriorLight(n1, -4, nodedef);
+                               if (l1 > l) 
+                                       l = l1;
+                       }
+                       video::SColor c = MapBlock_LightColor(255, l, 0);
+                       data->m_highlight_mesh_color = c;       
+                       std::vector<aabb3f> boxes = n.getSelectionBoxes(nodedef);
+                       TileSpec h_tile;                        
+                       h_tile.material_flags |= MATERIAL_FLAG_HIGHLIGHTED;
+                       h_tile.texture = tsrc->getTexture("halo.png",&h_tile.texture_id);
+                       v3f pos = intToFloat(p, BS);
+                       f32 d = 0.05 * BS;
+                       for(std::vector<aabb3f>::iterator
+                                       i = boxes.begin();
+                                       i != boxes.end(); i++)
+                       {
+                               aabb3f box = *i;
+                               box.MinEdge += v3f(-d, -d, -d) + pos;
+                               box.MaxEdge += v3f(d, d, d) + pos;
+                               makeCuboid(&collector, box, &h_tile, 1, c, NULL);
+                       }
+               }
+       }
+
+       for(s16 z = 0; z < MAP_BLOCKSIZE; z++)
+       for(s16 y = 0; y < MAP_BLOCKSIZE; y++)
+       for(s16 x = 0; x < MAP_BLOCKSIZE; x++)
        {
                v3s16 p(x,y,z);
 
-               MapNode n = data->m_vmanip.getNodeNoEx(blockpos_nodes+p);
+               MapNode n = data->m_vmanip.getNodeNoEx(blockpos_nodes + p);
                const ContentFeatures &f = nodedef->get(n);
 
                // Only solidness=0 stuff is drawn here
                if(f.solidness != 0)
                        continue;
-               
+
                switch(f.drawtype){
                default:
                        infostream<<"Got "<<f.drawtype<<std::endl;
@@ -220,7 +269,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                                top_is_same_liquid = true;
 
                        u16 l = getInteriorLight(n, 0, nodedef);
-                       video::SColor c = MapBlock_LightColor(f.alpha, l, decode_light(f.light_source));
+                       video::SColor c = MapBlock_LightColor(f.alpha, l, f.light_source);
 
                        /*
                                Generate sides
@@ -383,7 +432,6 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        // it at what it emits, for an increased effect
                        u8 light_source = nodedef->get(n).light_source;
                        if(light_source != 0){
-                               //l = decode_light(undiminish_light(light_source));
                                l = decode_light(light_source);
                                l = l | (l<<8);
                        }
@@ -393,7 +441,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        // Otherwise use the light of this node (the liquid)
                        else
                                l = getInteriorLight(n, 0, nodedef);
-                       video::SColor c = MapBlock_LightColor(f.alpha, l, decode_light(f.light_source));
+                       video::SColor c = MapBlock_LightColor(f.alpha, l, f.light_source);
                        
                        u8 range = rangelim(nodedef->get(c_flowing).liquid_range, 1, 8);
 
@@ -697,7 +745,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        TileSpec tile = getNodeTile(n, p, v3s16(0,0,0), data);
 
                        u16 l = getInteriorLight(n, 1, nodedef);
-                       video::SColor c = MapBlock_LightColor(255, l, decode_light(f.light_source));
+                       video::SColor c = MapBlock_LightColor(255, l, f.light_source);
 
                        for(u32 j=0; j<6; j++)
                        {
@@ -780,7 +828,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        param2  = param2 & 63;
                        
                        u16 l = getInteriorLight(n, 1, nodedef);
-                       video::SColor c = MapBlock_LightColor(255, l, decode_light(f.light_source));
+                       video::SColor c = MapBlock_LightColor(255, l, f.light_source);
                        v3f pos = intToFloat(p, BS);
                        static const float a = BS / 2;
                        static const float g = a - 0.003;
@@ -985,7 +1033,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                                        v3s16(0,0,0), data);
 
                        u16 l = getInteriorLight(n, 1, nodedef);
-                       video::SColor c = MapBlock_LightColor(255, l, decode_light(f.light_source));
+                       video::SColor c = MapBlock_LightColor(255, l, f.light_source);
 
                        v3f pos = intToFloat(p, BS);
                        aabb3f box(-BS/2,-BS/2,-BS/2,BS/2,BS/2,BS/2);
@@ -1018,7 +1066,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        tile.material_flags |= MATERIAL_FLAG_CRACK_OVERLAY;
 
                        u16 l = getInteriorLight(n, 1, nodedef);
-                       video::SColor c = MapBlock_LightColor(255, l, decode_light(f.light_source));
+                       video::SColor c = MapBlock_LightColor(255, l, f.light_source);
 
                        float s = BS/2*f.visual_scale;
                        // Wall at X+ of node
@@ -1059,7 +1107,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        tile.material_flags |= MATERIAL_FLAG_CRACK_OVERLAY;
 
                        u16 l = getInteriorLight(n, 0, nodedef);
-                       video::SColor c = MapBlock_LightColor(255, l, decode_light(f.light_source));
+                       video::SColor c = MapBlock_LightColor(255, l, f.light_source);
                                
                        float d = (float)BS/16;
                        float s = BS/2*f.visual_scale;
@@ -1102,7 +1150,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        tile.material_flags |= MATERIAL_FLAG_CRACK_OVERLAY;
                        
                        u16 l = getInteriorLight(n, 1, nodedef);
-                       video::SColor c = MapBlock_LightColor(255, l, decode_light(f.light_source));
+                       video::SColor c = MapBlock_LightColor(255, l, f.light_source);
 
                        float s = BS/2*f.visual_scale;
 
@@ -1149,7 +1197,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        tile_rot.rotation = 1;
 
                        u16 l = getInteriorLight(n, 1, nodedef);
-                       video::SColor c = MapBlock_LightColor(255, l, decode_light(f.light_source));
+                       video::SColor c = MapBlock_LightColor(255, l, f.light_source);
 
                        const f32 post_rad=(f32)BS/8;
                        const f32 bar_rad=(f32)BS/16;
@@ -1398,7 +1446,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        tile.material_flags |= MATERIAL_FLAG_CRACK_OVERLAY;
 
                        u16 l = getInteriorLight(n, 0, nodedef);
-                       video::SColor c = MapBlock_LightColor(255, l, decode_light(f.light_source));
+                       video::SColor c = MapBlock_LightColor(255, l, f.light_source);
 
                        float d = (float)BS/64;
                        
@@ -1436,8 +1484,8 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        };
                        TileSpec tiles[6];
                        
-                       u16 l = getInteriorLight(n, 0, nodedef);
-                       video::SColor c = MapBlock_LightColor(255, l, decode_light(f.light_source));
+                       u16 l = getInteriorLight(n, 1, nodedef);
+                       video::SColor c = MapBlock_LightColor(255, l, f.light_source);
 
                        v3f pos = intToFloat(p, BS);
 
Unnamed repository; edit this file 'description' to name the repository.