X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=blobdiff_plain;f=extra%2Fjamshred%2Ftunnel%2Ftunnel.factor;h=ac5be9df2e18b8630ed65dd01e95e6397ad9c6a0;hp=986574ee9148c847dc74fae2b047ed5136a3c0e9;hb=3f3d57032bf29190e9bee12d168a4bce6d74653c;hpb=cd1bb8f4c8afba318249c7b756a45aa1c46ea51e diff --git a/extra/jamshred/tunnel/tunnel.factor b/extra/jamshred/tunnel/tunnel.factor index 986574ee91..ac5be9df2e 100644 --- a/extra/jamshred/tunnel/tunnel.factor +++ b/extra/jamshred/tunnel/tunnel.factor @@ -13,7 +13,7 @@ TUPLE: segment < oint number color radius ; C: segment : segment-number++ ( segment -- ) - [ number>> 1+ ] keep (>>number) ; + [ number>> 1 + ] keep (>>number) ; : clamp-length ( n seq -- n' ) 0 swap length clamp ; @@ -31,7 +31,7 @@ CONSTANT: random-rotation-angle $[ pi 20 / ] : (random-segments) ( segments n -- segments ) dup 0 > [ - [ dup last random-segment over push ] dip 1- (random-segments) + [ dup last random-segment over push ] dip 1 - (random-segments) ] [ drop ] if ; CONSTANT: default-segment-radius 1 @@ -78,7 +78,7 @@ CONSTANT: default-segment-radius 1 rot dup length swap find-nearest-segment ; : nearest-segment-backward ( segments oint start -- segment ) - swapd 1+ 0 spin find-nearest-segment ; + swapd 1 + 0 spin find-nearest-segment ; : nearest-segment ( segments oint start-segment -- segment ) #! find the segment nearest to 'oint', and return it. @@ -91,10 +91,10 @@ CONSTANT: default-segment-radius 1 over clamp-length swap nth ; : next-segment ( segments current-segment -- segment ) - number>> 1+ get-segment ; + number>> 1 + get-segment ; : previous-segment ( segments current-segment -- segment ) - number>> 1- get-segment ; + number>> 1 - get-segment ; : heading-segment ( segments current-segment heading -- segment ) #! the next segment on the given heading