From 8ad356857e67470256cf8a49e07d4f33f94694ce Mon Sep 17 00:00:00 2001 From: HybridDog Date: Thu, 3 Apr 2014 20:17:18 +0200 Subject: [PATCH] =?UTF-8?q?use=20param2=5Fdata=20=E2=86=92=20faster?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- init.lua | 26 ++++++++++++++---------- textures/riesenpilz_lamellas_normal.png | Bin 0 -> 4176 bytes textures/riesenpilz_stem_normal.png | Bin 0 -> 4635 bytes 3 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 textures/riesenpilz_lamellas_normal.png create mode 100644 textures/riesenpilz_stem_normal.png diff --git a/init.lua b/init.lua index ff7d81d..45cbc2f 100644 --- a/init.lua +++ b/init.lua @@ -89,10 +89,9 @@ function riesenpilz_minecraft_fliegenpilz(pos) local manip = minetest.get_voxel_manip() local area = r_area(manip, 1, 4, pos) local nodes = manip:get_data() + local param2s = manip:get_param2_data() local height = 3 - local tab = {} - local num = 1 for i = 0, height, 1 do nodes[area:index(pos.x, pos.y+i, pos.z)] = riesenpilz_c_stem @@ -103,21 +102,24 @@ function riesenpilz_minecraft_fliegenpilz(pos) nodes[area:index(pos.x+j, pos.y+height+1, pos.z+k)] = riesenpilz_c_head_red end for l = 1, height, 1 do - tab[num] = {{x=pos.x+j, y=pos.y+l, z=pos.z+2}, {name="riesenpilz:head_red_side", param2=0}} - tab[num+1] = {{x=pos.x+j, y=pos.y+l, z=pos.z-2}, {name="riesenpilz:head_red_side", param2=2}} - tab[num+2] = {{x=pos.x+2, y=pos.y+l, z=pos.z+j}, {name="riesenpilz:head_red_side", param2=1}} - tab[num+3] = {{x=pos.x-2, y=pos.y+l, z=pos.z+j}, {name="riesenpilz:head_red_side", param2=3}} - num = num+4 + local y = pos.y+l + for _,p in ipairs({ + {area:index(pos.x+j, y, pos.z+2), 0}, + {area:index(pos.x+j, y, pos.z-2), 2}, + {area:index(pos.x+2, y, pos.z+j), 1}, + {area:index(pos.x-2, y, pos.z+j), 3}, + }) do + local tmp = p[1] + nodes[tmp] = riesenpilz_c_head_red_side + param2s[tmp] = p[2] + end end end manip:set_data(nodes) + manip:set_param2_data(param2s) manip:write_to_map() manip:update_map() - - for _,v in ipairs(tab) do - minetest.set_node(v[1], v[2]) - end print(string.format("[riesenpilz] a fly agaric grew at ("..pos.x.."|"..pos.y.."|"..pos.z..") in: %.2fs", os.clock() - t1)) end @@ -526,6 +528,8 @@ riesenpilz_c_lamellas = minetest.get_content_id("riesenpilz:lamellas") riesenpilz_c_head_brown = minetest.get_content_id("riesenpilz:head_brown") +riesenpilz_c_head_red_side = minetest.get_content_id("riesenpilz:head_red_side") + riesenpilz_c_stem_brown = minetest.get_content_id("riesenpilz:stem_brown") riesenpilz_c_head_brown_full = minetest.get_content_id("riesenpilz:head_brown_full") riesenpilz_c_head_orange = minetest.get_content_id("riesenpilz:head_orange") diff --git a/textures/riesenpilz_lamellas_normal.png b/textures/riesenpilz_lamellas_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..b60e11a896cec51d74a30a6fd7661ef255f973fb GIT binary patch literal 4176 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 a4gMD#t-mF?Mnmub0000000rel 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