Call this 0.4.dev-20111204-1

CMakeLists.txt

@@ -10,7 +10,7 @@ project(minetest)
 # Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 4)
-set(VERSION_PATCH dev-20111203-2)
+set(VERSION_PATCH dev-20111204-1)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 MESSAGE(STATUS "*** Will build version ${VERSION_STRING} ***")

data/builtin.lua

@@ -303,6 +303,19 @@ function test_stackstring()
 end
 test_stackstring()
 
+--
+-- nodeitem helpers
+--
+
+minetest.inventorycube = function(img1, img2, img3)
+	img2 = img2 or img1
+	img3 = img3 or img1
+	return "[inventorycube"
+			.. "{" .. img1:gsub("%^", "&")
+			.. "{" .. img2:gsub("%^", "&")
+			.. "{" .. img3:gsub("%^", "&")
+end
+
 --
 -- craftitem helpers
 --
@@ -327,6 +340,77 @@ minetest.craftitem_eat = function(hp_change)
 	end
 end
 
+--
+-- Default material types
+--
+
+function minetest.digprop_constanttime(time)
+	return {
+		diggability = "constant",
+		constant_time = time,
+	}
+end
+
+function minetest.digprop_stonelike(toughness)
+	return {
+		diggablity = "normal",
+		weight = toughness * 5,
+		crackiness = 1,
+		crumbliness = -0.1,
+		cuttability = -0.2,
+	}
+end
+
+function minetest.digprop_dirtlike(toughness)
+	return {
+		diggablity = "normal",
+		weight = toughness * 1.2,
+		crackiness = 0,
+		crumbliness = 1.2,
+		cuttability = -0.4,
+	}
+end
+
+function minetest.digprop_gravellike(toughness)
+	return {
+		diggablity = "normal",
+		weight = toughness * 2,
+		crackiness = 0.2,
+		crumbliness = 1.5,
+		cuttability = -1.0,
+	}
+end
+
+function minetest.digprop_woodlike(toughness)
+	return {
+		diggablity = "normal",
+		weight = toughness * 1.0,
+		crackiness = 0.75,
+		crumbliness = -1.0,
+		cuttability = 1.5,
+	}
+end
+
+function minetest.digprop_leaveslike(toughness)
+	return {
+		diggablity = "normal",
+		weight = toughness * (-0.5),
+		crackiness = 0,
+		crumbliness = 0,
+		cuttability = 2.0,
+	}
+end
+
+function minetest.digprop_glasslike(toughness)
+	return {
+		diggablity = "normal",
+		weight = toughness * 0.1,
+		crackiness = 2.0,
+		crumbliness = -1.0,
+		cuttability = -1.0,
+	}
+end
+
 --
 -- Creative inventory
 --

data/mods/bucket/init.lua

