]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/content_mapnode.cpp
projects / dragonfireclient.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Make CONTENT_IGNORE to not block the view when occlusion culling
[dragonfireclient.git] / src / content_mapnode.cpp
diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp
index 30839773538934bc39ca3388df3ad36900775ab9..ec0a7df05e3d09e7eee5484f7671536cad40ac32 100644 (file)
--- a/src/content_mapnode.cpp
+++ b/src/content_mapnode.cpp
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "content_mapnode.h"
 #include "mapnode.h"
 #include "content_nodemeta.h"
+#include "settings.h"
 
 #define WATER_ALPHA 160
 
@@ -103,9 +104,9 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version)
 void content_mapnode_init()
 {
        // Read some settings
-       bool new_style_water = g_settings.getBool("new_style_water");
-       bool new_style_leaves = g_settings.getBool("new_style_leaves");
-       bool invisible_stone = g_settings.getBool("invisible_stone");
+       bool new_style_water = g_settings->getBool("new_style_water");
+       bool new_style_leaves = g_settings->getBool("new_style_leaves");
+       bool invisible_stone = g_settings->getBool("invisible_stone");
 
        content_t i;
        ContentFeatures *f = NULL;
@@ -116,6 +117,7 @@ void content_mapnode_init()
        f->setInventoryTextureCube("stone.png", "stone.png", "stone.png");
        f->param_type = CPT_MINERAL;
        f->is_ground_content = true;
+       f->often_contains_mineral = true;
        f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COBBLE)+" 1";
        setStoneLikeDiggingProperties(f->digging_properties, 1.0);
        if(invisible_stone)
@@ -218,6 +220,7 @@ void content_mapnode_init()
        i = CONTENT_JUNGLEGRASS;
        f = &content_features(i);
        f->setInventoryTexture("junglegrass.png");
+       f->used_texturenames["junglegrass.png"] = true;
        f->light_propagates = true;
        f->param_type = CPT_LIGHT;
        //f->is_ground_content = true;
@@ -236,6 +239,8 @@ void content_mapnode_init()
        if(new_style_leaves)
        {
                f->solidness = 0; // drawn separately, makes no faces
+               f->visual_solidness = 1;
+               f->setAllTextures("leaves.png");
                f->setInventoryTextureCube("leaves.png", "leaves.png", "leaves.png");
        }
        else
@@ -243,7 +248,7 @@ void content_mapnode_init()
                f->setAllTextures("[noalpha:leaves.png");
        }
        f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAPLING)+" 1";
-       f->extra_dug_item_rarity = 10;
+       f->extra_dug_item_rarity = 20;
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        setWoodLikeDiggingProperties(f->digging_properties, 0.15);
 
@@ -261,6 +266,7 @@ void content_mapnode_init()
        i = CONTENT_PAPYRUS;
        f = &content_features(i);
        f->setInventoryTexture("papyrus.png");
+       f->used_texturenames["papyrus.png"] = true;
        f->light_propagates = true;
        f->param_type = CPT_LIGHT;
        f->is_ground_content = true;
@@ -289,6 +295,8 @@ void content_mapnode_init()
        f->is_ground_content = true;
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        f->solidness = 0; // drawn separately, makes no faces
+       f->visual_solidness = 1;
+       f->setAllTextures("glass.png");
        f->setInventoryTextureCube("glass.png", "glass.png", "glass.png");
        setWoodLikeDiggingProperties(f->digging_properties, 0.15);
 
@@ -301,11 +309,13 @@ void content_mapnode_init()
        f->solidness = 0; // drawn separately, makes no faces
        f->air_equivalent = true; // grass grows underneath
        f->setInventoryTexture("fence.png");
+       f->used_texturenames["fence.png"] = true;
        setWoodLikeDiggingProperties(f->digging_properties, 0.75);
 
        i = CONTENT_RAIL;
        f = &content_features(i);
        f->setInventoryTexture("rail.png");
