chameleonic.p8

@@ -679,13 +679,8 @@ function rope:drag(
  for x,y in self:_rast(
   anc.x,anc.y,x,y
  ) do
-  local a=self:_anc(i())
+  self:_drag1(i(),x,y)
-  if not (_point_eq(a, {x=x,y=y})) then
+  self:_tidy_up_gen()
-   a.x=x
-   a.y=y
-   a.dirty=true
-   self:_tidy_up_gen()
-  end
  end
 end
 
@@ -753,6 +748,17 @@ function rope:_tidy_up_gen()
  end
 end
 
+function rope:_drag1(
+ i,x,y
+)
+ local a=self:_anc(i)
+ if (_point_eq(a, {x=x,y=y})) return
+ 
+ a.x=x
+ a.y=y
+ a.dirty=true
+end
+
 function rope:_find_needed_anchors(i)
  if (i<=0) return false
  if (#self.ancs+1<i) return false
@@ -793,9 +799,6 @@ function rope:_find_touched_anchors(i)
  local a0=self:_anc(i-1)
  local a2=self:_anc(i)
 
- if (level:pcoll(a0.x,a0.y)) return false
- if (level:pcoll(a2.x,a2.y)) return false
-
  for bx,by in self:_rast(a0.x,a0.y,a2.x,a2.y) do
   local a1=level:point_anchor(bx,by)
   if a1!=nil and not _point_eq(a0,a1) and not _point_eq(a1,a2)
@@ -847,11 +850,6 @@ function rope:_elide_point(i)
 end
 
 function rope:_can_move_midpoint(a0,a1_0,a1_1,a2)
- if (level:pcoll(a0.x,a0.y)) return false
- if (level:pcoll(a2.x,a2.y)) return false
- if (level:pcoll(a1_0.x,a1_0.y)) return false
- if (level:pcoll(a1_1.x,a1_1.y)) return false
-
  if not self:_can_stretch(a1_0, a1_1) then
   return false
  end
@@ -917,21 +915,6 @@ end
 function rope:_can_stretch(
  p1,p2
 )
- -- faster implementation for straight lines
- if p1.y\8==p2.y\8 then
-  local my=p2.y\8
-  for mx=p1.x\8,p2.x\8 do
-   if (level:mcoll(mx,my)) return false
-  end
- end
-
- if p1.x\8==p2.x\8 then
-  local mx=p2.x\8
-  for my=p1.y\8,p2.y\8 do
-   if (level:mcoll(mx,my)) return false
-  end
- end
-
  if (level:pcoll(p1.x,p1.y)) return false
  if (level:pcoll(p2.x,p2.y)) return false
 
@@ -984,27 +967,34 @@ function rope:_rast(
  if (y0<y1) sy=1
 	
  local done=false,err
+ local queue={}
  if dx>dy then
   err=dx/2.0
   return function()
-   if (done) return 
+   if (queue==nil) return 
-   if (x==x1) done=true return x1,y1
+   if (x==x1) queue=nil return x1,y1
-   local oldx,oldy=x,y
+   if #queue==0 then
-   err-=dy
+    add(queue,{x,y})
-   if (err<0) y+=sy err+=dx
+    err-=dy
-   x+=sx
+    if (err<0) y+=sy add(queue,{x,y}) err+=dx
-   return oldx,oldy
+    x+=sx
+   end
+   return unpack(deli(queue,1))
   end
  else
   err=dy/2.0
   return function()
-   if (done) return
+   if (queue==nil) return
-   if (y==y1) done=true return x1,y1
+   if (y==y1) queue=nil return x1,y1
-   local oldx,oldy=x,y
+   if #queue==0 then
-   err-=dx
+    add(queue,{x,y})
-   if (err<0) x+=sx err+=dy
+   
-   y+=sy
+    local oldx,oldy=x,y
-   return oldx,oldy
+    err-=dx
+    if (err<0) x+=sx add(queue,{x,y}) err+=dy
+    y+=sy
+   end
+   return unpack(deli(queue,1))
   end
  end
 end