(define (begin-draw number-of-points)
(cond ((= number-of-points 2) (glBegin GL_LINES))
((= number-of-points 3) (glBegin GL_TRIANGLES))
- ((= number-of-points 4) (glBegin GL_QUADS))))
+ ((= number-of-points 4) (glBegin GL_QUADS))
+ ((> number-of-points 4) (glBegin GL_POLYGON))))
(define (draw-vertexes vertexes)
(cond ((not (null? vertexes))
(else
(draw (list 0 l) (list 0 (- l)))))))
+(define (draw-circle radius)
+ (glBegin GL_POLYGON)
+ (do ((i 0 (1+ i)))
+ ((>= i 360))
+ (let ((a (degrees-to-radians i)))
+ (draw-vertex (list (* radius (cos a)) (* radius (sin a))))))
+ (glEnd))
+
(define* (draw-quad v1 v2 v3 v4 #:key texture color (texture-coord '((0 0) (1 1))))
(cond (texture
(progn-textures
;;; Primitives
-(define-macro (define-mesh header . body)
- (let ((name (car header))
- (args (cdr header)))
- `(define* ,header
- (let ((m (make-mesh
- ',name
- (lambda (props)
- (apply (lambda* ,args ,@body)
- ((@ (gacela utils) arguments-apply) ,name props))))))
- (mesh-properties-set! m (list ,@(map (lambda (a) `(cons ',a ,a)) (names-arguments args))))
- m))))
-
(define-macro (primitive header . body)
(let* ((type (car header))
(args (cdr header))
(define-primitive (rectangle width height #:key texture color texture-coord)
(draw-rectangle width height #:texture texture #:color color #:texture-coord texture-coord))
-(define-primitive (texture texture #:key (zoom 1) (sprite '((0 0) (1 1))))
- (draw-texture texture #:zoom zoom #:sprite sprite))
+(define-primitive (circle radius)
+ (draw-circle radius))
+
+(define-primitive (picture filename #:key (min-filter GL_LINEAR) (mag-filter GL_LINEAR) (zoom 1) (sprite '((0 0) (1 1))))
+ (draw-texture (load-texture filename #:min-filter min-filter #:mag-filter mag-filter) #:zoom zoom #:sprite sprite))
(module-map (lambda (sym var)