Support cylinder and hollowcylinder

README.md

@@ -19,6 +19,8 @@ Supported chatcommands:
 * /hollowsphere and /hspr
 * /dome and /do
 * /hollowdome and /hdo
+* /cylinder and /cyl
+* /hollowcylinder and /hcyl
 * /load
 * /y
 * /n
@@ -46,8 +48,6 @@ Not yet implemented:
 * /outset
 * /inset
 * /mix
-* /hollowcylinder /hcyl
-* /cylinder /cyl
 * /hollowpyramid /hpyr
 * /pyramid /pyr
 * /spiral

init.lua

@@ -625,7 +625,7 @@ local function my_we_dome(pos, radius, ...)
 	local pos2 = vector.add(pos, r)
 
 	-- dome with negative radius looks different, I couldn't test it because
-	-- //dome does not accept negative radii.
+	-- //dome does not accept negative radii. FIXME
 	assert(radius >= 0)
 
 	-- a dome is a semi shpere, thus it's almost the same as sphere:
@@ -646,6 +646,41 @@ for i = 1,2 do
 	)
 end
 
+local we_cylinder = worldedit.cylinder
+local function cylinder_func(_,_, ...)
+	return we_cylinder(...)
+end
+local function my_we_cylinder(pos, axis, length, radius, ...)
+	local r = math.ceil(radius)
+	local pos1 = vector.subtract(pos, r)
+	local pos2 = vector.add(pos, r)
+
+	assert(radius >= 0)
+
+	pos1[axis] = pos[axis]
+	pos2[axis] = pos[axis] + length - 1
+	if length < 0 then
+		pos1[axis], pos2[axis] = pos2[axis], pos1[axis]
+		-- with negative length, the cylinder is shifted one node FIXME
+		pos1[axis] = pos1[axis]-1
+		pos2[axis] = pos2[axis]-1
+	end
+
+	return we_nodeset_wrapper(cylinder_func, pos1, pos2, pos, axis, length,
+		radius, ...)
+end
+local cylinder_cmds = {"/cylinder", "/hollowcylinder"}
+for i = 1,2 do
+	override_cc_with_confirm(cylinder_cmds[i],
+		function()
+			worldedit.cylinder = my_we_cylinder
+		end,
+		function()
+			worldedit.cylinder = we_cylinder
+		end
+	)
+end
+
 
 -- tells if the metadata is that dummy
 local function is_meta_empty(metatabl)