From ab4d509eda3a8f1a5cbca513809606ad79fe6752 Mon Sep 17 00:00:00 2001
From: Alexander Rose <alexander.rose@weirdbyte.de>
Date: Sat, 28 May 2022 13:13:35 -0700
Subject: [PATCH] fix rendering volumes
- when wboit is switched off and postprocessing is enabled
---
CHANGELOG.md | 1 +
src/mol-canvas3d/passes/draw.ts | 29 ++++++++++++++++++++++++++---
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index acd20ae27..bbf2d6f74 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ Note that since we don't clearly distinguish between a public and private interf
## [Unreleased]
- Fix ``Scene.clear`` not clearing primitives & volumes arrays (@JonStargaryen)
+- Fix rendering volumes when wboit is switched off and postprocessing is enabled
## [v3.8.2] - 2022-05-22
diff --git a/src/mol-canvas3d/passes/draw.ts b/src/mol-canvas3d/passes/draw.ts
index 407e5814b..dcb50c4ae 100644
--- a/src/mol-canvas3d/passes/draw.ts
+++ b/src/mol-canvas3d/passes/draw.ts
@@ -143,8 +143,12 @@ export class DrawPass {
// render transparent primitives and volumes
if (scene.opacityAverage < 1 || scene.volumes.renderables.length > 0) {
this.wboit.bind();
- renderer.renderWboitTransparent(scene.primitives, camera, this.depthTextureOpaque);
- renderer.renderWboitTransparent(scene.volumes, camera, this.depthTextureOpaque);
+ if (scene.opacityAverage < 1) {
+ renderer.renderWboitTransparent(scene.primitives, camera, this.depthTextureOpaque);
+ }
+ if (scene.volumes.renderables.length > 0) {
+ renderer.renderWboitTransparent(scene.volumes, camera, this.depthTextureOpaque);
+ }
// evaluate wboit
if (PostprocessingPass.isEnabled(postprocessingProps)) {
@@ -203,7 +207,26 @@ export class DrawPass {
}
}
- renderer.renderBlendedVolume(scene.volumes, camera, this.depthTextureOpaque);
+ if (scene.volumes.renderables.length > 0) {
+ const target = PostprocessingPass.isEnabled(postprocessingProps)
+ ? this.postprocessing.target : this.colorTarget;
+
+ if (!this.packedDepth) {
+ this.depthTextureOpaque.detachFramebuffer(target.framebuffer, 'depth');
+ } else {
+ this.colorTarget.depthRenderbuffer?.detachFramebuffer(target.framebuffer);
+ }
+ target.bind();
+
+ renderer.renderBlendedVolume(scene.volumes, camera, this.depthTextureOpaque);
+
+ if (!this.packedDepth) {
+ this.depthTextureOpaque.attachFramebuffer(target.framebuffer, 'depth');
+ } else {
+ this.colorTarget.depthRenderbuffer?.attachFramebuffer(target.framebuffer);
+ }
+ target.bind();
+ }
}
renderer.renderBlendedTransparent(scene.primitives, camera, null);
--
GitLab