@kitware/vtk.js 24.0.1 → 24.1.0

package/Rendering/OpenGL/PolyDataMapper2D.js

@@ -2,7 +2,6 @@ import { mat4 } from 'gl-matrix';
 import { newInstance as newInstance$1, setGet, obj, vtkErrorMacro as vtkErrorMacro$1 } from '../../macros.js';
 import vtkHelper from './Helper.js';
 import vtkMapper2D from '../Core/Mapper2D.js';
-import vtkOpenGLPolyDataMapper from './PolyDataMapper.js';
 import vtkPoints from '../../Common/Core/Points.js';
 import { v as vtkPolyData2DFS } from './glsl/vtkPolyData2DFS.glsl.js';
 import { v as vtkPolyData2DVS } from './glsl/vtkPolyData2DVS.glsl.js';
@@ -10,12 +9,11 @@ import vtkReplacementShaderMapper from './ReplacementShaderMapper.js';
 import vtkShaderProgram from './ShaderProgram.js';
 import vtkViewNode from '../SceneGraph/ViewNode.js';
 import { K as round } from '../../Common/Core/Math/index.js';
-import { Representation } from '../Core/Property/Constants.js';
 import { DisplayLocation } from '../Core/Property2D/Constants.js';
 import { registerOverride } from './ViewNodeFactory.js';
 
 // import { mat3, mat4, vec3 } from 'gl-matrix';
