BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Completely generalized mesh generation; ContentFeatures serialization

Browse Source
This commit is contained in:
Perttu Ahola 2011-11-15 19:58:36 +02:00
parent 89e7bacd99
commit eed727c61b
18 changed files with 795 additions and 821 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
minetest.conf.example
View File

@ -100,8 +100,6 @@
#farmesh_distance = 40
# Enable/disable clouds
#enable_clouds = true
# Don't draw stone (for testing)
#invisible_stone = false
# Path for screenshots
#screenshot_path = .
# Amount of view bobbing (0 = no view bobbing, 1.0 = normal, 2.0 = double)

1
src/common_irrlicht.h
View File

@ -26,7 +26,6 @@ video::SColor(255,30,30,30));d->endScene();}
#include "irrlichttypes.h"
#ifndef SERVER
#include <SColor.h>
#include <IMesh.h>
#include <IImage.h>
#include <IrrlichtDevice.h>

920
src/content_mapblock.cpp
View File

File diff suppressed because it is too large Load Diff

133
src/content_mapnode.cpp
View File

@ -17,13 +17,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
// For g_settings
#include "main.h"
#include "content_mapnode.h"
#include "irrlichttypes.h"
#include "mapnode.h"
#include "content_nodemeta.h"
#include "settings.h"
#include "nodedef.h"
#define WATER_ALPHA 160
@ -156,23 +154,8 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version)
}
// See header for description
void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr)
void content_mapnode_init(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 opaque_water = g_settings->getBool("opaque_water");
content_t i;
ContentFeatures *f = NULL;
@ -185,8 +168,6 @@ void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr
f->often_contains_mineral = true;
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COBBLE)+" 1";
setStoneLikeMaterialProperties(f->material, 1.0);
if(invisible_stone)
f->solidness = 0; // For debugging, hides regular stone
i = CONTENT_GRASS;
f = nodemgr->getModifiable(i);
@ -278,40 +259,29 @@ void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr
f->setTexture(0, "jungletree_top.png");
f->setTexture(1, "jungletree_top.png");
f->param_type = CPT_MINERAL;
//f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
setWoodLikeMaterialProperties(f->material, 1.0);
i = CONTENT_JUNGLEGRASS;
f = nodemgr->getModifiable(i);
f->drawtype = NDT_PLANTLIKE;
f->visual_scale = 1.6;
f->setAllTextures("junglegrass.png");
f->setInventoryTexture("junglegrass.png");
f->used_texturenames.insert("junglegrass.png"); // Add to atlas
f->light_propagates = true;
f->param_type = CPT_LIGHT;
//f->is_ground_content = true;
f->air_equivalent = false; // grass grows underneath
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->solidness = 0; // drawn separately, makes no faces
f->walkable = false;
setLeavesLikeMaterialProperties(f->material, 1.0);
i = CONTENT_LEAVES;
f = nodemgr->getModifiable(i);
f->light_propagates = true;
//f->param_type = CPT_MINERAL;
f->param_type = CPT_LIGHT;
//f->is_ground_content = true;
if(new_style_leaves)
{
f->solidness = 0; // drawn separately, makes no faces
f->visual_solidness = 1;
f->drawtype = NDT_ALLFACES_OPTIONAL;
f->setAllTextures("leaves.png");
f->setInventoryTextureCube("leaves.png", "leaves.png", "leaves.png");
}
else
{
f->setAllTextures("[noalpha:leaves.png");
}
//f->setAllTextures("[noalpha:leaves.png");
f->light_propagates = true;
f->param_type = CPT_LIGHT;
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";
@ -330,13 +300,13 @@ void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr
i = CONTENT_PAPYRUS;
f = nodemgr->getModifiable(i);
f->drawtype = NDT_PLANTLIKE;
f->setAllTextures("papyrus.png");
f->setInventoryTexture("papyrus.png");
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;
setLeavesLikeMaterialProperties(f->material, 0.5);
@ -354,27 +324,26 @@ void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr
i = CONTENT_GLASS;
f = nodemgr->getModifiable(i);
f->drawtype = NDT_GLASSLIKE;
f->setAllTextures("glass.png");
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->visual_solidness = 1;
f->setAllTextures("glass.png");
f->setInventoryTextureCube("glass.png", "glass.png", "glass.png");
setGlassLikeMaterialProperties(f->material, 1.0);
i = CONTENT_FENCE;
f = nodemgr->getModifiable(i);
f->drawtype = NDT_FENCELIKE;
f->setInventoryTexture("fence.png");
f->setTexture(0, "wood.png");
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("fence.png");
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);
@ -382,13 +351,16 @@ void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr
i = CONTENT_RAIL;
f = nodemgr->getModifiable(i);
f->drawtype = NDT_RAILLIKE;
f->setInventoryTexture("rail.png");
f->used_texturenames.insert("rail.png"); // Add to atlas
f->setTexture(0, "rail.png");
f->setTexture(1, "rail_curved.png");
f->setTexture(2, "rail_t_junction.png");
f->setTexture(3, "rail_crossing.png");
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->walkable = false;
f->selection_box.type = NODEBOX_FIXED;
@ -396,14 +368,14 @@ void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr
i = CONTENT_LADDER;
f = nodemgr->getModifiable(i);
f->drawtype = NDT_SIGNLIKE;
f->setAllTextures("ladder.png");
f->setInventoryTexture("ladder.png");
f->used_texturenames.insert("ladder.png"); // Add to atlas
f->light_propagates = true;
f->param_type = CPT_LIGHT;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
f->wall_mounted = true;
f->solidness = 0;
f->air_equivalent = true;
f->walkable = false;
f->climbable = true;
@ -445,7 +417,6 @@ void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr
f->param_type = CPT_LIGHT;
f->light_propagates = true;
f->sunlight_propagates = true;
f->solidness = 0;
f->walkable = false;
f->pointable = false;
f->diggable = false;
@ -454,11 +425,11 @@ void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr
i = CONTENT_WATER;
f = nodemgr->getModifiable(i);
f->drawtype = NDT_FLOWINGLIQUID;
f->setAllTextures("water.png", WATER_ALPHA);
f->setInventoryTextureCube("water.png", "water.png", "water.png");
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;
@ -467,8 +438,6 @@ void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr
f->liquid_alternative_flowing = CONTENT_WATER;
f->liquid_alternative_source = CONTENT_WATERSOURCE;
f->liquid_viscosity = WATER_VISC;
if(!opaque_water)
f->alpha = WATER_ALPHA;
f->post_effect_color = video::SColor(64, 100, 100, 200);
// Flowing water material
f->mspec_special[0].tname = "water.png";
@ -478,16 +447,8 @@ void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr
i = CONTENT_WATERSOURCE;
f = nodemgr->getModifiable(i);
if(new_style_water)
{
f->solidness = 0; // drawn separately, makes no faces
}
else // old style
{
f->solidness = 1;
f->drawtype = NDT_LIQUID;
f->setAllTextures("water.png", WATER_ALPHA);
f->backface_culling = false;
}
//f->setInventoryTexture("water.png");
f->setInventoryTextureCube("water.png", "water.png", "water.png");
f->param_type = CPT_LIGHT;
@ -501,8 +462,6 @@ void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr
f->liquid_alternative_flowing = CONTENT_WATER;
f->liquid_alternative_source = CONTENT_WATERSOURCE;
f->liquid_viscosity = WATER_VISC;
if(!opaque_water)
f->alpha = WATER_ALPHA;
f->post_effect_color = video::SColor(64, 100, 100, 200);
// New-style water source material (mostly unused)
f->mspec_special[0].tname = "water.png";
@ -510,13 +469,12 @@ void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr
i = CONTENT_LAVA;
f = nodemgr->getModifiable(i);
f->drawtype = NDT_FLOWINGLIQUID;
f->setAllTextures("lava.png");
f->setInventoryTextureCube("lava.png", "lava.png", "lava.png");
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;
@ -535,16 +493,8 @@ void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr
i = CONTENT_LAVASOURCE;
f = nodemgr->getModifiable(i);
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;
f->drawtype = NDT_LIQUID;
f->setAllTextures("lava.png");
}
f->setInventoryTextureCube("lava.png", "lava.png", "lava.png");
f->param_type = CPT_LIGHT;
f->light_propagates = false;
@ -566,14 +516,14 @@ void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr
i = CONTENT_TORCH;
f = nodemgr->getModifiable(i);
f->drawtype = NDT_TORCHLIKE;
f->setTexture(0, "torch_on_floor.png");
f->setTexture(1, "torch_on_ceiling.png");
f->setTexture(2, "torch.png");
f->setInventoryTexture("torch_on_floor.png");
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->solidness = 0; // drawn separately, makes no faces
f->walkable = false;
f->wall_mounted = true;
f->air_equivalent = true;
@ -590,12 +540,12 @@ void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr
i = CONTENT_SIGN_WALL;
f = nodemgr->getModifiable(i);
f->drawtype = NDT_SIGNLIKE;
f->setAllTextures("sign_wall.png");
f->setInventoryTexture("sign_wall.png");
f->used_texturenames.insert("sign_wall.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->wall_mounted = true;
f->air_equivalent = true;
@ -692,25 +642,26 @@ void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr
i = CONTENT_SAPLING;
f = nodemgr->getModifiable(i);
f->param_type = CPT_LIGHT;
f->drawtype = NDT_PLANTLIKE;
f->visual_scale = 1.5;
f->setAllTextures("sapling.png");
f->setInventoryTexture("sapling.png");
f->used_texturenames.insert("sapling.png"); // Add to atlas
f->param_type = CPT_LIGHT;
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);
i = CONTENT_APPLE;
f = nodemgr->getModifiable(i);
f->drawtype = NDT_PLANTLIKE;
f->visual_scale = 1.0;
f->setAllTextures("apple.png");
f->setInventoryTexture("apple.png");
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");

