Merge pull request #1 from EliasFleckenstein03/master

update

9 files changed, 138 insertions, 164 deletions

diff --git a/games/devtest/mods/testnodes/drawtypes.lua b/games/devtest/mods/testnodes/drawtypes.lua
index b3ab2b322..2bc7ec2e3 100644
--- a/games/devtest/mods/testnodes/drawtypes.lua
+++ b/games/devtest/mods/testnodes/drawtypes.lua
@@ -15,22 +15,6 @@ testing this node easier and more convenient.
 
 local S = minetest.get_translator("testnodes")
 
--- If set to true, will show an inventory image for nodes that have no inventory image as of Minetest 5.1.0.
--- This is due to <https://github.com/minetest/minetest/issues/9209>.
--- This is only added to make the items more visible to avoid confusion, but you will no longer see
--- the default inventory images for these items. When you want to test the default inventory image of drawtypes,
--- this should be turned off.
--- TODO: Remove support for fallback inventory image as soon #9209 is fixed.
-local SHOW_FALLBACK_IMAGE = minetest.settings:get_bool("testnodes_show_fallback_image", false)
-
-local fallback_image = function(img)
-	if SHOW_FALLBACK_IMAGE then
-		return img
-	else
-		return nil
-	end
-end
-
 -- A regular cube
 minetest.register_node("testnodes:normal", {
 	description = S("Normal Drawtype Test Node"),
@@ -145,20 +129,15 @@ minetest.register_node("testnodes:fencelike", {
 })
 
 minetest.register_node("testnodes:torchlike", {
-	description = S("Torchlike Drawtype Test Node"),
+	description = S("Floor Torchlike Drawtype Test Node"),
 	drawtype = "torchlike",
 	paramtype = "light",
-	tiles = {
-		"testnodes_torchlike_floor.png",
-		"testnodes_torchlike_ceiling.png",
-		"testnodes_torchlike_wall.png",
-	},
+	tiles = { "testnodes_torchlike_floor.png^[colorize:#FF0000:64" },
 
 
 	walkable = false,
 	sunlight_propagates = true,
 	groups = { dig_immediate = 3 },
-	inventory_image = fallback_image("testnodes_torchlike_floor.png"),
 })
 
 minetest.register_node("testnodes:torchlike_wallmounted", {
@@ -176,12 +155,22 @@ minetest.register_node("testnodes:torchlike_wallmounted", {
 	walkable = false,
 	sunlight_propagates = true,
 	groups = { dig_immediate = 3 },
-	inventory_image = fallback_image("testnodes_torchlike_floor.png"),
 })
 
+minetest.register_node("testnodes:signlike", {
+	description = S("Floor Signlike Drawtype Test Node"),
+	drawtype = "signlike",
+	paramtype = "light",
+	tiles = { "testnodes_signlike.png^[colorize:#FF0000:64" },
 
 
-minetest.register_node("testnodes:signlike", {
+	walkable = false,
+	groups = { dig_immediate = 3 },
+	sunlight_propagates = true,
+})
+
+
+minetest.register_node("testnodes:signlike_wallmounted", {
 	description = S("Wallmounted Signlike Drawtype Test Node"),
 	drawtype = "signlike",
 	paramtype = "light",
@@ -192,7 +181,6 @@ minetest.register_node("testnodes:signlike", {
 	walkable = false,
 	groups = { dig_immediate = 3 },
 	sunlight_propagates = true,
-	inventory_image = fallback_image("testnodes_signlike.png"),
 })
 
 minetest.register_node("testnodes:plantlike", {
@@ -223,6 +211,30 @@ minetest.register_node("testnodes:plantlike_waving", {
 
 
 -- param2 will rotate
+local function rotate_on_rightclick(pos, node, clicker)
+	local def = minetest.registered_nodes[node.name]
+	local aux1 = clicker:get_player_control().aux1
+
+	local deg, deg_max
+	local color, color_mult = 0, 0
+	if def.paramtype2 == "degrotate" then
+		deg = node.param2
+		deg_max = 240
+	elseif def.paramtype2 == "colordegrotate" then
+		-- MSB [3x color, 5x rotation] LSB
+		deg = node.param2 % 2^5
+		deg_max = 24
+		color_mult = 2^5
+		color = math.floor(node.param2 / color_mult)
+	end
+
+	deg = (deg + (aux1 and 10 or 1)) % deg_max
+	node.param2 = color * color_mult + deg
+	minetest.swap_node(pos, node)
+	minetest.chat_send_player(clicker:get_player_name(),
+		"Rotation is now " .. deg .. " / " .. deg_max)
+end
+
 minetest.register_node("testnodes:plantlike_degrotate", {
 	description = S("Degrotate Plantlike Drawtype Test Node"),
 	drawtype = "plantlike",
@@ -230,12 +242,43 @@ minetest.register_node("testnodes:plantlike_degrotate", {
 	paramtype2 = "degrotate",
 	tiles = { "testnodes_plantlike_degrotate.png" },
 
-
+	on_rightclick = rotate_on_rightclick,
+	place_param2 = 7,
 	walkable = false,
 	sunlight_propagates = true,
 	groups = { dig_immediate = 3 },
 })
 
+minetest.register_node("testnodes:mesh_degrotate", {
+	description = S("Degrotate Mesh Drawtype Test Node"),
+	drawtype = "mesh",
+	paramtype = "light",
+	paramtype2 = "degrotate",
+	mesh = "testnodes_ocorner.obj",
+	tiles = { "testnodes_mesh_stripes2.png" },
+
+	on_rightclick = rotate_on_rightclick,
+	place_param2 = 10, -- 15°
+	sunlight_propagates = true,
+	groups = { dig_immediate = 3 },
+})
+
+minetest.register_node("testnodes:mesh_colordegrotate", {
+	description = S("Color Degrotate Mesh Drawtype Test Node"),
+	drawtype = "mesh",
+	paramtype = "light",
+	paramtype2 = "colordegrotate",
+	palette = "testnodes_palette_facedir.png",
+	mesh = "testnodes_ocorner.obj",
+	tiles = { "testnodes_mesh_stripes3.png" },
+
+	on_rightclick = rotate_on_rightclick,
+	-- color index 1, 1 step (=15°) rotated
+	place_param2 = 1 * 2^5 + 1,
+	sunlight_propagates = true,
+	groups = { dig_immediate = 3 },
+})
+
 -- param2 will change height
 minetest.register_node("testnodes:plantlike_leveled", {
 	description = S("Leveled Plantlike Drawtype Test Node"),
@@ -350,68 +393,72 @@ minetest.register_node("testnodes:plantlike_rooted_degrotate", {
 })
 
 -- Demonstrative liquid nodes, source and flowing form.
-minetest.register_node("testnodes:liquid", {
-	description = S("Source Liquid Drawtype Test Node"),
-	drawtype = "liquid",
-	paramtype = "light",
-	tiles = {
-		"testnodes_liquidsource.png",
-	},
-	special_tiles = {
-		{name="testnodes_liquidsource.png", backface_culling=false},
-		{name="testnodes_liquidsource.png", backface_culling=true},
-	},
-	use_texture_alpha = true,
-
-
-	walkable = false,
-	liquidtype = "source",
-	liquid_range = 1,
-	liquid_viscosity = 0,
-	liquid_alternative_flowing = "testnodes:liquid_flowing",
-	liquid_alternative_source = "testnodes:liquid",
-	groups = { dig_immediate = 3 },
-})
-minetest.register_node("testnodes:liquid_flowing", {
-	description = S("Flowing Liquid Drawtype Test Node"),
-	drawtype = "flowingliquid",
-	paramtype = "light",
-	paramtype2 = "flowingliquid",
-	tiles = {
-		"testnodes_liquidflowing.png",
-	},
-	special_tiles = {
-		{name="testnodes_liquidflowing.png", backface_culling=false},
-		{name="testnodes_liquidflowing.png", backface_culling=false},
-	},
-	use_texture_alpha = true,
+-- DRAWTYPE ONLY, NO LIQUID PHYSICS!
+-- Liquid ranges 0 to 8
+for r = 0, 8 do
+	minetest.register_node("testnodes:liquid_"..r, {
+		description = S("Source Liquid Drawtype Test Node, Range @1", r),
+		drawtype = "liquid",
+		paramtype = "light",
+		tiles = {
+			"testnodes_liquidsource_r"..r..".png^[colorize:#FFFFFF:100",
+		},
+		special_tiles = {
+			{name="testnodes_liquidsource_r"..r..".png^[colorize:#FFFFFF:100", backface_culling=false},
+			{name="testnodes_liquidsource_r"..r..".png^[colorize:#FFFFFF:100", backface_culling=true},
+		},
+		use_texture_alpha = "blend",
+
+
+		walkable = false,
+		liquid_range = r,
+		liquid_viscosity = 0,
+		liquid_alternative_flowing = "testnodes:liquid_flowing_"..r,
+		liquid_alternative_source = "testnodes:liquid_"..r,
+		groups = { dig_immediate = 3 },
+	})
+	minetest.register_node("testnodes:liquid_flowing_"..r, {
+		description = S("Flowing Liquid Drawtype Test Node, Range @1", r),
+		drawtype = "flowingliquid",
+		paramtype = "light",
+		paramtype2 = "flowingliquid",
+		tiles = {
+			"testnodes_liquidflowing_r"..r..".png^[colorize:#FFFFFF:100",
+		},
+		special_tiles = {
+			{name="testnodes_liquidflowing_r"..r..".png^[colorize:#FFFFFF:100", backface_culling=false},
+			{name="testnodes_liquidflowing_r"..r..".png^[colorize:#FFFFFF:100", backface_culling=false},
+		},
+		use_texture_alpha = "blend",
+
+
+		walkable = false,
+		liquid_range = r,
+		liquid_viscosity = 0,
+		liquid_alternative_flowing = "testnodes:liquid_flowing_"..r,
+		liquid_alternative_source = "testnodes:liquid_"..r,
+		groups = { dig_immediate = 3 },
+	})
 
+end
 
-	walkable = false,
-	liquidtype = "flowing",
-	liquid_range = 1,
-	liquid_viscosity = 0,
-	liquid_alternative_flowing = "testnodes:liquid_flowing",
-	liquid_alternative_source = "testnodes:liquid",
-	groups = { dig_immediate = 3 },
-})
+-- Waving liquid test (drawtype only)
 minetest.register_node("testnodes:liquid_waving", {
 	description = S("Waving Source Liquid Drawtype Test Node"),
 	drawtype = "liquid",
 	paramtype = "light",
 	tiles = {
-		"testnodes_liquidsource.png^[brighten",
+		"testnodes_liquidsource.png^[colorize:#0000FF:127",
 	},
 	special_tiles = {
-		{name="testnodes_liquidsource.png^[brighten", backface_culling=false},
-		{name="testnodes_liquidsource.png^[brighten", backface_culling=true},
+		{name="testnodes_liquidsource.png^[colorize:#0000FF:127", backface_culling=false},
+		{name="testnodes_liquidsource.png^[colorize:#0000FF:127", backface_culling=true},
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	waving = 3,
 
 
 	walkable = false,
-	liquidtype = "source",
 	liquid_range = 1,
 	liquid_viscosity = 0,
 	liquid_alternative_flowing = "testnodes:liquid_flowing_waving",
@@ -424,18 +471,17 @@ minetest.register_node("testnodes:liquid_flowing_waving", {
 	paramtype = "light",
 	paramtype2 = "flowingliquid",
 	tiles = {
-		"testnodes_liquidflowing.png^[brighten",
+		"testnodes_liquidflowing.png^[colorize:#0000FF:127",
 	},
 	special_tiles = {
-		{name="testnodes_liquidflowing.png^[brighten", backface_culling=false},
-		{name="testnodes_liquidflowing.png^[brighten", backface_culling=false},
+		{name="testnodes_liquidflowing.png^[colorize:#0000FF:127", backface_culling=false},
+		{name="testnodes_liquidflowing.png^[colorize:#0000FF:127", backface_culling=false},
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	waving = 3,
 
 
 	walkable = false,
-	liquidtype = "flowing",
 	liquid_range = 1,
 	liquid_viscosity = 0,
 	liquid_alternative_flowing = "testnodes:liquid_flowing_waving",
@@ -443,8 +489,6 @@ minetest.register_node("testnodes:liquid_flowing_waving", {
 	groups = { dig_immediate = 3 },
 })
 
-
-
 -- Invisible node
 minetest.register_node("testnodes:airlike", {
 	description = S("Airlike Drawtype Test Node"),
@@ -455,7 +499,6 @@ minetest.register_node("testnodes:airlike", {
 	walkable = false,
 	groups = { dig_immediate = 3 },
 	sunlight_propagates = true,
-	inventory_image = fallback_image("testnodes_airlike.png"),
 })
 
 -- param2 changes liquid height
@@ -548,7 +591,7 @@ scale("plantlike",
 scale("torchlike_wallmounted",
 	S("Double-sized Wallmounted Torchlike Drawtype Test Node"),
 	S("Half-sized Wallmounted Torchlike Drawtype Test Node"))
-scale("signlike",
+scale("signlike_wallmounted",
 	S("Double-sized Wallmounted Signlike Drawtype Test Node"),
 	S("Half-sized Wallmounted Signlike Drawtype Test Node"))
 scale("firelike",
diff --git a/games/devtest/mods/testnodes/liquids.lua b/games/devtest/mods/testnodes/liquids.lua
index e316782ad..3d2ea17f5 100644
--- a/games/devtest/mods/testnodes/liquids.lua
+++ b/games/devtest/mods/testnodes/liquids.lua
@@ -9,11 +9,9 @@ for d=0, 8 do
 			{name = "testnodes_liquidsource_r"..d..".png", backface_culling = false},
 			{name = "testnodes_liquidsource_r"..d..".png", backface_culling = true},
 		},
-		alpha = 192,
+		use_texture_alpha = "blend",
 		paramtype = "light",
 		walkable = false,
-		pointable = false,
-		diggable = false,
 		buildable_to = true,
 		is_ground_content = false,
 		liquidtype = "source",
@@ -30,12 +28,10 @@ for d=0, 8 do
 			{name = "testnodes_liquidflowing_r"..d..".png", backface_culling = false},
 			{name = "testnodes_liquidflowing_r"..d..".png", backface_culling = false},
 		},
-		alpha = 192,
+		use_texture_alpha = "blend",
 		paramtype = "light",
 		paramtype2 = "flowingliquid",
 		walkable = false,
-		pointable = false,
-		diggable = false,
 		buildable_to = true,
 		is_ground_content = false,
 		liquidtype = "flowing",
@@ -53,11 +49,9 @@ for d=0, 8 do
 			{name = "testnodes_liquidsource_r"..d..".png"..mod, backface_culling = false},
 			{name = "testnodes_liquidsource_r"..d..".png"..mod, backface_culling = true},
 		},
-		alpha = 192,
+		use_texture_alpha = "blend",
 		paramtype = "light",
 		walkable = false,
-		pointable = false,
-		diggable = false,
 		buildable_to = true,
 		is_ground_content = false,
 		liquidtype = "source",
@@ -74,12 +68,10 @@ for d=0, 8 do
 			{name = "testnodes_liquidflowing_r"..d..".png"..mod, backface_culling = false},
 			{name = "testnodes_liquidflowing_r"..d..".png"..mod, backface_culling = false},
 		},
-		alpha = 192,
+		use_texture_alpha = "blend",
 		paramtype = "light",
 		paramtype2 = "flowingliquid",
 		walkable = false,
-		pointable = false,
-		diggable = false,
 		buildable_to = true,
 		is_ground_content = false,
 		liquidtype = "flowing",
diff --git a/games/devtest/mods/testnodes/properties.lua b/games/devtest/mods/testnodes/properties.lua
index 01846a5f0..a52cd1d6f 100644
--- a/games/devtest/mods/testnodes/properties.lua
+++ b/games/devtest/mods/testnodes/properties.lua
@@ -114,11 +114,10 @@ minetest.register_node("testnodes:liquid_nojump", {
 		{name = "testnodes_liquidsource.png^[colorize:#FF0000:127", backface_culling = false},
 		{name = "testnodes_liquidsource.png^[colorize:#FF0000:127", backface_culling = true},
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	paramtype = "light",
 	pointable = false,
 	liquids_pointable = true,
-	diggable = false,
 	buildable_to = true,
 	is_ground_content = false,
 	post_effect_color = {a = 70, r = 255, g = 0, b = 200},
@@ -143,12 +142,11 @@ minetest.register_node("testnodes:liquidflowing_nojump", {
 		{name = "testnodes_liquidflowing.png^[colorize:#FF0000:127", backface_culling = false},
 		{name = "testnodes_liquidflowing.png^[colorize:#FF0000:127", backface_culling = false},
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	paramtype = "light",
 	paramtype2 = "flowingliquid",
 	pointable = false,
 	liquids_pointable = true,
-	diggable = false,
 	buildable_to = true,
 	is_ground_content = false,
 	post_effect_color = {a = 70, r = 255, g = 0, b = 200},
diff --git a/games/devtest/mods/testnodes/settingtypes.txt b/games/devtest/mods/testnodes/settingtypes.txt
deleted file mode 100644
index 7f753bf3e..000000000
--- a/games/devtest/mods/testnodes/settingtypes.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# If set to true, will show an inventory image for nodes that have no inventory image as of Minetest 5.1.0.
-# This is due to <https://github.com/minetest/minetest/issues/9209>.
-# This is only added to make the items more visible to avoid confusion, but you will no longer see the default inventory images for these items. When you want to test the default inventory image of drawtypes, this should be turned off.
-testnodes_show_fallback_image (Use fallback inventory images) bool false
diff --git a/games/devtest/mods/testnodes/textures.lua b/games/devtest/mods/testnodes/textures.lua
index e0724c229..f6e6a0c2a 100644
--- a/games/devtest/mods/testnodes/textures.lua
+++ b/games/devtest/mods/testnodes/textures.lua
@@ -46,77 +46,22 @@ for a=1,#alphas do
 		tiles = {
 			"testnodes_alpha"..alpha..".png",
 		},
-		use_texture_alpha = true,
+		use_texture_alpha = "blend",
 
 		groups = { dig_immediate = 3 },
 	})
 
-	-- Transparency set via "alpha" parameter
+	-- Transparency set via texture modifier
 	minetest.register_node("testnodes:alpha_"..alpha, {
 		description = S("Alpha Test Node (@1)", alpha),
-		-- It seems that only the liquid drawtype supports the alpha parameter
-		drawtype = "liquid",
+		drawtype = "glasslike",
 		paramtype = "light",
 		tiles = {
-			"testnodes_alpha.png",
+			"testnodes_alpha.png^[opacity:" .. alpha,
 		},
-		alpha = alpha,
-
+		use_texture_alpha = "blend",
 
-		liquidtype = "source",
-		liquid_range = 0,
-		liquid_viscosity = 0,
-		liquid_alternative_source = "testnodes:alpha_"..alpha,
-		liquid_alternative_flowing = "testnodes:alpha_"..alpha,
 		groups = { dig_immediate = 3 },
 	})
 end
 
-
--- Bumpmapping and Parallax Occlusion
-
--- This node has a normal map which corresponds to a pyramid with sides tilted
--- by an angle of 45°, i.e. the normal map contains four vectors which point
--- diagonally away from the surface (e.g. (0.7, 0.7, 0)),
--- and the heights in the height map linearly increase towards the centre,
--- so that the surface corresponds to a simple pyramid.
--- The node can help to determine if e.g. tangent space transformations work
--- correctly.
--- If, for example, the light comes from above, then the (tilted) pyramids
--- should look like they're lit from this light direction on all node faces.
--- The white albedo texture has small black indicators which can be used to see
--- how it is transformed ingame (and thus see if there's rotation around the
--- normal vector).
-minetest.register_node("testnodes:height_pyramid", {
-	description = "Bumpmapping and Parallax Occlusion Tester (height pyramid)",
-	tiles = {"testnodes_height_pyramid.png"},
-	groups = {dig_immediate = 3},
-})
-
--- The stairs nodes should help to validate if shading works correctly for
--- rotated nodes (which have rotated textures).
-stairs.register_stair_and_slab("height_pyramid", "experimantal:height_pyramid",
-	{dig_immediate = 3},
-	{"testnodes_height_pyramid.png"},
-	"Bumpmapping and Parallax Occlusion Tester Stair (height pyramid)",
-	"Bumpmapping and Parallax Occlusion Tester Slab (height pyramid)")
-
--- This node has a simple heightmap for parallax occlusion testing and flat
--- normalmap.
--- When parallax occlusion is enabled, the yellow scrawl should stick out of
--- the texture when viewed at an angle.
-minetest.register_node("testnodes:parallax_extruded", {
-	description = "Parallax Occlusion Tester",
-	tiles = {"testnodes_parallax_extruded.png"},
-	groups = {dig_immediate = 3},
-})
-
--- Analogously to the height pyramid stairs nodes,
--- these nodes should help to validate if parallax occlusion works correctly for
--- rotated nodes (which have rotated textures).
-stairs.register_stair_and_slab("parallax_extruded",
-	"experimantal:parallax_extruded",
-	{dig_immediate = 3},
-	{"testnodes_parallax_extruded.png"},
-	"Parallax Occlusion Tester Stair",
-	"Parallax Occlusion Tester Slab")
diff --git a/games/devtest/mods/testnodes/textures/testnodes_height_pyramid.png b/games/devtest/mods/testnodes/textures/testnodes_height_pyramid.png
deleted file mode 100644
index 8c787b740..000000000
--- a/games/devtest/mods/testnodes/textures/testnodes_height_pyramid.png
+++ /dev/null
diff --git a/games/devtest/mods/testnodes/textures/testnodes_height_pyramid_normal.png b/games/devtest/mods/testnodes/textures/testnodes_height_pyramid_normal.png
deleted file mode 100644
index 5ab7865f2..000000000
--- a/games/devtest/mods/testnodes/textures/testnodes_height_pyramid_normal.png
+++ /dev/null
diff --git a/games/devtest/mods/testnodes/textures/testnodes_parallax_extruded.png b/games/devtest/mods/testnodes/textures/testnodes_parallax_extruded.png
deleted file mode 100644
index 7e1c32398..000000000
--- a/games/devtest/mods/testnodes/textures/testnodes_parallax_extruded.png
+++ /dev/null
diff --git a/games/devtest/mods/testnodes/textures/testnodes_parallax_extruded_normal.png b/games/devtest/mods/testnodes/textures/testnodes_parallax_extruded_normal.png
deleted file mode 100644
index b134699d0..000000000
--- a/games/devtest/mods/testnodes/textures/testnodes_parallax_extruded_normal.png
+++ /dev/null