(no commit message)

diff --git a/games/asteroids/asteroids.scm b/games/asteroids/asteroids.scm
index d684e07d7e3fb272cefc7359355c3f3406369465..c36ae0569b90ab23f200a7cedd41834960b44d76 100644 (file)
--- a/games/asteroids/asteroids.scm
+++ b/games/asteroids/asteroids.scm
@@ -106,6 +106,12 @@
                (assoc-ref (car a) 'size))
             (killed-ship? s (cdr a))))))
 
+(define (kill-asteroids s a)
+  (cond ((or (null? s) (null? a)) (values s a))
+       (else
+        (let ((s1 (car s)) (a1 (car a)))
+          (cond ((or (< (sqrt (+ (expt (- (assoc-ref 
+
 (let ((asteroids #f) (ship #f) (shots #f))
   (define (new-game n)
     (set! asteroids (make-asteroids n))

diff --git a/src/gacela_misc.scm b/src/gacela_misc.scm
index a9393ca89607d52e3d75ea42700753ec9f6c44d6..6dd13b11a8acd7844c1943279b0c5f2aebc51ee1 100644 (file)
--- a/src/gacela_misc.scm
+++ b/src/gacela_misc.scm
@@ -26,6 +26,28 @@
 (define *pi* (* (asin 1) 2))
 
 
+;;; Geometry
+
+(define (degrees-to-radians angle)
+  (/ (* angle *pi*) 180))
+
+(define (radians-to-degrees angle)
+  (/ (* angle 180) *pi*))
+
+(define (distance-between-points p1 p2)
+  (define (add-power-of-two p1 p2)
+    (cond ((null? p1)
+          0)
+         (else
+          (+ (expt (- (car p1) (car p2)) 2)
+             (add-power-of-two (cdr p1) (cdr p2))))))
+
+  (cond ((not (= (length p1) (length p2)))
+        #f)
+       (else
+        (sqrt (add-power-of-two p1 p2)))))
+
+
 ;;; Functions
 
 (define (nearest-power-of-two n)
@@ -34,12 +56,6 @@
          (else (power (* p 2) n))))
   (power 1 n))
 
-(define (degrees-to-radians angle)
-  (/ (* angle *pi*) 180))
-
-(define (radians-to-degrees angle)
-  (/ (* angle 180) *pi*))
-
 (define-macro (pushnew elem list)
   `(cond ((not (find (lambda (e) (eq? e ,elem)) ,list))
          (set! ,list (cons ,elem ,list)))))