(let ((x 0) (y 0) (z 0)
(ax 0) (ay 0) (az 0)
(rx 0) (ry 0) (rz 0)
- (id (gensym)))
- (let ((get-properties
+ (id (gensym))
+ (properties '()))
+ (let ((inner-properties
(lambda ()
`((id . ,id) (x . ,x) (y . ,y) (z . ,z) (ax . ,ax) (ay . ,ay) (az . ,az) (rx . ,rx) (ry . ,ry) (rz . ,rz)))))
(lambda (option . params)
(case option
((draw)
(video:glmatrix-block
- (video:rotate rx ry rz)
- (video:translate x y z)
(video:rotate ax ay az)
- (primitive)))
+ (video:translate x y z)
+ (video:rotate rx ry rz)
+ (primitive properties)))
((translate)
(set! x (+ x (car params)))
(set! y (+ y (cadr params)))
(set! z (+ z (caddr params))))
- ((get-properties)
- (get-properties))
- ((get-property)
- (assoc-ref (get-properties) (car params))))))))
+ ((turn)
+ (set! ax (+ ax (car params)))
+ (set! ay (+ ay (cadr params)))
+ (set! az (+ az (caddr params))))
+ ((rotate)
+ (set! rx (+ rx (car params)))
+ (set! ry (+ ry (cadr params)))
+ (set! rz (+ rz (caddr params))))
+ ((inner-properties)
+ (inner-properties))
+ ((inner-property)
+ (assoc-ref (inner-properties) (car params)))
+ ((properties)
+ properties)
+ ((properties-set!)
+ (set! properties (car params)))
+ ((property)
+ (assoc-ref properties (car params)))
+ ((property-set!)
+ (set! properties (assoc-set! properties (car params) (cadr params)))))))))
-(define* (show-mesh mesh #:optional (view default-view))
- (let ((id (mesh 'get-property 'id)))
+(define* (show mesh #:optional (view default-view))
+ (let ((id (mesh 'inner-property 'id)))
(if (not (hash-ref view id))
(hash-set! view id mesh))))
-(define* (hide-mesh mesh #:optional (view default-view))
- (hash-remove! view (mesh 'get-property 'id)))
+(define* (hide mesh #:optional (view default-view))
+ (hash-remove! view (mesh 'inner-property 'id)))
(define* (translate mesh x y #:optional (z 0))
(mesh 'translate x y z)
mesh)
+(define (turn mesh . params)
+ (if (>= (length params) 3)
+ (apply mesh (cons 'turn params))
+ (mesh 'turn 0 0 (car params)))
+ mesh)
+
+(define (rotate mesh . params)
+ (if (>= (length params) 3)
+ (apply mesh (cons 'rotate params))
+ (mesh 'rotate 0 0 (car params)))
+ mesh)
+
+
+;;; Primitives
+
+(define-macro (primitive proc)
+ `(lambda (. params)
+ (let ((m (mesh (lambda (props) (apply ,proc ((@ (gacela utils) arguments-apply) ,proc props))))))
+ (m 'properties-set! ((@ (gacela utils) arguments-calling) ,proc params))
+ m)))
+
(define-macro (define-primitives . symbols)
(cond ((null? symbols)
`#t)
(else
- `(begin
- (define (,(caar symbols) . params) (mesh (lambda () (apply ,(cadar symbols) params))))
- (define-primitives ,@(cdr symbols))))))
+ (let ((origin (caar symbols))
+ (dest (cadar symbols)))
+ `(begin
+ (define ,origin (primitive ,dest))
+ (define-primitives ,@(cdr symbols)))))))
(define-primitives
(rectangle video:draw-rectangle)