-var primTypes = vtkOpenGLPolyDataMapper.primTypes;
+var primTypes = vtkHelper.primTypes;
 var ScalarMode = vtkMapper2D.ScalarMode;
 var vtkErrorMacro = vtkErrorMacro$1;
 var StartEvent = {
@@ -146,7 +144,7 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
     // property modified (representation interpolation and lighting)
     // input modified
     // light complexity changed
-    if (cellBO.getProgram() === 0 || cellBO.getShaderSourceTime().getMTime() < publicAPI.getMTime() || cellBO.getShaderSourceTime().getMTime() < actor.getMTime() || cellBO.getShaderSourceTime().getMTime() < model.renderable.getMTime() || cellBO.getShaderSourceTime().getMTime() < model.currentInput.getMTime()) {
+    if (cellBO.getShaderSourceTime().getMTime() < model.renderable.getMTime() || cellBO.getShaderSourceTime().getMTime() < model.currentInput.getMTime()) {
       return true;
     }
 
@@ -172,18 +170,6 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
     return false;
   };
 
-  publicAPI.getOpenGLMode = function (rep, type) {
-    if (rep === Representation.POINTS || type === primTypes.Points) {
-      return model.context.POINTS;
-    }
-
-    if (rep === Representation.WIREFRAME || type === primTypes.Lines || type === primTypes.TrisEdges || type === primTypes.TriStripsEdges) {
-      return model.context.LINES;
-    }
-
-    return model.context.TRIANGLES;
-  };
-
   publicAPI.buildBufferObjects = function (ren, actor) {
     var poly = model.currentInput;
 
@@ -252,9 +238,7 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
 
   publicAPI.renderPieceDraw = function (ren, actor) {
     var representation = actor.getProperty().getRepresentation();
-    var drawSurfaceWithEdges = false;
     var gl = model.context;
-    gl.lineWidth(actor.getProperty().getLineWidth());
     gl.depthMask(true); // for every primitive type
 
     for (var i = primTypes.Start; i < primTypes.End; i++) {
@@ -262,27 +246,15 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
       var cabo = model.primitives[i].getCABO();
 
       if (cabo.getElementCount()) {
-        // are we drawing edges
-        model.drawingEdges = drawSurfaceWithEdges ;
-        var mode = publicAPI.getOpenGLMode(representation, i);
-
-        if (!model.drawingEdges || !model.renderDepth) {
-          publicAPI.updateShaders(model.primitives[i], ren, actor);
-          gl.drawArrays(mode, 0, cabo.getElementCount());
-        }
-
-        var stride = (mode === gl.POINTS ? 1 : 0) || (mode === gl.LINES ? 2 : 3);
-        model.primitiveIDOffset += cabo.getElementCount() / stride;
+        model.lastBoundBO = model.primitives[i];
+        model.primitiveIDOffset += model.primitives[i].drawArrays(ren, actor, representation, publicAPI);
       }
-    } // reset the line width
-
-
-    gl.lineWidth(1);
+    }
   };
 
   publicAPI.renderPieceFinish = function (ren, actor) {
-    if (model.LastBoundBO) {
-      model.LastBoundBO.getVAO().release();
+    if (model.lastBoundBO) {
+      model.lastBoundBO.getVAO().release();
     }
   };
 
@@ -402,48 +374,11 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
   };
 
   publicAPI.replaceShaderPositionVC = function (shaders, ren, actor) {
-    var VSSource = shaders.Vertex;
-    var GSSource = shaders.Geometry;
-    var FSSource = shaders.Fragment; // for points make sure to add in the point size
-
-    if (actor.getProperty().getRepresentation() === Representation.POINTS || model.lastBoundBO.getPrimitiveType() === primTypes.Points) {
-      VSSource = vtkShaderProgram.substitute(VSSource, '//VTK::PositionVC::Impl', ['//VTK::PositionVC::Impl', "  gl_PointSize = ".concat(actor.getProperty().getPointSize(), ".0;")], false).result;
-    }
-
-    shaders.Vertex = VSSource;
-    shaders.Geometry = GSSource;
-    shaders.Fragment = FSSource;
+    // replace common shader code
+    model.lastBoundBO.replaceShaderPositionVC(shaders, ren, actor);
   };
 
-  publicAPI.updateShaders = function (cellBO, ren, actor) {
-    model.lastBoundBO = cellBO; // has something changed that would require us to recreate the shader?
-
-    if (publicAPI.getNeedToRebuildShaders(cellBO, ren, actor)) {
-      var shaders = {
-        Vertex: null,
-        Fragment: null,
-        Geometry: null
-      };
-      publicAPI.buildShaders(shaders, ren, actor); // compile and bind the program if needed
-
-      var newShader = model._openGLRenderWindow.getShaderCache().readyShaderProgramArray(shaders.Vertex, shaders.Fragment, shaders.Geometry); // if the shader changed reinitialize the VAO
-
-
-      if (newShader !== cellBO.getProgram()) {
-        cellBO.setProgram(newShader); // reset the VAO as the shader has changed
-
-        cellBO.getVAO().releaseGraphicsResources();
-      }
-
-      cellBO.getShaderSourceTime().modified();
-    } else {
-      model._openGLRenderWindow.getShaderCache().readyShaderProgram(cellBO.getProgram());
-    }
-
-    cellBO.getVAO().bind();
-    publicAPI.setMapperShaderParameters(cellBO, ren, actor);
-    publicAPI.setPropertyShaderParameters(cellBO, ren, actor);
-    publicAPI.setCameraShaderParameters(cellBO, ren, actor);
+  publicAPI.invokeShaderCallbacks = function (cellBO, ren, actor) {
     var listCallbacks = model.renderable.getViewSpecificProperties().ShadersCallbacks;
 
     if (listCallbacks) {
@@ -501,15 +436,7 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
       } // handle wide lines
 
 
-      if (publicAPI.haveWideLines(ren, actor)) {
-        var gl = model.context;
-        var vp = gl.getParameter(gl.VIEWPORT);
-        var lineWidth = [1, 1];
-        lineWidth[0] = 2.0 * actor.getProperty().getLineWidth() / vp[2];
-        lineWidth[1] = 2.0 * actor.getProperty().getLineWidth() / vp[3];
-        cellBO.getProgram().setUniform2f('lineWidthNVC', lineWidth);
-      }
-
+      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);
@@ -529,6 +456,9 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
     }
   };
 
