From 89ccebfdbb2a266c33428d12a5d8f22a625bcc67 Mon Sep 17 00:00:00 2001 From: Trevor Manz Date: Tue, 28 Jan 2025 13:06:09 -0500 Subject: [PATCH] fix(layers): Pass through `opts.renderPass` Fixes #854, which I believe was introduced in #805. --- packages/layers/src/xr-3d-layer/xr-3d-layer.js | 7 ++++++- packages/layers/src/xr-layer/xr-layer.js | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/layers/src/xr-3d-layer/xr-3d-layer.js b/packages/layers/src/xr-3d-layer/xr-3d-layer.js index 2a152bb3..bd2d0c82 100644 --- a/packages/layers/src/xr-3d-layer/xr-3d-layer.js +++ b/packages/layers/src/xr-3d-layer/xr-3d-layer.js @@ -251,6 +251,11 @@ const XR3DLayer = class extends Layer { */ draw(opts) { const { uniforms } = opts; + /** @type {{ + * textures: Record, + * model: Model + * scaleMatrix: Matrix4, + * }} */ const { textures, model, scaleMatrix } = this.state; const { contrastLimits, @@ -324,7 +329,7 @@ const XR3DLayer = class extends Layer { { disableWanings: false } ); model.setBindings(textures); - model.draw(opts); + model.draw(opts.renderPass); } } diff --git a/packages/layers/src/xr-layer/xr-layer.js b/packages/layers/src/xr-layer/xr-layer.js index ab66ec8c..5f050c12 100644 --- a/packages/layers/src/xr-layer/xr-layer.js +++ b/packages/layers/src/xr-layer/xr-layer.js @@ -244,6 +244,7 @@ const XRLayer = class extends Layer { */ draw(opts) { const { uniforms } = opts; + /** @type {{ textures: Record, model: Model }} */ const { textures, model } = this.state; if (textures && model) { const { contrastLimits, domain, dtype, channelsVisible } = this.props; @@ -265,7 +266,7 @@ const XRLayer = class extends Layer { { disableWarnings: false } ); model.setBindings(textures); - model.draw(opts); + model.draw(opts.renderPass); } }