From 696d3ada69126ca19f990b43f3714b5dc05bf56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9tro?= <yann.roberge@polymtl.ca> Date: Sat, 31 Oct 2020 02:46:29 -0400 Subject: [PATCH] Correctif de bug sur move2D en mode 'grounded' sur l'axe z --- rsiTurtle.lua | 15 ++++++++++++++- test.lua | 8 ++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/rsiTurtle.lua b/rsiTurtle.lua index 91ed175..23f5096 100644 --- a/rsiTurtle.lua +++ b/rsiTurtle.lua @@ -104,6 +104,14 @@ function RSI_Turtle:moveToOrigin() end +--- +-- \brief Retourner au point d'origine (0,0) tout en restant au niveau du sol +-- \return bool Succès +function RSI_Turtle:moveToOriginGrounded() + return self:moveToGrounded(0,0) +end + + --- -- \brief Déplacement parallèle au sol -- Ordre de déplacement: X, Z @@ -168,8 +176,13 @@ function RSI_Turtle:move2D(dx, dz, grounded) then return false end - success = self:moveForward(math.abs(dz)) + if(grounded) + then + success = self:moveForwardGrounded(math.abs(dz)) + else + success = self:moveForward(math.abs(dz)) + end return success end diff --git a/test.lua b/test.lua index 7d46a29..80e4932 100644 --- a/test.lua +++ b/test.lua @@ -176,8 +176,12 @@ b:print() --print("Test chopTree") --assert(b:chopTree()) -print("Test chopArea") -assert(b:chopArea(15, 20)) +--print("Test chopArea") +--assert(b:chopArea(15, 20)) + +print("Test moveToOriginGounded") +b.base_:moveTo(5,5,5) +assert(b.base_:moveToOriginGrounded()) -- assert(t:moveToOrigin()) -- print(t:getPos()) -- GitLab