#include "content_mapnode.h"
#include "mapnode.h"
#include "content_nodemeta.h"
+#include "settings.h"
+#include "nodedef.h"
-// TODO: Get rid of these and set up some attributes like toughness,
-// fluffyness, and a funciton to calculate time and durability loss
-// (and sound? and whatever else) from them
-void setStoneLikeDiggingProperties(DiggingPropertiesList &list, float toughness);
-void setDirtLikeDiggingProperties(DiggingPropertiesList &list, float toughness);
-void setWoodLikeDiggingProperties(DiggingPropertiesList &list, float toughness);
+#define WATER_ALPHA 160
+#define WATER_VISC 1
+#define LAVA_VISC 7
+
+void setConstantMaterialProperties(MaterialProperties &mprop, float time)
+{
+ mprop.diggability = DIGGABLE_CONSTANT;
+ mprop.constant_time = time;
+}
+
+void setStoneLikeMaterialProperties(MaterialProperties &mprop, float toughness)
+{
+ mprop.diggability = DIGGABLE_NORMAL;
+ mprop.weight = 5.0 * toughness;
+ mprop.crackiness = 1.0;
+ mprop.crumbliness = -0.1;
+ mprop.cuttability = -0.2;
+}
+
+void setDirtLikeMaterialProperties(MaterialProperties &mprop, float toughness)
+{
+ mprop.diggability = DIGGABLE_NORMAL;
+ mprop.weight = toughness * 1.2;
+ mprop.crackiness = 0;
+ mprop.crumbliness = 1.2;
+ mprop.cuttability = -0.4;
+}
+
+void setGravelLikeMaterialProperties(MaterialProperties &mprop, float toughness)
+{
+ mprop.diggability = DIGGABLE_NORMAL;
+ mprop.weight = toughness * 2.0;
+ mprop.crackiness = 0.2;
+ mprop.crumbliness = 1.5;
+ mprop.cuttability = -1.0;
+}
+
+void setWoodLikeMaterialProperties(MaterialProperties &mprop, float toughness)
+{
+ mprop.diggability = DIGGABLE_NORMAL;
+ mprop.weight = toughness * 1.0;
+ mprop.crackiness = 0.75;
+ mprop.crumbliness = -1.0;
+ mprop.cuttability = 1.5;
+}
+
+void setLeavesLikeMaterialProperties(MaterialProperties &mprop, float toughness)
+{
+ mprop.diggability = DIGGABLE_NORMAL;
+ mprop.weight = -0.5 * toughness;
+ mprop.crackiness = 0;
+ mprop.crumbliness = 0;
+ mprop.cuttability = 2.0;
+}
+
+void setGlassLikeMaterialProperties(MaterialProperties &mprop, float toughness)
+{
+ mprop.diggability = DIGGABLE_NORMAL;
+ mprop.weight = 0.1 * toughness;
+ mprop.crackiness = 2.0;
+ mprop.crumbliness = -1.0;
+ mprop.cuttability = -1.0;
+}
+
+/*
+ A conversion table for backwards compatibility.
+ Maps <=v19 content types to current ones.
+ Should never be touched.
+*/
content_t trans_table_19[21][2] = {
{CONTENT_GRASS, 1},
{CONTENT_TREE, 4},
return result;
}
-void content_mapnode_init()
+// See header for description
+void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr)
{
+ if(tsrc == NULL)
+ dstream<<"INFO: Initial run of content_mapnode_init with "
+ "tsrc=NULL. If this segfaults, "
+ "there is a bug with something not checking for "
+ "the NULL value."<<std::endl;
+ else
+ dstream<<"INFO: Full run of content_mapnode_init with "
+ "tsrc!=NULL"<<std::endl;
+
// 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");
+ bool opaque_water = g_settings->getBool("opaque_water");
content_t i;
ContentFeatures *f = NULL;
i = CONTENT_STONE;
- f = &content_features(i);
- f->setAllTextures("stone.png");
- f->setInventoryTextureCube("stone.png", "stone.png", "stone.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "stone.png");
+ f->setInventoryTextureCube("stone.png", "stone.png", "stone.png", tsrc);
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);
+ setStoneLikeMaterialProperties(f->material, 1.0);
if(invisible_stone)
f->solidness = 0; // For debugging, hides regular stone
i = CONTENT_GRASS;
- f = &content_features(i);
- f->setAllTextures("mud.png^grass_side.png");
- f->setTexture(0, "grass.png");
- f->setTexture(1, "mud.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "mud.png^grass_side.png");
+ f->setTexture(tsrc, 0, "grass.png");
+ f->setTexture(tsrc, 1, "mud.png");
f->param_type = CPT_MINERAL;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_MUD)+" 1";
- setDirtLikeDiggingProperties(f->digging_properties, 1.0);
+ setDirtLikeMaterialProperties(f->material, 1.0);
i = CONTENT_GRASS_FOOTSTEPS;
- f = &content_features(i);
- f->setAllTextures("mud.png^grass_side.png");
- f->setTexture(0, "grass_footsteps.png");
- f->setTexture(1, "mud.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "mud.png^grass_side.png");
+ f->setTexture(tsrc, 0, "grass_footsteps.png");
+ f->setTexture(tsrc, 1, "mud.png");
f->param_type = CPT_MINERAL;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_MUD)+" 1";
- setDirtLikeDiggingProperties(f->digging_properties, 1.0);
+ setDirtLikeMaterialProperties(f->material, 1.0);
i = CONTENT_MUD;
- f = &content_features(i);
- f->setAllTextures("mud.png");
- f->setInventoryTextureCube("mud.png", "mud.png", "mud.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "mud.png");
+ f->setInventoryTextureCube("mud.png", "mud.png", "mud.png", tsrc);
f->param_type = CPT_MINERAL;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
- setDirtLikeDiggingProperties(f->digging_properties, 1.0);
+ setDirtLikeMaterialProperties(f->material, 1.0);
i = CONTENT_SAND;
- f = &content_features(i);
- f->setAllTextures("sand.png");
- f->setInventoryTextureCube("sand.png", "sand.png", "sand.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "sand.png");
+ f->setInventoryTextureCube("sand.png", "sand.png", "sand.png", tsrc);
f->param_type = CPT_MINERAL;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
- setDirtLikeDiggingProperties(f->digging_properties, 1.0);
+ setDirtLikeMaterialProperties(f->material, 1.0);
i = CONTENT_GRAVEL;
- f = &content_features(i);
- f->setAllTextures("gravel.png");
- f->setInventoryTextureCube("gravel.png", "gravel.png", "gravel.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "gravel.png");
+ f->setInventoryTextureCube("gravel.png", "gravel.png", "gravel.png", tsrc);
f->param_type = CPT_MINERAL;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
- setDirtLikeDiggingProperties(f->digging_properties, 1.75);
+ setGravelLikeMaterialProperties(f->material, 1.0);
i = CONTENT_SANDSTONE;
- f = &content_features(i);
- f->setAllTextures("sandstone.png");
- f->setInventoryTextureCube("sandstone.png", "sandstone.png", "sandstone.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "sandstone.png");
+ f->setInventoryTextureCube("sandstone.png", "sandstone.png", "sandstone.png", tsrc);
f->param_type = CPT_MINERAL;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAND)+" 1";
- setDirtLikeDiggingProperties(f->digging_properties, 1.0);
+ setDirtLikeMaterialProperties(f->material, 1.0);
i = CONTENT_CLAY;
- f = &content_features(i);
- f->setAllTextures("clay.png");
- f->setInventoryTextureCube("clay.png", "clay.png", "clay.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "clay.png");
+ f->setInventoryTextureCube("clay.png", "clay.png", "clay.png", tsrc);
f->param_type = CPT_MINERAL;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem lump_of_clay 4");
- setDirtLikeDiggingProperties(f->digging_properties, 1.0);
+ setDirtLikeMaterialProperties(f->material, 1.0);
i = CONTENT_BRICK;
- f = &content_features(i);
- f->setAllTextures("brick.png");
- f->setInventoryTextureCube("brick.png", "brick.png", "brick.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "brick.png");
+ f->setInventoryTextureCube("brick.png", "brick.png", "brick.png", tsrc);
f->param_type = CPT_MINERAL;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 4");
- setStoneLikeDiggingProperties(f->digging_properties, 1.0);
+ setStoneLikeMaterialProperties(f->material, 1.0);
i = CONTENT_TREE;
- f = &content_features(i);
- f->setAllTextures("tree.png");
- f->setTexture(0, "tree_top.png");
- f->setTexture(1, "tree_top.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "tree.png");
+ f->setTexture(tsrc, 0, "tree_top.png");
+ f->setTexture(tsrc, 1, "tree_top.png");
f->param_type = CPT_MINERAL;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
- setWoodLikeDiggingProperties(f->digging_properties, 1.0);
+ setWoodLikeMaterialProperties(f->material, 1.0);
i = CONTENT_JUNGLETREE;
- f = &content_features(i);
- f->setAllTextures("jungletree.png");
- f->setTexture(0, "jungletree_top.png");
- f->setTexture(1, "jungletree_top.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "jungletree.png");
+ f->setTexture(tsrc, 0, "jungletree_top.png");
+ f->setTexture(tsrc, 1, "jungletree_top.png");
f->param_type = CPT_MINERAL;
//f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
- setWoodLikeDiggingProperties(f->digging_properties, 1.0);
+ setWoodLikeMaterialProperties(f->material, 1.0);
i = CONTENT_JUNGLEGRASS;
- f = &content_features(i);
- f->setInventoryTexture("junglegrass.png");
+ f = nodemgr->getModifiable(i);
+ f->setInventoryTexture("junglegrass.png", tsrc);
+ f->used_texturenames.insert("junglegrass.png"); // Add to atlas
f->light_propagates = true;
f->param_type = CPT_LIGHT;
//f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->solidness = 0; // drawn separately, makes no faces
f->walkable = false;
- setWoodLikeDiggingProperties(f->digging_properties, 0.10);
+ setLeavesLikeMaterialProperties(f->material, 1.0);
i = CONTENT_LEAVES;
- f = &content_features(i);
+ f = nodemgr->getModifiable(i);
f->light_propagates = true;
//f->param_type = CPT_MINERAL;
f->param_type = CPT_LIGHT;
if(new_style_leaves)
{
f->solidness = 0; // drawn separately, makes no faces
- f->setInventoryTextureCube("leaves.png", "leaves.png", "leaves.png");
+ f->visual_solidness = 1;
+ f->setAllTextures(tsrc, "leaves.png");
+ f->setInventoryTextureCube("leaves.png", "leaves.png", "leaves.png", tsrc);
}
else
{
- f->setAllTextures("[noalpha:leaves.png");
+ f->setAllTextures(tsrc, "[noalpha:leaves.png");
}
+ f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAPLING)+" 1";
+ f->extra_dug_item_rarity = 20;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
- setWoodLikeDiggingProperties(f->digging_properties, 0.15);
+ setLeavesLikeMaterialProperties(f->material, 1.0);
i = CONTENT_CACTUS;
- f = &content_features(i);
- f->setAllTextures("cactus_side.png");
- f->setTexture(0, "cactus_top.png");
- f->setTexture(1, "cactus_top.png");
- f->setInventoryTextureCube("cactus_top.png", "cactus_side.png", "cactus_side.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "cactus_side.png");
+ f->setTexture(tsrc, 0, "cactus_top.png");
+ f->setTexture(tsrc, 1, "cactus_top.png");
+ f->setInventoryTextureCube("cactus_top.png", "cactus_side.png", "cactus_side.png", tsrc);
f->param_type = CPT_MINERAL;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
- setWoodLikeDiggingProperties(f->digging_properties, 0.75);
+ setWoodLikeMaterialProperties(f->material, 0.75);
i = CONTENT_PAPYRUS;
- f = &content_features(i);
- f->setInventoryTexture("papyrus.png");
+ f = nodemgr->getModifiable(i);
+ f->setInventoryTexture("papyrus.png", tsrc);
+ f->used_texturenames.insert("papyrus.png"); // Add to atlas
f->light_propagates = true;
f->param_type = CPT_LIGHT;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->solidness = 0; // drawn separately, makes no faces
f->walkable = false;
- setWoodLikeDiggingProperties(f->digging_properties, 0.25);
+ setLeavesLikeMaterialProperties(f->material, 0.5);
i = CONTENT_BOOKSHELF;
- f = &content_features(i);
- f->setAllTextures("bookshelf.png");
- f->setTexture(0, "wood.png");
- f->setTexture(1, "wood.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "bookshelf.png");
+ f->setTexture(tsrc, 0, "wood.png");
+ f->setTexture(tsrc, 1, "wood.png");
// FIXME: setInventoryTextureCube() only cares for the first texture
- f->setInventoryTextureCube("bookshelf.png", "bookshelf.png", "bookshelf.png");
- //f->setInventoryTextureCube("wood.png", "bookshelf.png", "bookshelf.png");
+ f->setInventoryTextureCube("bookshelf.png", "bookshelf.png", "bookshelf.png", tsrc);
+ //f->setInventoryTextureCube("wood.png", "bookshelf.png", "bookshelf.png", tsrc);
f->param_type = CPT_MINERAL;
f->is_ground_content = true;
- setWoodLikeDiggingProperties(f->digging_properties, 0.75);
+ setWoodLikeMaterialProperties(f->material, 0.75);
i = CONTENT_GLASS;
- f = &content_features(i);
+ f = nodemgr->getModifiable(i);
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->solidness = 0; // drawn separately, makes no faces
- f->setInventoryTextureCube("glass.png", "glass.png", "glass.png");
- setWoodLikeDiggingProperties(f->digging_properties, 0.15);
+ f->visual_solidness = 1;
+ f->setAllTextures(tsrc, "glass.png");
+ f->setInventoryTextureCube("glass.png", "glass.png", "glass.png", tsrc);
+ setGlassLikeMaterialProperties(f->material, 1.0);
i = CONTENT_FENCE;
- f = &content_features(i);
+ f = nodemgr->getModifiable(i);
f->light_propagates = true;
f->param_type = CPT_LIGHT;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->solidness = 0; // drawn separately, makes no faces
f->air_equivalent = true; // grass grows underneath
- f->setInventoryTexture("item_fence.png");
- setWoodLikeDiggingProperties(f->digging_properties, 0.75);
+ f->setInventoryTexture("fence.png", tsrc);
+ f->used_texturenames.insert("fence.png"); // Add to atlas
+ f->selection_box.type = NODEBOX_FIXED;
+ f->selection_box.fixed = core::aabbox3d<f32>(
+ -BS/7, -BS/2, -BS/7, BS/7, BS/2, BS/7);
+ setWoodLikeMaterialProperties(f->material, 0.75);
i = CONTENT_RAIL;
- f = &content_features(i);
- f->setInventoryTexture("rail.png");
+ f = nodemgr->getModifiable(i);
+ f->setInventoryTexture("rail.png", tsrc);
+ f->used_texturenames.insert("rail.png"); // Add to atlas
f->light_propagates = true;
f->param_type = CPT_LIGHT;
f->is_ground_content = true;
f->solidness = 0; // drawn separately, makes no faces
f->air_equivalent = true; // grass grows underneath
f->walkable = false;
- setDirtLikeDiggingProperties(f->digging_properties, 0.75);
+ f->selection_box.type = NODEBOX_FIXED;
+ setDirtLikeMaterialProperties(f->material, 0.75);
i = CONTENT_LADDER;
- f = &content_features(i);
- f->setInventoryTexture("ladder.png");
+ f = nodemgr->getModifiable(i);
+ f->setInventoryTexture("ladder.png", tsrc);
+ f->used_texturenames.insert("ladder.png"); // Add to atlas
f->light_propagates = true;
f->param_type = CPT_LIGHT;
f->is_ground_content = true;
f->air_equivalent = true;
f->walkable = false;
f->climbable = true;
- setWoodLikeDiggingProperties(f->digging_properties, 0.5);
+ f->selection_box.type = NODEBOX_WALLMOUNTED;
+ setWoodLikeMaterialProperties(f->material, 0.5);
// Deprecated
i = CONTENT_COALSTONE;
- f = &content_features(i);
- f->setAllTextures("stone.png^mineral_coal.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "stone.png^mineral_coal.png");
f->is_ground_content = true;
- setStoneLikeDiggingProperties(f->digging_properties, 1.5);
+ setStoneLikeMaterialProperties(f->material, 1.5);
i = CONTENT_WOOD;
- f = &content_features(i);
- f->setAllTextures("wood.png");
- f->setInventoryTextureCube("wood.png", "wood.png", "wood.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "wood.png");
+ f->setInventoryTextureCube("wood.png", "wood.png", "wood.png", tsrc);
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
- setWoodLikeDiggingProperties(f->digging_properties, 0.75);
+ setWoodLikeMaterialProperties(f->material, 0.75);
i = CONTENT_MESE;
- f = &content_features(i);
- f->setAllTextures("mese.png");
- f->setInventoryTextureCube("mese.png", "mese.png", "mese.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "mese.png");
+ f->setInventoryTextureCube("mese.png", "mese.png", "mese.png", tsrc);
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
- setStoneLikeDiggingProperties(f->digging_properties, 0.5);
+ setStoneLikeMaterialProperties(f->material, 0.5);
i = CONTENT_CLOUD;
- f = &content_features(i);
- f->setAllTextures("cloud.png");
- f->setInventoryTextureCube("cloud.png", "cloud.png", "cloud.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "cloud.png");
+ f->setInventoryTextureCube("cloud.png", "cloud.png", "cloud.png", tsrc);
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
i = CONTENT_AIR;
- f = &content_features(i);
+ f = nodemgr->getModifiable(i);
f->param_type = CPT_LIGHT;
f->light_propagates = true;
f->sunlight_propagates = true;
f->air_equivalent = true;
i = CONTENT_WATER;
- f = &content_features(i);
- f->setInventoryTextureCube("water.png", "water.png", "water.png");
+ f = nodemgr->getModifiable(i);
+ f->setInventoryTextureCube("water.png", "water.png", "water.png", tsrc);
f->param_type = CPT_LIGHT;
f->light_propagates = true;
f->solidness = 0; // Drawn separately, makes no faces
+ f->visual_solidness = 1;
f->walkable = false;
f->pointable = false;
f->diggable = false;
f->liquid_type = LIQUID_FLOWING;
f->liquid_alternative_flowing = CONTENT_WATER;
f->liquid_alternative_source = CONTENT_WATERSOURCE;
- f->vertex_alpha = 160;
- if(f->special_material == NULL && g_texturesource)
+ f->liquid_viscosity = WATER_VISC;
+#ifndef SERVER
+ if(!opaque_water)
+ f->vertex_alpha = WATER_ALPHA;
+ f->post_effect_color = video::SColor(64, 100, 100, 200);
+ if(f->special_material == NULL && tsrc)
{
// Flowing water material
f->special_material = new video::SMaterial;
f->special_material->setFlag(video::EMF_BACK_FACE_CULLING, false);
f->special_material->setFlag(video::EMF_BILINEAR_FILTER, false);
f->special_material->setFlag(video::EMF_FOG_ENABLE, true);
- f->special_material->MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
- AtlasPointer *pa_water1 = new AtlasPointer(g_texturesource->getTexture(
- g_texturesource->getTextureId("water.png")));
+ if(!opaque_water)
+ f->special_material->MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+ AtlasPointer *pa_water1 = new AtlasPointer(tsrc->getTexture(
+ tsrc->getTextureId("water.png")));
f->special_material->setTexture(0, pa_water1->atlas);
+
+ // Flowing water material, backface culled
+ f->special_material2 = new video::SMaterial;
+ *f->special_material2 = *f->special_material;
+ f->special_material2->setFlag(video::EMF_BACK_FACE_CULLING, true);
+
f->special_atlas = pa_water1;
}
+#endif
i = CONTENT_WATERSOURCE;
- f = &content_features(i);
- //f->setInventoryTexture("water.png");
- f->setInventoryTextureCube("water.png", "water.png", "water.png");
+ f = nodemgr->getModifiable(i);
+ //f->setInventoryTexture("water.png", tsrc);
+ f->setInventoryTextureCube("water.png", "water.png", "water.png", tsrc);
if(new_style_water)
{
f->solidness = 0; // drawn separately, makes no faces
else // old style
{
f->solidness = 1;
-
+#ifndef SERVER
TileSpec t;
- if(g_texturesource)
- t.texture = g_texturesource->getTexture("water.png");
+ if(tsrc)
+ t.texture = tsrc->getTexture("water.png");
- t.alpha = 160;
- t.material_type = MATERIAL_ALPHA_VERTEX;
+ if(!opaque_water){
+ t.alpha = WATER_ALPHA;
+ 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;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->liquid_alternative_flowing = CONTENT_WATER;
f->liquid_alternative_source = CONTENT_WATERSOURCE;
- f->vertex_alpha = 160;
- if(f->special_material == NULL && g_texturesource)
+ f->liquid_viscosity = WATER_VISC;
+#ifndef SERVER
+ if(!opaque_water)
+ f->vertex_alpha = WATER_ALPHA;
+ f->post_effect_color = video::SColor(64, 100, 100, 200);
+ if(f->special_material == NULL && tsrc)
{
- // Flowing water material
+ // New-style water source material (mostly unused)
f->special_material = new video::SMaterial;
f->special_material->setFlag(video::EMF_LIGHTING, false);
f->special_material->setFlag(video::EMF_BACK_FACE_CULLING, false);
f->special_material->setFlag(video::EMF_BILINEAR_FILTER, false);
f->special_material->setFlag(video::EMF_FOG_ENABLE, true);
f->special_material->MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
- AtlasPointer *pa_water1 = new AtlasPointer(g_texturesource->getTexture(
- g_texturesource->getTextureId("water.png")));
+ AtlasPointer *pa_water1 = new AtlasPointer(tsrc->getTexture(
+ tsrc->getTextureId("water.png")));
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 = nodemgr->getModifiable(i);
+ f->setInventoryTextureCube("lava.png", "lava.png", "lava.png", tsrc);
+ f->used_texturenames.insert("lava.png"); // Add to atlas
f->param_type = CPT_LIGHT;
f->light_propagates = false;
f->light_source = LIGHT_MAX-1;
f->solidness = 0; // Drawn separately, makes no faces
+ f->visual_solidness = 1; // Does not completely cover block boundaries
f->walkable = false;
f->pointable = false;
f->diggable = false;
f->liquid_type = LIQUID_FLOWING;
f->liquid_alternative_flowing = CONTENT_LAVA;
f->liquid_alternative_source = CONTENT_LAVASOURCE;
+ f->liquid_viscosity = LAVA_VISC;
f->damage_per_second = 4*2;
- if(f->special_material == NULL && g_texturesource)
+#ifndef SERVER
+ f->post_effect_color = video::SColor(192, 255, 64, 0);
+ if(f->special_material == NULL && tsrc)
{
// Flowing lava material
f->special_material = new video::SMaterial;
f->special_material->setFlag(video::EMF_BACK_FACE_CULLING, false);
f->special_material->setFlag(video::EMF_BILINEAR_FILTER, false);
f->special_material->setFlag(video::EMF_FOG_ENABLE, true);
- f->special_material->MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+ f->special_material->MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
+
AtlasPointer *pa_lava1 = new AtlasPointer(
- g_texturesource->getTexture(
- g_texturesource->getTextureId("lava.png")));
+ tsrc->getTexture(
+ tsrc->getTextureId("lava.png")));
f->special_material->setTexture(0, pa_lava1->atlas);
+
+ // Flowing lava material, backface culled
+ f->special_material2 = new video::SMaterial;
+ *f->special_material2 = *f->special_material;
+ f->special_material2->setFlag(video::EMF_BACK_FACE_CULLING, true);
+
f->special_atlas = pa_lava1;
}
+#endif
i = CONTENT_LAVASOURCE;
- f = &content_features(i);
- f->setInventoryTextureCube("lava.png", "lava.png", "lava.png");
+ f = nodemgr->getModifiable(i);
+ f->setInventoryTextureCube("lava.png", "lava.png", "lava.png", tsrc);
+ f->used_texturenames.insert("ladder.png"); // Add to atlas
if(new_style_water)
{
f->solidness = 0; // drawn separately, makes no faces
else // old style
{
f->solidness = 2;
-
+#ifndef SERVER
TileSpec t;
- if(g_texturesource)
- t.texture = g_texturesource->getTexture("lava.png");
+ if(tsrc)
+ t.texture = tsrc->getTexture("lava.png");
//t.alpha = 255;
//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;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->liquid_alternative_flowing = CONTENT_LAVA;
f->liquid_alternative_source = CONTENT_LAVASOURCE;
+ f->liquid_viscosity = LAVA_VISC;
f->damage_per_second = 4*2;
- if(f->special_material == NULL && g_texturesource)
+#ifndef SERVER
+ f->post_effect_color = video::SColor(192, 255, 64, 0);
+ if(f->special_material == NULL && tsrc)
{
- // Flowing lava material
+ // New-style lava source material (mostly unused)
f->special_material = new video::SMaterial;
f->special_material->setFlag(video::EMF_LIGHTING, false);
f->special_material->setFlag(video::EMF_BACK_FACE_CULLING, false);
f->special_material->setFlag(video::EMF_BILINEAR_FILTER, false);
f->special_material->setFlag(video::EMF_FOG_ENABLE, true);
- f->special_material->MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+ f->special_material->MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
AtlasPointer *pa_lava1 = new AtlasPointer(
- g_texturesource->getTexture(
- g_texturesource->getTextureId("lava.png")));
+ tsrc->getTexture(
+ tsrc->getTextureId("lava.png")));
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 = nodemgr->getModifiable(i);
+ f->setInventoryTexture("torch_on_floor.png", tsrc);
+ f->used_texturenames.insert("torch_on_floor.png"); // Add to atlas
+ f->used_texturenames.insert("torch_on_ceiling.png"); // Add to atlas
+ f->used_texturenames.insert("torch.png"); // Add to atlas
f->param_type = CPT_LIGHT;
f->light_propagates = true;
f->sunlight_propagates = true;
f->air_equivalent = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->light_source = LIGHT_MAX-1;
- f->digging_properties.set("", DiggingProperties(true, 0.0, 0));
+ f->selection_box.type = NODEBOX_WALLMOUNTED;
+ f->selection_box.wall_top = core::aabbox3d<f32>(
+ -BS/10, BS/2-BS/3.333*2, -BS/10, BS/10, BS/2, BS/10);
+ f->selection_box.wall_bottom = core::aabbox3d<f32>(
+ -BS/10, -BS/2, -BS/10, BS/10, -BS/2+BS/3.333*2, BS/10);
+ f->selection_box.wall_side = core::aabbox3d<f32>(
+ -BS/2, -BS/3.333, -BS/10, -BS/2+BS/3.333, BS/3.333, BS/10);
+ setConstantMaterialProperties(f->material, 0.0);
i = CONTENT_SIGN_WALL;
- f = &content_features(i);
- f->setInventoryTexture("sign_wall.png");
+ f = nodemgr->getModifiable(i);
+ f->setInventoryTexture("sign_wall.png", tsrc);
+ f->used_texturenames.insert("sign_wall.png"); // Add to atlas
f->param_type = CPT_LIGHT;
f->light_propagates = true;
f->sunlight_propagates = true;
f->air_equivalent = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
if(f->initial_metadata == NULL)
- f->initial_metadata = new SignNodeMetadata("Some sign");
- f->digging_properties.set("", DiggingProperties(true, 0.5, 0));
+ f->initial_metadata = new SignNodeMetadata(NULL, "Some sign");
+ setConstantMaterialProperties(f->material, 0.5);
+ f->selection_box.type = NODEBOX_WALLMOUNTED;
i = CONTENT_CHEST;
- f = &content_features(i);
+ f = nodemgr->getModifiable(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_front.png"); // Z-
- f->setInventoryTexture("chest_top.png");
- //f->setInventoryTextureCube("chest_top.png", "chest_side.png", "chest_side.png");
+ f->setAllTextures(tsrc, "chest_side.png");
+ f->setTexture(tsrc, 0, "chest_top.png");
+ f->setTexture(tsrc, 1, "chest_top.png");
+ f->setTexture(tsrc, 5, "chest_front.png"); // Z-
+ f->setInventoryTexture("chest_top.png", tsrc);
+ //f->setInventoryTextureCube("chest_top.png", "chest_side.png", "chest_side.png", tsrc);
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
if(f->initial_metadata == NULL)
- f->initial_metadata = new ChestNodeMetadata();
- setWoodLikeDiggingProperties(f->digging_properties, 1.0);
+ f->initial_metadata = new ChestNodeMetadata(NULL);
+ setWoodLikeMaterialProperties(f->material, 1.0);
+ i = CONTENT_LOCKABLE_CHEST;
+ f = nodemgr->getModifiable(i);
+ f->param_type = CPT_FACEDIR_SIMPLE;
+ f->setAllTextures(tsrc, "chest_side.png");
+ f->setTexture(tsrc, 0, "chest_top.png");
+ f->setTexture(tsrc, 1, "chest_top.png");
+ f->setTexture(tsrc, 5, "chest_lock.png"); // Z-
+ f->setInventoryTexture("chest_lock.png", tsrc);
+ //f->setInventoryTextureCube("chest_top.png", "chest_side.png", "chest_side.png", tsrc);
+ f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+ if(f->initial_metadata == NULL)
+ f->initial_metadata = new LockingChestNodeMetadata(NULL);
+ setWoodLikeMaterialProperties(f->material, 1.0);
+
i = CONTENT_FURNACE;
- f = &content_features(i);
+ f = nodemgr->getModifiable(i);
f->param_type = CPT_FACEDIR_SIMPLE;
- f->setAllTextures("furnace_side.png");
- f->setTexture(5, "furnace_front.png"); // Z-
- f->setInventoryTexture("furnace_front.png");
+ f->setAllTextures(tsrc, "furnace_side.png");
+ f->setTexture(tsrc, 5, "furnace_front.png"); // Z-
+ f->setInventoryTexture("furnace_front.png", tsrc);
//f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COBBLE)+" 6";
if(f->initial_metadata == NULL)
- f->initial_metadata = new FurnaceNodeMetadata();
- setStoneLikeDiggingProperties(f->digging_properties, 3.0);
+ f->initial_metadata = new FurnaceNodeMetadata(NULL);
+ setStoneLikeMaterialProperties(f->material, 3.0);
i = CONTENT_COBBLE;
- f = &content_features(i);
- f->setAllTextures("cobble.png");
- f->setInventoryTextureCube("cobble.png", "cobble.png", "cobble.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "cobble.png");
+ f->setInventoryTextureCube("cobble.png", "cobble.png", "cobble.png", tsrc);
f->param_type = CPT_NONE;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
- setStoneLikeDiggingProperties(f->digging_properties, 0.9);
+ setStoneLikeMaterialProperties(f->material, 0.9);
i = CONTENT_MOSSYCOBBLE;
- f = &content_features(i);
- f->setAllTextures("mossycobble.png");
- f->setInventoryTextureCube("mossycobble.png", "mossycobble.png", "mossycobble.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "mossycobble.png");
+ f->setInventoryTextureCube("mossycobble.png", "mossycobble.png", "mossycobble.png", tsrc);
f->param_type = CPT_NONE;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
- setStoneLikeDiggingProperties(f->digging_properties, 0.8);
+ setStoneLikeMaterialProperties(f->material, 0.8);
i = CONTENT_STEEL;
- f = &content_features(i);
- f->setAllTextures("steel_block.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "steel_block.png");
f->setInventoryTextureCube("steel_block.png", "steel_block.png",
- "steel_block.png");
+ "steel_block.png", tsrc);
f->param_type = CPT_NONE;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
- setStoneLikeDiggingProperties(f->digging_properties, 5.0);
+ setStoneLikeMaterialProperties(f->material, 5.0);
i = CONTENT_NC;
- f = &content_features(i);
+ f = nodemgr->getModifiable(i);
f->param_type = CPT_FACEDIR_SIMPLE;
- f->setAllTextures("nc_side.png");
- f->setTexture(5, "nc_front.png"); // Z-
- f->setTexture(4, "nc_back.png"); // Z+
- f->setInventoryTexture("nc_front.png");
+ f->setAllTextures(tsrc, "nc_side.png");
+ f->setTexture(tsrc, 5, "nc_front.png"); // Z-
+ f->setTexture(tsrc, 4, "nc_back.png"); // Z+
+ f->setInventoryTexture("nc_front.png", tsrc);
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
- setStoneLikeDiggingProperties(f->digging_properties, 3.0);
+ setStoneLikeMaterialProperties(f->material, 3.0);
i = CONTENT_NC_RB;
- f = &content_features(i);
- f->setAllTextures("nc_rb.png");
- f->setInventoryTexture("nc_rb.png");
+ f = nodemgr->getModifiable(i);
+ f->setAllTextures(tsrc, "nc_rb.png");
+ f->setInventoryTexture("nc_rb.png", tsrc);
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
- setStoneLikeDiggingProperties(f->digging_properties, 3.0);
-
- // NOTE: Remember to add frequently used stuff to the texture atlas in tile.cpp
-
+ setStoneLikeMaterialProperties(f->material, 3.0);
- /*
- Add MesePick to everything
- */
- for(u16 i=0; i<=MAX_CONTENT; i++)
- {
- content_features(i).digging_properties.set("MesePick",
- DiggingProperties(true, 0.0, 65535./1337));
- }
-
-}
-
-void setStoneLikeDiggingProperties(DiggingPropertiesList &list, float toughness)
-{
- list.set("",
- DiggingProperties(true, 15.0*toughness, 0));
-
- list.set("WPick",
- DiggingProperties(true, 1.3*toughness, 65535./30.*toughness));
- list.set("STPick",
- DiggingProperties(true, 0.75*toughness, 65535./100.*toughness));
- list.set("SteelPick",
- DiggingProperties(true, 0.50*toughness, 65535./333.*toughness));
-
- /*list.set("MesePick",
- DiggingProperties(true, 0.0*toughness, 65535./20.*toughness));*/
-}
-
-void setDirtLikeDiggingProperties(DiggingPropertiesList &list, float toughness)
-{
- list.set("",
- DiggingProperties(true, 0.75*toughness, 0));
-
- list.set("WShovel",
- DiggingProperties(true, 0.4*toughness, 65535./50.*toughness));
- list.set("STShovel",
- DiggingProperties(true, 0.2*toughness, 65535./150.*toughness));
- list.set("SteelShovel",
- DiggingProperties(true, 0.15*toughness, 65535./400.*toughness));
-}
-
-void setWoodLikeDiggingProperties(DiggingPropertiesList &list, float toughness)
-{
- list.set("",
- DiggingProperties(true, 3.0*toughness, 0));
+ i = CONTENT_SAPLING;
+ f = nodemgr->getModifiable(i);
+ f->param_type = CPT_LIGHT;
+ f->setAllTextures(tsrc, "sapling.png");
+ f->setInventoryTexture("sapling.png", tsrc);
+ f->used_texturenames.insert("sapling.png"); // Add to atlas
+ f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+ f->light_propagates = true;
+ f->air_equivalent = false;
+ f->solidness = 0; // drawn separately, makes no faces
+ f->walkable = false;
+ setConstantMaterialProperties(f->material, 0.0);
- list.set("WAxe",
- DiggingProperties(true, 1.5*toughness, 65535./30.*toughness));
- list.set("STAxe",
- DiggingProperties(true, 0.75*toughness, 65535./100.*toughness));
- list.set("SteelAxe",
- DiggingProperties(true, 0.5*toughness, 65535./333.*toughness));
+ i = CONTENT_APPLE;
+ f = nodemgr->getModifiable(i);
+ f->setInventoryTexture("apple.png", tsrc);
+ f->used_texturenames.insert("apple.png"); // Add to atlas
+ f->param_type = CPT_LIGHT;
+ f->light_propagates = true;
+ f->sunlight_propagates = true;
+ f->solidness = 0; // drawn separately, makes no faces
+ f->walkable = false;
+ f->air_equivalent = true;
+ f->dug_item = std::string("CraftItem apple 1");
+ setConstantMaterialProperties(f->material, 0.0);
}
projects / oweals / minetest.git / blobdiff