(no commit message)

diff --git a/games/asteroids/asteroids.scm b/games/asteroids/asteroids.scm
index bda8fc0a9c263eed163a08b19a90e5629cea02bf..3a355a63db0d747d3054e25b24a45361a84eed5d 100644 (file)
--- a/games/asteroids/asteroids.scm
+++ b/games/asteroids/asteroids.scm
@@ -54,6 +54,10 @@
           (set! moving #f)))
     `((x . ,x) (y . ,y) (angle . ,angle) (moving . ,moving))))
 
+(define (ship-shot s)
+  (cond ((key-released? 'space)
+        #f)))
+
 (define (make-asteroids n)
   (define (xy n r)
     (let ((n2 (- (random (* n 2)) n)))
@@ -71,6 +75,8 @@
   (run-game
    (set! asteroids (map move-asteroid asteroids))
    (set! ship (move-ship ship))
-   (set! shots (ship-shots
+   (let ((shot (ship-shot ship)))
+     (cond (shot
+           (set! shots (cons shot shots)))))
    (for-each draw-asteroid asteroids)
    (draw-ship ship)))

diff --git a/src/gacela_draw.scm b/src/gacela_draw.scm
index 5290dc490e5a661af069ee78d208b02417ed3342..9500429965ded61b0d3abf4f17c354426038c084 100644 (file)
--- a/src/gacela_draw.scm
+++ b/src/gacela_draw.scm
@@ -39,7 +39,8 @@
   (glEnd))
 
 (define (begin-draw number-of-points)
-  (cond ((= number-of-points 3) (glBegin GL_TRIANGLES))
+  (cond ((= number-of-points 2) (glBegin GL_LINES))
+       ((= number-of-points 3) (glBegin GL_TRIANGLES))
        ((= number-of-points 4) (glBegin GL_QUADS))))
 
 (define (draw-vertexes vertexes)
@@ -112,6 +113,13 @@
               (height (texture-h texture)))
           (draw-rectangle (* zoom width) (* zoom height) #:texture texture)))))
 
+(define* (draw-line length #:optional color)
+  (let ((l
+  (cond (color
+        (with-color color (draw v1 v2)))
+       (else
+        (draw v1 v2))))
+
 (define* (draw-quad v1 v2 v3 v4 #:key texture color)
   (cond (texture
         (progn-textures