+       f->used_texturenames["rail.png"] = true;
        f->light_propagates = true;
        f->param_type = CPT_LIGHT;
        f->is_ground_content = true;
@@ -318,6 +328,7 @@ void content_mapnode_init()
        i = CONTENT_LADDER;
        f = &content_features(i);
        f->setInventoryTexture("ladder.png");
+       f->used_texturenames["ladder.png"] = true;
        f->light_propagates = true;
        f->param_type = CPT_LIGHT;
        f->is_ground_content = true;
@@ -386,7 +397,9 @@ void content_mapnode_init()
        f->liquid_alternative_flowing = CONTENT_WATER;
        f->liquid_alternative_source = CONTENT_WATERSOURCE;
        f->liquid_viscosity = WATER_VISC;
+#ifndef SERVER
        f->vertex_alpha = WATER_ALPHA;
+       f->post_effect_color = video::SColor(64, 100, 100, 200);
        if(f->special_material == NULL && g_texturesource)
        {
                // Flowing water material
@@ -401,6 +414,7 @@ void content_mapnode_init()
                f->special_material->setTexture(0, pa_water1->atlas);
                f->special_atlas = pa_water1;
        }
+#endif
        
        i = CONTENT_WATERSOURCE;
        f = &content_features(i);
@@ -413,7 +427,7 @@ void content_mapnode_init()
        else // old style
        {
                f->solidness = 1;
-
+#ifndef SERVER
                TileSpec t;
                if(g_texturesource)
                        t.texture = g_texturesource->getTexture("water.png");
@@ -422,6 +436,7 @@ void content_mapnode_init()
                t.material_type = MATERIAL_ALPHA_VERTEX;
                t.material_flags &= ~MATERIAL_FLAG_BACKFACE_CULLING;
                f->setAllTiles(t);
+#endif
        }
        f->param_type = CPT_LIGHT;
        f->light_propagates = true;
@@ -434,7 +449,9 @@ void content_mapnode_init()
        f->liquid_alternative_flowing = CONTENT_WATER;
        f->liquid_alternative_source = CONTENT_WATERSOURCE;
        f->liquid_viscosity = WATER_VISC;
+#ifndef SERVER
        f->vertex_alpha = WATER_ALPHA;
+       f->post_effect_color = video::SColor(64, 100, 100, 200);
        if(f->special_material == NULL && g_texturesource)
        {
                // Flowing water material
@@ -449,10 +466,12 @@ void content_mapnode_init()
                f->special_material->setTexture(0, pa_water1->atlas);
                f->special_atlas = pa_water1;
        }
+#endif
        
        i = CONTENT_LAVA;
        f = &content_features(i);
        f->setInventoryTextureCube("lava.png", "lava.png", "lava.png");
+       f->used_texturenames["lava.png"] = true;
        f->param_type = CPT_LIGHT;
        f->light_propagates = false;
        f->light_source = LIGHT_MAX-1;
@@ -467,6 +486,8 @@ void content_mapnode_init()
        f->liquid_alternative_source = CONTENT_LAVASOURCE;
        f->liquid_viscosity = LAVA_VISC;
        f->damage_per_second = 4*2;
+#ifndef SERVER
+       f->post_effect_color = video::SColor(192, 255, 64, 0);
        if(f->special_material == NULL && g_texturesource)
        {
                // Flowing lava material
@@ -482,10 +503,12 @@ void content_mapnode_init()
                f->special_material->setTexture(0, pa_lava1->atlas);
                f->special_atlas = pa_lava1;
        }
+#endif
        
        i = CONTENT_LAVASOURCE;
        f = &content_features(i);
        f->setInventoryTextureCube("lava.png", "lava.png", "lava.png");
