From 21ab482f62b6f12469b56e7533a1b41d0ff7a0cd Mon Sep 17 00:00:00 2001 From: David Thompson Date: Wed, 12 May 2021 20:49:05 -0400 Subject: graphics: model: Remove occlusion factor. This was silly. It's not even in the spec! --- chickadee/graphics/model.scm | 5 ----- chickadee/graphics/pbr.scm | 3 --- 2 files changed, 8 deletions(-) diff --git a/chickadee/graphics/model.scm b/chickadee/graphics/model.scm index 86f307b..e291f39 100644 --- a/chickadee/graphics/model.scm +++ b/chickadee/graphics/model.scm @@ -888,10 +888,6 @@ (let ((v (or (array-ref/optional obj "normalFactor") #(1.0 1.0 1.0)))) (vec3 (vector-ref v 0) (vector-ref v 1) (vector-ref v 2)))) - (occlusion-factor - (let ((v (or (array-ref/optional obj "occlusionFactor") - #(1.0 1.0 1.0)))) - (vec3 (vector-ref v 0) (vector-ref v 1) (vector-ref v 2)))) (emissive-factor (let ((v (or (array-ref/optional obj "emissiveFactor") #(1.0 1.0 1.0)))) @@ -940,7 +936,6 @@ #:normal-texture normal-texture #:normal-texture-enabled (non-null-texture? normal-texture) #:normal-texcoord normal-texcoord - #:occlusion-factor occlusion-factor #:occlusion-texture occlusion-texture #:occlusion-texture-enabled (non-null-texture? occlusion-texture) #:occlusion-texcoord occlusion-texcoord diff --git a/chickadee/graphics/pbr.scm b/chickadee/graphics/pbr.scm index 441c875..836f8ee 100644 --- a/chickadee/graphics/pbr.scm +++ b/chickadee/graphics/pbr.scm @@ -48,7 +48,6 @@ pbr-material-normal-texture pbr-material-normal-texture-enabled? pbr-material-normal-texcoord - pbr-material-occlusion-facgor pbr-material-occlusion-texture pbr-material-occlusion-texture-enabled? pbr-material-occlusion-texcoord @@ -80,7 +79,6 @@ (local-field normal-texture pbr-material-normal-texture) (bool normal-texture-enabled pbr-material-normal-texture-enabled) (int normal-texcoord pbr-material-normal-texcoord) - (float-vec3 occlusion-factor pbr-material-occlusion-factor) (local-field occlusion-texture pbr-material-occlusion-texture) (bool occlusion-texture-enabled pbr-material-occlusion-texture-enabled) (int occlusion-texcoord pbr-material-occlusion-texcoord) @@ -107,7 +105,6 @@ #:normal-texture null-texture #:normal-texture-enabled #f #:normal-texcoord 0 - #:occlusion-factor #v(1.0 1.0 1.0) #:occlusion-texture null-texture #:occlusion-texture-enabled #f #:occlusion-texcoord 0 -- cgit v1.2.3