ff to current state #6

Merged
kistaro merged 27 commits from pyrex/chameleonic:main into main 2022-12-19 07:03:33 +00:00
Showing only changes of commit e985c29e02 - Show all commits

View File

@ -1381,7 +1381,7 @@ function rope:_tug(hypothetically)
for i=#ancs-1,2,-1 do for i=#ancs-1,2,-1 do
local ops_before_trash=self:_calc_push(ancs[i+1],ancs[i],ancs[i-1]) local ops_before_trash=self:_calc_push(ancs[i+1],ancs[i],ancs[i-1])
local ops_after_trash=self:_calc_push(ancs[i+1],ancs[i-1],ancs[i]) local ops_after_trash=self:_calc_push(ancs[i-2],ancs[i-1],ancs[i])
local ops_to_do={} local ops_to_do={}
if #ops_before_trash>0 then if #ops_before_trash>0 then
ops_to_do=ops_before_trash ops_to_do=ops_before_trash
@ -1496,6 +1496,7 @@ function rope:_calc_push(
an,a0,a1 an,a0,a1
) )
local ops={} local ops={}
if (an==nil) return ops
if a0.x==a1.x then if a0.x==a1.x then
local y0,y1=_mnmx(a0.y,a1.y) local y0,y1=_mnmx(a0.y,a1.y)