From e64dcda931f31969b69d3f211db532ffeed43e49 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 11 Feb 2016 21:31:01 -0500 Subject: Remove dead modules. These modules haven't been used in a long time, but were never deleted. Oops! * sly/render/model.scm: Delete. * sly/render/scene.scm: Delete. * Makefile.am (SOURCES): Remove them. --- Makefile.am | 2 - sly/render/model.scm | 209 --------------------------------------------------- sly/render/scene.scm | 76 ------------------- 3 files changed, 287 deletions(-) delete mode 100644 sly/render/model.scm delete mode 100644 sly/render/scene.scm diff --git a/Makefile.am b/Makefile.am index 97fc1c8..f63e3da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,8 +57,6 @@ SOURCES = \ sly/render/tile-map.scm \ sly/render/viewport.scm \ sly/render.scm \ - sly/render/model.scm \ - sly/render/scene.scm \ $(WRAPPER_SOURCES) \ sly.scm diff --git a/sly/render/model.scm b/sly/render/model.scm deleted file mode 100644 index 0eb07c0..0000000 --- a/sly/render/model.scm +++ /dev/null @@ -1,209 +0,0 @@ -;;; Sly -;;; Copyright (C) 2014 David Thompson -;;; -;;; Sly is free software: you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation, either version 3 of the License, or -;;; (at your option) any later version. -;;; -;;; Sly is distributed in the hope that it will be useful, but WITHOUT -;;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -;;; or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -;;; License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with this program. If not, see -;;; . - -;;; Commentary: -;; -;; OpenGL rendering state. -;; -;;; Code: - -(define-module (sly render model) - #:use-module (system foreign) - #:use-module (ice-9 match) - #:use-module (srfi srfi-1) - #:use-module (srfi srfi-9) - #:use-module (gl) - #:use-module (gl low-level) - #:use-module (sly math transform) - #:use-module (sly math vector) - #:use-module (sly math rect) - #:use-module (sly render) - #:use-module (sly render shader) - #:use-module (sly render texture) - #:use-module (sly render utils) - #:use-module (sly render camera) - #:use-module (sly render color) - #:use-module (sly render mesh) - #:export (make-model - model - model-inherit - model? model-null? - null-model - model-mesh model-transform model-texture model-shader model-color - model-blend-mode model-depth-test? model-sub-scene model-children - draw-model - model-paint - model-blend - model-group - list->model - model-move - model-scale - model-place)) - -;; Representation of a single OpenGL render call. -(define-record-type - (%make-model mesh transform texture shader color blend-mode - depth-test? sub-scene children) - model? - (mesh model-mesh) - (transform model-transform) - (texture model-texture) - (shader model-shader) - (color model-color) - (blend-mode model-blend-mode) - (depth-test? model-depth-test?) - (sub-scene model-sub-scene) - (children model-children)) - -(define* (make-model #:optional #:key (mesh null-mesh) - (transform identity-transform) (texture null-texture) - (shader (load-default-shader)) (color white) - (blend-mode default-blend-mode) (depth-test? #t) - sub-scene (children '())) - "Create a new model from MESH and the given rendering state. When -rendering, TEXTURE and SHADER are bound, BLEND-MODE and DEPTH-TEST? -are set, and the COLOR uniform variable is set. The presence of a -SUB-SCENE indicates that the model uses the scene's framebuffer as -it's texture, so it must be rendered first." - (%make-model mesh transform texture shader color blend-mode - depth-test? sub-scene children)) - -(define model make-model) - -(define kwargs->alist - (match-lambda - (((? keyword? key) value . rest) - (cons (cons (keyword->symbol key) value) (kwargs->alist rest))) - (() '()))) - -(define model-inherit - (let* ((fields (record-type-fields )) - (field-indices (iota (length fields)))) - (lambda (original . kwargs) - "Create a new model based on the fields of ORIGINAL, only -changing the fields specified in KWARGS." - (let ((field+value (kwargs->alist kwargs))) - (apply %make-model - (map (lambda (field index) - (let ((override (find (match-lambda - ((k . v) - (eq? field k))) - field+value))) - (if override - (cdr override) - (struct-ref original index)))) - fields field-indices)))))) - -(define null-model - (make-model #:shader null-shader)) - -(define (model-null? model) - "Return #t if MODEL has no mesh and no children." - (and (eq? (model-mesh model) null-mesh) - (null? (model-children model)))) - -(define (set-transform-identity! t) - (let ((matrix (transform-matrix t))) - (array-set! matrix 1 0 0) - (array-set! matrix 0 0 1) - (array-set! matrix 0 0 2) - (array-set! matrix 0 0 3) - (array-set! matrix 0 1 0) - (array-set! matrix 1 1 1) - (array-set! matrix 0 1 2) - (array-set! matrix 0 1 3) - (array-set! matrix 0 2 0) - (array-set! matrix 0 2 1) - (array-set! matrix 1 2 2) - (array-set! matrix 0 2 3) - (array-set! matrix 0 3 0) - (array-set! matrix 0 3 1) - (array-set! matrix 0 3 2) - (array-set! matrix 1 3 3))) - -;; Avoid circular dependency. -(define draw-sub-scene - (delay (module-ref (resolve-interface '(sly render scene)) 'draw-scene))) - -(define (draw-model model gfx) - "Render MODEL by applying its transformation, texture, -shader, vertex array, uniforms, blend mode, etc. using GFX." - (match model - ((? model-null? _) - *unspecified*) - (($ mesh local-transform texture shader color blend-mode - depth-test? sub-scene children) - - (when sub-scene - (with-graphics-excursion gfx - ((force draw-sub-scene) sub-scene gfx))) - - (with-model-view-excursion gfx - (graphics-model-view-mul! gfx local-transform) - (with-model-view-excursion gfx - (graphics-model-view-mul! gfx (graphics-projection-transform gfx)) - (set-graphics-depth-test! gfx depth-test?) - (set-graphics-blend-mode! gfx blend-mode) - (set-graphics-shader! gfx shader) - (set-graphics-mesh! gfx mesh) - (set-graphics-texture! gfx texture) - ;; TODO: Support user-defined uniforms. - (uniform-set! shader "mvp" (graphics-model-view-transform gfx)) - (uniform-set! shader "color" color) - (uniform-set! shader "use_texture" (not (texture-null? texture))) - (glDrawElements (begin-mode triangles) - (mesh-length mesh) - (data-type unsigned-int) - %null-pointer)) - (for-each (lambda (child) (draw-model child gfx)) children))))) - -;;; -;;; Utility Procedures -;;; - -(define (model-paint color model) - "Create a copy of MODEL, but with a new COLOR." - (model-inherit model #:color color)) - -(define (model-blend blend-mode model) - "Create a copy of MODEL, but with a new BLEND-MODE." - (model-inherit model #:blend-mode blend-mode)) - -(define (model-group . children) - "Create a new compound model containing the list of CHILDREN." - (make-model #:children children)) - -(define (list->model children) - "Create a new compound model containing the list of CHILDREN." - (make-model #:children children)) - -(define (model-move position model) - "Create a new group in which the list of CHILDREN are translated by -the vector POSITION." - (model-inherit model #:transform (transform* (model-transform model) - (translate position)))) - -(define (model-scale factor model) - "Create a version of MODEL that is scaled up/down by FACTOR." - (model-inherit model #:transform (transform* (model-transform model) - (scale factor)))) - -(define (model-place transform model) - "Create a new group in which the tranformation matrices of the -CHILDREN are multiplied by TRANSFORM." - (model-inherit model #:transform (transform* (model-transform model) - transform))) diff --git a/sly/render/scene.scm b/sly/render/scene.scm deleted file mode 100644 index b46baae..0000000 --- a/sly/render/scene.scm +++ /dev/null @@ -1,76 +0,0 @@ -;;; Sly -;;; Copyright (C) 2015 David Thompson -;;; -;;; Sly is free software: you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation, either version 3 of the License, or -;;; (at your option) any later version. -;;; -;;; Sly is distributed in the hope that it will be useful, but WITHOUT -;;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -;;; or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -;;; License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with this program. If not, see -;;; . - -;;; Commentary: -;; -;; Scene data type. -;; -;;; Code: - -(define-module (sly render scene) - #:use-module (ice-9 match) - #:use-module (srfi srfi-9) - #:use-module (sly math transform) - #:use-module (sly render) - #:use-module (sly render camera) - #:use-module (sly render framebuffer) - #:use-module (sly render model) - #:use-module (sly render sprite) - #:export (make-scene - scene - scene? - scene-camera - scene-model - scene-framebuffer - draw-scene - scene->sprite)) - -(define-record-type - (%make-scene camera model framebuffer) - scene? - (camera scene-camera) - (model scene-model) - (framebuffer scene-framebuffer)) - -(define* (make-scene camera model #:optional (framebuffer null-framebuffer)) - "Create a new scene that views MODEL from the perspective of CAMERA. -FRAMEBUFFER specifies where the scene will be drawn to. By default, a -scene is drawn to directly to the OpenGL window." - (%make-scene camera model framebuffer)) - -(define scene make-scene) - -(define (draw-scene scene gfx) - "Render SCENE with the given rendering GFX." - (match scene - (($ camera model framebuffer) - (with-projection-excursion gfx - (graphics-projection-identity! gfx) - (graphics-projection-mul! gfx (camera-projection camera)) - (with-model-view-excursion gfx - (graphics-model-view-identity! gfx) - (graphics-model-view-mul! gfx (camera-location camera)) - (set-graphics-framebuffer! gfx framebuffer) - (set-graphics-viewport! gfx (camera-viewport camera)) - (clear-viewport (camera-viewport camera)) - (draw-model model gfx)))))) - -(define* (scene->sprite scene #:key (anchor 'center)) - "Create a sprite that renders the framebuffer texture for SCENE." - (model-inherit (make-sprite (framebuffer-texture (scene-framebuffer scene)) - #:anchor anchor) - #:sub-scene scene)) -- cgit v1.2.3