diff --git a/homedecor/models/homedecor_slope.obj b/homedecor/models/homedecor_slope.obj new file mode 100644 index 00000000..97b8bb12 --- /dev/null +++ b/homedecor/models/homedecor_slope.obj @@ -0,0 +1,35 @@ +# Blender v2.69 (sub 0) OBJ File: 'slope_test_slope.blend' +# www.blender.org +mtllib slope_test_slope.mtl +o Cube_Cube.002 +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.500000 0.500000 +v -0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 -0.500000 +vt 0.546875 0.984375 +vt 0.296875 0.984375 +vt 0.296875 0.734375 +vt 0.546875 0.734375 +vt 0.578125 0.734375 +vt 0.828125 0.734375 +vt 0.828125 0.984375 +vt 0.578125 0.984375 +vt 0.546875 0.703125 +vt 0.296875 0.453125 +vt 0.546875 0.453125 +vt 0.578125 0.703125 +vt 0.578125 0.453125 +vt 0.828125 0.453125 +vt 0.265625 0.984375 +vt 0.015625 0.984375 +vt 0.015625 0.609375 +vt 0.265625 0.609375 +usemtl None +s off +f 1/1 2/2 3/3 4/4 +f 4/5 3/6 5/7 6/8 +f 2/9 5/10 3/11 +f 1/12 4/13 6/14 +f 2/15 1/16 6/17 5/18 diff --git a/homedecor/models/homedecor_slope_inner_corner.obj b/homedecor/models/homedecor_slope_inner_corner.obj new file mode 100644 index 00000000..8cf7cd3d --- /dev/null +++ b/homedecor/models/homedecor_slope_inner_corner.obj @@ -0,0 +1,48 @@ +# Blender v2.69 (sub 0) OBJ File: 'slope_test_icorner.blend' +# www.blender.org +mtllib slope_test_icorner.mtl +o Cube_Cube.000 +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.500000 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.500000 -0.500000 +v -0.500000 -0.500000 -0.500000 +vt 0.546875 0.984375 +vt 0.296875 0.984375 +vt 0.296875 0.734375 +vt 0.546875 0.734375 +vt 0.828125 0.421875 +vt 0.578125 0.171875 +vt 0.828125 0.171875 +vt 0.546875 0.703125 +vt 0.296875 0.703125 +vt 0.546875 0.328125 +vt 0.578125 0.703125 +vt 0.578125 0.453125 +vt 0.828125 0.453125 +vt 0.828125 0.984375 +vt 0.578125 0.984375 +vt 0.578125 0.734375 +vt 0.828125 0.734375 +vt 0.015625 0.734375 +vt 0.265625 0.734375 +vt 0.265625 0.984375 +vt 0.015625 0.984375 +vt 0.265625 0.703125 +vt 0.015625 0.703125 +vt 0.015625 0.328125 +usemtl None +s off +f 6/1 1/2 7/3 8/4 +f 2/5 5/6 3/7 +f 2/8 1/9 5/10 +f 6/11 8/12 9/13 +f 9/14 8/15 7/16 3/17 +f 3/18 7/19 1/20 2/21 +f 1/22 6/23 9/24 +l 1 4 +l 3 4 diff --git a/homedecor/models/homedecor_slope_outer_corner.obj b/homedecor/models/homedecor_slope_outer_corner.obj new file mode 100644 index 00000000..6d94562b --- /dev/null +++ b/homedecor/models/homedecor_slope_outer_corner.obj @@ -0,0 +1,32 @@ +# Blender v2.69 (sub 0) OBJ File: 'slope_test_ocorner.blend' +# www.blender.org +mtllib slope_test_ocorner.mtl +o Cube_Cube.002 +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.500000 -0.500000 +v 0.500000 -0.500000 -0.500000 +vt 0.578125 0.734375 +vt 0.828125 0.734375 +vt 0.828125 0.984375 +vt 0.578125 0.984375 +vt 0.296875 0.703125 +vt 0.296875 0.453125 +vt 0.546875 0.453125 +vt 0.546875 0.984375 +vt 0.296875 0.734375 +vt 0.546875 0.734375 +vt 0.265625 0.578125 +vt 0.015625 0.203125 +vt 0.265625 0.203125 +vt 0.015625 0.984375 +vt 0.015625 0.609375 +vt 0.265625 0.609375 +usemtl None +s off +f 3/1 2/2 4/3 5/4 +f 1/5 3/6 5/7 +f 1/8 2/9 3/10 +f 1/11 4/12 2/13 +f 1/14 5/15 4/16 diff --git a/homedecor/slopes.lua b/homedecor/slopes.lua index e9de9380..916f9384 100644 --- a/homedecor/slopes.lua +++ b/homedecor/slopes.lua @@ -4,16 +4,12 @@ local S = homedecor.gettext -- Corner shingle nodes, courtesy Bas080 -homedecor.register_outer_corner = function(modname, subname, groups, images, description) - local slopeboxedge = {} - local detail = homedecor.detail_level - for i = 0, detail-1 do - slopeboxedge[i+1]={-0.5, -0.5, (i/detail)-0.5, 0.5-(i/detail), (i/detail)-0.5+(1.25/detail), 0.5} - end +homedecor.register_outer_corner = function(modname, subname, groups, slope_image, description) minetest.register_node(modname..":shingle_outer_corner_" .. subname, { description = S(description.. " (outer corner)"), - drawtype = "nodebox", - tiles = images, + drawtype = "mesh", + mesh = "homedecor_slope_outer_corner.obj", + tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" }, paramtype = "light", paramtype2 = "facedir", walkable = true, @@ -34,17 +30,12 @@ homedecor.register_outer_corner = function(modname, subname, groups, images, des }) end -homedecor.register_inner_corner = function(modname, subname, groups, images, description) - local slopeboxedge = {} - local detail = homedecor.detail_level - for i = 0, detail-1 do - slopeboxedge[i+1]={-0.5, -0.5, -0.5, 0.5-(i/detail), (i/detail)-0.5+(1.25/detail), 0.5} - slopeboxedge[i+detail+1]={-0.5, -0.5, (i/detail)-0.5, 0.5, (i/detail)-0.5+(1.25/detail), 0.5} - end +homedecor.register_inner_corner = function(modname, subname, groups, slope_image, description) minetest.register_node(modname..":shingle_inner_corner_" .. subname, { description = S(description.. " (inner corner)"), - drawtype = "nodebox", - tiles = images, + drawtype = "mesh", + mesh = "homedecor_slope_inner_corner.obj", + tiles = { "homedecor_slope_inner_corner_"..slope_image..".png" }, paramtype = "light", paramtype2 = "facedir", walkable = true, @@ -52,24 +43,16 @@ homedecor.register_inner_corner = function(modname, subname, groups, images, des type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5} }, - node_box = { - type = "fixed", - fixed = slopeboxedge - }, groups = groups, }) end -homedecor.register_slope = function(modname, subname, recipeitem, groups, images, description) - local slopeboxedge = {} - local detail = homedecor.detail_level - for i = 0, detail-1 do - slopeboxedge[i+1]={-0.5, -0.5, (i/detail)-0.5, 0.5, (i/detail)-0.5+(1.25/detail), 0.5} - end +homedecor.register_slope = function(modname, subname, recipeitem, groups, slope_image, description) minetest.register_node(modname..":shingle_side_" .. subname, { description = S(description), - drawtype = "nodebox", - tiles = images, + drawtype = "mesh", + mesh = "homedecor_slope.obj", + tiles = { "homedecor_slope_"..slope_image..".png" }, paramtype = "light", paramtype2 = "facedir", walkable = true, @@ -201,49 +184,28 @@ minetest.register_craft({ burntime = 30, }) -homedecor.register_roof = function(modname, subname, groups, images , description) - homedecor.register_outer_corner(modname, subname, groups, images, description) - homedecor.register_inner_corner(modname, subname, groups, images, description) +homedecor.register_roof = function(modname, subname, groups, slope_image , description) + homedecor.register_outer_corner(modname, subname, groups, slope_image, description) + homedecor.register_inner_corner(modname, subname, groups, slope_image, description) end -- corners homedecor.register_roof("homedecor", "wood", { snappy = 3 }, - { - "homedecor_shingles_wood_c_t.png", - "homedecor_shingles_wood_c_x.png", - "homedecor_shingles_wood_c_x.png", - "homedecor_shingles_wood_c_x.png", - "homedecor_shingles_wood_c_z.png", - "homedecor_shingles_wood_c_z.png", - }, + "wood", "Wood Shingles" ) homedecor.register_roof("homedecor", "asphalt", { snappy = 3 }, - { - "homedecor_shingles_asphalt_c_t.png", - "homedecor_shingles_asphalt_c_x.png", - "homedecor_shingles_asphalt_c_x.png", - "homedecor_shingles_asphalt_c_x.png", - "homedecor_shingles_asphalt_c_z.png", - "homedecor_shingles_asphalt_c_z.png", - }, + "asphalt", "Asphalt Shingles" ) homedecor.register_roof("homedecor", "terracotta", { snappy = 3 }, - { - "homedecor_shingles_terracotta_c_t.png", - "homedecor_shingles_terracotta_c_x.png", - "homedecor_shingles_terracotta_c_x.png", - "homedecor_shingles_terracotta_c_x.png", - "homedecor_shingles_terracotta_c_z.png", - "homedecor_shingles_terracotta_c_z.png", - }, + "terracotta", "Terracotta Shingles" ) @@ -252,52 +214,28 @@ homedecor.register_roof("homedecor", "terracotta", homedecor.register_slope("homedecor", "wood", "homedecor:shingles_wood", { snappy = 3 }, - { - "homedecor_shingles_wood_s_t.png", - "homedecor_shingles_wood_s_z.png", - "homedecor_shingles_wood_s_z.png", - "homedecor_shingles_wood_s_z.png", - "homedecor_shingles_wood_s_z.png", - "homedecor_shingles_wood_s_z.png", - }, + "wood", "Wood Shingles" ) homedecor.register_slope("homedecor", "asphalt", "homedecor:shingles_asphalt", { snappy = 3 }, - { - "homedecor_shingles_asphalt_s_t.png", - "homedecor_shingles_asphalt_s_z.png", - "homedecor_shingles_asphalt_s_z.png", - "homedecor_shingles_asphalt_s_z.png", - "homedecor_shingles_asphalt_s_z.png", - "homedecor_shingles_asphalt_s_z.png", - }, + "asphalt", "Asphalt Shingles" ) homedecor.register_slope("homedecor", "terracotta", "homedecor:shingles_terracotta", { snappy = 3 }, - { - "homedecor_shingles_terracotta_s_t.png", - "homedecor_shingles_terracotta_s_z.png", - "homedecor_shingles_terracotta_s_z.png", - "homedecor_shingles_terracotta_s_z.png", - "homedecor_shingles_terracotta_s_z.png", - "homedecor_shingles_terracotta_s_z.png", - }, + "terracotta", "Terracotta Shingles" ) homedecor.register_slope("homedecor", "glass", "homedecor:shingles_glass", { snappy = 3 }, - { - "homedecor_shingles_glass_top.png", - "homedecor_shingles_glass.png" - }, + "glass", "Glass Shingles" ) diff --git a/homedecor/textures/homedecor_shingles_asphalt.png b/homedecor/textures/homedecor_shingles_asphalt.png index 9912a7de..144e1de8 100644 Binary files a/homedecor/textures/homedecor_shingles_asphalt.png and b/homedecor/textures/homedecor_shingles_asphalt.png differ diff --git a/homedecor/textures/homedecor_shingles_asphalt_c_t.png b/homedecor/textures/homedecor_shingles_asphalt_c_t.png deleted file mode 100644 index 9ed80930..00000000 Binary files a/homedecor/textures/homedecor_shingles_asphalt_c_t.png and /dev/null differ diff --git a/homedecor/textures/homedecor_shingles_asphalt_c_x.png b/homedecor/textures/homedecor_shingles_asphalt_c_x.png deleted file mode 100644 index 34b06641..00000000 Binary files a/homedecor/textures/homedecor_shingles_asphalt_c_x.png and /dev/null differ diff --git a/homedecor/textures/homedecor_shingles_asphalt_c_z.png b/homedecor/textures/homedecor_shingles_asphalt_c_z.png deleted file mode 100644 index 537760ac..00000000 Binary files a/homedecor/textures/homedecor_shingles_asphalt_c_z.png and /dev/null differ diff --git a/homedecor/textures/homedecor_shingles_asphalt_inv.png b/homedecor/textures/homedecor_shingles_asphalt_inv.png index f1de9b94..1d7fd8a5 100644 Binary files a/homedecor/textures/homedecor_shingles_asphalt_inv.png and b/homedecor/textures/homedecor_shingles_asphalt_inv.png differ diff --git a/homedecor/textures/homedecor_shingles_asphalt_s_t.png b/homedecor/textures/homedecor_shingles_asphalt_s_t.png deleted file mode 100644 index 9ed80930..00000000 Binary files a/homedecor/textures/homedecor_shingles_asphalt_s_t.png and /dev/null differ diff --git a/homedecor/textures/homedecor_shingles_asphalt_s_z.png b/homedecor/textures/homedecor_shingles_asphalt_s_z.png deleted file mode 100644 index 537760ac..00000000 Binary files a/homedecor/textures/homedecor_shingles_asphalt_s_z.png and /dev/null differ diff --git a/homedecor/textures/homedecor_shingles_glass.png b/homedecor/textures/homedecor_shingles_glass.png index 727d5758..a2a05d28 100644 Binary files a/homedecor/textures/homedecor_shingles_glass.png and b/homedecor/textures/homedecor_shingles_glass.png differ diff --git a/homedecor/textures/homedecor_shingles_glass_top.png b/homedecor/textures/homedecor_shingles_glass_top.png deleted file mode 100644 index 727d5758..00000000 Binary files a/homedecor/textures/homedecor_shingles_glass_top.png and /dev/null differ diff --git a/homedecor/textures/homedecor_shingles_terracotta.png b/homedecor/textures/homedecor_shingles_terracotta.png index 90c21c12..4dc43a78 100644 Binary files a/homedecor/textures/homedecor_shingles_terracotta.png and b/homedecor/textures/homedecor_shingles_terracotta.png differ diff --git a/homedecor/textures/homedecor_shingles_terracotta_c_t.png b/homedecor/textures/homedecor_shingles_terracotta_c_t.png deleted file mode 100644 index f99e9aae..00000000 Binary files a/homedecor/textures/homedecor_shingles_terracotta_c_t.png and /dev/null differ diff --git a/homedecor/textures/homedecor_shingles_terracotta_c_x.png b/homedecor/textures/homedecor_shingles_terracotta_c_x.png deleted file mode 100644 index e0403667..00000000 Binary files a/homedecor/textures/homedecor_shingles_terracotta_c_x.png and /dev/null differ diff --git a/homedecor/textures/homedecor_shingles_terracotta_c_z.png b/homedecor/textures/homedecor_shingles_terracotta_c_z.png deleted file mode 100644 index 69bd47ed..00000000 Binary files a/homedecor/textures/homedecor_shingles_terracotta_c_z.png and /dev/null differ diff --git a/homedecor/textures/homedecor_shingles_terracotta_inv.png b/homedecor/textures/homedecor_shingles_terracotta_inv.png index f5aaa5da..97f198ef 100644 Binary files a/homedecor/textures/homedecor_shingles_terracotta_inv.png and b/homedecor/textures/homedecor_shingles_terracotta_inv.png differ diff --git a/homedecor/textures/homedecor_shingles_terracotta_s_t.png b/homedecor/textures/homedecor_shingles_terracotta_s_t.png deleted file mode 100644 index f99e9aae..00000000 Binary files a/homedecor/textures/homedecor_shingles_terracotta_s_t.png and /dev/null differ diff --git a/homedecor/textures/homedecor_shingles_terracotta_s_z.png b/homedecor/textures/homedecor_shingles_terracotta_s_z.png deleted file mode 100644 index 69bd47ed..00000000 Binary files a/homedecor/textures/homedecor_shingles_terracotta_s_z.png and /dev/null differ diff --git a/homedecor/textures/homedecor_shingles_wood.png b/homedecor/textures/homedecor_shingles_wood.png index 44ce9758..46781f1b 100644 Binary files a/homedecor/textures/homedecor_shingles_wood.png and b/homedecor/textures/homedecor_shingles_wood.png differ diff --git a/homedecor/textures/homedecor_shingles_wood_c_t.png b/homedecor/textures/homedecor_shingles_wood_c_t.png deleted file mode 100644 index 44ce9758..00000000 Binary files a/homedecor/textures/homedecor_shingles_wood_c_t.png and /dev/null differ diff --git a/homedecor/textures/homedecor_shingles_wood_c_x.png b/homedecor/textures/homedecor_shingles_wood_c_x.png deleted file mode 100644 index 3e9d5043..00000000 Binary files a/homedecor/textures/homedecor_shingles_wood_c_x.png and /dev/null differ diff --git a/homedecor/textures/homedecor_shingles_wood_c_z.png b/homedecor/textures/homedecor_shingles_wood_c_z.png deleted file mode 100644 index 8cc4adb4..00000000 Binary files a/homedecor/textures/homedecor_shingles_wood_c_z.png and /dev/null differ diff --git a/homedecor/textures/homedecor_shingles_wood_inv.png b/homedecor/textures/homedecor_shingles_wood_inv.png index df0e6778..4c2b042c 100644 Binary files a/homedecor/textures/homedecor_shingles_wood_inv.png and b/homedecor/textures/homedecor_shingles_wood_inv.png differ diff --git a/homedecor/textures/homedecor_shingles_wood_s_t.png b/homedecor/textures/homedecor_shingles_wood_s_t.png deleted file mode 100644 index 44ce9758..00000000 Binary files a/homedecor/textures/homedecor_shingles_wood_s_t.png and /dev/null differ diff --git a/homedecor/textures/homedecor_shingles_wood_s_z.png b/homedecor/textures/homedecor_shingles_wood_s_z.png deleted file mode 100644 index 8cc4adb4..00000000 Binary files a/homedecor/textures/homedecor_shingles_wood_s_z.png and /dev/null differ diff --git a/homedecor/textures/homedecor_slope_asphalt.png b/homedecor/textures/homedecor_slope_asphalt.png new file mode 100644 index 00000000..18d116d4 Binary files /dev/null and b/homedecor/textures/homedecor_slope_asphalt.png differ diff --git a/homedecor/textures/homedecor_slope_glass.png b/homedecor/textures/homedecor_slope_glass.png new file mode 100644 index 00000000..bb516cf5 Binary files /dev/null and b/homedecor/textures/homedecor_slope_glass.png differ diff --git a/homedecor/textures/homedecor_slope_inner_corner_asphalt.png b/homedecor/textures/homedecor_slope_inner_corner_asphalt.png new file mode 100644 index 00000000..886d22ee Binary files /dev/null and b/homedecor/textures/homedecor_slope_inner_corner_asphalt.png differ diff --git a/homedecor/textures/homedecor_slope_inner_corner_terracotta.png b/homedecor/textures/homedecor_slope_inner_corner_terracotta.png new file mode 100644 index 00000000..6393c46a Binary files /dev/null and b/homedecor/textures/homedecor_slope_inner_corner_terracotta.png differ diff --git a/homedecor/textures/homedecor_slope_inner_corner_wood.png b/homedecor/textures/homedecor_slope_inner_corner_wood.png new file mode 100644 index 00000000..4ec6ca03 Binary files /dev/null and b/homedecor/textures/homedecor_slope_inner_corner_wood.png differ diff --git a/homedecor/textures/homedecor_slope_outer_corner_asphalt.png b/homedecor/textures/homedecor_slope_outer_corner_asphalt.png new file mode 100644 index 00000000..9f80d5bc Binary files /dev/null and b/homedecor/textures/homedecor_slope_outer_corner_asphalt.png differ diff --git a/homedecor/textures/homedecor_slope_outer_corner_terracotta.png b/homedecor/textures/homedecor_slope_outer_corner_terracotta.png new file mode 100644 index 00000000..8a0b4119 Binary files /dev/null and b/homedecor/textures/homedecor_slope_outer_corner_terracotta.png differ diff --git a/homedecor/textures/homedecor_slope_outer_corner_wood.png b/homedecor/textures/homedecor_slope_outer_corner_wood.png new file mode 100644 index 00000000..50ad5fee Binary files /dev/null and b/homedecor/textures/homedecor_slope_outer_corner_wood.png differ diff --git a/homedecor/textures/homedecor_slope_terracotta.png b/homedecor/textures/homedecor_slope_terracotta.png new file mode 100644 index 00000000..0c61791c Binary files /dev/null and b/homedecor/textures/homedecor_slope_terracotta.png differ diff --git a/homedecor/textures/homedecor_slope_wood.png b/homedecor/textures/homedecor_slope_wood.png new file mode 100644 index 00000000..2d3c5872 Binary files /dev/null and b/homedecor/textures/homedecor_slope_wood.png differ