+  publicAPI.setLightingShaderParameters = function (cellBO, ren, actor) {// no-op
+  };
+
   function safeMatrixMultiply(matrixArray, matrixType, tmpMat) {
     matrixType.identity(tmpMat);
     return matrixArray.reduce(function (res, matrix, index) {
@@ -598,20 +528,6 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
     mat4.transpose(tmpMat4, tmpMat4);
     program.setUniformMatrix('WCVCMatrix', safeMatrixMultiply([tmpMat4, inverseShiftScaleMatrix], mat4, model.tmpMat4));
   };
-
-  publicAPI.haveWideLines = function (ren, actor) {
-    if (model.lastBoundBO === model.lines && actor.getProperty().getLineWidth() > 1.0) {
-      // we have wide lines, but the OpenGL implementation may
-      // actually support them, check the range to see if we
-      // really need have to implement our own wide lines
-      // vtkOpenGLRenderWindow* renWin = vtkOpenGLRenderWindow::SafeDownCast(ren->GetVTKWindow());
-      // return !(
-      //   renWin && renWin->GetMaximumHardwareLineWidth() >= actor->GetProperty()->GetLineWidth());
-      return true;
-    }
-
-    return false;
-  };
 } // ----------------------------------------------------------------------------
 // Object factory
 // ----------------------------------------------------------------------------

package/Rendering/OpenGL/RenderWindow.js

@@ -737,6 +737,12 @@ function vtkOpenGLRenderWindow(publicAPI, model) {
     });
   };
 
