@kitware/vtk.js 25.9.1 → 26.0.0-beta.1

package/Rendering/OpenGL/ImageSlice.js

@@ -21,7 +21,7 @@ function vtkOpenGLImageSlice(publicAPI, model) {
       }
 
       model._openGLRenderWindow = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderWindow');
-      model.openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
+      model._openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
       model.context = model._openGLRenderWindow.getContext();
       publicAPI.prepareNodes();
       publicAPI.addMissingNode(model.renderable.getMapper());
@@ -35,7 +35,7 @@ function vtkOpenGLImageSlice(publicAPI, model) {
 
 
   publicAPI.traverseOpaquePass = function (renderPass) {
-    if (!model.renderable || !model.renderable.getNestedVisibility() || !model.renderable.getIsOpaque() || model.openGLRenderer.getSelector() && !model.renderable.getNestedPickable()) {
+    if (!model.renderable || !model.renderable.getNestedVisibility() || !model.renderable.getIsOpaque() || model._openGLRenderer.getSelector() && !model.renderable.getNestedPickable()) {
       return;
     }
 
@@ -48,7 +48,7 @@ function vtkOpenGLImageSlice(publicAPI, model) {
 
 
   publicAPI.traverseTranslucentPass = function (renderPass) {
-    if (!model.renderable || !model.renderable.getNestedVisibility() || model.renderable.getIsOpaque() || model.openGLRenderer.getSelector() && !model.renderable.getNestedPickable()) {
+    if (!model.renderable || !model.renderable.getNestedVisibility() || model.renderable.getIsOpaque() || model._openGLRenderer.getSelector() && !model.renderable.getNestedPickable()) {
       return;
     }
 

package/Rendering/OpenGL/PixelSpaceCallbackMapper.js

@@ -11,11 +11,15 @@ function vtkOpenGLPixelSpaceCallbackMapper(publicAPI, model) {
   model.classHierarchy.push('vtkOpenGLPixelSpaceCallbackMapper');
 
   publicAPI.opaquePass = function (prepass, renderPass) {
-    model.openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
-    model._openGLRenderWindow = model.openGLRenderer.getParent();
-    var aspectRatio = model.openGLRenderer.getAspectRatio();
-    var camera = model.openGLRenderer ? model.openGLRenderer.getRenderable().getActiveCamera() : null;
-    var tsize = model.openGLRenderer.getTiledSizeAndOrigin();
+    model._openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
+    model._openGLRenderWindow = model._openGLRenderer.getParent();
+
+    var aspectRatio = model._openGLRenderer.getAspectRatio();
+
+    var camera = model._openGLRenderer ? model._openGLRenderer.getRenderable().getActiveCamera() : null;
+
+    var tsize = model._openGLRenderer.getTiledSizeAndOrigin();
+
     var texels = null;
 
     if (model.renderable.getUseZValues()) {

package/Rendering/OpenGL/PolyDataMapper.js

@@ -54,9 +54,9 @@ function vtkOpenGLPolyDataMapper(publicAPI, model) {
     if (prepass) {
       model.currentRenderPass = null;
       model.openGLActor = publicAPI.getFirstAncestorOfType('vtkOpenGLActor');
-      model.openGLRenderer = model.openGLActor.getFirstAncestorOfType('vtkOpenGLRenderer');
-      model._openGLRenderWindow = model.openGLRenderer.getParent();
-      model.openGLCamera = model.openGLRenderer.getViewNodeFor(model.openGLRenderer.getRenderable().getActiveCamera());
+      model._openGLRenderer = model.openGLActor.getFirstAncestorOfType('vtkOpenGLRenderer');
+      model._openGLRenderWindow = model._openGLRenderer.getParent();
+      model.openGLCamera = model._openGLRenderer.getViewNodeFor(model._openGLRenderer.getRenderable().getActiveCamera());
     }
   }; // Renders myself
 
@@ -95,7 +95,9 @@ function vtkOpenGLPolyDataMapper(publicAPI, model) {
     }
 
     var actor = model.openGLActor.getRenderable();
-    var ren = model.openGLRenderer.getRenderable();
+
+    var ren = model._openGLRenderer.getRenderable();
+
     publicAPI.renderPiece(ren, actor);
   };
 
@@ -516,7 +518,7 @@ function vtkOpenGLPolyDataMapper(publicAPI, model) {
     // This gets you above the saved surface depth buffer.
 
 
-    var selector = model.openGLRenderer.getSelector();
+    var selector = model._openGLRenderer.getSelector();
 
     if (selector && selector.getFieldAssociation() === FieldAssociations.FIELD_ASSOCIATION_POINTS) {
       cp.offset -= 2.0;
@@ -530,7 +532,7 @@ function vtkOpenGLPolyDataMapper(publicAPI, model) {
     var VSSource = shaders.Vertex;
     FSSource = vtkShaderProgram.substitute(FSSource, '//VTK::Picking::Dec', ['uniform int picking;', '//VTK::Picking::Dec']).result;
 
-    if (!model.openGLRenderer.getSelector()) {
+    if (!model._openGLRenderer.getSelector()) {
       return;
     }
 
@@ -793,8 +795,10 @@ function vtkOpenGLPolyDataMapper(publicAPI, model) {
     } // handle wide lines
 
 
-    cellBO.setMapperShaderParameters(ren, actor, model.openGLRenderer.getTiledSizeAndOrigin());
-    var selector = model.openGLRenderer.getSelector();
+    cellBO.setMapperShaderParameters(ren, actor, model._openGLRenderer.getTiledSizeAndOrigin());
+
+    var selector = model._openGLRenderer.getSelector();
+
     cellBO.getProgram().setUniform3fArray('mapperIndex', selector ? selector.getPropColorValue() : [0.0, 0.0, 0.0]);
     cellBO.getProgram().setUniformi('picking', selector ? selector.getCurrentPass() + 1 : 0);
   };
@@ -908,7 +912,8 @@ function vtkOpenGLPolyDataMapper(publicAPI, model) {
     } : model.openGLActor.getKeyMatrices();
 
     if (actor.getCoordinateSystem() === CoordinateSystem.DISPLAY) {
-      var size = model.openGLRenderer.getTiledSizeAndOrigin();
+      var size = model._openGLRenderer.getTiledSizeAndOrigin();
+
       mat4.identity(model.tmpMat4);
       model.tmpMat4[0] = 2.0 / size.usize;
       model.tmpMat4[12] = -1.0;
@@ -997,7 +1002,7 @@ function vtkOpenGLPolyDataMapper(publicAPI, model) {
   publicAPI.updateMaximumPointCellIds = function (ren, actor) {
     var _model$selectionWebGL, _model$selectionWebGL2, _model$selectionWebGL3, _model$selectionWebGL4;
 
-    var selector = model.openGLRenderer.getSelector();
+    var selector = model._openGLRenderer.getSelector();
 
     if (!selector) {
       return;
@@ -1023,17 +1028,18 @@ function vtkOpenGLPolyDataMapper(publicAPI, model) {
   publicAPI.renderPieceStart = function (ren, actor) {
     model.primitiveIDOffset = 0;
     model.vertexIDOffset = 0;
-    var picking = getPickState(model.openGLRenderer);
+    var picking = getPickState(model._openGLRenderer);
 
     if (model.lastSelectionState !== picking) {
       model.selectionStateChanged.modified();
       model.lastSelectionState = picking;
     }
 
-    if (model.openGLRenderer.getSelector()) {
+    if (model._openGLRenderer.getSelector()) {
       switch (picking) {
         default:
-          model.openGLRenderer.getSelector().renderProp(actor);
+          model._openGLRenderer.getSelector().renderProp(actor);
+
       }
     } // make sure the BOs are up to date
 
@@ -1052,7 +1058,9 @@ function vtkOpenGLPolyDataMapper(publicAPI, model) {
   publicAPI.renderPieceDraw = function (ren, actor) {
     var representation = actor.getProperty().getRepresentation();
     var drawSurfaceWithEdges = actor.getProperty().getEdgeVisibility() && representation === Representation.SURFACE;
-    var selector = model.openGLRenderer.getSelector(); // If we are picking points, we need to tell it to the helper
+
+    var selector = model._openGLRenderer.getSelector(); // If we are picking points, we need to tell it to the helper
+
 
     var pointPicking = selector && selector.getFieldAssociation() === FieldAssociations.FIELD_ASSOCIATION_POINTS && (model.lastSelectionState === PassTypes.ID_LOW24 || model.lastSelectionState === PassTypes.ID_HIGH24); // for every primitive type
 

package/Rendering/OpenGL/PolyDataMapper2D.js

@@ -32,9 +32,9 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
   publicAPI.buildPass = function (prepass) {
     if (prepass) {
       model.openGLActor2D = publicAPI.getFirstAncestorOfType('vtkOpenGLActor2D');
-      model.openGLRenderer = model.openGLActor2D.getFirstAncestorOfType('vtkOpenGLRenderer');
-      model._openGLRenderWindow = model.openGLRenderer.getParent();
-      model.openGLCamera = model.openGLRenderer.getViewNodeFor(model.openGLRenderer.getRenderable().getActiveCamera());
+      model._openGLRenderer = model.openGLActor2D.getFirstAncestorOfType('vtkOpenGLRenderer');
+      model._openGLRenderWindow = model._openGLRenderer.getParent();
+      model.openGLCamera = model._openGLRenderer.getViewNodeFor(model._openGLRenderer.getRenderable().getActiveCamera());
     }
   };
 
@@ -93,7 +93,9 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
     }
 
     var actor = model.openGLActor2D.getRenderable();
-    var ren = model.openGLRenderer.getRenderable();
+
+    var ren = model._openGLRenderer.getRenderable();
+
     publicAPI.renderPiece(ren, actor);
   };
 
@@ -125,10 +127,11 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
   publicAPI.renderPieceStart = function (ren, actor) {
     model.primitiveIDOffset = 0;
 
-    if (model.openGLRenderer.getSelector()) {
-      switch (model.openGLRenderer.getSelector().getCurrentPass()) {
+    if (model._openGLRenderer.getSelector()) {
+      switch (model._openGLRenderer.getSelector().getCurrentPass()) {
         default:
-          model.openGLRenderer.getSelector().renderProp(actor);
+          model._openGLRenderer.getSelector().renderProp(actor);
+
       }
     } // make sure the BOs are up to date
 
@@ -440,8 +443,10 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
       } // handle wide lines
 
 
-      cellBO.setMapperShaderParameters(ren, actor, model.openGLRenderer.getTiledSizeAndOrigin());
-      var selector = model.openGLRenderer.getSelector();
+      cellBO.setMapperShaderParameters(ren, actor, model._openGLRenderer.getTiledSizeAndOrigin());
+
+      var selector = model._openGLRenderer.getSelector();
+
       cellBO.getProgram().setUniform3fArray('mapperIndex', selector ? selector.getPropColorValue() : [0.0, 0.0, 0.0]);
       cellBO.getProgram().setUniformi('picking', selector ? selector.getCurrentPass() + 1 : 0);
     }
@@ -502,7 +507,9 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
 
     size[0] = round(size[0] * (visVP[2] - visVP[0]) / (vport[2] - vport[0]));
     size[1] = round(size[1] * (visVP[3] - visVP[1]) / (vport[3] - vport[1]));
-    var winSize = model.openGLRenderer.getParent().getSize();
+
+    var winSize = model._openGLRenderer.getParent().getSize();
+
     var xoff = round(actorPos[0] - (visVP[0] - vport[0]) * winSize[0]);
     var yoff = round(actorPos[1] - (visVP[1] - vport[1]) * winSize[1]); // set ortho projection
 

package/Rendering/OpenGL/ScalarBarActor.js

@@ -11,8 +11,8 @@ function vtkOpenGLScalarBarActor(publicAPI, model) {
 
   publicAPI.buildPass = function (prepass) {
     if (prepass) {
-      model.openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
-      model._openGLRenderWindow = model.openGLRenderer.getParent();
+      model._openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
+      model._openGLRenderWindow = model._openGLRenderer.getParent();
 
       if (!model.scalarBarActorHelper.getRenderable()) {
         model.scalarBarActorHelper.setRenderable(model.renderable);
@@ -27,8 +27,10 @@ function vtkOpenGLScalarBarActor(publicAPI, model) {
 
   publicAPI.opaquePass = function (prepass, renderPass) {
     if (prepass) {
-      var camera = model.openGLRenderer ? model.openGLRenderer.getRenderable().getActiveCamera() : null;
-      var tsize = model.openGLRenderer.getTiledSizeAndOrigin();
+      var camera = model._openGLRenderer ? model._openGLRenderer.getRenderable().getActiveCamera() : null;
+
+      var tsize = model._openGLRenderer.getTiledSizeAndOrigin();
+
       model.scalarBarActorHelper.updateAPISpecificData([tsize.usize, tsize.vsize], camera, model._openGLRenderWindow.getRenderable());
     }
   };

package/Rendering/OpenGL/Skybox.js

@@ -17,13 +17,15 @@ function vtkOpenGLSkybox(publicAPI, model) {
 
   publicAPI.buildPass = function (prepass) {
     if (prepass) {
-      model.openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
-      model._openGLRenderWindow = model.openGLRenderer.getParent();
+      model._openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
+      model._openGLRenderWindow = model._openGLRenderer.getParent();
       model.context = model._openGLRenderWindow.getContext();
       model.tris.setOpenGLRenderWindow(model._openGLRenderWindow);
       model.openGLTexture.setOpenGLRenderWindow(model._openGLRenderWindow);
-      var ren = model.openGLRenderer.getRenderable();
-      model.openGLCamera = model.openGLRenderer.getViewNodeFor(ren.getActiveCamera());
+
+      var ren = model._openGLRenderer.getRenderable();
+
+      model.openGLCamera = model._openGLRenderer.getViewNodeFor(ren.getActiveCamera());
     }
   };
 
@@ -38,7 +40,7 @@ function vtkOpenGLSkybox(publicAPI, model) {
   };
 
   publicAPI.opaquePass = function (prepass, renderPass) {
-    if (prepass && !model.openGLRenderer.getSelector()) {
+    if (prepass && !model._openGLRenderer.getSelector()) {
       publicAPI.updateBufferObjects();
       model.context.depthMask(true);
 
@@ -47,7 +49,9 @@ function vtkOpenGLSkybox(publicAPI, model) {
       model.openGLTexture.render(model._openGLRenderWindow);
       var texUnit = model.openGLTexture.getTextureUnit();
       model.tris.getProgram().setUniformi('sbtexture', texUnit);
-      var ren = model.openGLRenderer.getRenderable();
+
+      var ren = model._openGLRenderer.getRenderable();
+
       var keyMats = model.openGLCamera.getKeyMatrices(ren);
       var imat = new Float64Array(16);
       mat4.invert(imat, keyMats.wcpc);

package/Rendering/OpenGL/Texture.js

@@ -1,7 +1,7 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import Constants from './Texture/Constants.js';
 import HalfFloat from '../../Common/Core/HalfFloat.js';
-import { newInstance as newInstance$1, obj, set, setGet, get, newTypedArray, vtkDebugMacro as vtkDebugMacro$1, vtkErrorMacro as vtkErrorMacro$1, vtkWarningMacro as vtkWarningMacro$1 } from '../../macros.js';
+import { newInstance as newInstance$1, obj, set, setGet, get, moveToProtected, newTypedArray, vtkDebugMacro as vtkDebugMacro$1, vtkErrorMacro as vtkErrorMacro$1, vtkWarningMacro as vtkWarningMacro$1 } from '../../macros.js';
 import vtkDataArray from '../../Common/Core/DataArray.js';
 import { R as isPowerOfTwo, N as nearestPowerOfTwo } from '../../Common/Core/Math/index.js';
 import vtkViewNode from '../SceneGraph/ViewNode.js';
@@ -31,9 +31,9 @@ function vtkOpenGLTexture(publicAPI, model) {
     if (renWin) {
       model._openGLRenderWindow = renWin;
     } else {
-      model.openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer'); // sync renderable properties
+      model._openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer'); // sync renderable properties
 
-      model._openGLRenderWindow = model.openGLRenderer.getParent();
+      model._openGLRenderWindow = model._openGLRenderer.getParent();
     }
 
     model.context = model._openGLRenderWindow.getContext();
@@ -1287,7 +1287,7 @@ function vtkOpenGLTexture(publicAPI, model) {
 
 
 var DEFAULT_VALUES = {
-  _openGLRenderWindow: null,
+  // _openGLRenderWindow: null,
   context: null,
   handle: 0,
   sendParametersTime: null,
@@ -1329,7 +1329,8 @@ function extend(publicAPI, model) {
 
   set(publicAPI, model, ['format', 'openGLDataType']);
   setGet(publicAPI, model, ['keyMatrixTime', 'minificationFilter', 'magnificationFilter', 'wrapS', 'wrapT', 'wrapR', 'generateMipmap']);
-  get(publicAPI, model, ['width', 'height', 'volumeInfo', 'components', 'handle', 'target']); // Object methods
+  get(publicAPI, model, ['width', 'height', 'volumeInfo', 'components', 'handle', 'target']);
+  moveToProtected(publicAPI, model, ['openGLRenderWindow']); // Object methods
 
   vtkOpenGLTexture(publicAPI, model);
 } // ----------------------------------------------------------------------------

package/Rendering/OpenGL/Volume.js

@@ -17,7 +17,7 @@ function vtkOpenGLVolume(publicAPI, model) {
 
     if (prepass) {
       model._openGLRenderWindow = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderWindow');
-      model.openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
+      model._openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
       model.context = model._openGLRenderWindow.getContext();
       publicAPI.prepareNodes();
       publicAPI.addMissingNode(model.renderable.getMapper());
@@ -36,7 +36,7 @@ function vtkOpenGLVolume(publicAPI, model) {
   };
 
   publicAPI.traverseVolumePass = function (renderPass) {
-    if (!model.renderable || !model.renderable.getNestedVisibility() || model.openGLRenderer.getSelector() && !model.renderable.getNestedPickable()) {
+    if (!model.renderable || !model.renderable.getNestedVisibility() || model._openGLRenderer.getSelector() && !model.renderable.getNestedPickable()) {
       return;
     }
 

package/Rendering/OpenGL/VolumeMapper.js

@@ -75,9 +75,11 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
       model.opacityTexture.setOpenGLRenderWindow(model._openGLRenderWindow);
       model.openGLVolume = publicAPI.getFirstAncestorOfType('vtkOpenGLVolume');
       var actor = model.openGLVolume.getRenderable();
-      model.openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
-      var ren = model.openGLRenderer.getRenderable();
-      model.openGLCamera = model.openGLRenderer.getViewNodeFor(ren.getActiveCamera());
+      model._openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
+
+      var ren = model._openGLRenderer.getRenderable();
+
+      model.openGLCamera = model._openGLRenderer.getViewNodeFor(ren.getActiveCamera());
       publicAPI.renderPiece(ren, actor);
     }
   };
@@ -715,9 +717,7 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
 
     if (vtkImageLabelOutline === true) {
       var labelOutlineThickness = actor.getProperty().getLabelOutlineThickness();
-      var labelOutlineOpacity = actor.getProperty().getLabelOutlineOpacity();
       program.setUniformi('outlineThickness', labelOutlineThickness);
-      program.setUniformf('outlineOpacity', labelOutlineOpacity);
     }
 
     if (model.lastLightComplexity > 0) {
@@ -768,17 +768,17 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
       return [model._smallViewportWidth, model._smallViewportHeight];
     }
 
-    var _model$openGLRenderer = model.openGLRenderer.getTiledSizeAndOrigin(),
-        usize = _model$openGLRenderer.usize,
-        vsize = _model$openGLRenderer.vsize;
+    var _model$_openGLRendere = model._openGLRenderer.getTiledSizeAndOrigin(),
+        usize = _model$_openGLRendere.usize,
+        vsize = _model$_openGLRendere.vsize;
 
     return [usize, vsize];
   };
 
   publicAPI.getRenderTargetOffset = function () {
-    var _model$openGLRenderer2 = model.openGLRenderer.getTiledSizeAndOrigin(),
-        lowerLeftU = _model$openGLRenderer2.lowerLeftU,
-        lowerLeftV = _model$openGLRenderer2.lowerLeftV;
+    var _model$_openGLRendere2 = model._openGLRenderer.getTiledSizeAndOrigin(),
+        lowerLeftU = _model$_openGLRendere2.lowerLeftU,
+        lowerLeftV = _model$_openGLRendere2.lowerLeftV;
 
     return [lowerLeftU, lowerLeftV];
   };