3
src/content_mapnode.h
View File

@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define CONTENT_MAPNODE_HEADER
#include "mapnode.h"
class ITextureSource;
class IWritableNodeDefManager;
/*
@ -36,7 +35,7 @@ class IWritableNodeDefManager;
Server only calls this once with tsrc=NULL.
*/
void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr);
void content_mapnode_init(IWritableNodeDefManager *nodemgr);
// Backwards compatibility for non-extended content types in v19
extern content_t trans_table_19[21][2];

1
src/defaultsettings.cpp
View File

@ -75,7 +75,6 @@ void set_default_settings(Settings *settings)
settings->setDefault("invert_mouse", "false");
settings->setDefault("enable_farmesh", "false");
settings->setDefault("enable_clouds", "true");
settings->setDefault("invisible_stone", "false");
settings->setDefault("screenshot_path", ".");
settings->setDefault("view_bobbing_amount", "1.0");
settings->setDefault("enable_3d_clouds", "false");

2
src/game.cpp
View File

@ -645,7 +645,7 @@ void the_game(
IWritableNodeDefManager *nodedef = createNodeDefManager();
// Fill node feature table with default definitions
content_mapnode_init(tsrc, nodedef);
content_mapnode_init(nodedef);
/*
Create server.

1
src/irrlichttypes.h
View File

@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <irrList.h>
#include <irrArray.h>
#include <aabbox3d.h>
#include <SColor.h>
using namespace irr;
typedef core::vector3df v3f;
typedef core::vector3d<s16> v3s16;

2
src/mapnode.cpp
View File

@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "nodedef.h"
#include "content_mapnode.h" // For mapnode_translate_*_internal
#ifndef SERVER
/*
Nodes make a face if contents differ and solidness differs.
Return value:
@ -81,6 +82,7 @@ u8 face_contents(content_t m1, content_t m2, bool *equivalent,
else
return 2;
}
#endif
v3s16 facedir_rotate(u8 facedir, v3s16 dir)
{

2
src/mapnode.h
View File

@ -62,6 +62,7 @@ typedef u16 content_t;
*/
#define CONTENT_AIR 126
#ifndef SERVER
/*
Nodes make a face if contents differ and solidness differs.
Return value:
@ -72,6 +73,7 @@ typedef u16 content_t;
*/
u8 face_contents(content_t m1, content_t m2, bool *equivalent,
INodeDefManager *nodemgr);
#endif
/*
Packs directions like (1,0,0), (1,-1,0) in six bits.

42
src/materials.cpp
View File

@ -1,7 +1,49 @@
/*
Minetest-c55
Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "materials.h"
#include "mapnode.h"
#include "nodedef.h"
#include "tooldef.h"
#include "utility.h"
void MaterialProperties::serialize(std::ostream &os)
{
writeU8(os, 0); // version
writeU8(os, diggability);
writeF1000(os, weight);
writeF1000(os, crackiness);
writeF1000(os, crumbliness);
writeF1000(os, cuttability);
}
void MaterialProperties::deSerialize(std::istream &is)
{
int version = readU8(is);
if(version != 0)
throw SerializationError("unsupported MaterialProperties version");
diggability = (enum Diggability)readU8(is);
weight = readF1000(is);
crackiness = readF1000(is);
crumbliness = readF1000(is);
cuttability = readF1000(is);
}
DiggingProperties getDiggingProperties(u16 content, ToolDiggingProperties *tp,
INodeDefManager *nodemgr)

6
src/materials.h
View File

@ -1,6 +1,6 @@
/*
Minetest-c55
Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "common_irrlicht.h"
#include <string>
#include <iostream>
enum Diggability
{
@ -65,6 +66,9 @@ struct MaterialProperties
crumbliness(1),
cuttability(1)
{}
void serialize(std::ostream &os);
void deSerialize(std::istream &is);
};
struct DiggingProperties

317
src/nodedef.cpp
View File

@ -25,6 +25,54 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "tile.h"
#endif
#include "log.h"
#include "settings.h"
void NodeBox::serialize(std::ostream &os)
{
writeU8(os, 0); // version
writeU8(os, type);
writeV3F1000(os, fixed.MinEdge);
writeV3F1000(os, fixed.MaxEdge);
writeV3F1000(os, wall_top.MinEdge);
writeV3F1000(os, wall_top.MaxEdge);
writeV3F1000(os, wall_bottom.MinEdge);
writeV3F1000(os, wall_bottom.MaxEdge);
writeV3F1000(os, wall_side.MinEdge);
writeV3F1000(os, wall_side.MaxEdge);
}
void NodeBox::deSerialize(std::istream &is)
{
int version = readU8(is);
if(version != 0)
throw SerializationError("unsupported NodeBox version");
type = (enum NodeBoxType)readU8(is);
fixed.MinEdge = readV3F1000(is);
fixed.MaxEdge = readV3F1000(is);
wall_top.MinEdge = readV3F1000(is);
wall_top.MaxEdge = readV3F1000(is);
wall_bottom.MinEdge = readV3F1000(is);
wall_bottom.MaxEdge = readV3F1000(is);
wall_side.MinEdge = readV3F1000(is);
wall_side.MaxEdge = readV3F1000(is);
}
void MaterialSpec::serialize(std::ostream &os)
{
os<<serializeString(tname);
writeU8(os, backface_culling);
}
void MaterialSpec::deSerialize(std::istream &is)
{
tname = deSerializeString(is);
backface_culling = readU8(is);
}
ContentFeatures::ContentFeatures()
{
reset();
}
ContentFeatures::~ContentFeatures()
{
@ -37,6 +85,161 @@ ContentFeatures::~ContentFeatures()
#endif
}
void ContentFeatures::reset()
{
/*
Cached stuff
*/
#ifndef SERVER
inventory_texture = NULL;
for(u16 j=0; j<CF_SPECIAL_COUNT; j++){
special_materials[j] = NULL;
special_aps[j] = NULL;
}
solidness = 2;
visual_solidness = 0;
backface_culling = true;
#endif
used_texturenames.clear();
modified = true; // NodeDefManager explicitly sets to false
/*
Actual data
*/
drawtype = NDT_NORMAL;
visual_scale = 1.0;
for(u32 i=0; i<6; i++)
tname_tiles[i] = "";
for(u16 j=0; j<CF_SPECIAL_COUNT; j++)
mspec_special[j] = MaterialSpec();
tname_inventory = "";
alpha = 255;
post_effect_color = video::SColor(0, 0, 0, 0);
param_type = CPT_NONE;
is_ground_content = false;
light_propagates = false;
sunlight_propagates = false;
walkable = true;
pointable = true;
diggable = true;
climbable = false;
buildable_to = false;
wall_mounted = false;
air_equivalent = false;
often_contains_mineral = false;
dug_item = "";
initial_metadata = NULL;
liquid_type = LIQUID_NONE;
liquid_alternative_flowing = CONTENT_IGNORE;
liquid_alternative_source = CONTENT_IGNORE;
liquid_viscosity = 0;
light_source = 0;
damage_per_second = 0;
selection_box = NodeBox();
material = MaterialProperties();
}
void ContentFeatures::serialize(std::ostream &os)
{
writeU8(os, 0); // version
writeU8(os, drawtype);
writeF1000(os, visual_scale);
writeU8(os, 6);
for(u32 i=0; i<6; i++)
os<<serializeString(tname_tiles[i]);
os<<serializeString(tname_inventory);
writeU8(os, CF_SPECIAL_COUNT);
for(u32 i=0; i<CF_SPECIAL_COUNT; i++){
mspec_special[i].serialize(os);
}
writeU8(os, alpha);
writeU8(os, post_effect_color.getAlpha());
writeU8(os, post_effect_color.getRed());
writeU8(os, post_effect_color.getGreen());
writeU8(os, post_effect_color.getBlue());
writeU8(os, param_type);
writeU8(os, is_ground_content);
writeU8(os, light_propagates);
writeU8(os, sunlight_propagates);
writeU8(os, walkable);
writeU8(os, pointable);
writeU8(os, diggable);
writeU8(os, climbable);
writeU8(os, buildable_to);
writeU8(os, wall_mounted);
writeU8(os, air_equivalent);
writeU8(os, often_contains_mineral);
os<<serializeString(dug_item);
os<<serializeString(extra_dug_item);
writeS32(os, extra_dug_item_rarity);
if(initial_metadata){
writeU8(os, true);
initial_metadata->serialize(os);
} else {
writeU8(os, false);
}
writeU8(os, liquid_type);
writeU16(os, liquid_alternative_flowing);
writeU16(os, liquid_alternative_source);
writeU8(os, liquid_viscosity);
writeU8(os, light_source);
writeU32(os, damage_per_second);
selection_box.serialize(os);
material.serialize(os);
}
void ContentFeatures::deSerialize(std::istream &is, IGameDef *gamedef)
{
int version = readU8(is);
if(version != 0)
throw SerializationError("unsupported ContentFeatures version");
drawtype = (enum NodeDrawType)readU8(is);
visual_scale = readF1000(is);
if(readU8(is) != 6)
throw SerializationError("unsupported tile count");
for(u32 i=0; i<6; i++)
tname_tiles[i] = deSerializeString(is);
tname_inventory = deSerializeString(is);
if(readU8(is) != CF_SPECIAL_COUNT)
throw SerializationError("unsupported CF_SPECIAL_COUNT");
for(u32 i=0; i<CF_SPECIAL_COUNT; i++){
mspec_special[i].deSerialize(is);
}
alpha = readU8(is);
post_effect_color.setAlpha(readU8(is));
post_effect_color.setRed(readU8(is));
post_effect_color.setGreen(readU8(is));
post_effect_color.setBlue(readU8(is));
param_type = (enum ContentParamType)readU8(is);
is_ground_content = readU8(is);
light_propagates = readU8(is);
sunlight_propagates = readU8(is);
walkable = readU8(is);
pointable = readU8(is);
diggable = readU8(is);
climbable = readU8(is);
buildable_to = readU8(is);
wall_mounted = readU8(is);
air_equivalent = readU8(is);
often_contains_mineral = readU8(is);
dug_item = deSerializeString(is);
extra_dug_item = deSerializeString(is);
extra_dug_item_rarity = readS32(is);
if(readU8(is)){
initial_metadata = NodeMetadata::deSerialize(is, gamedef);
} else {
initial_metadata = NULL;
}
liquid_type = (enum LiquidType)readU8(is);
liquid_alternative_flowing = readU16(is);
liquid_alternative_source = readU16(is);
liquid_viscosity = readU8(is);
light_source = readU8(is);
damage_per_second = readU32(is);
selection_box.deSerialize(is);
material.deSerialize(is);
}
void ContentFeatures::setTexture(u16 i, std::string name)
{
used_texturenames.insert(name);
@ -70,20 +273,28 @@ void ContentFeatures::setInventoryTextureCube(std::string top,
class CNodeDefManager: public IWritableNodeDefManager
{
public:
CNodeDefManager()
void clear()
{
for(u16 i=0; i<=MAX_CONTENT; i++)
{
ContentFeatures *f = &m_content_features[i];
// Reset to defaults
f->reset();
if(i == CONTENT_IGNORE || i == CONTENT_AIR)
f->reset(); // Reset to defaults
f->modified = false; // Not changed from default
if(i == CONTENT_IGNORE || i == CONTENT_AIR){
f->drawtype = NDT_AIRLIKE;
continue;
f->setAllTextures("unknown_block.png");
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
}
f->setAllTextures("unknown_block.png");
//f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
}
#ifndef SERVER
// Make CONTENT_IGNORE to not block the view when occlusion culling
m_content_features[CONTENT_IGNORE].solidness = 0;
#endif
}
CNodeDefManager()
{
clear();
}
virtual ~CNodeDefManager()
{
@ -116,6 +327,7 @@ public:
virtual ContentFeatures* getModifiable(content_t c)
{
assert(c <= MAX_CONTENT);
m_content_features[c].modified = true; // Assume it is modified
return &m_content_features[c];
}
virtual void updateTextures(ITextureSource *tsrc)
@ -123,10 +335,72 @@ public:
#ifndef SERVER
infostream<<"CNodeDefManager::updateTextures(): Updating "
<<"textures in node definitions"<<std::endl;
bool new_style_water = g_settings->getBool("new_style_water");
bool new_style_leaves = g_settings->getBool("new_style_leaves");
bool opaque_water = g_settings->getBool("opaque_water");
for(u16 i=0; i<=MAX_CONTENT; i++)
{
infostream<<"Updating content "<<i<<std::endl;
ContentFeatures *f = &m_content_features[i];
switch(f->drawtype){
default:
case NDT_NORMAL:
f->solidness = 2;
break;
case NDT_AIRLIKE:
f->solidness = 0;
break;
case NDT_LIQUID:
assert(f->liquid_type == LIQUID_SOURCE);
if(opaque_water)
f->alpha = 255;
if(new_style_water){
f->solidness = 0;
} else {
f->solidness = 1;
if(f->alpha == 255)
f->solidness = 2;
}
break;
case NDT_FLOWINGLIQUID:
assert(f->liquid_type == LIQUID_FLOWING);
f->solidness = 0;
if(opaque_water)
f->alpha = 255;
break;
case NDT_GLASSLIKE:
f->solidness = 0;
f->visual_solidness = 1;
break;
case NDT_ALLFACES:
f->solidness = 0;
f->visual_solidness = 1;
break;
case NDT_ALLFACES_OPTIONAL:
if(new_style_leaves){
f->drawtype = NDT_ALLFACES;
f->solidness = 0;
f->visual_solidness = 1;
} else {
f->drawtype = NDT_NORMAL;
f->solidness = 1;
for(u32 i=0; i<6; i++){
f->tname_tiles[i] = std::string("[noalpha:")
+ f->tname_tiles[i];
}
}
break;
case NDT_TORCHLIKE:
case NDT_SIGNLIKE:
case NDT_PLANTLIKE:
case NDT_FENCELIKE:
case NDT_RAILLIKE:
f->solidness = 0;
break;
}
// Inventory texture
if(f->tname_inventory != "")
f->inventory_texture = tsrc->getTextureRaw(f->tname_inventory);
@ -175,6 +449,35 @@ public:
}
#endif
}
void serialize(std::ostream &os)
{
std::ostringstream tmp_os(std::ios::binary);
for(u16 i=0; i<=MAX_CONTENT; i++)
{
ContentFeatures *f = &m_content_features[i];
if(!f->modified)
continue;
writeU16(tmp_os, i);
f->serialize(tmp_os);
}
os<<serializeLongString(tmp_os.str());
}
void deSerialize(std::istream &is, IGameDef *gamedef)
{
clear();
std::istringstream tmp_is(deSerializeLongString(is), std::ios::binary);
while(!tmp_is.eof()){
u16 i = readU16(tmp_is);
if(i > MAX_CONTENT){
errorstream<<"ContentFeatures::deSerialize(): "
<<"Too large content id: "<<i<<std::endl;
continue;
}
ContentFeatures *f = &m_content_features[i];
f->deSerialize(tmp_is, gamedef);
f->modified = true;
}
}
private:
ContentFeatures m_content_features[MAX_CONTENT+1];
};

130
src/nodedef.h
View File

@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "common_irrlicht.h"
#include <string>
#include <iostream>
#include <set>
#include "mapnode.h"
#ifndef SERVER
@ -29,6 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#endif
#include "materials.h" // MaterialProperties
class ITextureSource;
class IGameDef;
/*
TODO: Rename to nodedef.h
@ -95,6 +97,9 @@ struct NodeBox
wall_bottom(-BS/2, -BS/2, -BS/2, BS/2, -BS/2+BS/16., BS/2),
wall_side(-BS/2, -BS/2, -BS/2, -BS/2+BS/16., BS/2, BS/2)
{}
void serialize(std::ostream &os);
void deSerialize(std::istream &is);
};
struct MapNode;
@ -109,42 +114,70 @@ struct MaterialSpec
tname(tname_),
backface_culling(backface_culling_)
{}
void serialize(std::ostream &os);
void deSerialize(std::istream &is);
};
enum NodeDrawType
{
NDT_NORMAL, // A basic solid block
NDT_AIRLIKE, // Nothing is drawn
NDT_LIQUID, // Do not draw face towards same kind of flowing/source liquid
NDT_FLOWINGLIQUID, // A very special kind of thing
NDT_GLASSLIKE, // Glass-like, don't draw faces towards other glass
NDT_ALLFACES, // Leaves-like, draw all faces no matter what
NDT_ALLFACES_OPTIONAL, // Fancy -> allfaces, fast -> normal
NDT_TORCHLIKE,
NDT_SIGNLIKE,
NDT_PLANTLIKE,
NDT_FENCELIKE,
NDT_RAILLIKE,
};
#define CF_SPECIAL_COUNT 2
struct ContentFeatures
{
/*
Cached stuff
*/
#ifndef SERVER
// 0 1 2 3 4 5
// up down right left back front
TileSpec tiles[6];
video::ITexture *inventory_texture;
// Post effect color, drawn when the camera is inside the node.
video::SColor post_effect_color;
// Special material/texture
// - Currently used for flowing liquids
video::SMaterial *special_materials[CF_SPECIAL_COUNT];
AtlasPointer *special_aps[CF_SPECIAL_COUNT];
#endif
// Visual definition
std::string tname_tiles[6];
std::string tname_inventory;
MaterialSpec mspec_special[CF_SPECIAL_COUNT];
u8 alpha;
bool backface_culling;
u8 solidness; // Used when choosing which face is drawn
u8 visual_solidness; // When solidness=0, this tells how it looks like
bool backface_culling;
#endif
// List of all block textures that have been used (value is dummy)
// Used for texture atlas making.
// Exists on server too for cleaner code in content_mapnode.cpp.
std::set<std::string> used_texturenames;
// True if this actually contains non-default data
bool modified;
/*
Actual data
*/
// Visual definition
enum NodeDrawType drawtype;
float visual_scale; // Misc. scale parameter
std::string tname_tiles[6];
std::string tname_inventory;
MaterialSpec mspec_special[CF_SPECIAL_COUNT];
u8 alpha;
// Post effect color, drawn when the camera is inside the node.
video::SColor post_effect_color;
// Type of MapNode::param1
ContentParamType param_type;
// True for all ground-like things like stone and mud, false for eg. trees
@ -172,18 +205,14 @@ struct ContentFeatures
// Used for texture atlas creation.
// Currently only enabled for CONTENT_STONE.
bool often_contains_mineral;
// Inventory item string as which the node appears in inventory when dug.
// Mineral overrides this.
std::string dug_item;
// Extra dug item and its rarity
std::string extra_dug_item;
s32 extra_dug_item_rarity;
// Initial metadata is cloned from this
NodeMetadata *initial_metadata;
// Whether the node is non-liquid, source liquid or flowing liquid
enum LiquidType liquid_type;
// If the content is liquid, this is the flowing version of the liquid.
@ -194,71 +223,21 @@ struct ContentFeatures
// 1 giving almost instantaneous propagation and 7 being
// the slowest possible
u8 liquid_viscosity;
// Amount of light the node emits
u8 light_source;
u32 damage_per_second;
NodeBox selection_box;
MaterialProperties material;
// NOTE: Move relevant properties to here from elsewhere
void reset()
{
// This isn't exactly complete due to lazyness
// TODO: Make it completely reset everything
#ifndef SERVER
inventory_texture = NULL;
post_effect_color = video::SColor(0, 0, 0, 0);
for(u16 j=0; j<CF_SPECIAL_COUNT; j++){
special_materials[j] = NULL;
special_aps[j] = NULL;
}
#endif
for(u32 i=0; i<6; i++)
tname_tiles[i] = "";
for(u16 j=0; j<CF_SPECIAL_COUNT; j++)
mspec_special[j] = MaterialSpec();
tname_inventory = "";
alpha = 255;
backface_culling = true;
solidness = 2;
visual_solidness = 0;
used_texturenames.clear();
param_type = CPT_NONE;
is_ground_content = false;
light_propagates = false;
sunlight_propagates = false;
walkable = true;
pointable = true;
diggable = true;
climbable = false;
buildable_to = false;
wall_mounted = false;
air_equivalent = false;
often_contains_mineral = false;
dug_item = "";
initial_metadata = NULL;
liquid_type = LIQUID_NONE;
liquid_alternative_flowing = CONTENT_IGNORE;
liquid_alternative_source = CONTENT_IGNORE;
liquid_viscosity = 0;
light_source = 0;
damage_per_second = 0;
selection_box = NodeBox();
material = MaterialProperties();
}
ContentFeatures()
{
reset();
}
/*
Methods
*/
ContentFeatures();
~ContentFeatures();
void reset();
void serialize(std::ostream &os);
void deSerialize(std::istream &is, IGameDef *gamedef);
/*
Quickhands for simple materials
@ -320,6 +299,9 @@ public:
Call after updating the texture atlas of a TextureSource.
*/
virtual void updateTextures(ITextureSource *tsrc)=0;
virtual void serialize(std::ostream &os)=0;
virtual void deSerialize(std::istream &is, IGameDef *gamedef)=0;
};
IWritableNodeDefManager* createNodeDefManager();

2
src/server.cpp
View File

@ -1016,7 +1016,7 @@ Server::Server(
infostream<<"m_nodemgr="<<m_nodemgr<<std::endl;
// Initialize default node definitions
content_mapnode_init(NULL, m_nodemgr);
content_mapnode_init(m_nodemgr);
// Add default global mod path
m_modspaths.push_back(porting::path_data + DIR_DELIM + "mods");

2
src/test.cpp
View File

@ -1088,7 +1088,7 @@ void run_tests()
// Create node definitions
IWritableNodeDefManager *nodedef = createNodeDefManager();
content_mapnode_init(NULL, nodedef);
content_mapnode_init(nodedef);
infostream<<"run_tests() started"<<std::endl;
TEST(TestUtilities);

7
src/tile.cpp
View File

@ -182,12 +182,15 @@ struct SourceAtlasPointer
class SourceImageCache
{
public:
void insert(const std::string &name, video::IImage *img)
void insert(const std::string &name, video::IImage *img,
bool do_overwrite)
{
assert(img);
core::map<std::string, video::IImage*>::Node *n;
n = m_images.find(name);
if(n){
if(!do_overwrite)
return;
video::IImage *oldimg = n->getValue();
if(oldimg)
oldimg->drop();
@ -720,7 +723,7 @@ void TextureSource::insertSourceImage(const std::string &name, video::IImage *im
assert(get_current_thread_id() == m_main_thread);
m_sourcecache.insert(name, img);
m_sourcecache.insert(name, img, false);
#if 0
JMutexAutoLock lock(m_atlaspointer_cache_mutex);

13
src/utility.h
View File

@ -235,6 +235,19 @@ inline u32 readU32(std::istream &is)
return readU32((u8*)buf);
}
inline void writeS32(std::ostream &os, u32 p)
{
char buf[4];
writeS32((u8*)buf, p);
os.write(buf, 4);
}
inline u32 readS32(std::istream &is)
{
char buf[4];
is.read(buf, 4);
return readS32((u8*)buf);
}
inline void writeF1000(std::ostream &os, f32 p)
{
char buf[4];