@kitware/vtk.js 25.10.0 → 26.0.0-beta.2

package/Common/Core/CellArray.d.ts

@@ -35,12 +35,6 @@ export interface vtkCellArray extends vtkDataArray {
 	 */
 	getCell(loc: any): void;
 
-	/**
-	 * Reset the cell array by setting the number of cells to 0.
-	 * NOTE: This won't touch the actual memory of the underlying typedArray.
-	 */
-	initialize(): void;
-
 	/**
 	 * Insert a cell to this array in the next available slot.
 	 * @param {Number[]} cellPointIds The list of point ids (NOT prefixed with the number of points)

package/Common/Core/CellArray.js

@@ -1,5 +1,5 @@
-import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import macro from '../../macros.js';
 import vtkDataArray from './DataArray.js';
 import { VtkDataTypes } from './DataArray/Constants.js';
@@ -47,6 +47,8 @@ function vtkCellArray(publicAPI, model) {
   // Set our className
   model.classHierarchy.push('vtkCellArray');
 
+  var superClass = _objectSpread({}, publicAPI);
+
   publicAPI.getNumberOfCells = function (recompute) {
     if (model.numberOfCells !== undefined && !recompute) {
       return model.numberOfCells;
@@ -70,10 +72,26 @@ function vtkCellArray(publicAPI, model) {
     return model.cellSizes;
   };
 
-  var superSetData = publicAPI.setData;
+  publicAPI.resize = function (requestedNumTuples) {
+    var oldNumTuples = publicAPI.getNumberOfTuples();
+    superClass.resize(requestedNumTuples);
+    var newNumTuples = publicAPI.getNumberOfTuples();
+
+    if (newNumTuples < oldNumTuples) {
+      if (newNumTuples === 0) {
+        model.numberOfCells = 0;
+        model.cellSizes = [];
+      } else {
+        // We do not know how many cells are left.
+        // Set to undefined to ensure insertNextCell works correctly.
+        model.numberOfCells = undefined;
+        model.cellSizes = undefined;
+      }
+    }
+  };
 
   publicAPI.setData = function (typedArray) {
-    superSetData(typedArray, 1);
+    superClass.setData(typedArray, 1);
     model.numberOfCells = undefined;
     model.cellSizes = undefined;
   };
@@ -84,15 +102,6 @@ function vtkCellArray(publicAPI, model) {
     return model.values.subarray(cellLoc, cellLoc + numberOfPoints);
   };
 
-  var superInitialize = publicAPI.initialize;
-
-  publicAPI.initialize = function () {
-    superInitialize(); // Set to undefined to ensure insertNextCell works correctly
-
-    model.numberOfCells = undefined;
-    model.cellSizes = undefined;
-  };
-
   publicAPI.insertNextCell = function (cellPointIds) {
     var cellId = publicAPI.getNumberOfCells();
     publicAPI.insertNextTuples([cellPointIds.length].concat(_toConsumableArray(cellPointIds))); // By computing the number of cells earlier, we made sure that numberOfCells is defined

package/Common/Core/ClassHierarchy.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _get from '@babel/runtime/helpers/get';
@@ -10,7 +11,6 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-/* eslint-disable prefer-rest-params */
 var ClassHierarchy = /*#__PURE__*/function (_Array) {
   _inherits(ClassHierarchy, _Array);
 
@@ -25,13 +25,18 @@ var ClassHierarchy = /*#__PURE__*/function (_Array) {
   _createClass(ClassHierarchy, [{
     key: "push",
     value: function push() {
-      for (var i = 0; i < arguments.length; i++) {
-        if (!this.includes(arguments[i])) {
-          _get(_getPrototypeOf(ClassHierarchy.prototype), "push", this).call(this, arguments[i]);
-        }
+      var _this = this,
+          _get2;
+
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
       }
 
-      return this.length;
+      // no perf issue since args.length should be small
+      var newArgs = args.filter(function (arg) {
+        return !_this.includes(arg);
+      });
+      return (_get2 = _get(_getPrototypeOf(ClassHierarchy.prototype), "push", this)).call.apply(_get2, [this].concat(_toConsumableArray(newArgs)));
     }
   }]);
 

package/Common/Core/DataArray.d.ts

@@ -264,9 +264,29 @@ export interface vtkDataArray extends vtkObject {
 		t: float
 	): void;
 
+	/**
+	 * Resize the array to the requested number of tuples and preserve data.
+	 * Increasing the array size may allocate extra memory beyond what was
+	 * requested.
+	 * Decreasing the array size will trim memory to the requested size.
+	 * model.size WILL be modified according ot the new size.
+	 * If requestedNumTuples > getNumberOfTuples(),
+	 * it creates a new typed array and copies the old values to the new array.
+	 * If requestedNumTuples < getNumberOfTuples(), the typed array is untouched,
+	 * only model.size is modified.
+	 * @param {Number} requestedNumTuples Final expected number of tuples; must be >= 0
+	 * @returns {Boolean} True if a resize occured, false otherwise
+	 * @see insertNextTuple
+	 * @see insertNextTuples
+	 * @see initialize
+	 */
+	resize(requestedNumTuples: number): boolean;
+
 	/**
 	 * Reset this array.
 	 * NOTE: This won't touch the actual memory of the underlying typedArray. 
+	 * @see insertNextTuple
+	 * @see insertNextTuples
 	 */
 	initialize(): void;
 

package/Common/Core/DataArray.js

@@ -193,16 +193,33 @@ function vtkDataArray(publicAPI, model) {
       model.values = newTypedArray(model.dataType, (requestedNumTuples + curNumTuples) * numComps);
       model.values.set(oldValues);
       return true;
-    } // Requested size is smaller than current size
+    } // Requested size is smaller than currently allocated size
 
 
-    model.size = requestedNumTuples * numComps;
-    dataChange();
+    if (model.size > requestedNumTuples * numComps) {
+      model.size = requestedNumTuples * numComps;
+      dataChange();
+    }
+
     return true;
   }
 
+  publicAPI.resize = function (requestedNumTuples) {
+    resize(requestedNumTuples);
+    var newSize = requestedNumTuples * publicAPI.getNumberOfComponents();
+
+    if (model.size !== newSize) {
+      model.size = newSize;
+      dataChange();
+      return true;
+    }
+
+    return false;
+  }; // FIXME, to rename into "clear()" or "reset()"
+
+
   publicAPI.initialize = function () {
-    resize(0);
+    publicAPI.resize(0);
   };
 
   publicAPI.getElementComponentSize = function () {

package/Proxy/Core/ViewProxy.js

@@ -2,7 +2,7 @@ import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
-import { newInstance as newInstance$1, obj, setGet, get, event, proxy, proxyPropertyMapping, chain } from '../../macros.js';
+import { newInstance as newInstance$1, obj, setGet, get, moveToProtected, event, proxy, proxyPropertyMapping, chain } from '../../macros.js';
 import vtkAnnotatedCubeActor from '../../Rendering/Core/AnnotatedCubeActor.js';
 import vtkAxesActor from '../../Rendering/Core/AxesActor.js';
 import vtkCornerAnnotation from '../../Interaction/UI/CornerAnnotation.js';
@@ -42,10 +42,10 @@ function vtkViewProxy(publicAPI, model) {
     background: [0, 0, 0]
   });
   model.renderWindow.addRenderer(model.renderer);
-  model.openglRenderWindow = model.renderWindow.newAPISpecificView();
-  model.renderWindow.addView(model.openglRenderWindow);
+  model._openGLRenderWindow = model.renderWindow.newAPISpecificView();
+  model.renderWindow.addView(model._openGLRenderWindow);
   model.interactor = vtkRenderWindowInteractor.newInstance();
-  model.interactor.setView(model.openglRenderWindow);
+  model.interactor.setView(model._openGLRenderWindow);
   model.interactorStyle3D = vtkInteractorStyleManipulator.newInstance();
   model.interactorStyle2D = vtkInteractorStyleManipulator.newInstance(); // Apply default interaction styles
 
@@ -143,14 +143,17 @@ function vtkViewProxy(publicAPI, model) {
     if (model.container) {
       model.orientationWidget.setEnabled(false);
       model.interactor.unbindEvents(model.container);
-      model.openglRenderWindow.setContainer(null);
+
+      model._openGLRenderWindow.setContainer(null);
+
       model.cornerAnnotation.setContainer(null);
     }
 
     model.container = container;
 
     if (container) {
-      model.openglRenderWindow.setContainer(container);
+      model._openGLRenderWindow.setContainer(container);
+
       model.cornerAnnotation.setContainer(container);
       model.interactor.initialize();
       model.interactor.bindEvents(container);
@@ -170,7 +173,9 @@ function vtkViewProxy(publicAPI, model) {
       var devicePixelRatio = window.devicePixelRatio || 1;
       var width = Math.max(10, Math.floor(devicePixelRatio * dims.width));
       var height = Math.max(10, Math.floor(devicePixelRatio * dims.height));
-      model.openglRenderWindow.setSize(width, height);
+
+      model._openGLRenderWindow.setSize(width, height);
+
       publicAPI.invokeResize({
         width: width,
         height: height
@@ -511,7 +516,9 @@ function vtkViewProxy(publicAPI, model) {
 
     model.interactor.delete();
     model.renderer.delete();
-    model.openglRenderWindow.delete();
+
+    model._openGLRenderWindow.delete();
+
     model.renderWindow.delete();
   }, publicAPI.delete); // --------------------------------------------------------------------------
   // Initialization from state or input
@@ -542,8 +549,9 @@ function extend(publicAPI, model) {
   Object.assign(model, DEFAULT_VALUES, initialValues);
   obj(publicAPI, model);
   setGet(publicAPI, model, ['name', 'disableAnimation']);
-  get(publicAPI, model, ['annotationOpacity', 'camera', 'container', 'cornerAnnotation', 'interactor', 'interactorStyle2D', 'interactorStyle3D', 'openglRenderWindow', // todo breaking? convert to apiSpecificWindow
+  get(publicAPI, model, ['annotationOpacity', 'camera', 'container', 'cornerAnnotation', 'interactor', 'interactorStyle2D', 'interactorStyle3D', '_openGLRenderWindow', // todo breaking? convert to apiSpecificWindow
   'orientationAxesType', 'presetToOrientationAxes', 'renderer', 'renderWindow', 'representations', 'useParallelRendering']);
+  moveToProtected(publicAPI, model, ['openGLRenderWindow']);
   event(publicAPI, model, 'Resize'); // Object specific methods
 
   vtkViewProxy(publicAPI, model); // Proxy handling

package/Rendering/Core/ColorTransferFunction.d.ts

@@ -1,4 +1,3 @@
-import vtkDataArray from './../../Common/Core/DataArray';
 import { vtkObject } from './../../interfaces';
 import { ColorSpace, Scale } from './ColorTransferFunction/Constants';
 
@@ -202,25 +201,6 @@ export interface vtkColorTransferFunction extends vtkObject {
     withAlpha: boolean
   ): Float32Array;
 
-  /**
-   * Construct a color transfer function from a vtkDataArray.
-   * The order of values depends on the number of components
-   * of the array.
-   * 3 -> RGB
-   * 4 -> XRGB
-   * 5 -> RGBMS
-   * 6 -> XRGBMS
-   * 
-   * X represents the input value to a function
-   * RGB represents the red, green, and blue value output
-   * M represents the midpoint
-   * S represents sharpness
-   * @param {vtkDataArray} array
-   */
-   buildFunctionFromArray(
-    array: vtkDataArray,
-  ): void;
-
   /**
    * Construct a color transfer function from a table.
    * @param {Number} xStart The index of the first point.

package/Rendering/Core/ColorTransferFunction.js

@@ -849,69 +849,6 @@ function vtkColorTransferFunction(publicAPI, model) {
 
     model.buildTime.modified();
     return model.table;
-  };
-
-  publicAPI.buildFunctionFromArray = function (array) {
-    publicAPI.removeAllPoints();
-    var numComponents = array.getNumberOfComponents();
-
-    for (var i = 0; i < array.getNumberOfTuples(); i++) {
-      switch (numComponents) {
-        case 3:
-          {
-            model.nodes.push({
-              x: i,
-              r: array.getComponent(i, 0),
-              g: array.getComponent(i, 1),
-              b: array.getComponent(i, 2),
-              midpoint: 0.5,
-              sharpness: 0.0
-            });
-            break;
-          }
-
-        case 4:
-          {
-            model.nodes.push({
-              x: array.getComponent(i, 0),
-              r: array.getComponent(i, 1),
-              g: array.getComponent(i, 2),
-              b: array.getComponent(i, 3),
-              midpoint: 0.5,
-              sharpness: 0.0
-            });
-            break;
-          }
-
-        case 5:
-          {
-            model.nodes.push({
-              x: i,
-              r: array.getComponent(i, 0),
-              g: array.getComponent(i, 1),
-              b: array.getComponent(i, 2),
-              midpoint: array.getComponent(i, 4),
-              sharpness: array.getComponent(i, 5)
-            });
-            break;
-          }
-
-        case 6:
-          {
-            model.nodes.push({
-              x: array.getComponent(i, 0),
-              r: array.getComponent(i, 1),
-              g: array.getComponent(i, 2),
-              b: array.getComponent(i, 3),
-              midpoint: array.getComponent(i, 4),
-              sharpness: array.getComponent(i, 5)
-            });
-            break;
-          }
-      }
-    }
-
-    publicAPI.sortAndUpdateRange();
   }; //----------------------------------------------------------------------------
 
 

package/Rendering/Core/Prop3D.js

@@ -1,7 +1,7 @@
 import { mat4, quat } from 'gl-matrix';
 import macro from '../../macros.js';
 import vtkBoundingBox from '../../Common/DataModel/BoundingBox.js';
-import { B as degreesFromRadians, r as radiansFromDegrees, a as areMatricesEqual } from '../../Common/Core/Math/index.js';
+import { B as degreesFromRadians, r as radiansFromDegrees } from '../../Common/Core/Math/index.js';
 import vtkProp from './Prop.js';
 
 // vtkProp3D methods
@@ -83,13 +83,8 @@ function vtkProp3D(publicAPI, model) {
   };
 
   publicAPI.setUserMatrix = function (matrix) {
-    if (areMatricesEqual(model.userMatrix, matrix)) {
-      return false;
-    }
-
     mat4.copy(model.userMatrix, matrix);
     publicAPI.modified();
-    return true;
   };
 
   publicAPI.getMatrix = function () {

package/Rendering/Core/RenderWindow.js

@@ -63,20 +63,22 @@ function vtkRenderWindow(publicAPI, model) {
     }
 
     view.setRenderable(publicAPI);
-    model.views.push(view);
+
+    model._views.push(view);
+
     publicAPI.modified();
   }; // Remove renderer
 
 
   publicAPI.removeView = function (view) {
-    model.views = model.views.filter(function (r) {
+    model._views = model._views.filter(function (r) {
       return r !== view;
     });
     publicAPI.modified();
   };
 
   publicAPI.hasView = function (view) {
-    return model.views.indexOf(view) !== -1;
+    return model._views.indexOf(view) !== -1;
   }; // handle any pre render initializations
 
 
@@ -95,7 +97,7 @@ function vtkRenderWindow(publicAPI, model) {
     if (model.interactor) {
       model.interactor.render();
     } else {
-      model.views.forEach(function (view) {
+      model._views.forEach(function (view) {
         return view.traverseAllPasses();
       });
     }
@@ -138,7 +140,7 @@ function vtkRenderWindow(publicAPI, model) {
     var format = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'image/png';
     var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     macro.setImmediate(publicAPI.render);
-    return model.views.map(function (view) {
+    return model._views.map(function (view) {
       return view.captureNextImage ? view.captureNextImage(format, opts) : undefined;
     }).filter(function (i) {
       return !!i;
@@ -163,9 +165,10 @@ function extend(publicAPI, model) {
   Object.assign(model, DEFAULT_VALUES, initialValues); // Build VTK API
 
   macro.obj(publicAPI, model);
-  macro.setGet(publicAPI, model, ['interactor', 'numberOfLayers', 'views', 'defaultViewAPI']);
+  macro.setGet(publicAPI, model, ['interactor', 'numberOfLayers', '_views', 'defaultViewAPI']);
   macro.get(publicAPI, model, ['neverRendered']);
   macro.getArray(publicAPI, model, ['renderers']);
+  macro.moveToProtected(publicAPI, model, ['views']);
   macro.event(publicAPI, model, 'completion'); // Object methods
 
   vtkRenderWindow(publicAPI, model);

package/Rendering/Core/VolumeProperty.js

@@ -243,8 +243,7 @@ var DEFAULT_VALUES = {
   specular: 0.2,
   specularPower: 10.0,
   useLabelOutline: false,
-  labelOutlineThickness: 1,
-  labelOutlineOpacity: 1.0
+  labelOutlineThickness: 1
 }; // ----------------------------------------------------------------------------
 
 function extend(publicAPI, model) {
@@ -274,7 +273,7 @@ function extend(publicAPI, model) {
     }
   }
 
-  macro.setGet(publicAPI, model, ['independentComponents', 'interpolationType', 'shade', 'ambient', 'diffuse', 'specular', 'specularPower', 'useLabelOutline', 'labelOutlineThickness', 'labelOutlineOpacity']); // Object methods
+  macro.setGet(publicAPI, model, ['independentComponents', 'interpolationType', 'shade', 'ambient', 'diffuse', 'specular', 'specularPower', 'useLabelOutline', 'labelOutlineThickness']); // Object methods
 
   vtkVolumeProperty(publicAPI, model);
 } // ----------------------------------------------------------------------------

package/Rendering/Misc/CanvasView.js

@@ -10,7 +10,7 @@ function vtkCanvasView(publicAPI, model) {
 
   function updateWindow() {
     // Canvas size
-    if (model.renderable) {
+    if (model._renderable) {
       model.canvas.setAttribute('width', model.size[0]);
       model.canvas.setAttribute('height', model.size[1]);
     } // ImageStream size
@@ -111,8 +111,8 @@ function vtkCanvasView(publicAPI, model) {
   // Make us look like a View (i.e.: vtkOpenGLRenderWindow)
   // --------------------------------------------------------------------------
 
-  model.renderable = publicAPI;
-  model.renderers = [publicAPI];
+  model._renderable = publicAPI;
+  model._renderers = [publicAPI];
 
   publicAPI.traverseAllPasses = function () {};
 
@@ -154,10 +154,11 @@ function extend(publicAPI, model) {
 
   macro.obj(publicAPI, model, initialValues); // Build VTK API
 
-  macro.get(publicAPI, model, ['useBackgroundImage', 'renderable']);
+  macro.get(publicAPI, model, ['useBackgroundImage', '_renderable']);
   macro.setGet(publicAPI, model, ['canvas', 'cursor', 'useOffScreen', 'interactor']);
   macro.setGetArray(publicAPI, model, ['size'], 2);
-  macro.getArray(publicAPI, model, ['renderers']); // Object methods
+  macro.getArray(publicAPI, model, ['_renderers']);
+  macro.moveToProtected(publicAPI, model, ['renderable', 'renderers']); // Object methods
 
   vtkCanvasView(publicAPI, model);
 } // ----------------------------------------------------------------------------

package/Rendering/Misc/GenericRenderWindow.js

@@ -20,12 +20,12 @@ function vtkGenericRenderWindow(publicAPI, model) {
   model.renderer = vtkRenderer.newInstance();
   model.renderWindow.addRenderer(model.renderer); // OpenGLRenderWindow
 
-  model.openGLRenderWindow = vtkRenderWindow$1.newInstance();
-  model.renderWindow.addView(model.openGLRenderWindow); // Interactor
+  model._openGLRenderWindow = vtkRenderWindow$1.newInstance();
+  model.renderWindow.addView(model._openGLRenderWindow); // Interactor
 
   model.interactor = vtkRenderWindowInteractor.newInstance();
   model.interactor.setInteractorStyle(vtkInteractorStyleTrackballCamera.newInstance());
-  model.interactor.setView(model.openGLRenderWindow);
+  model.interactor.setView(model._openGLRenderWindow);
   model.interactor.initialize(); // Expose background
 
   publicAPI.setBackground = model.renderer.setBackground; // Update BG color
@@ -36,7 +36,9 @@ function vtkGenericRenderWindow(publicAPI, model) {
     if (model.container) {
       var dims = model.container.getBoundingClientRect();
       var devicePixelRatio = window.devicePixelRatio || 1;
-      model.openGLRenderWindow.setSize(Math.floor(dims.width * devicePixelRatio), Math.floor(dims.height * devicePixelRatio));
+
+      model._openGLRenderWindow.setSize(Math.floor(dims.width * devicePixelRatio), Math.floor(dims.height * devicePixelRatio));
+
       invokeResize();
       model.renderWindow.render();
     }
@@ -50,7 +52,9 @@ function vtkGenericRenderWindow(publicAPI, model) {
 
 
     model.container = el;
-    model.openGLRenderWindow.setContainer(model.container); // Bind to new container
+
+    model._openGLRenderWindow.setContainer(model.container); // Bind to new container
+
 
     if (model.container) {
       model.interactor.bindEvents(model.container);
@@ -58,7 +62,7 @@ function vtkGenericRenderWindow(publicAPI, model) {
   }; // Properly release GL context
 
 
-  publicAPI.delete = macro.chain(publicAPI.setContainer, model.openGLRenderWindow.delete, publicAPI.delete); // Handle size
+  publicAPI.delete = macro.chain(publicAPI.setContainer, model._openGLRenderWindow.delete, publicAPI.delete); // Handle size
 
   if (model.listenWindowResize) {
     window.addEventListener('resize', publicAPI.resize);
@@ -81,7 +85,8 @@ function extend(publicAPI, model) {
   Object.assign(model, DEFAULT_VALUES, initialValues); // Object methods
 
   macro.obj(publicAPI, model);
-  macro.get(publicAPI, model, ['renderWindow', 'renderer', 'openGLRenderWindow', 'interactor', 'container']);
+  macro.get(publicAPI, model, ['renderWindow', 'renderer', '_openGLRenderWindow', 'interactor', 'container']);
+  macro.moveToProtected(publicAPI, model, ['openGLRenderWindow']);
   macro.event(publicAPI, model, 'resize'); // Object specific methods
 
   vtkGenericRenderWindow(publicAPI, model);

package/Rendering/OpenGL/Actor.js

@@ -13,7 +13,7 @@ function vtkOpenGLActor(publicAPI, model) {
   publicAPI.buildPass = function (prepass) {
     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.addMissingNodes(model.renderable.getTextures());
@@ -40,7 +40,7 @@ function vtkOpenGLActor(publicAPI, model) {
   };
 
   publicAPI.traverseOpaqueZBufferPass = 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;
     }
 
@@ -51,7 +51,7 @@ function vtkOpenGLActor(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;
     }
 
@@ -62,7 +62,7 @@ function vtkOpenGLActor(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/Actor2D.js

@@ -16,7 +16,7 @@ function vtkOpenGLActor2D(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.addMissingNodes(model.renderable.getTextures());
@@ -54,7 +54,7 @@ function vtkOpenGLActor2D(publicAPI, model) {
 
 
   publicAPI.traverseOpaquePass = function (renderPass) {
-    if (!model.oglmapper || !model.renderable || !model.renderable.getNestedVisibility() || !model.renderable.getIsOpaque() || model.openGLRenderer.getSelector() && !model.renderable.getNestedPickable()) {
+    if (!model.oglmapper || !model.renderable || !model.renderable.getNestedVisibility() || !model.renderable.getIsOpaque() || model._openGLRenderer.getSelector() && !model.renderable.getNestedPickable()) {
       return;
     }
 
@@ -65,7 +65,7 @@ function vtkOpenGLActor2D(publicAPI, model) {
 
 
   publicAPI.traverseTranslucentPass = function (renderPass) {
-    if (!model.oglmapper || !model.renderable || !model.renderable.getNestedVisibility() || model.renderable.getIsOpaque() || model.openGLRenderer.getSelector() && !model.renderable.getNestedPickable()) {
+    if (!model.oglmapper || !model.renderable || !model.renderable.getNestedVisibility() || model.renderable.getIsOpaque() || model._openGLRenderer.getSelector() && !model.renderable.getNestedPickable()) {
       return;
     }
 
@@ -75,7 +75,7 @@ function vtkOpenGLActor2D(publicAPI, model) {
   };
 
   publicAPI.traverseOverlayPass = function (renderPass) {
-    if (!model.oglmapper || !model.renderable || !model.renderable.getNestedVisibility() || model.openGLRenderer.getSelector() && !model.renderable.getNestedPickable) {
+    if (!model.oglmapper || !model.renderable || !model.renderable.getNestedVisibility() || model._openGLRenderer.getSelector() && !model.renderable.getNestedPickable) {
       return;
     }
 

package/Rendering/OpenGL/Camera.js

@@ -12,8 +12,8 @@ function vtkOpenGLCamera(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();
     }
   }; // Renders myself
@@ -21,7 +21,8 @@ function vtkOpenGLCamera(publicAPI, model) {
 
   publicAPI.opaquePass = function (prepass) {
     if (prepass) {
-      var tsize = model.openGLRenderer.getTiledSizeAndOrigin();
+      var tsize = model._openGLRenderer.getTiledSizeAndOrigin();
+
       model.context.viewport(tsize.lowerLeftU, tsize.lowerLeftV, tsize.usize, tsize.vsize);
       model.context.scissor(tsize.lowerLeftU, tsize.lowerLeftV, tsize.usize, tsize.vsize);
     }
@@ -38,7 +39,9 @@ function vtkOpenGLCamera(publicAPI, model) {
       mat3.fromMat4(model.keyMatrices.normalMatrix, model.keyMatrices.wcvc);
       mat3.invert(model.keyMatrices.normalMatrix, model.keyMatrices.normalMatrix);
       mat4.transpose(model.keyMatrices.wcvc, model.keyMatrices.wcvc);
-      var aspectRatio = model.openGLRenderer.getAspectRatio();
+
+      var aspectRatio = model._openGLRenderer.getAspectRatio();
+
       mat4.copy(model.keyMatrices.vcpc, model.renderable.getProjectionMatrix(aspectRatio, -1, 1));
       mat4.transpose(model.keyMatrices.vcpc, model.keyMatrices.vcpc);
       mat4.multiply(model.keyMatrices.wcpc, model.keyMatrices.vcpc, model.keyMatrices.wcvc);