Merge pull request #2146 from finetjul/fix-translucency-without-opaque-actor

fix(renderwindow): fix inconsistent depth mask value

Author: finetjul

Sources/Rendering/OpenGL/Actor/index.js

@@ -132,7 +132,7 @@ function vtkOpenGLActor(publicAPI, model) {
 
   publicAPI.opaquePass = (prepass, renderPass) => {
     if (prepass) {
-      model.openGLRenderWindow.enableDepthMask();
+      model.context.depthMask(true);
       publicAPI.activateTextures();
     } else if (model.activeTextures) {
       for (let index = 0; index < model.activeTextures.length; index++) {
@@ -144,7 +144,7 @@ function vtkOpenGLActor(publicAPI, model) {
   // Renders myself
   publicAPI.translucentPass = (prepass, renderPass) => {
     if (prepass) {
-      model.openGLRenderWindow.disableDepthMask();
+      model.context.depthMask(false);
       publicAPI.activateTextures();
     } else if (model.activeTextures) {
       for (let index = 0; index < model.activeTextures.length; index++) {

Sources/Rendering/OpenGL/Actor2D/index.js

@@ -17,8 +17,12 @@ function vtkOpenGLActor2D(publicAPI, model) {
       if (!model.renderable) {
         return;
       }
+      model.openGLRenderWindow = publicAPI.getFirstAncestorOfType(
+        'vtkOpenGLRenderWindow'
+      );
       model.openGLRenderer =
         publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
+      model.context = model.openGLRenderWindow.getContext();
       publicAPI.prepareNodes();
       publicAPI.addMissingNodes(model.renderable.getTextures());
       publicAPI.addMissingNode(model.renderable.getMapper());
@@ -84,9 +88,6 @@ function vtkOpenGLActor2D(publicAPI, model) {
   // Renders myself
   publicAPI.opaquePass = (prepass, renderPass) => {
     if (prepass) {
-      model.context = publicAPI
-        .getFirstAncestorOfType('vtkOpenGLRenderWindow')
-        .getContext();
       model.context.depthMask(true);
       publicAPI.activateTextures();
     } else {
@@ -100,9 +101,6 @@ function vtkOpenGLActor2D(publicAPI, model) {
   // Renders myself
   publicAPI.translucentPass = (prepass, renderPass) => {
     if (prepass) {
-      model.context = publicAPI
-        .getFirstAncestorOfType('vtkOpenGLRenderWindow')
-        .getContext();
       model.context.depthMask(false);
       publicAPI.activateTextures();
     } else {

Sources/Rendering/OpenGL/ImageSlice/index.js

@@ -22,9 +22,12 @@ function vtkOpenGLImageSlice(publicAPI, model) {
       if (!model.renderable) {
         return;
       }
-
+      model.openGLRenderWindow = publicAPI.getFirstAncestorOfType(
+        'vtkOpenGLRenderWindow'
+      );
       model.openGLRenderer =
         publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
+      model.context = model.openGLRenderWindow.getContext();
       publicAPI.prepareNodes();
       publicAPI.addMissingNode(model.renderable.getMapper());
       publicAPI.removeUnusedNodes();
@@ -92,23 +95,13 @@ function vtkOpenGLImageSlice(publicAPI, model) {
   // Renders myself
   publicAPI.opaquePass = (prepass, renderPass) => {
     if (prepass) {
-      model.context = publicAPI
-        .getFirstAncestorOfType('vtkOpenGLRenderWindow')
-        .getContext();
       model.context.depthMask(true);
     }
   };
 
   // Renders myself
   publicAPI.translucentPass = (prepass, renderPass) => {
-    if (prepass) {
-      model.context = publicAPI
-        .getFirstAncestorOfType('vtkOpenGLRenderWindow')
-        .getContext();
-      model.context.depthMask(false);
-    } else {
-      model.context.depthMask(true);
-    }
+    model.context.depthMask(!prepass);
   };
 
   publicAPI.getKeyMatrices = () => {

Sources/Rendering/OpenGL/RenderWindow/index.d.ts

@@ -273,16 +273,6 @@ export interface vtkOpenGLRenderWindow extends vtkOpenGLRenderWindowBase {
 	 */
 	traverseAllPasses(): void;
 
-	/**
-	 * 
-	 */
-	disableDepthMask(): void;
-
-	/**
-	 * 
-	 */
-	enableDepthMask(): void;
-
 	/**
 	 * 
 	 */

Sources/Rendering/OpenGL/RenderWindow/index.js

@@ -1045,20 +1045,6 @@ function vtkOpenGLRenderWindow(publicAPI, model) {
     }
   };
 
-  publicAPI.disableDepthMask = () => {
-    if (model.depthMaskEnabled) {
-      model.context.depthMask(false);
-      model.depthMaskEnabled = false;
-    }
-  };
-
-  publicAPI.enableDepthMask = () => {
-    if (!model.depthMaskEnabled) {
-      model.context.depthMask(true);
-      model.depthMaskEnabled = true;
-    }
-  };
-
   publicAPI.disableCullFace = () => {
     if (model.cullFaceEnabled) {
       model.context.disable(model.context.CULL_FACE);
@@ -1116,7 +1102,6 @@ function vtkOpenGLRenderWindow(publicAPI, model) {
 
 const DEFAULT_VALUES = {
   cullFaceEnabled: false,
-  depthMaskEnabled: true,
   shaderCache: null,
   initialized: false,
   context: null,

Sources/Rendering/OpenGL/Renderer/index.js

@@ -59,7 +59,7 @@ function vtkOpenGLRenderer(publicAPI, model) {
       if (!model.renderable.getPreserveDepthBuffer()) {
         gl.clearDepth(1.0);
         clearMask |= gl.DEPTH_BUFFER_BIT;
-        gl.depthMask(true);
+        model.context.depthMask(true);
       }
 
       const ts = publicAPI.getTiledSizeAndOrigin();
@@ -146,7 +146,7 @@ function vtkOpenGLRenderer(publicAPI, model) {
     if (!model.renderable.getPreserveDepthBuffer()) {
       gl.clearDepth(1.0);
       clearMask |= gl.DEPTH_BUFFER_BIT;
-      gl.depthMask(true);
+      model.context.depthMask(true);
     }
 
     gl.colorMask(true, true, true, true);

Sources/Rendering/OpenGL/Skybox/index.js

@@ -49,7 +49,7 @@ function vtkOpenGLSkybox(publicAPI, model) {
     if (prepass && !model.openGLRenderer.getSelector()) {
       publicAPI.updateBufferObjects();
 
-      model.openGLRenderWindow.enableDepthMask();
+      model.context.depthMask(true);
 
       model.openGLRenderWindow
         .getShaderCache()

Sources/Rendering/OpenGL/Volume/index.js

@@ -19,8 +19,12 @@ function vtkOpenGLVolume(publicAPI, model) {
       return;
     }
     if (prepass) {
+      model.openGLRenderWindow = publicAPI.getFirstAncestorOfType(
+        'vtkOpenGLRenderWindow'
+      );
       model.openGLRenderer =
         publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
+      model.context = model.openGLRenderWindow.getContext();
       publicAPI.prepareNodes();
       publicAPI.addMissingNode(model.renderable.getMapper());
       publicAPI.removeUnusedNodes();
@@ -58,14 +62,7 @@ function vtkOpenGLVolume(publicAPI, model) {
     if (!model.renderable || !model.renderable.getVisibility()) {
       return;
     }
-    if (prepass) {
-      model.context = publicAPI
-        .getFirstAncestorOfType('vtkOpenGLRenderWindow')
-        .getContext();
-      model.context.depthMask(false);
-    } else {
-      model.context.depthMask(true);
-    }
+    model.context.depthMask(!prepass);
   };
 
   publicAPI.getKeyMatrices = () => {