diff options
Diffstat (limited to 'chickadee/graphics/model.scm')
| -rw-r--r-- | chickadee/graphics/model.scm | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/chickadee/graphics/model.scm b/chickadee/graphics/model.scm index 5746e5a..737748f 100644 --- a/chickadee/graphics/model.scm +++ b/chickadee/graphics/model.scm @@ -27,16 +27,13 @@ #:use-module (chickadee math quaternion) #:use-module (chickadee math vector) #:use-module (chickadee graphics buffer) - #:use-module (chickadee graphics blend) #:use-module (chickadee graphics color) - #:use-module (chickadee graphics depth) #:use-module (chickadee graphics engine) + #:use-module (chickadee graphics gpu) #:use-module (chickadee graphics light) #:use-module (chickadee graphics mesh) - #:use-module (chickadee graphics multisample) #:use-module (chickadee graphics pbr) #:use-module (chickadee graphics phong) - #:use-module (chickadee graphics polygon) #:use-module (chickadee graphics shader) #:use-module (chickadee graphics skybox) #:use-module (chickadee graphics texture) @@ -147,7 +144,6 @@ (define* (make-model #:key name scenes (default-scene (car scenes)) render-state) (%make-model name scenes default-scene render-state)) -(define %depth-test (make-depth-test)) (define %identity-matrix (make-identity-matrix4)) (define %origin (vec3 0.0 0.0 0.0)) @@ -157,8 +153,8 @@ (camera-position %origin) (skybox (default-skybox)) (lights '())) - (with-graphics-state ((g:depth-test %depth-test) - (g:multisample? #t)) + (with-graphics-state ((depth-test depth-test:default) + (multisample? #t)) (let ((state (model-render-state model))) (render-state-reset! state) (render-state-model-matrix-mult! state model-matrix) @@ -877,9 +873,7 @@ (make-pbr-material #:name name #:blend-mode (if (eq? alpha-mode 'opaque) blend:alpha blend:replace) - #:cull-face-mode (if double-sided? - no-cull-face-mode - back-cull-face-mode) + #:cull-face-mode (if double-sided? cull-face:none cull-face:back) #:base-color-texture base-color-texture #:metallic-roughness-texture metal-rough-texture #:normal-texture normal-texture |