@@ -1,3 +1,10 @@
+-- bucket (Minetest 0.4 mod)
+-- A bucket, which can pick up water and lava
+
+minetest.alias_craftitem("bucket", "bucket:bucket_empty")
+minetest.alias_craftitem("bucket_water", "bucket:bucket_water")
+minetest.alias_craftitem("bucket_lava", "bucket:bucket_lava")
+
 minetest.register_craft({
 	output = 'craft "bucket:bucket_empty" 1',
 	recipe = {
@@ -14,11 +21,11 @@ minetest.register_craftitem("bucket:bucket_empty", {
 	on_use = function(item, player, pointed_thing)
 		if pointed_thing.type == "node" then
 			n = minetest.env:get_node(pointed_thing.under)
-			if n.name == "water_source" then
+			if n.name == "default:water_source" then
 				minetest.env:add_node(pointed_thing.under, {name="air"})
 				player:add_to_inventory_later('craft "bucket:bucket_water" 1')
 				return true
-			elseif n.name == "lava_source" then
+			elseif n.name == "default:lava_source" then
 				minetest.env:add_node(pointed_thing.under, {name="air"})
 				player:add_to_inventory_later('craft "bucket:bucket_lava" 1')
 				return true
@@ -29,19 +36,19 @@ minetest.register_craftitem("bucket:bucket_empty", {
 })
 
 minetest.register_craftitem("bucket:bucket_water", {
-	image = "bucket:bucket_water.png",
+	image = "bucket_water.png",
 	stack_max = 1,
 	liquids_pointable = true,
 	on_place_on_ground = minetest.craftitem_place_item,
 	on_use = function(item, player, pointed_thing)
 		if pointed_thing.type == "node" then
 			n = minetest.env:get_node(pointed_thing.under)
-			if n.name == "water_source" then
+			if n.name == "default:water_source" then
 				-- unchanged
-			elseif n.name == "water_flowing" or n.name == "lava_source" or n.name == "lava_flowing" then
-				minetest.env:add_node(pointed_thing.under, {name="water_source"})
+			elseif n.name == "default:water_flowing" or n.name == "default:lava_source" or n.name == "default:lava_flowing" then
+				minetest.env:add_node(pointed_thing.under, {name="default:water_source"})
 			else
-				minetest.env:add_node(pointed_thing.above, {name="water_source"})
+				minetest.env:add_node(pointed_thing.above, {name="default:water_source"})
 			end
 			player:add_to_inventory_later('craft "bucket:bucket_empty" 1')
 			return true
@@ -51,19 +58,19 @@ minetest.register_craftitem("bucket:bucket_water", {
 })
 
 minetest.register_craftitem("bucket:bucket_lava", {
-	image = "bucket:bucket_lava.png",
+	image = "bucket_lava.png",
 	stack_max = 1,
 	liquids_pointable = true,
 	on_place_on_ground = minetest.craftitem_place_item,
 	on_use = function(item, player, pointed_thing)
 		if pointed_thing.type == "node" then
 			n = minetest.env:get_node(pointed_thing.under)
-			if n.name == "lava_source" then
+			if n.name == "default:lava_source" then
 				-- unchanged
-			elseif n.name == "water_source" or n.name == "water_flowing" or n.name == "lava_flowing" then
-				minetest.env:add_node(pointed_thing.under, {name="lava_source"})
+			elseif n.name == "default:water_source" or n.name == "default:water_flowing" or n.name == "default:lava_flowing" then
+				minetest.env:add_node(pointed_thing.under, {name="default:lava_source"})
 			else
-				minetest.env:add_node(pointed_thing.above, {name="lava_source"})
+				minetest.env:add_node(pointed_thing.above, {name="default:lava_source"})
 			end
 			player:add_to_inventory_later('craft "bucket:bucket_empty" 1')
 			return true

data/mods/experimental/init.lua

@@ -5,26 +5,22 @@
 -- An example furnace-thing implemented in Lua
 
 minetest.register_node("experimental:luafurnace", {
-	tile_images = {"lava.png", "furnace_side.png", "furnace_side.png",
-		"furnace_side.png", "furnace_side.png", "furnace_front.png"},
+	tile_images = {"default_lava.png", "default_furnace_side.png",
+		"default_furnace_side.png", "default_furnace_side.png",
+		"default_furnace_side.png", "default_furnace_front.png"},
 	--inventory_image = "furnace_front.png",
-	inventory_image = inventorycube("furnace_front.png"),
+	inventory_image = minetest.inventorycube("default_furnace_front.png"),
 	paramtype = "facedir_simple",
 	metadata_name = "generic",
-	material = digprop_stonelike(3.0),
+	material = minetest.digprop_stonelike(3.0),
 })
 
 minetest.register_on_placenode(function(pos, newnode, placer)
 	if newnode.name == "experimental:luafurnace" then
-		print("get_meta");
 		local meta = minetest.env:get_meta(pos)
-		print("inventory_set_list");
 		meta:inventory_set_list("fuel", {""})
-		print("inventory_set_list");
 		meta:inventory_set_list("src", {""})
-		print("inventory_set_list");
 		meta:inventory_set_list("dst", {"","","",""})
-		print("set_inventory_draw_spec");
 		meta:set_inventory_draw_spec(
 			"invsize[8,9;]"
 			.."list[current_name;fuel;2,3;1,1;]"
@@ -34,9 +30,7 @@ minetest.register_on_placenode(function(pos, newnode, placer)
 		)
 		
 		local total_cooked = 0;
-		print("set_string")
 		meta:set_string("total_cooked", total_cooked)
-		print("set_infotext");
 		meta:set_infotext("Lua Furnace: total cooked: "..total_cooked)
 	end
 end)
@@ -99,9 +93,9 @@ minetest.register_abm({
 minetest.register_craft({
 	output = 'node "experimental:luafurnace" 1',
 	recipe = {
-		{'node "cobble"', 'node "cobble"', 'node "cobble"'},
-		{'node "cobble"', 'node "cobble"', 'node "cobble"'},
-		{'node "cobble"', 'node "cobble"', 'node "cobble"'},
+		{'node "default:cobble"', 'node "default:cobble"', 'node "default:cobble"'},
+		{'node "default:cobble"', 'node "default:steel_ingot"', 'node "default:cobble"'},
+		{'node "default:cobble"', 'node "default:cobble"', 'node "default:cobble"'},
 	}
 })
 
@@ -110,8 +104,8 @@ minetest.register_craft({
 --
 
 --[[
-minetest.register_tool("horribletool", {
-	image = "lava.png",
+minetest.register_tool("experimental:horribletool", {
+	image = "default_lava.png",
 	basetime = 2.0
 	dt_weight = 0.2
 	dt_crackiness = 0.2
@@ -125,16 +119,17 @@ minetest.register_tool("horribletool", {
 })
 --]]
 
-minetest.register_craft({
+--[[minetest.register_craft({
 	output = 'node "somenode" 4',
 	recipe = {
-		{'craft "Stick" 1'},
+		{'craft "default_tick" 1'},
 	}
 })
 
 minetest.register_node("experimental:somenode", {
 	tile_images = {"lava.png", "mese.png", "stone.png", "grass.png", "cobble.png", "tree_top.png"},
-	inventory_image = "treeprop.png",
+	inventory_image = minetest.inventorycube("lava.png", "mese.png", "stone.png"),
+	--inventory_image = "treeprop.png",
 	material = {
 		diggability = "normal",
 		weight = 0,
@@ -144,7 +139,7 @@ minetest.register_node("experimental:somenode", {
 		flammability = 0
 	},
 	metadata_name = "chest",
-})
+})]]
 
 --
 -- TNT (not functional)
@@ -153,15 +148,18 @@ minetest.register_node("experimental:somenode", {
 minetest.register_craft({
 	output = 'node "experimental:tnt" 4',
 	recipe = {
-		{'node "wood" 1'},
-		{'craft "lump_of_coal" 1'},
-		{'node "wood" 1'}
+		{'node "default:wood" 1'},
+		{'craft "default:coal_lump" 1'},
+		{'node "default:wood" 1'}
 	}
 })
 
 minetest.register_node("experimental:tnt", {
-	tile_images = {"tnt_top.png", "tnt_bottom.png", "tnt_side.png", "tnt_side.png", "tnt_side.png", "tnt_side.png"},
-	inventory_image = "tnt_side.png",
+	tile_images = {"default_tnt_top.png", "default_tnt_bottom.png",
+			"default_tnt_side.png", "default_tnt_side.png",
+			"default_tnt_side.png", "default_tnt_side.png"},
+	inventory_image = minetest.inventorycube("default_tnt_top.png",
+			"default_tnt_side.png", "default_tnt_side.png"),
 	dug_item = '', -- Get nothing
 	material = {
 		diggability = "not",
@@ -182,7 +180,9 @@ local TNT = {
 	-- weight = 5,
 	collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
 	visual = "cube",
-	textures = {"tnt_top.png","tnt_bottom.png","tnt_side.png","tnt_side.png","tnt_side.png","tnt_side.png"},
+	textures = {"default_tnt_top.png", "default_tnt_bottom.png",
+			"default_tnt_side.png", "default_tnt_side.png",
+			"default_tnt_side.png", "default_tnt_side.png"},
 	-- Initial value for our timer
 	timer = 0,
 	-- Number of punches required to defuse
@@ -287,8 +287,8 @@ minetest.register_on_generated(function(minp, maxp)
 end)
 
 -- Example setting get
-print("setting max_users = " .. dump(minetest.setting_get("max_users")))
-print("setting asdf = " .. dump(minetest.setting_get("asdf")))
+--print("setting max_users = " .. dump(minetest.setting_get("max_users")))
+--print("setting asdf = " .. dump(minetest.setting_get("asdf")))
 
 minetest.register_on_chat_message(function(name, message)
 	--[[print("on_chat_message: name="..dump(name).." message="..dump(message))

data/mods/legacy/depends.txt

@@ -0,0 +1,2 @@
+default
+

data/mods/legacy/init.lua

@@ -0,0 +1,100 @@
+-- legacy (Minetest 0.4 mod)
+-- Provides as much backwards-compatibility as feasible
+
+--
+-- Aliases to support loading 0.3 and old 0.4 worlds and inventories
+--
+
+minetest.alias_node("stone", "default:stone")
+minetest.alias_node("dirt_with_grass", "default:dirt_with_grass")
+minetest.alias_node("dirt_with_grass_footsteps", "default:dirt_with_grass_footsteps")
+minetest.alias_node("dirt", "default:dirt")
+minetest.alias_node("sand", "default:sand")
+minetest.alias_node("gravel", "default:gravel")
+minetest.alias_node("sandstone", "default:sandstone")
+minetest.alias_node("clay", "default:clay")
+minetest.alias_node("brick", "default:brick")
+minetest.alias_node("tree", "default:tree")
+minetest.alias_node("jungletree", "default:jungletree")
+minetest.alias_node("junglegrass", "default:junglegrass")
+minetest.alias_node("leaves", "default:leaves")
+minetest.alias_node("cactus", "default:cactus")
+minetest.alias_node("papyrus", "default:papyrus")
+minetest.alias_node("bookshelf", "default:bookshelf")
+minetest.alias_node("glass", "default:glass")
+minetest.alias_node("wooden_fence", "default:fence_wood")
+minetest.alias_node("rail", "default:rail")
+minetest.alias_node("ladder", "default:ladder")
+minetest.alias_node("wood", "default:wood")
+minetest.alias_node("mese", "default:mese")
+minetest.alias_node("cloud", "default:cloud")
+minetest.alias_node("water_flowing", "default:water_flowing")
+minetest.alias_node("water_source", "default:water_source")
+minetest.alias_node("lava_flowing", "default:lava_flowing")
+minetest.alias_node("lava_source", "default:lava_source")
+minetest.alias_node("torch", "default:torch")
+minetest.alias_node("sign_wall", "default:sign_wall")
+minetest.alias_node("chest", "default:chest")
+minetest.alias_node("locked_chest", "default:chest_locked")
+minetest.alias_node("cobble", "default:cobble")
+minetest.alias_node("mossycobble", "default:mossycobble")
+minetest.alias_node("steelblock", "default:steelblock")
+minetest.alias_node("nyancat", "default:nyancat")
+minetest.alias_node("nyancat_rainbow", "default:nyancat_rainbow")
+minetest.alias_node("sapling", "default:sapling")
+minetest.alias_node("apple", "default:apple")
+
+minetest.alias_tool("WPick", "default:pick_wood")
+minetest.alias_tool("STPick", "default:pick_stone")
+minetest.alias_tool("SteelPick", "default:pick_steel")
+minetest.alias_tool("MesePick", "default:pick_mese")
+minetest.alias_tool("WShovel", "default:shovel_wood")
+minetest.alias_tool("STShovel", "default:shovel_stone")
+minetest.alias_tool("SteelShovel", "default:shovel_steel")
+minetest.alias_tool("WAxe", "default:axe_wood")
+minetest.alias_tool("STAxe", "default:axe_stone")
+minetest.alias_tool("SteelAxe", "default:axe_steel")
+minetest.alias_tool("WSword", "default:sword_wood")
+minetest.alias_tool("STSword", "default:sword_stone")
+minetest.alias_tool("SteelSword", "default:sword_steel")
+
+minetest.alias_craftitem("Stick", "default:stick")
+minetest.alias_craftitem("paper", "default:paper")
+minetest.alias_craftitem("book", "default:book")
+minetest.alias_craftitem("lump_of_coal", "default:coal_lump")
+minetest.alias_craftitem("lump_of_iron", "default:iron_lump")
+minetest.alias_craftitem("lump_of_clay", "default:clay_lump")
+minetest.alias_craftitem("steel_ingot", "default:steel_ingot")
+minetest.alias_craftitem("clay_brick", "default:clay_brick")
+minetest.alias_craftitem("scorched_stuff", "default:scorched_stuff")
+minetest.alias_craftitem("apple", "default:apple")
+
+--
+-- Old items
+--
+
+minetest.register_craftitem(":rat", {
+	image = "rat.png",
+	cookresult_itemstring = 'craft "cooked_rat" 1',
+	on_drop = function(item, dropper, pos)
+		minetest.env:add_rat(pos)
+		return true
+	end,
+})
+
+minetest.register_craftitem(":cooked_rat", {
+	image = "cooked_rat.png",
+	cookresult_itemstring = 'craft "scorched_stuff" 1',
+	on_place_on_ground = minetest.craftitem_place_item,
+	on_use = minetest.craftitem_eat(6),
+})
+
+minetest.register_craftitem(":firefly", {
+	image = "firefly.png",
+	on_drop = function(item, dropper, pos)
+		minetest.env:add_firefly(pos)
+		return true
+	end,
+})
+
+-- END

src/CMakeLists.txt

@@ -161,6 +161,7 @@ set(minetest_SRCS
 	MyBillboardSceneNode.cpp
 	content_mapblock.cpp
 	content_cao.cpp
+	mesh.cpp
 	mapblock_mesh.cpp
 	farmesh.cpp
 	keycode.cpp

src/camera.cpp

@@ -22,21 +22,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "client.h"
 #include "main.h" // for g_settings
 #include "map.h"
+#include "mesh.h"
 #include "player.h"
 #include "tile.h"
 #include <cmath>
-#include <SAnimatedMesh.h>
 #include "settings.h"
 #include "nodedef.h" // For wield visualization
 
-// In Irrlicht 1.8 the signature of ITexture::lock was changed from
-// (bool, u32) to (E_TEXTURE_LOCK_MODE, u32).
-#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR <= 7
-#define MY_ETLM_READ_ONLY true
-#else
-#define MY_ETLM_READ_ONLY video::ETLM_READ_ONLY
-#endif
-
 Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control):
 	m_smgr(smgr),
 	m_playernode(NULL),
@@ -480,7 +472,6 @@ void Camera::wield(const InventoryItem* item, IGameDef *gamedef)
 			case NDT_ALLFACES:
 			case NDT_ALLFACES_OPTIONAL:
 				m_wieldnode->setCube(ndef->get(content).tiles);
-				m_wieldnode->setScale(v3f(30));
 				isCube = true;
 				break;
 			default:
@@ -492,7 +483,6 @@ void Camera::wield(const InventoryItem* item, IGameDef *gamedef)
 		if (!isCube)
 		{
 			m_wieldnode->setSprite(item->getImageRaw());
-			m_wieldnode->setScale(v3f(40));
 		}
 
 		m_wieldnode->setVisible(true);
@@ -501,7 +491,6 @@ void Camera::wield(const InventoryItem* item, IGameDef *gamedef)
 	{
 		// Bare hands
 		m_wieldnode->setSprite(gamedef->tsrc()->getTextureRaw("wieldhand.png"));
-		m_wieldnode->setScale(v3f(40));
 		m_wieldnode->setVisible(true);
 	}
 }
@@ -536,7 +525,6 @@ ExtrudedSpriteSceneNode::ExtrudedSpriteSceneNode(
 	ISceneNode(parent, mgr, id, position, rotation, scale)
 {
 	m_meshnode = mgr->addMeshSceneNode(NULL, this, -1, v3f(0,0,0), v3f(0,0,0), v3f(1,1,1), true);
-	m_thickness = 0.1;
 	m_cubemesh = NULL;
 	m_is_cube = false;
 	m_light = LIGHT_MAX;
@@ -551,6 +539,8 @@ ExtrudedSpriteSceneNode::~ExtrudedSpriteSceneNode()
 
 void ExtrudedSpriteSceneNode::setSprite(video::ITexture* texture)
 {
+	const v3f sprite_scale(40.0, 40.0, 4.0); // width, height, thickness
+
 	if (texture == NULL)
 	{
 		m_meshnode->setVisible(false);
@@ -568,7 +558,9 @@ void ExtrudedSpriteSceneNode::setSprite(video::ITexture* texture)
 	else
 	{
 		// Texture was not yet extruded, do it now and save in cache
-		mesh = extrude(texture);
+		mesh = createExtrudedMesh(texture,
+				SceneManager->getVideoDriver(),
+				sprite_scale);
 		if (mesh == NULL)
 		{
 			dstream << "Warning: failed to extrude sprite" << std::endl;
@@ -580,7 +572,6 @@ void ExtrudedSpriteSceneNode::setSprite(video::ITexture* texture)
 		mesh->drop();
 	}
 
-	m_meshnode->setScale(v3f(1, 1, m_thickness));
 	m_meshnode->getMaterial(0).setTexture(0, texture);
 	m_meshnode->getMaterial(0).setFlag(video::EMF_LIGHTING, false);
 	m_meshnode->getMaterial(0).setFlag(video::EMF_BILINEAR_FILTER, false);
@@ -592,11 +583,14 @@ void ExtrudedSpriteSceneNode::setSprite(video::ITexture* texture)
 
 void ExtrudedSpriteSceneNode::setCube(const TileSpec tiles[6])
 {
+	const v3f cube_scale(30.0, 30.0, 30.0);
+
 	if (m_cubemesh == NULL)
-		m_cubemesh = createCubeMesh();
+	{
+		m_cubemesh = createCubeMesh(cube_scale);
+	}
 
 	m_meshnode->setMesh(m_cubemesh);
-	m_meshnode->setScale(v3f(1));
 	for (int i = 0; i < 6; ++i)
 	{
 		// Get the tile texture and atlas transformation
@@ -626,7 +620,7 @@ void ExtrudedSpriteSceneNode::updateLight(u8 light)
 	// Set brightness one lower than incoming light
 	diminish_light(li);
 	video::SColor color(255,li,li,li);
-	setMeshVerticesColor(m_meshnode->getMesh(), color);
+	setMeshColor(m_meshnode->getMesh(), color);
 }
 
 void ExtrudedSpriteSceneNode::removeSpriteFromCache(video::ITexture* texture)
@@ -637,13 +631,6 @@ void ExtrudedSpriteSceneNode::removeSpriteFromCache(video::ITexture* texture)
 		cache->removeMesh(mesh);
 }
 
-void ExtrudedSpriteSceneNode::setSpriteThickness(f32 thickness)
-{
-	m_thickness = thickness;
-	if (!m_is_cube)
-		m_meshnode->setScale(v3f(1, 1, thickness));
-}
-
 const core::aabbox3d<f32>& ExtrudedSpriteSceneNode::getBoundingBox() const
 {
 	return m_meshnode->getBoundingBox();
@@ -667,259 +654,3 @@ io::path ExtrudedSpriteSceneNode::getExtrudedName(video::ITexture* texture)
 	path.append("/[extruded]");
 	return path;
 }
-
-scene::IAnimatedMesh* ExtrudedSpriteSceneNode::extrudeARGB(u32 width, u32 height, u8* data)
-{
-	const s32 argb_wstep = 4 * width;
-	const s32 alpha_threshold = 1;
-
-	scene::IMeshBuffer* buf = new scene::SMeshBuffer();
-	video::SColor c(255,255,255,255);
-
-	// Front and back
-	{
-		video::S3DVertex vertices[8] =
-		{
-			video::S3DVertex(-0.5,-0.5,-0.5, 0,0,-1, c, 0,1),
-			video::S3DVertex(-0.5,+0.5,-0.5, 0,0,-1, c, 0,0),
-			video::S3DVertex(+0.5,+0.5,-0.5, 0,0,-1, c, 1,0),
-			video::S3DVertex(+0.5,-0.5,-0.5, 0,0,-1, c, 1,1),
-			video::S3DVertex(+0.5,-0.5,+0.5, 0,0,+1, c, 1,1),
-			video::S3DVertex(+0.5,+0.5,+0.5, 0,0,+1, c, 1,0),
-			video::S3DVertex(-0.5,+0.5,+0.5, 0,0,+1, c, 0,0),
-			video::S3DVertex(-0.5,-0.5,+0.5, 0,0,+1, c, 0,1),
-		};
-		u16 indices[12] = {0,1,2,2,3,0,4,5,6,6,7,4};
-		buf->append(vertices, 8, indices, 12);
-	}
-
-	// "Interior"
-	// (add faces where a solid pixel is next to a transparent one)
-	u8* solidity = new u8[(width+2) * (height+2)];
-	u32 wstep = width + 2;
-	for (u32 y = 0; y < height + 2; ++y)
-	{
-		u8* scanline = solidity + y * wstep;
-		if (y == 0 || y == height + 1)
-		{
-			for (u32 x = 0; x < width + 2; ++x)
-				scanline[x] = 0;
-		}
-		else
-		{
-			scanline[0] = 0;
-			u8* argb_scanline = data + (y - 1) * argb_wstep;
-			for (u32 x = 0; x < width; ++x)
-				scanline[x+1] = (argb_scanline[x*4+3] >= alpha_threshold);
-			scanline[width + 1] = 0;
-		}
-	}
-
-	// without this, there would be occasional "holes" in the mesh
-	f32 eps = 0.01;
-
-	for (u32 y = 0; y <= height; ++y)
-	{
-		u8* scanline = solidity + y * wstep + 1;
-		for (u32 x = 0; x <= width; ++x)
-		{
-			if (scanline[x] && !scanline[x + wstep])
-			{
-				u32 xx = x + 1;
-				while (scanline[xx] && !scanline[xx + wstep])
-					++xx;
-				f32 vx1 = (x - eps) / (f32) width - 0.5;
-				f32 vx2 = (xx + eps) / (f32) width - 0.5;
-				f32 vy = 0.5 - (y - eps) / (f32) height;
-				f32 tx1 = x / (f32) width;
-				f32 tx2 = xx / (f32) width;
-				f32 ty = (y - 0.5) / (f32) height;
-				video::S3DVertex vertices[8] =
-				{
-					video::S3DVertex(vx1,vy,-0.5, 0,-1,0, c, tx1,ty),
-					video::S3DVertex(vx2,vy,-0.5, 0,-1,0, c, tx2,ty),
-					video::S3DVertex(vx2,vy,+0.5, 0,-1,0, c, tx2,ty),
-					video::S3DVertex(vx1,vy,+0.5, 0,-1,0, c, tx1,ty),
-				};
-				u16 indices[6] = {0,1,2,2,3,0};
-				buf->append(vertices, 4, indices, 6);
-				x = xx - 1;
-			}
-			if (!scanline[x] && scanline[x + wstep])
-			{
-				u32 xx = x + 1;
-				while (!scanline[xx] && scanline[xx + wstep])
-					++xx;
-				f32 vx1 = (x - eps) / (f32) width - 0.5;
-				f32 vx2 = (xx + eps) / (f32) width - 0.5;
-				f32 vy = 0.5 - (y + eps) / (f32) height;
-				f32 tx1 = x / (f32) width;
-				f32 tx2 = xx / (f32) width;
-				f32 ty = (y + 0.5) / (f32) height;
-				video::S3DVertex vertices[8] =
-				{
-					video::S3DVertex(vx1,vy,-0.5, 0,1,0, c, tx1,ty),
-					video::S3DVertex(vx1,vy,+0.5, 0,1,0, c, tx1,ty),
-					video::S3DVertex(vx2,vy,+0.5, 0,1,0, c, tx2,ty),
-					video::S3DVertex(vx2,vy,-0.5, 0,1,0, c, tx2,ty),
-				};
-				u16 indices[6] = {0,1,2,2,3,0};
-				buf->append(vertices, 4, indices, 6);
-				x = xx - 1;
-			}
-		}
-	}
-
-	for (u32 x = 0; x <= width; ++x)
-	{
-		u8* scancol = solidity + x + wstep;
-		for (u32 y = 0; y <= height; ++y)
-		{
-			if (scancol[y * wstep] && !scancol[y * wstep + 1])
-			{
-				u32 yy = y + 1;
-				while (scancol[yy * wstep] && !scancol[yy * wstep + 1])
-					++yy;
-				f32 vx = (x - eps) / (f32) width - 0.5;
-				f32 vy1 = 0.5 - (y - eps) / (f32) height;
-				f32 vy2 = 0.5 - (yy + eps) / (f32) height;
-				f32 tx = (x - 0.5) / (f32) width;
-				f32 ty1 = y / (f32) height;
-				f32 ty2 = yy / (f32) height;
-				video::S3DVertex vertices[8] =
-				{
-					video::S3DVertex(vx,vy1,-0.5, 1,0,0, c, tx,ty1),
-					video::S3DVertex(vx,vy1,+0.5, 1,0,0, c, tx,ty1),
-					video::S3DVertex(vx,vy2,+0.5, 1,0,0, c, tx,ty2),
-					video::S3DVertex(vx,vy2,-0.5, 1,0,0, c, tx,ty2),
-				};
-				u16 indices[6] = {0,1,2,2,3,0};
-				buf->append(vertices, 4, indices, 6);
-				y = yy - 1;
-			}
-			if (!scancol[y * wstep] && scancol[y * wstep + 1])
-			{
-				u32 yy = y + 1;
-				while (!scancol[yy * wstep] && scancol[yy * wstep + 1])
-					++yy;
-				f32 vx = (x + eps) / (f32) width - 0.5;
-				f32 vy1 = 0.5 - (y - eps) / (f32) height;
-				f32 vy2 = 0.5 - (yy + eps) / (f32) height;
-				f32 tx = (x + 0.5) / (f32) width;
-				f32 ty1 = y / (f32) height;
-				f32 ty2 = yy / (f32) height;
-				video::S3DVertex vertices[8] =
-				{
-					video::S3DVertex(vx,vy1,-0.5, -1,0,0, c, tx,ty1),
-					video::S3DVertex(vx,vy2,-0.5, -1,0,0, c, tx,ty2),
-					video::S3DVertex(vx,vy2,+0.5, -1,0,0, c, tx,ty2),
-					video::S3DVertex(vx,vy1,+0.5, -1,0,0, c, tx,ty1),
-				};
-				u16 indices[6] = {0,1,2,2,3,0};
-				buf->append(vertices, 4, indices, 6);
-				y = yy - 1;
-			}
-		}
-	}
-
-	// Add to mesh
-	scene::SMesh* mesh = new scene::SMesh();
-	buf->recalculateBoundingBox();
-	mesh->addMeshBuffer(buf);
-	buf->drop();
-	mesh->recalculateBoundingBox();
-	scene::SAnimatedMesh* anim_mesh = new scene::SAnimatedMesh(mesh);
-	mesh->drop();
-	return anim_mesh;
-}
-
-scene::IAnimatedMesh* ExtrudedSpriteSceneNode::extrude(video::ITexture* texture)
-{
-	scene::IAnimatedMesh* mesh = NULL;
-	core::dimension2d<u32> size = texture->getSize();
-	video::ECOLOR_FORMAT format = texture->getColorFormat();
-	if (format == video::ECF_A8R8G8B8)
-	{
-		// Texture is in the correct color format, we can pass it
-		// to extrudeARGB right away.
-		void* data = texture->lock(MY_ETLM_READ_ONLY);
-		if (data == NULL)
-			return NULL;
-		mesh = extrudeARGB(size.Width, size.Height, (u8*) data);
-		texture->unlock();
-	}
-	else
-	{
-		video::IVideoDriver* driver = SceneManager->getVideoDriver();
-
-		video::IImage* img1 = driver->createImageFromData(format, size, texture->lock(MY_ETLM_READ_ONLY));
-		if (img1 == NULL)
-			return NULL;
-
-		// img1 is in the texture's color format, convert to 8-bit ARGB
-		video::IImage* img2 = driver->createImage(video::ECF_A8R8G8B8, size);
-		if (img2 != NULL)
-		{
-			img1->copyTo(img2);
-			img1->drop();
-
-			mesh = extrudeARGB(size.Width, size.Height, (u8*) img2->lock());
-			img2->unlock();
-			img2->drop();
-		}
-		img1->drop();
-	}
-	return mesh;
-}
-
-scene::IMesh* ExtrudedSpriteSceneNode::createCubeMesh()
-{
-	video::SColor c(255,255,255,255);
-	video::S3DVertex vertices[24] =
-	{
-		// Up
-		video::S3DVertex(-0.5,+0.5,-0.5, 0,1,0, c, 0,1),
-		video::S3DVertex(-0.5,+0.5,+0.5, 0,1,0, c, 0,0),
-		video::S3DVertex(+0.5,+0.5,+0.5, 0,1,0, c, 1,0),
-		video::S3DVertex(+0.5,+0.5,-0.5, 0,1,0, c, 1,1),
-		// Down
-		video::S3DVertex(-0.5,-0.5,-0.5, 0,-1,0, c, 0,0),
-		video::S3DVertex(+0.5,-0.5,-0.5, 0,-1,0, c, 1,0),
-		video::S3DVertex(+0.5,-0.5,+0.5, 0,-1,0, c, 1,1),
-		video::S3DVertex(-0.5,-0.5,+0.5, 0,-1,0, c, 0,1),
-		// Right
-		video::S3DVertex(+0.5,-0.5,-0.5, 1,0,0, c, 0,1),
-		video::S3DVertex(+0.5,+0.5,-0.5, 1,0,0, c, 0,0),
-		video::S3DVertex(+0.5,+0.5,+0.5, 1,0,0, c, 1,0),
-		video::S3DVertex(+0.5,-0.5,+0.5, 1,0,0, c, 1,1),
-		// Left
-		video::S3DVertex(-0.5,-0.5,-0.5, -1,0,0, c, 1,1),
-		video::S3DVertex(-0.5,-0.5,+0.5, -1,0,0, c, 0,1),
-		video::S3DVertex(-0.5,+0.5,+0.5, -1,0,0, c, 0,0),
-		video::S3DVertex(-0.5,+0.5,-0.5, -1,0,0, c, 1,0),
-		// Back
-		video::S3DVertex(-0.5,-0.5,+0.5, 0,0,1, c, 1,1),
-		video::S3DVertex(+0.5,-0.5,+0.5, 0,0,1, c, 0,1),
-		video::S3DVertex(+0.5,+0.5,+0.5, 0,0,1, c, 0,0),
-		video::S3DVertex(-0.5,+0.5,+0.5, 0,0,1, c, 1,0),
-		// Front
-		video::S3DVertex(-0.5,-0.5,-0.5, 0,0,-1, c, 0,1),
-		video::S3DVertex(-0.5,+0.5,-0.5, 0,0,-1, c, 0,0),
-		video::S3DVertex(+0.5,+0.5,-0.5, 0,0,-1, c, 1,0),
-		video::S3DVertex(+0.5,-0.5,-0.5, 0,0,-1, c, 1,1),
-	};
-
-	u16 indices[6] = {0,1,2,2,3,0};
-
-	scene::SMesh* mesh = new scene::SMesh();
-	for (u32 i=0; i<6; ++i)
-	{
-		scene::IMeshBuffer* buf = new scene::SMeshBuffer();
-		buf->append(vertices + 4 * i, 4, indices, 6);
-		buf->recalculateBoundingBox();
-		mesh->addMeshBuffer(buf);
-		buf->drop();
-	}
-	mesh->recalculateBoundingBox();
-	return mesh;
-}

src/camera.h

@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "common_irrlicht.h"
 #include "inventory.h"
+#include "mesh.h"
 #include "tile.h"
 #include "utility.h"
 #include <ICameraSceneNode.h>
@@ -206,9 +207,6 @@ class ExtrudedSpriteSceneNode: public scene::ISceneNode
 	void setSprite(video::ITexture* texture);
 	void setCube(const TileSpec tiles[6]);
 
-	f32 getSpriteThickness() const { return m_thickness; }
-	void setSpriteThickness(f32 thickness);
-
 	void updateLight(u8 light);
 
 	void removeSpriteFromCache(video::ITexture* texture);
@@ -219,16 +217,11 @@ class ExtrudedSpriteSceneNode: public scene::ISceneNode
 
 private:
 	scene::IMeshSceneNode* m_meshnode;
-	f32 m_thickness;
 	scene::IMesh* m_cubemesh;
 	bool m_is_cube;
 	u8 m_light;
 
-	// internal extrusion helper methods
 	io::path getExtrudedName(video::ITexture* texture);
-	scene::IAnimatedMesh* extrudeARGB(u32 width, u32 height, u8* data);
-	scene::IAnimatedMesh* extrude(video::ITexture* texture);
-	scene::IMesh* createCubeMesh();
 };
 
 #endif

src/content_cao.cpp

@@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "gamedef.h"
 #include "clientobject.h"
 #include "content_object.h"
+#include "mesh.h"
 #include "utility.h" // For IntervalLimiter
 class Settings;
 #include "MyBillboardSceneNode.h"
@@ -182,12 +183,16 @@ class ItemCAO : public ClientActiveObject
 		{return &m_selection_box;}
 	v3f getPosition()
 		{return m_position;}
+	
+	std::string infoText()
+		{return m_infotext;}
 
 private:
 	core::aabbox3d<f32> m_selection_box;
 	scene::IMeshSceneNode *m_node;
 	v3f m_position;
 	std::string m_inventorystring;
+	std::string m_infotext;
 };
 
 /*
@@ -529,7 +534,10 @@ ItemCAO::ItemCAO(IGameDef *gamedef, ClientEnvironment *env):
 	m_node(NULL),
 	m_position(v3f(0,10*BS,0))
 {
-	ClientActiveObject::registerType(getType(), create);
+	if(!gamedef && !env)
+	{
+		ClientActiveObject::registerType(getType(), create);
+	}
 }
 
 ItemCAO::~ItemCAO()
@@ -568,9 +576,8 @@ void ItemCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
 	// Set material
 	buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
 	buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false);
-	//buf->getMaterial().setTexture(0, NULL);
-	// Initialize with the stick texture
-	buf->getMaterial().setTexture(0, tsrc->getTextureRaw("stick.png"));
+	// Initialize with a generated placeholder texture
+	buf->getMaterial().setTexture(0, tsrc->getTextureRaw(""));
 	buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
 	buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
 	buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
@@ -630,7 +637,7 @@ void ItemCAO::updateLight(u8 light_at_pos)
 
 	u8 li = decode_light(light_at_pos);
 	video::SColor color(255,li,li,li);
-	setMeshVerticesColor(m_node->getMesh(), color);
+	setMeshColor(m_node->getMesh(), color);
 }
 
 v3s16 ItemCAO::getLightPosition()
@@ -693,6 +700,23 @@ void ItemCAO::initialize(const std::string &data)
 	}
 	
 	updateNodePos();
+	
+	/*
+		Set infotext to item name if item cannot be deserialized
+	*/
+	try{
+		InventoryItem *item = NULL;
+		item = InventoryItem::deSerialize(m_inventorystring, m_gamedef);
+		if(item){
+			if(!item->isKnown())
+				m_infotext = "Unknown item: '" + m_inventorystring + "'";
+		}
+		delete item;
+	}
+	catch(SerializationError &e)
+	{
+		m_infotext = "Unknown item: '" + m_inventorystring + "'";
+	}
 }
 
 /*
@@ -778,7 +802,7 @@ void RatCAO::updateLight(u8 light_at_pos)
 
 	u8 li = decode_light(light_at_pos);
 	video::SColor color(255,li,li,li);
-	setMeshVerticesColor(m_node->getMesh(), color);
+	setMeshColor(m_node->getMesh(), color);
 }
 
 v3s16 RatCAO::getLightPosition()
@@ -934,7 +958,7 @@ void Oerkki1CAO::updateLight(u8 light_at_pos)
 
 	u8 li = decode_light(light_at_pos);
 	video::SColor color(255,li,li,li);
-	setMeshVerticesColor(m_node->getMesh(), color);
+	setMeshColor(m_node->getMesh(), color);
 }
 
 v3s16 Oerkki1CAO::getLightPosition()
@@ -1165,7 +1189,7 @@ void FireflyCAO::updateLight(u8 light_at_pos)
 
 	u8 li = 255;
 	video::SColor color(255,li,li,li);
-	setMeshVerticesColor(m_node->getMesh(), color);
+	setMeshColor(m_node->getMesh(), color);
 }
 
 v3s16 FireflyCAO::getLightPosition()
@@ -1866,7 +1890,7 @@ class LuaEntityCAO : public ClientActiveObject
 		u8 li = decode_light(light_at_pos);
 		video::SColor color(255,li,li,li);
 		if(m_meshnode){
-			setMeshVerticesColor(m_meshnode->getMesh(), color);
+			setMeshColor(m_meshnode->getMesh(), color);
 			m_meshnode->setVisible(true);
 		}
 		if(m_spritenode){
@@ -2250,7 +2274,7 @@ class PlayerCAO : public ClientActiveObject
 
 		u8 li = decode_light(light_at_pos);
 		video::SColor color(255,li,li,li);
-		setMeshVerticesColor(m_node->getMesh(), color);
+		setMeshColor(m_node->getMesh(), color);
 	}
 
 	v3s16 getLightPosition()

src/craftitemdef.cpp

@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include <sstream>
 #include "utility.h"
+#include <map>
 
 CraftItemDefinition::CraftItemDefinition():
 	imagename(""),
@@ -84,8 +85,11 @@ class CCraftItemDefManager: public IWritableCraftItemDefManager
 	{
 		clear();
 	}
-	virtual const CraftItemDefinition* getCraftItemDefinition(const std::string &itemname) const
+	virtual const CraftItemDefinition* getCraftItemDefinition(const std::string &itemname_) const
 	{
+		// Convert name according to possible alias
+		std::string itemname = getAlias(itemname_);
+		// Get the definition
 		core::map<std::string, CraftItemDefinition*>::Node *n;
 		n = m_item_definitions.find(itemname);
 		if(n == NULL)
@@ -99,17 +103,25 @@ class CCraftItemDefManager: public IWritableCraftItemDefManager
 			return "";
 		return def->imagename;
 	}
+	virtual std::string getAlias(const std::string &name) const
+	{
+		std::map<std::string, std::string>::const_iterator i;
+		i = m_aliases.find(name);
+		if(i != m_aliases.end())
+			return i->second;
+		return name;
+	}
 	virtual bool registerCraftItem(std::string itemname, const CraftItemDefinition &def)
 	{
 		infostream<<"registerCraftItem: registering CraftItem \""<<itemname<<"\""<<std::endl;
-		/*core::map<std::string, CraftItemDefinition*>::Node *n;
-		n = m_item_definitions.find(itemname);
-		if(n != NULL){
-			errorstream<<"registerCraftItem: registering item \""<<toolname
-					<<"\" failed: name is already registered"<<std::endl;
-			return false;
-		}*/
 		m_item_definitions[itemname] = new CraftItemDefinition(def);
+
+		// Remove conflicting alias if it exists
+		bool alias_removed = (m_aliases.erase(itemname) != 0);
+		if(alias_removed)
+			infostream<<"cidef: erased alias "<<itemname
+					<<" because item was defined"<<std::endl;
+		
 		return true;
 	}
 	virtual void clear()
@@ -120,6 +132,19 @@ class CCraftItemDefManager: public IWritableCraftItemDefManager
 			delete i.getNode()->getValue();
 		}
 		m_item_definitions.clear();
+		m_aliases.clear();
+	}
+	virtual void setAlias(const std::string &name,
+			const std::string &convert_to)
+	{
+		if(getCraftItemDefinition(name) != NULL){
+			infostream<<"nidef: not setting alias "<<name<<" -> "<<convert_to
+					<<": "<<name<<" is already defined"<<std::endl;
+			return;
+		}
+		infostream<<"nidef: setting alias "<<name<<" -> "<<convert_to
+				<<std::endl;
+		m_aliases[name] = convert_to;
 	}
 	virtual void serialize(std::ostream &os)
 	{
@@ -138,6 +163,14 @@ class CCraftItemDefManager: public IWritableCraftItemDefManager
 			def->serialize(tmp_os);
 			os<<serializeString(tmp_os.str());
 		}
+
+		writeU16(os, m_aliases.size());
+		for(std::map<std::string, std::string>::const_iterator
+				i = m_aliases.begin(); i != m_aliases.end(); i++)
+		{
+			os<<serializeString(i->first);
+			os<<serializeString(i->second);
+		}
 	}
 	virtual void deSerialize(std::istream &is)
 	{
@@ -158,10 +191,21 @@ class CCraftItemDefManager: public IWritableCraftItemDefManager
 			// Register
 			registerCraftItem(name, def);
 		}
+
+		u16 num_aliases = readU16(is);
+		if(!is.eof()){
+			for(u16 i=0; i<num_aliases; i++){
+				std::string name = deSerializeString(is);
+				std::string convert_to = deSerializeString(is);
+				m_aliases[name] = convert_to;
+			}
+		}
 	}
 private:
 	// Key is name
 	core::map<std::string, CraftItemDefinition*> m_item_definitions;
+	// Aliases
+	std::map<std::string, std::string> m_aliases;
 };
 
 IWritableCraftItemDefManager* createCraftItemDefManager()