From 169327abceb04cafa8449bd69d14bad69a4021b4 Mon Sep 17 00:00:00 2001 From: Wouters Dorian Date: Thu, 9 Jul 2015 10:33:07 +0200 Subject: [PATCH 1/2] Update [stairs] --- minetestforfun_game/mods/stairs/init.lua | 28 +++++++------ .../mods/stairs/models/stairs.obj | 39 +++++++++++++++++++ 2 files changed, 52 insertions(+), 15 deletions(-) create mode 100644 minetestforfun_game/mods/stairs/models/stairs.obj diff --git a/minetestforfun_game/mods/stairs/init.lua b/minetestforfun_game/mods/stairs/init.lua index bda35955..ca2aff1f 100755 --- a/minetestforfun_game/mods/stairs/init.lua +++ b/minetestforfun_game/mods/stairs/init.lua @@ -7,14 +7,22 @@ stairs = {} function stairs.register_stair(subname, recipeitem, groups, images, description, sounds) minetest.register_node(":stairs:stair_" .. subname, { description = description, - drawtype = "nodebox", + drawtype = "mesh", + mesh = "stairs.obj", tiles = images, paramtype = "light", paramtype2 = "facedir", is_ground_content = false, groups = groups, sounds = sounds, - node_box = { + selection_box = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, + {-0.5, 0, 0, 0.5, 0.5, 0.5}, + }, + }, + collision_box = { type = "fixed", fixed = { {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, @@ -138,7 +146,7 @@ function stairs.register_slab(subname, recipeitem, groups, images, description, end return itemstack end - + -- Upside down slabs if p0.y-1 == p1.y then -- Turn into full block if pointing at a existing slab @@ -267,7 +275,7 @@ stairs.register_stair_and_slab("sandstone", "default:sandstone", "Sandstone Stair", "Sandstone Slab", default.node_sound_stone_defaults()) - + stairs.register_stair_and_slab("sandstonebrick", "default:sandstonebrick", {crumbly=2,cracky=2}, {"default_sandstone_brick.png"}, @@ -308,14 +316,4 @@ stairs.register_stair_and_slab("obsidianbrick", "default:obsidianbrick", {"default_obsidian_brick.png"}, "Obsidian Brick Stair", "Obsidian Brick Slab", - default.node_sound_stone_defaults()) - --- From BFD: - -stairs.register_stair_and_slab("cherry_wood", "default:cherry_plank", - {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3}, - {"default_wood_cherry_planks.png"}, - "Cherry Plank Stair", - "Cherry Plank Slab", - "Cherry Plank Corner Stair", - default.node_sound_wood_defaults()) + default.node_sound_stone_defaults()) \ No newline at end of file diff --git a/minetestforfun_game/mods/stairs/models/stairs.obj b/minetestforfun_game/mods/stairs/models/stairs.obj new file mode 100644 index 00000000..889bf616 --- /dev/null +++ b/minetestforfun_game/mods/stairs/models/stairs.obj @@ -0,0 +1,39 @@ +# Blender v2.72 (sub 0) OBJ File: '' +# www.blender.org +o stair +v -0.500000 -0.500000 0.500000 +v -0.500000 -0.000000 0.500000 +v -0.500000 0.000000 -0.500000 +v -0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 0.500000 +v 0.500000 -0.500000 -0.500000 +v 0.500000 0.000000 -0.500000 +v 0.500000 -0.000000 0.500000 +v -0.500000 -0.000000 0.500000 +v -0.500000 0.500000 0.500000 +v -0.500000 0.500000 0.000000 +v -0.500000 0.000000 0.000000 +v 0.500000 -0.000000 0.500000 +v 0.500000 0.000000 0.000000 +v 0.500000 0.500000 0.000000 +v 0.500000 0.500000 0.500000 +vt 1.000000 0.000000 +vt 1.000000 0.500000 +vt 0.000000 0.500000 +vt 0.000000 0.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 0.500000 1.000000 +vt 0.500000 0.500000 +s off +f 1/1 2/2 3/3 4/4 +f 5/4 6/1 7/2 8/3 +f 1/4 5/1 8/2 2/3 +f 4/1 3/2 7/3 6/4 +f 1/1 4/5 6/6 5/4 +f 2/5 8/6 7/4 3/1 +f 9/2 10/5 11/7 12/8 +f 13/3 14/8 15/7 16/6 +f 9/3 13/2 16/5 10/6 +f 12/2 11/5 15/6 14/3 +f 10/5 16/6 15/3 11/2 From 42fcceec5b58c11fa0943e7f1aa27209d2f7f46e Mon Sep 17 00:00:00 2001 From: Wouters Dorian Date: Thu, 9 Jul 2015 11:20:34 +0200 Subject: [PATCH 2/2] Optimize [stairs] mesh --- .../mods/stairs/models/stairs.obj | 44 +++++++++---------- other_things/update_sources.txt | 4 ++ 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/minetestforfun_game/mods/stairs/models/stairs.obj b/minetestforfun_game/mods/stairs/models/stairs.obj index 889bf616..009801e9 100644 --- a/minetestforfun_game/mods/stairs/models/stairs.obj +++ b/minetestforfun_game/mods/stairs/models/stairs.obj @@ -1,39 +1,39 @@ -# Blender v2.72 (sub 0) OBJ File: '' +# Blender v2.74 (sub 0) OBJ File: '' # www.blender.org -o stair v -0.500000 -0.500000 0.500000 -v -0.500000 -0.000000 0.500000 +v -0.500000 0.000000 0.000000 v -0.500000 0.000000 -0.500000 v -0.500000 -0.500000 -0.500000 v 0.500000 -0.500000 0.500000 v 0.500000 -0.500000 -0.500000 v 0.500000 0.000000 -0.500000 -v 0.500000 -0.000000 0.500000 -v -0.500000 -0.000000 0.500000 +v 0.500000 0.000000 0.000000 v -0.500000 0.500000 0.500000 v -0.500000 0.500000 0.000000 -v -0.500000 0.000000 0.000000 -v 0.500000 -0.000000 0.500000 -v 0.500000 0.000000 0.000000 v 0.500000 0.500000 0.000000 v 0.500000 0.500000 0.500000 -vt 1.000000 0.000000 -vt 1.000000 0.500000 vt 0.000000 0.500000 vt 0.000000 0.000000 +vt 0.500000 0.500000 +vt 1.000000 0.000000 +vt 1.000000 0.500000 vt 1.000000 1.000000 vt 0.000000 1.000000 vt 0.500000 1.000000 -vt 0.500000 0.500000 +vt 0.999900 0.000100 +vt 0.999900 0.999900 +vt 0.000100 0.999900 +vt 0.000100 0.000100 s off -f 1/1 2/2 3/3 4/4 -f 5/4 6/1 7/2 8/3 -f 1/4 5/1 8/2 2/3 -f 4/1 3/2 7/3 6/4 -f 1/1 4/5 6/6 5/4 -f 2/5 8/6 7/4 3/1 -f 9/2 10/5 11/7 12/8 -f 13/3 14/8 15/7 16/6 -f 9/3 13/2 16/5 10/6 -f 12/2 11/5 15/6 14/3 -f 10/5 16/6 15/3 11/2 +f 3/1 4/2 2/3 +f 8/3 6/4 7/5 +f 4/4 3/5 7/1 6/2 +f 1/4 4/6 6/7 5/2 +f 2/5 8/1 7/2 3/4 +f 2/5 10/6 11/7 8/1 +f 9/6 12/7 11/1 10/5 +f 8/3 11/8 12/7 +f 5/9 12/10 9/11 1/12 +f 2/3 9/6 10/8 +f 4/2 1/4 9/6 +f 6/4 12/7 5/2 diff --git a/other_things/update_sources.txt b/other_things/update_sources.txt index 7f0802c9..b877fe82 100755 --- a/other_things/update_sources.txt +++ b/other_things/update_sources.txt @@ -15,6 +15,10 @@ # http://gitorious.org/calinou/carbone # https://github.com/Jordach/big_freaking_dig (some elements) +# Minetest_game +# [Stairs] +# mff-edit: Optimized stair mesh + # Mods [3D Armor] dir: 3d_armor