From f14a257d9c4be96d547d43860c7247ea3ff31cc3 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Mon, 9 Nov 2015 19:56:41 -0500
Subject: render: shape: Fix make-cube.

Forgot to update this one to the new rendering API.

* sly/render/shape.scm (make-cube): Use render combinators.
---
 sly/render/shape.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/sly/render/shape.scm b/sly/render/shape.scm
index 8e374b3..de4fd95 100644
--- a/sly/render/shape.scm
+++ b/sly/render/shape.scm
@@ -23,15 +23,16 @@
 
 (define-module (sly render shape)
   #:use-module (sly math)
+  #:use-module (sly render)
   #:use-module (sly render mesh)
-  #:use-module (sly render model)
-  #:use-module (sly render shader)
   #:use-module (sly render texture)
   #:use-module (sly math vector)
   #:export (make-cube))
 
-(define* (make-cube size #:optional #:key (texture #f)
-                    (shader (load-default-shader)))
+;; TODO: Write some combinators for composing triangles into more
+;; complex shapes with a procedure to convert them into a mesh.
+
+(define* (make-cube size #:optional #:key (texture #f))
   (let* ((half-size (half size))
          (mesh (build-mesh #(
                              ;; Front
@@ -112,4 +113,5 @@
                               (vector2 s2 t1)
                               (vector2 s2 t2)
                               (vector2 s1 t2))))))
-    (make-model #:mesh mesh #:texture texture #:shader shader)))
+    (with-texture texture
+      (render-mesh mesh))))
-- 
cgit v1.2.3