+       f->used_texturenames["ladder.png"] = true;
        if(new_style_water)
        {
                f->solidness = 0; // drawn separately, makes no faces
@@ -493,7 +516,7 @@ void content_mapnode_init()
        else // old style
        {
                f->solidness = 2;
-
+#ifndef SERVER
                TileSpec t;
                if(g_texturesource)
                        t.texture = g_texturesource->getTexture("lava.png");
@@ -502,6 +525,7 @@ void content_mapnode_init()
                //t.material_type = MATERIAL_ALPHA_VERTEX;
                //t.material_flags &= ~MATERIAL_FLAG_BACKFACE_CULLING;
                f->setAllTiles(t);
+#endif
        }
        f->param_type = CPT_LIGHT;
        f->light_propagates = false;
@@ -516,6 +540,8 @@ void content_mapnode_init()
        f->liquid_alternative_source = CONTENT_LAVASOURCE;
        f->liquid_viscosity = LAVA_VISC;
        f->damage_per_second = 4*2;
+#ifndef SERVER
+       f->post_effect_color = video::SColor(192, 255, 64, 0);
        if(f->special_material == NULL && g_texturesource)
        {
                // Flowing lava material
@@ -531,10 +557,15 @@ void content_mapnode_init()
                f->special_material->setTexture(0, pa_lava1->atlas);
                f->special_atlas = pa_lava1;
        }
+#endif
        
        i = CONTENT_TORCH;
        f = &content_features(i);
        f->setInventoryTexture("torch_on_floor.png");
+       f->used_texturenames["torch_on_floor.png"] = true;
+       f->used_texturenames["torch_on_ceiling.png"] = true;
+       f->used_texturenames["torch_on_floor.png"] = true;
+       f->used_texturenames["torch.png"] = true;
        f->param_type = CPT_LIGHT;
        f->light_propagates = true;
        f->sunlight_propagates = true;
@@ -549,6 +580,7 @@ void content_mapnode_init()
        i = CONTENT_SIGN_WALL;
        f = &content_features(i);
        f->setInventoryTexture("sign_wall.png");
+       f->used_texturenames["sign_wall.png"] = true;
        f->param_type = CPT_LIGHT;
        f->light_propagates = true;
        f->sunlight_propagates = true;
@@ -575,6 +607,20 @@ void content_mapnode_init()
                f->initial_metadata = new ChestNodeMetadata();
        setWoodLikeDiggingProperties(f->digging_properties, 1.0);
        
+       i = CONTENT_LOCKABLE_CHEST;
+       f = &content_features(i);
+       f->param_type = CPT_FACEDIR_SIMPLE;
+       f->setAllTextures("chest_side.png");
+       f->setTexture(0, "chest_top.png");
+       f->setTexture(1, "chest_top.png");
+       f->setTexture(5, "chest_lock.png"); // Z-
+       f->setInventoryTexture("chest_lock.png");
+       //f->setInventoryTextureCube("chest_top.png", "chest_side.png", "chest_side.png");
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+       if(f->initial_metadata == NULL)
+               f->initial_metadata = new LockingChestNodeMetadata();
+       setWoodLikeDiggingProperties(f->digging_properties, 1.0);
+
        i = CONTENT_FURNACE;
        f = &content_features(i);
        f->param_type = CPT_FACEDIR_SIMPLE;
@@ -637,6 +683,7 @@ void content_mapnode_init()
        f->param_type = CPT_LIGHT;
        f->setAllTextures("sapling.png");
        f->setInventoryTexture("sapling.png");
+       f->used_texturenames["sapling.png"] = true;
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        f->light_propagates = true;
        f->air_equivalent = false;
@@ -647,6 +694,7 @@ void content_mapnode_init()
        i = CONTENT_APPLE;
        f = &content_features(i);
        f->setInventoryTexture("apple.png");
+       f->used_texturenames["apple.png"] = true;
        f->param_type = CPT_LIGHT;
        f->light_propagates = true;
        f->sunlight_propagates = true;
Dragonfireclient is an utility client for the Voxelengine minetest (http://minetest.net/). The client was created by Elias Fleckenstein and is inspired by the Minecraft clients Liquid Bounce and Impact. Discord: https://discord.gg/kab99uu for more information.