(no commit message)

[gacela.git] / games / asteroids / asteroids.scm

diff --git a/games/asteroids/asteroids.scm b/games/asteroids/asteroids.scm
index 92b03c406c8a93ca506b906e5dc512311cad454c..2b70db1de94ec9f38e1e1bc890e5b979363dabfb 100644 (file)
--- a/games/asteroids/asteroids.scm
+++ b/games/asteroids/asteroids.scm
@@ -7,21 +7,34 @@
 
 (define-mob (asteroid
             (image (load-texture "Asteroid.png"))
-            (x 0) (y 0) (angle 0)
-            (vx 1) (vy 1))
-  (set! x (+ x vx))
-  (set! y (+ y vy))
+            (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 ((> x max-x) (set! vx -1))
-       ((< x min-x) (set! vx 1)))
-  (cond ((> y max-y) (set! vy -1))
-       ((< y min-y) (set! vy 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)
   (draw-texture image))
 
+;; (define (killed-ship? s a)
+;;   (cond ((null? a) #f)
+;;     (else
+;;      (or (< (distance-between-points (list (assoc-ref s 'x) (assoc-ref s 'y))
+;;                                      (list (assoc-ref (car a) 'x) (assoc-ref (car a) 'y)))
+;;             (assoc-ref (car a) 'size))
+;;          (killed-ship? s (cdr a))))))
+
+(define-macro (killed-ship?)
+  `(
+    (map-mobs
+     (lambda (m)
+       
 (define-mob (ship
             (ship1 (load-texture "Ship1.png"))
             (ship2 (load-texture "Ship2.png"))
@@ -62,20 +75,32 @@
   (draw-line 10))
 
 
-(show-mob (make-asteroid))
+(define (init-asteroids n)
+  (cond ((> n 0)
+        (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))))))))
+
+
+(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 (make-asteroids n)
-;;   (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))
+;;     (set! ship '((x . 0) (y . 0) (angle . 0) (moving . #f)))
+;;     (set! shots '()))
+
+;;   (new-game 2)
 
 ;; (define (killed-ship? s a)
 ;;   (cond ((null? a) #f)
@@ -112,12 +137,6 @@
                           
 
 ;; (let ((asteroids #f) (ship #f) (shots #f))
-;;   (define (new-game n)
-;;     (set! asteroids (make-asteroids n))
-;;     (set! ship '((x . 0) (y . 0) (angle . 0) (moving . #f)))
-;;     (set! shots '()))
-
-;;   (new-game 2)
 
 ;;   (run-game
 ;;    (cond ((killed-ship? ship asteroids)