feat: 🚧 WIP clearArea integration

Author: ChristophLHR

builder-lib.lua

@@ -36,20 +36,29 @@ local function placeDownItem(itemname)
     if not succ then error(txt) end
 end
 
-local function getTurningDirection(builderRef ,cHorizontal, cVertical)
+local function getTurningDirection(builderRef ,cHorizontal, cVertical, maxWidth)
     assert(type(builderRef) == "table", "needs self reference!")
     cHorizontal = cHorizontal or 1
     cVertical = cVertical or 1
+    maxWidth = maxWidth or 2 -- default is even
+    local even = maxWidth % 2
     local hModulo = cHorizontal % 2
     local vModulo = cVertical % 2
-    if builderRef.movementDirection.width == "left" then
+    if builderRef.movementDirection.width == "right" then
         hModulo = 1 - hModulo -- toggle between 1 / 0
     end
-    if builderRef.movementDirection.height == "down" and cVertical ~= 0 then
-        vModulo = 1 - vModulo -- toggle between 1 / 0
-    end
+
     -- TODO Simplify
-    if (hModulo == 1 and vModulo == 1) or (hModulo == 0 and vModulo == 0) then
+    -- with vModulo == hModulo xor even
+    if (even == 1 and vModulo == 0) then
+        if (hModulo ~= vModulo) then
+            turtle.turnRight()
+        else
+            turtle.turnLeft()
+        end
+        return
+    end
+    if (hModulo == vModulo) then
         turtle.turnRight()
     else
         turtle.turnLeft()
@@ -104,24 +113,29 @@ function Builder_Lib:clearArea(length, width, height)
             end
             upDownDig(currentHeight, height)
             if (j < width) then
-                getTurningDirection(self, j, k)
+                getTurningDirection(self, j, k, width)
                 turtleController:goStraight(1)
-                getTurningDirection(self, j, k)
+                getTurningDirection(self, j, k, width)
             end
         end
         upDownDig(currentHeight, height)
 
         -- go up 3 blocks
-        local u = height - currentHeight
-        if u > 3 then 
-            u = 3
+        local diff = height - currentHeight
+        if diff > 3 then 
+            diff = 3
         end
-        if u == 0 then
+        if diff == 0 then
             break
         end
-        currentHeight = currentHeight + u
+        if self.movementDirection.height == "up" then
+            turtleController:goUp(diff)
+        else
+            turtleController:goDown(diff)
+        end
+        currentHeight = currentHeight + diff
+        
         k = k + 1
-        turtleController:goUp(u)
         turtleController:tryMove("tA")
     end
 

builder.lua

@@ -1,7 +1,7 @@
 --- UI for Builder
 
 ---@class Builder_Lib
-local builder = require("/progs/builder-prog/builder-lib")
+local builder = require("builder-lib")
 
 
 local function help()

tests/clearArea_spec.lua

@@ -143,23 +143,61 @@ describe("Testing ClearArea Function", function()
         beforeeach()
         fillWorld()
     end)
+
     it("testing the basic Test setup", function()
         -- pending("jup")
         local n, _ = checkEmptyFromTo(vector.new(0,0,0),vector.new(3,3,3))
         assert.are.equal(63, n)
         assert(998, countTableLength(turtleEmulator.blocks))
     end)
+
     it("Clear 4 x 4 x 4 | Moving: left up", function()
+        -- pending("pending")
         builder.movementDirection.height = "up"
-        builder.movementDirection.height = "left"
+        builder.movementDirection.width = "left"
         builder:clearArea(4,4,4)
-        local filter = function(t)
-            return t.position.y == 3
-        end
 
         local n = countTableLength(turtleEmulator.blocks)
         assert(998 - (4*4*4), n)
         local m, blocks = checkEmptyFromTo(vector.new(0,0,0),vector.new(3,3,3))
         assert.are.equal(0,m)
     end)
+
+    it("Clear 4 x 4 x 4 | Moving: right up", function()
+        -- pending("pending")
+        builder.movementDirection.height = "up"
+        builder.movementDirection.width = "right"
+        ---position turtle at 0, 0, 3
+        turtle.position = vector.new(-1, 0, 3)
+        turtle.refuel()
+        turtle.dig()
+        assert.is_true(turtle.forward())
+        
+        builder:clearArea(4,4,4)
+
+        local n = countTableLength(turtleEmulator.blocks)
+        assert(998 - (4*4*4), n)
+        local m, blocks = checkEmptyFromTo(vector.new(0,0,0),vector.new(3,3,3))
+        assert.are.equal(0,m)
+    end)
+
+        it("Clear 5 x 5 x 5 | Moving: left down", function()
+        pending("pending")
+        builder.movementDirection.height = "down"
+        builder.movementDirection.width = "left"
+        
+        ---position turtle at 0, 4, 0
+        turtle.position = vector.new(-1, 4, 0)
+        turtle.refuel()
+        turtle.dig()
+        assert.is_true(turtle.forward())
+
+        builder:clearArea(5,5,5)
+
+        local n = countTableLength(turtleEmulator.blocks)
+        assert(998 - (5*5*5), n)
+        local m, blocks = checkEmptyFromTo(vector.new(0,0,0),vector.new(4,4,4))
+        print(textutils.serialize(blocks))
+        assert.are.equal(0,m)
+    end)
 end)

tests/floor_spec.lua

@@ -97,6 +97,7 @@ describe("Testing placing Floor", function ()
     it("Create 9x9 floor", function()
         assert.are.equal(0, countTableLength(turtleEmulator.blocks))
         local succ, err = xpcall(function ()
+            builder.movementDirection.width = "right"
             builder:floor(9, 9)
         end, debug.traceback)
         if err then error(err) end
@@ -137,6 +138,7 @@ describe("Testing placing Floor", function ()
     it("Create 10x10 floor", function()
         assert.are.equal(0, countTableLength(turtleEmulator.blocks))
         local succ, err = xpcall(function ()
+            builder.movementDirection.width = "right"
             builder:floor(10, 10)
         end, debug.traceback)
         if err then error(err) end