library-mirrors/HC
1
0
Fork 0
mirror of https://github.com/vrld/HC.git synced 2024-11-18 12:54:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed error in do_line

Browse Source 
Add start and end arguments to unpack
This commit is contained in:
Pablo Ariel Mayobre (Positive07) 2017-11-05 19:38:18 -03:00
parent 14aa6450b9
commit 1bee6093e6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gjk.lua
View File

@ -62,7 +62,7 @@ end
local function EPA(shape_a, shape_b) local function EPA(shape_a, shape_b)
-- make sure simplex is oriented counter clockwise -- make sure simplex is oriented counter clockwise
local cx,cy, bx,by, ax,ay = unpack(simplex) local cx,cy, bx,by, ax,ay = unpack(simplex, 1, 6)
if vector.dot(ax-bx,ay-by, cx-bx,cy-by) < 0 then if vector.dot(ax-bx,ay-by, cx-bx,cy-by) < 0 then
simplex[1],simplex[2] = ax,ay simplex[1],simplex[2] = ax,ay
simplex[5],simplex[6] = cx,cy simplex[5],simplex[6] = cx,cy
@ -96,7 +96,7 @@ end
-- B o------o A since A is the furthest point on the MD -- B o------o A since A is the furthest point on the MD
-- : : in direction of the origin. -- : : in direction of the origin.
local function do_line() local function do_line()
local bx,by, ax,ay = unpack(simplex) local bx,by, ax,ay = unpack(simplex, 1, 4)
local abx,aby = bx-ax, by-ay local abx,aby = bx-ax, by-ay
@ -105,7 +105,7 @@ local function do_line()
if vector.dot(dx,dy, -ax,-ay) < 0 then if vector.dot(dx,dy, -ax,-ay) < 0 then
dx,dy = -dx,-dy dx,dy = -dx,-dy
end end
return 4, dx,dy return dx,dy
end end
-- B .' -- B .'
@ -116,7 +116,7 @@ end
-- o-' 3 -- o-' 3
-- C '. -- C '.
local function do_triangle() local function do_triangle()
local cx,cy, bx,by, ax,ay = unpack(simplex) local cx,cy, bx,by, ax,ay = unpack(simplex, 1, 6)
local aox,aoy = -ax,-ay local aox,aoy = -ax,-ay
local abx,aby = bx-ax, by-ay local abx,aby = bx-ax, by-ay
local acx,acy = cx-ax, cy-ay local acx,acy = cx-ax, cy-ay