From 708ec3e9b7d554539d2fe9e27d02a9cbcc357038 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sun, 30 Nov 2014 19:21:24 -0500 Subject: render: Prefix group and model procedures. * sly/render/group.scm (move, place, show): Delete. (group-move, group-place, group-show): New procedures. * sly/render/model.scm (paint, blend): Delete. (model-paint, model-blend): New procedures. --- sly/render/group.scm | 8 ++++---- sly/render/model.scm | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sly/render/group.scm b/sly/render/group.scm index ddcc94f..b4fad16 100644 --- a/sly/render/group.scm +++ b/sly/render/group.scm @@ -36,7 +36,7 @@ group? group-transform group-visible? group-children draw-group - move place show)) + group-move group-place group-show)) ;;; ;;; Group @@ -112,17 +112,17 @@ render CONTEXT." "Create a new group containing the list of CHILDREN." (make-group children)) -(define (move position . children) +(define (group-move position . children) "Create a new group in which the list of CHILDREN are translated by the vector POSITION." (make-group children #:transform (translate position))) -(define (place transform . children) +(define (group-place transform . children) "Create a new group in which the tranformation matrices of the CHILDREN are multiplied by TRANSFORM." (make-group children #:transform transform)) -(define (show visible? . children) +(define (group-show visible? . children) "Create a new group in which the visibility of the list of CHILDREN is determined by the VISIBLE? flag." (make-group children #:visible? visible?)) diff --git a/sly/render/model.scm b/sly/render/model.scm index 7f9ead9..b42dd64 100644 --- a/sly/render/model.scm +++ b/sly/render/model.scm @@ -43,7 +43,7 @@ model-mesh model-texture model-shader model-color model-blend-mode model-depth-test? draw-model - paint blend)) + model-paint model-blend)) ;; Representation of a single OpenGL render call. (define-record-type @@ -115,10 +115,10 @@ CONTEXT." ;;; Utility Procedures ;;; -(define (paint color model) +(define (model-paint color model) "Create a copy of MODEL, but with a new COLOR." (model-inherit model #:color color)) -(define (blend blend-mode model) +(define (model-blend blend-mode model) "Create a copy of MODEL, but with a new BLEND-MODE." (model-inherit model #:blend-mode blend-mode)) -- cgit v1.2.3