diff options
Diffstat (limited to 'sly/shape.scm')
| -rw-r--r-- | sly/shape.scm | 97 |
1 files changed, 49 insertions, 48 deletions
diff --git a/sly/shape.scm b/sly/shape.scm index 8ffe185..8283875 100644 --- a/sly/shape.scm +++ b/sly/shape.scm @@ -26,6 +26,7 @@ #:use-module (sly mesh) #:use-module (sly shader) #:use-module (sly texture) + #:use-module (sly math vector) #:export (make-cube)) (define* (make-cube size #:optional #:key (texture #f) @@ -49,35 +50,35 @@ 20 22 23 20 21 22) #:data `(("position" ,(vector ;; Front - (vector (- half-size) (- half-size) (- half-size)) - (vector half-size (- half-size) (- half-size)) - (vector half-size half-size (- half-size)) - (vector (- half-size) half-size (- half-size)) + (vector3 (- half-size) (- half-size) (- half-size)) + (vector3 half-size (- half-size) (- half-size)) + (vector3 half-size half-size (- half-size)) + (vector3 (- half-size) half-size (- half-size)) ;; Back - (vector (- half-size) (- half-size) half-size) - (vector half-size (- half-size) half-size) - (vector half-size half-size half-size) - (vector (- half-size) half-size half-size) + (vector3 (- half-size) (- half-size) half-size) + (vector3 half-size (- half-size) half-size) + (vector3 half-size half-size half-size) + (vector3 (- half-size) half-size half-size) ;; Top - (vector (- half-size) half-size (- half-size)) - (vector half-size half-size (- half-size)) - (vector half-size half-size half-size) - (vector (- half-size) half-size half-size) + (vector3 (- half-size) half-size (- half-size)) + (vector3 half-size half-size (- half-size)) + (vector3 half-size half-size half-size) + (vector3 (- half-size) half-size half-size) ;; Bottom - (vector (- half-size) (- half-size) (- half-size)) - (vector half-size (- half-size) (- half-size)) - (vector half-size (- half-size) half-size) - (vector (- half-size) (- half-size) half-size) + (vector3 (- half-size) (- half-size) (- half-size)) + (vector3 half-size (- half-size) (- half-size)) + (vector3 half-size (- half-size) half-size) + (vector3 (- half-size) (- half-size) half-size) ;; Left - (vector (- half-size) (- half-size) (- half-size)) - (vector (- half-size) half-size (- half-size)) - (vector (- half-size) half-size half-size) - (vector (- half-size) (- half-size) half-size) + (vector3 (- half-size) (- half-size) (- half-size)) + (vector3 (- half-size) half-size (- half-size)) + (vector3 (- half-size) half-size half-size) + (vector3 (- half-size) (- half-size) half-size) ;; Right - (vector half-size (- half-size) (- half-size)) - (vector half-size half-size (- half-size)) - (vector half-size half-size half-size) - (vector half-size (- half-size) half-size))) + (vector3 half-size (- half-size) (- half-size)) + (vector3 half-size half-size (- half-size)) + (vector3 half-size half-size half-size) + (vector3 half-size (- half-size) half-size))) ,@(if texture (let ((s1 (texture-s1 texture)) (t1 (texture-t1 texture)) @@ -86,33 +87,33 @@ `(("tex" ,(vector ;; Front - (vector s1 t1) - (vector s2 t1) - (vector s2 t2) - (vector s1 t2) + (vector2 s1 t1) + (vector2 s2 t1) + (vector2 s2 t2) + (vector2 s1 t2) ;; Back - (vector s1 t1) - (vector s2 t1) - (vector s2 t2) - (vector s1 t2) + (vector2 s1 t1) + (vector2 s2 t1) + (vector2 s2 t2) + (vector2 s1 t2) ;; Top - (vector s1 t1) - (vector s2 t1) - (vector s2 t2) - (vector s1 t2) + (vector2 s1 t1) + (vector2 s2 t1) + (vector2 s2 t2) + (vector2 s1 t2) ;; Bottom - (vector s1 t1) - (vector s2 t1) - (vector s2 t2) - (vector s1 t2) + (vector2 s1 t1) + (vector2 s2 t1) + (vector2 s2 t2) + (vector2 s1 t2) ;; Left - (vector s1 t1) - (vector s2 t1) - (vector s2 t2) - (vector s1 t2) + (vector2 s1 t1) + (vector2 s2 t1) + (vector2 s2 t2) + (vector2 s1 t2) ;; Right - (vector s1 t1) - (vector s2 t1) - (vector s2 t2) - (vector s1 t2))))) + (vector2 s1 t1) + (vector2 s2 t1) + (vector2 s2 t2) + (vector2 s1 t2))))) '()))))) |