X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=games%2Fasteroids%2Fasteroids.scm;h=3b45d99f343f19f0fd26cca8ae6070e2f58ab473;hb=7d0f4f2b5baf59b76eb0a1d910dc8fa2aa96b93b;hp=84c0ac4d795c65ec9cfa97ff1d2304bb4932889d;hpb=9f1a815198eb124e64ce742342c46d6ec11e0cf2;p=gacela.git

diff --git a/games/asteroids/asteroids.scm b/games/asteroids/asteroids.scm
index 84c0ac4..3b45d99 100644
--- a/games/asteroids/asteroids.scm
+++ b/games/asteroids/asteroids.scm
@@ -5,18 +5,28 @@
 (define max-y (/ (assoc-ref (get-game-properties) 'height) 2))
 (define min-y (- max-y))
 
+(define-macro (asteroid-killed?)
+  `(> (apply +
+	     (map-mobs
+	      (lambda (s) (if (< (distance-between-points (list (assoc-ref s 'x) (assoc-ref s 'y)) (list x y)) size) 1 0))
+	      'shot))
+      0))
+
 (define-mob (asteroid
 	     (image (load-texture "Asteroid.png"))
-	     (x 0) (y 0) (angle 0) (dir 0))
-  (let ((r (degrees-to-radians (- dir))))
-    (set! x (+ x (sin r)))
-    (set! y (+ y (cos r))))
-  (set! angle (+ angle 1))
-
-  (cond ((or (> x max-x) (< x min-x))
-	 (set! dir (* -1 dir))))
-  (cond ((or (> y max-y) (< y min-y))
-	 (set! dir (- 180 dir))))
+	     (x 0) (y 0) (angle 0) (dir 0) (size 100))
+  (cond ((asteroid-killed?)
+	 (kill-me))
+	(else
+	 (let ((r (degrees-to-radians (- dir))))
+	   (set! x (+ x (sin r)))
+	   (set! y (+ y (cos r))))
+	 (set! angle (+ angle 1))
+
+	 (cond ((or (> x max-x) (< x min-x))
+		(set! dir (* -1 dir))))
+	 (cond ((or (> y max-y) (< y min-y))
+		(set! dir (- 180 dir))))))
   
   (translate x y)
   (rotate angle)
@@ -47,15 +57,25 @@
   (rotate angle)
   (draw-texture (if moving ship2 ship1)))
 
+(define-macro (shot-killed?)
+  `(> (apply +
+	     (map-mobs
+	      (lambda (a) (if (< (distance-between-points (list (assoc-ref a 'x) (assoc-ref a 'y)) (list x y)) (assoc-ref a 'size)) 1 0))
+	      'asteroid))
+      0))
+
 (define-mob (shot (x 0) (y 0) (angle 0))
-  (let ((r (degrees-to-radians (- angle))))
-    (set! x (+ x (* 10 (sin r))))
-    (set! y (+ y (* 10 (cos r))))
-    (cond ((or (> x max-x)
-	       (< x min-x)
-	       (> y max-y)
-	       (< y min-y))
-	   (kill-me))))
+  (cond ((shot-killed?)
+	 (kill-me))
+	(else
+	 (let ((r (degrees-to-radians (- angle))))
+	   (set! x (+ x (* 10 (sin r))))
+	   (set! y (+ y (* 10 (cos r))))
+	   (cond ((or (> x max-x)
+		      (< x min-x)
+		      (> y max-y)
+		      (< y min-y))
+		  (kill-me))))))
 
   (translate x y)
   (rotate angle)
@@ -63,30 +83,24 @@
 
 
 (define (init-asteroids n)
-  (define (xy n m)
-    (let ((n2 (- (random (* (- n m) 2)) (- n m))))
-      (if (> n2 0) (+ n2 m) (- n2 m))))
-
   (cond ((> n 0)
-	 (let ((x (xy max-x 100)) (y (xy max-y 100))
-	       (angle (random 360)) (dir (- (random 360) 180)))
-	   (show-mob (make-asteroid #:x x #:y y #:angle angle #:dir dir)))
-	 (init-asteroids (- n 1)))))
+	 (let ((x (- (random (* max-x 2)) max-x))
+	       (y (- (random (* max-y 2)) max-y)))
+	   (cond ((< (distance-between-points (list x y) '(0 0)) 120)
+		  (init-asteroids n))
+		 (else
+		  (let ((angle (random 360)) (dir (- (random 360) 180)))
+		    (show-mob (make-asteroid #:x x #:y y #:angle angle #:dir dir)))
+		  (init-asteroids (- n 1))))))))
+
 
-;(show-mob (make-asteroid))
 (init-asteroids 2)
 (show-mob (make-ship))
+     
+(let ((font (load-font "../tetris/lazy.ttf" #:size 20)))
+  (run-game
+   (render-text (format #f "Mobs: ~a" (length (get-active-mobs))) font)))
 
-;;   (define (xy n r)
-;;     (let ((n2 (- (random (* n 2)) n)))
-;;       (cond ((and (< n2 r) (>= n2 0)) r)
-;; 	    ((and (> n2 (- r)) (< n2 0)) (- r))
-;; 	    (else n2))))
-
-;;   (cond ((= n 0) '())
-;; 	(else
-;; 	 (cons `((x . ,(xy max-x 20)) (y . ,(xy max-y 20)) (angle . 0) (vx . 1) (vy . 1) (size . 95))
-;; 	       (make-asteroids (- n 1))))))
 
 ;;   (define (new-game n)
 ;;     (set! asteroids (make-asteroids n))
@@ -103,31 +117,6 @@
 ;; 		(assoc-ref (car a) 'size))
 ;; 	     (killed-ship? s (cdr a))))))
 
-;; (define (kill-asteroids s a)
-;;   (define (f1 s1 a)
-;;     (cond ((null? a)
-;; 	   (values a #f))
-;; 	  (else
-;; 	   (let ((a1 (car a)))
-;; 	     (cond ((< (distance-between-points (list (assoc-ref s1 'x) (assoc-ref s1 'y))
-;; 						(list (assoc-ref a1 'x) (assoc-ref a1 'y)))
-;; 		       (assoc-ref a1 'size))
-;; 		    (values (cdr a) #t))
-;; 		   (else
-;; 		    (receive (an k) (f1 s1 (cdr a))
-;; 			     (values (cons a1 an) k))))))))
-
-;;   (cond ((null? s)
-;; 	 (values s a))
-;; 	(else
-;; 	 (let ((s1 (car s)))
-;; 	   (receive (an k) (f1 s1 a)
-;; 		    (cond (k
-;; 			   (kill-asteroids (cdr s) an))
-;; 			  (else
-;; 			   (receive (sn an) (kill-asteroids (cdr s) an)
-;; 				    (values (cons s1 sn) an)))))))))
-			   
 
 ;; (let ((asteroids #f) (ship #f) (shots #f))