Update to current project state #1

Merged
kistaro merged 6 commits from pyrex/chameleonic:main into main 2022-12-17 22:16:05 +00:00
Showing only changes of commit f7170428c9 - Show all commits

View File

@ -677,8 +677,8 @@ function rope:drag(
local anc=self:_anc(i()) local anc=self:_anc(i())
local busy=self:busy() local busy=self:busy()
for x,y in self:_rastn( for x,y in self:_rast(
anc.x,anc.y,x,y,2,2 anc.x,anc.y,x,y
) do ) do
local a=self:_anc(i()) local a=self:_anc(i())
if not (_point_eq(a,{x=x,y=y})) then if not (_point_eq(a,{x=x,y=y})) then
@ -799,8 +799,9 @@ function rope:_find_touched_anchors(i)
for bx,by in self:_rast(a0.x,a0.y,a2.x,a2.y) do for bx,by in self:_rast(a0.x,a0.y,a2.x,a2.y) do
local a1=level:point_anchor(bx,by) local a1=level:point_anchor(bx,by)
if a1!=nil and not _point_eq(a0,a1) and not _point_eq(a1,a2) if
and _linedist(a0,a1,a2) < 0.01 a1!=nil and not _point_eq(a0,a1) and not _point_eq(a1,a2)
and _linedist(a0,a1,a2) == 0.0
-- and self:_can_stretch(p,a2) -- and self:_can_stretch(p,a2)
then then
local id=self.id local id=self.id