+  publicAPI.getHardwareMaximumLineWidth = function () {
+    var gl = publicAPI.get3DContext();
+    var lineWidthRange = gl.getParameter(gl.ALIASED_LINE_WIDTH_RANGE);
+    return lineWidthRange[1];
+  };
+
   publicAPI.getGLInformations = function () {
     var gl = publicAPI.get3DContext();
     var glTextureFloat = gl.getExtension('OES_texture_float');

package/Rendering/OpenGL/Renderer.js

@@ -1,4 +1,4 @@
-import { newInstance as newInstance$1, get, setGet, vtkDebugMacro as vtkDebugMacro$1 } from '../../macros.js';
+import { newInstance as newInstance$1, get, setGet, moveToProtected, vtkDebugMacro as vtkDebugMacro$1 } from '../../macros.js';
 import vtkViewNode from '../SceneGraph/ViewNode.js';
 import { registerOverride } from './ViewNodeFactory.js';
 
@@ -178,7 +178,7 @@ function vtkOpenGLRenderer(publicAPI, model) {
 
 var DEFAULT_VALUES = {
   context: null,
-  _openGLRenderWindow: null,
+  // _openGLRenderWindow: null,
   selector: null
 }; // ----------------------------------------------------------------------------
 
@@ -189,7 +189,8 @@ function extend(publicAPI, model) {
   vtkViewNode.extend(publicAPI, model, initialValues); // Build VTK API
 
   get(publicAPI, model, ['shaderCache']);
-  setGet(publicAPI, model, ['selector']); // Object methods
+  setGet(publicAPI, model, ['selector']);
+  moveToProtected(publicAPI, model, ['openGLRenderWindow']); // Object methods
 
   vtkOpenGLRenderer(publicAPI, model);
 } // ----------------------------------------------------------------------------

package/Widgets/SVG/SVGLandmarkRepresentation.js

@@ -16,6 +16,11 @@ function vtkSVGLandmarkRepresentation(publicAPI, model) {
 
   publicAPI.render = function () {
     var list = publicAPI.getRepresentationStates();
+
+    if (!list.length) {
+      return createSvgElement('g');
+    }
+
     var coords = [];
     var texts = [];
     list.forEach(function (state, index) {
@@ -58,6 +63,8 @@ function vtkSVGLandmarkRepresentation(publicAPI, model) {
         var splitText = texts[i].split('\n');
         var fontSize = fontSizeToPixels(model.fontProperties);
         splitText.forEach(function (subText, j) {
+          var _model$textProps, _model$textProps2;
+
           var text = publicAPI.createListenableSvgElement('text', i);
           Object.keys(model.textProps || {}).forEach(function (prop) {
             text.setAttribute(prop, model.textProps[prop]);
@@ -65,9 +72,9 @@ function vtkSVGLandmarkRepresentation(publicAPI, model) {
           text.setAttribute('x', x);
           text.setAttribute('y', y); // Vertical offset (dy) calculation based on VerticalTextAlignment
 
-          var dy = model.textProps.dy ? model.textProps.dy : 0;
+          var dy = ((_model$textProps = model.textProps) === null || _model$textProps === void 0 ? void 0 : _model$textProps.dy) || 0;
 
-          switch (model.textProps.verticalAlign) {
+          switch ((_model$textProps2 = model.textProps) === null || _model$textProps2 === void 0 ? void 0 : _model$textProps2.verticalAlign) {
             case VerticalTextAlignment.MIDDLE:
               dy -= fontSize * (0.5 * splitText.length - j - 1);
               break;

package/Widgets/Widgets3D/AngleWidget/behavior.js

@@ -42,7 +42,8 @@ function widgetBehavior(publicAPI, model) {
       newHandle.setScale1(moveHandle.getScale1());
     } else {
       isDragging = true;
-      model.apiSpecificRenderWindow.setCursor('grabbing');
+
+      model._apiSpecificRenderWindow.setCursor('grabbing');
 
       model._interactor.requestAnimation(publicAPI);
     }
@@ -57,8 +58,8 @@ function widgetBehavior(publicAPI, model) {
   publicAPI.handleMouseMove = function (callData) {
     if (model.pickable && model.dragable && model.manipulator && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
       model.manipulator.setOrigin(model.activeState.getOrigin());
-      model.manipulator.setNormal(model.camera.getDirectionOfProjection());
-      var worldCoords = model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+      model.manipulator.setNormal(model._camera.getDirectionOfProjection());
+      var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
       if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || isDragging)) {
         model.activeState.setOrigin(worldCoords);
@@ -68,7 +69,7 @@ function widgetBehavior(publicAPI, model) {
     }
 
     if (model.hasFocus) {
-      model.widgetManager.disablePicking();
+      model._widgetManager.disablePicking();
     }
 
     return macro.VOID;
@@ -79,7 +80,8 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.handleLeftButtonRelease = function () {
     if (isDragging && model.pickable) {
-      model.apiSpecificRenderWindow.setCursor('pointer');
+      model._apiSpecificRenderWindow.setCursor('pointer');
+
       model.widgetState.deactivate();
 
       model._interactor.cancelAnimation(publicAPI);
@@ -91,7 +93,8 @@ function widgetBehavior(publicAPI, model) {
 
     if (model.hasFocus && !model.activeState || model.activeState && !model.activeState.getActive()) {
       publicAPI.invokeEndInteractionEvent();
-      model.widgetManager.enablePicking();
+
+      model._widgetManager.enablePicking();
 
       model._interactor.render();
     } // Don't make any more points
@@ -134,7 +137,8 @@ function widgetBehavior(publicAPI, model) {
     model.widgetState.getMoveHandle().setVisible(false);
     model.activeState = null;
     model.hasFocus = false;
-    model.widgetManager.enablePicking();
+
+    model._widgetManager.enablePicking();
 
     model._interactor.render();
   };

package/Widgets/Widgets3D/DistanceWidget/behavior.js

@@ -36,7 +36,8 @@ function widgetBehavior(publicAPI, model) {
       newHandle.setScale1(moveHandle.getScale1());
     } else {
       isDragging = true;
-      model.apiSpecificRenderWindow.setCursor('grabbing');
+
+      model._apiSpecificRenderWindow.setCursor('grabbing');
 
       model._interactor.requestAnimation(publicAPI);
     }
@@ -55,7 +56,7 @@ function widgetBehavior(publicAPI, model) {
     }
 
     if (model.pickable && model.dragable && model.manipulator && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
-      var worldCoords = model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+      var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
       if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || isDragging)) {
         model.activeState.setOrigin(worldCoords);
@@ -72,7 +73,8 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.handleLeftButtonRelease = function () {
     if (isDragging && model.pickable) {
-      model.apiSpecificRenderWindow.setCursor('pointer');
+      model._apiSpecificRenderWindow.setCursor('pointer');
+
       model.widgetState.deactivate();
 
       model._interactor.cancelAnimation(publicAPI);
@@ -84,7 +86,8 @@ function widgetBehavior(publicAPI, model) {
 
     if (model.hasFocus && !model.activeState || model.activeState && !model.activeState.getActive()) {
       publicAPI.invokeEndInteractionEvent();
-      model.widgetManager.enablePicking();
+
+      model._widgetManager.enablePicking();
 
       model._interactor.render();
     }
@@ -122,7 +125,8 @@ function widgetBehavior(publicAPI, model) {
     model.widgetState.getMoveHandle().setVisible(false);
     model.activeState = null;
     model.hasFocus = false;
-    model.widgetManager.enablePicking();
+
+    model._widgetManager.enablePicking();
 
     model._interactor.render();
   };

package/Widgets/Widgets3D/ImageCroppingWidget/behavior.js

@@ -55,8 +55,8 @@ function widgetBehavior(publicAPI, model) {
 
         if (type === 'corners') {
           // manipulator should be a plane manipulator
-          manipulator.setNormal(model.camera.getDirectionOfProjection());
-          worldCoords = manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+          manipulator.setNormal(model._camera.getDirectionOfProjection());
+          worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
         }
 
         if (type === 'faces') {
@@ -69,7 +69,7 @@ function widgetBehavior(publicAPI, model) {
 
           manipulator.setOrigin(transformVec3(center, indexToWorldT));
           manipulator.setNormal(rotateVec3(constraintAxis, indexToWorldT));
-          worldCoords = manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+          worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
         }
 
         if (type === 'edges') {
@@ -78,7 +78,7 @@ function widgetBehavior(publicAPI, model) {
             return a === 1 ? a : 0;
           });
           manipulator.setNormal(rotateVec3(edgeAxis, indexToWorldT));
-          worldCoords = manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+          worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
         }
 
         if (worldCoords.length) {
@@ -111,7 +111,7 @@ function widgetBehavior(publicAPI, model) {
   // --------------------------------------------------------------------------
 
 
-  model.camera = model.renderer.getActiveCamera();
+  model._camera = model._renderer.getActiveCamera();
   model.classHierarchy.push('vtkImageCroppingWidgetProp');
 }
 

package/Widgets/Widgets3D/ImplicitPlaneWidget.js

@@ -21,19 +21,23 @@ function widgetBehavior(publicAPI, model) {
   publicAPI.updateCursor = function () {
     switch (model.activeState.getUpdateMethodName()) {
       case 'updateFromOrigin':
-        model.apiSpecificRenderWindow.setCursor('crosshair');
+        model._apiSpecificRenderWindow.setCursor('crosshair');
+
         break;
 
       case 'updateFromPlane':
-        model.apiSpecificRenderWindow.setCursor('move');
+        model._apiSpecificRenderWindow.setCursor('move');
+
         break;
 
       case 'updateFromNormal':
-        model.apiSpecificRenderWindow.setCursor('alias');
+        model._apiSpecificRenderWindow.setCursor('alias');
+
         break;
 
       default:
-        model.apiSpecificRenderWindow.setCursor('grabbing');
+        model._apiSpecificRenderWindow.setCursor('grabbing');
+
         break;
     }
   };
@@ -88,7 +92,7 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.updateFromOrigin = function (callData) {
     model.planeManipulator.setNormal(model.widgetState.getNormal());
-    var worldCoords = model.planeManipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+    var worldCoords = model.planeManipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
     if (model.widgetState.containsPoint(worldCoords)) {
       model.activeState.setOrigin(worldCoords);
@@ -101,7 +105,7 @@ function widgetBehavior(publicAPI, model) {
 
     // Move origin along normal axis
     model.lineManipulator.setNormal(model.activeState.getNormal());
-    var worldCoords = model.lineManipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+    var worldCoords = model.lineManipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
     if ((_model$widgetState = model.widgetState).containsPoint.apply(_model$widgetState, _toConsumableArray(worldCoords))) {
       model.activeState.setOrigin(worldCoords);
@@ -111,7 +115,7 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.updateFromNormal = function (callData) {
     model.trackballManipulator.setNormal(model.activeState.getNormal());
-    var newNormal = model.trackballManipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+    var newNormal = model.trackballManipulator.handleEvent(callData, model._apiSpecificRenderWindow);
     model.activeState.setNormal(newNormal);
   }; // --------------------------------------------------------------------------
   // initialization

package/Widgets/Widgets3D/LabelWidget/behavior.js

@@ -15,7 +15,8 @@ function widgetBehavior(publicAPI, model) {
     model.representations[1].setCircleProps(_objectSpread(_objectSpread({}, model.representations[1].getCircleProps()), {}, {
       visible: !text
     }));
-    model.interactor.render();
+
+    model._interactor.render();
   };
 
   publicAPI.getText = function () {
@@ -51,8 +52,10 @@ function widgetBehavior(publicAPI, model) {
       publicAPI.loseFocus();
     } else {
       model.isDragging = true;
-      model.apiSpecificRenderWindow.setCursor('grabbing');
-      model.interactor.requestAnimation(publicAPI);
+
+      model._apiSpecificRenderWindow.setCursor('grabbing');
+
+      model._interactor.requestAnimation(publicAPI);
     }
 
     publicAPI.invokeStartInteractionEvent();
@@ -64,9 +67,12 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.handleLeftButtonRelease = function () {
     if (model.isDragging && model.pickable) {
-      model.apiSpecificRenderWindow.setCursor('pointer');
+      model._apiSpecificRenderWindow.setCursor('pointer');
+
       model.widgetState.deactivate();
-      model.interactor.cancelAnimation(publicAPI);
+
+      model._interactor.cancelAnimation(publicAPI);
+
       publicAPI.invokeEndInteractionEvent();
     } else if (model.activeState !== model.widgetState.getMoveHandle()) {
       model.widgetState.deactivate();
@@ -74,8 +80,10 @@ function widgetBehavior(publicAPI, model) {
 
     if (model.hasFocus && !model.activeState || model.activeState && !model.activeState.getActive()) {
       publicAPI.invokeEndInteractionEvent();
-      model.widgetManager.enablePicking();
-      model.interactor.render();
+
+      model._widgetManager.enablePicking();
+
+      model._interactor.render();
     }
 
     model.isDragging = false;
@@ -86,7 +94,7 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.handleMouseMove = function (callData) {
     if (model.pickable && model.dragable && model.manipulator && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
-      var worldCoords = model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+      var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
       if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || model.isDragging)) {
         model.activeState.setOrigin(worldCoords);
@@ -113,7 +121,9 @@ function widgetBehavior(publicAPI, model) {
       publicAPI.reset();
       model.activeState = model.widgetState.getMoveHandle();
       model.widgetState.getMoveHandle().activate();
-      model.interactor.requestAnimation(publicAPI);
+
+      model._interactor.requestAnimation(publicAPI);
+
       publicAPI.invokeStartInteractionEvent();
     }
 
@@ -122,7 +132,8 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.loseFocus = function () {
     if (model.hasFocus) {
-      model.interactor.cancelAnimation(publicAPI);
+      model._interactor.cancelAnimation(publicAPI);
+
       publicAPI.invokeEndInteractionEvent();
     }
 
@@ -130,8 +141,10 @@ function widgetBehavior(publicAPI, model) {
     model.widgetState.getMoveHandle().deactivate();
     model.activeState = null;
     model.hasFocus = false;
-    model.widgetManager.enablePicking();
-    model.interactor.render();
+
+    model._widgetManager.enablePicking();
+
+    model._interactor.render();
   };
 }
 

package/Widgets/Widgets3D/LineWidget/behavior.js

@@ -36,8 +36,9 @@ function widgetBehavior(publicAPI, model) {
 
   function updateCursor(callData) {
     model.isDragging = true;
-    model.previousPosition = _toConsumableArray(model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow));
-    model.apiSpecificRenderWindow.setCursor('grabbing');
+    model.previousPosition = _toConsumableArray(model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow));
+
+    model._apiSpecificRenderWindow.setCursor('grabbing');
 
     model._interactor.requestAnimation(publicAPI);
   } // --------------------------------------------------------------------------
@@ -101,8 +102,8 @@ function widgetBehavior(publicAPI, model) {
 
 
   function computeMousePosition(p1, callData) {
-    var displayMousePos = publicAPI.computeWorldToDisplay.apply(publicAPI, [model.renderer].concat(_toConsumableArray(p1)));
-    var worldMousePos = publicAPI.computeDisplayToWorld(model.renderer, callData.position.x, callData.position.y, displayMousePos[2]);
+    var displayMousePos = publicAPI.computeWorldToDisplay.apply(publicAPI, [model._renderer].concat(_toConsumableArray(p1)));
+    var worldMousePos = publicAPI.computeDisplayToWorld(model._renderer, callData.position.x, callData.position.y, displayMousePos[2]);
     return worldMousePos;
   }
   /**
@@ -137,8 +138,8 @@ function widgetBehavior(publicAPI, model) {
   };
 
   publicAPI.rotateHandlesToFaceCamera = function () {
-    model.representations[0].setViewMatrix(Array.from(model.camera.getViewMatrix()));
-    model.representations[1].setViewMatrix(Array.from(model.camera.getViewMatrix()));
+    model.representations[0].setViewMatrix(Array.from(model._camera.getViewMatrix()));
+    model.representations[1].setViewMatrix(Array.from(model._camera.getViewMatrix()));
   }; // Handles visibility ---------------------------------------------------------
 
 
@@ -227,7 +228,7 @@ function widgetBehavior(publicAPI, model) {
     }
 
     if (model.pickable && model.dragable && model.manipulator && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
-      var worldCoords = model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+      var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
       var translation = model.previousPosition ? subtract(worldCoords, model.previousPosition, []) : [0, 0, 0];
       model.previousPosition = worldCoords;
 
@@ -269,10 +270,12 @@ function widgetBehavior(publicAPI, model) {
         model._interactor.cancelAnimation(publicAPI);
       }
 
-      model.apiSpecificRenderWindow.setCursor('pointer');
+      model._apiSpecificRenderWindow.setCursor('pointer');
+
       model.hasFocus = false;
       publicAPI.invokeEndInteractionEvent();
-      model.widgetManager.enablePicking();
+
+      model._widgetManager.enablePicking();
 
       model._interactor.render();
     }
@@ -314,7 +317,8 @@ function widgetBehavior(publicAPI, model) {
     model.widgetState.getMoveHandle().deactivate();
     model.activeState = null;
     model.hasFocus = false;
-    model.widgetManager.enablePicking();
+
+    model._widgetManager.enablePicking();
 
     model._interactor.render();
   };

package/Widgets/Widgets3D/PaintWidget/behavior.js

@@ -35,8 +35,10 @@ function widgetBehavior(publicAPI, model) {
     if (model.manipulator && model.activeState && model.activeState.getActive()) {
       var _model$activeState, _model$activeState2, _model$activeState3;
 
-      var normal = model.camera.getDirectionOfProjection();
-      var up = model.camera.getViewUp();
+      var normal = model._camera.getDirectionOfProjection();
+
+      var up = model._camera.getViewUp();
+
       var right = [];
       vec3.cross(right, up, normal);
 
@@ -47,7 +49,7 @@ function widgetBehavior(publicAPI, model) {
       (_model$activeState3 = model.activeState).setDirection.apply(_model$activeState3, _toConsumableArray(normal));
 
       model.manipulator.setNormal(normal);
-      var worldCoords = model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+      var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
       if (worldCoords.length) {
         var _model$widgetState, _model$activeState4;
@@ -76,7 +78,7 @@ function widgetBehavior(publicAPI, model) {
 
       model._interactor.requestAnimation(publicAPI);
 
-      var canvas = model.apiSpecificRenderWindow.getCanvas();
+      var canvas = model._apiSpecificRenderWindow.getCanvas();
 
       canvas.onmouseenter = function () {
         if (model.hasFocus && model.activeState === model.widgetState.getHandle()) {