@kitware/vtk.js 23.4.0 → 24.0.0-beta.1

package/Rendering/OpenGL/PolyDataMapper2D.js

@@ -9,7 +9,7 @@ import { v as vtkPolyData2DVS } from './glsl/vtkPolyData2DVS.glsl.js';
 import vtkReplacementShaderMapper from './ReplacementShaderMapper.js';
 import vtkShaderProgram from './ShaderProgram.js';
 import vtkViewNode from '../SceneGraph/ViewNode.js';
-import { J as round } from '../../Common/Core/Math/index.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';
@@ -35,7 +35,7 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
     if (prepass) {
       model.openGLActor2D = publicAPI.getFirstAncestorOfType('vtkOpenGLActor2D');
       model.openGLRenderer = model.openGLActor2D.getFirstAncestorOfType('vtkOpenGLRenderer');
-      model.openGLRenderWindow = model.openGLRenderer.getParent();
+      model._openGLRenderWindow = model.openGLRenderer.getParent();
       model.openGLCamera = model.openGLRenderer.getViewNodeFor(model.openGLRenderer.getRenderable().getActiveCamera());
     }
   };
@@ -84,13 +84,13 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
   };
 
   publicAPI.render = function () {
-    var ctx = model.openGLRenderWindow.getContext();
+    var ctx = model._openGLRenderWindow.getContext();
 
     if (model.context !== ctx) {
       model.context = ctx;
 
       for (var i = primTypes.Start; i < primTypes.End; i++) {
-        model.primitives[i].setOpenGLRenderWindow(model.openGLRenderWindow);
+        model.primitives[i].setOpenGLRenderWindow(model._openGLRenderWindow);
       }
     }
 
@@ -426,7 +426,8 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
       };
       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
+      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
@@ -436,7 +437,7 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
 
       cellBO.getShaderSourceTime().modified();
     } else {
-      model.openGLRenderWindow.getShaderCache().readyShaderProgram(cellBO.getProgram());
+      model._openGLRenderWindow.getShaderCache().readyShaderProgram(cellBO.getProgram());
     }
 
     cellBO.getVAO().bind();
@@ -544,18 +545,18 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
     var shiftScaleEnabled = cellBO.getCABO().getCoordShiftAndScaleEnabled();
     var inverseShiftScaleMatrix = shiftScaleEnabled ? cellBO.getCABO().getInverseShiftAndScaleMatrix() : null; // Get the position of the actor
 
-    var view = ren.getRenderWindow().getViews()[0];
-    var size = view.getViewportSize(ren);
+    var size = model.openGLRenderer.getTiledSizeAndOrigin();
     var vport = ren.getViewport();
-    var actorPos = actor.getActualPositionCoordinate().getComputedDoubleViewportValue(ren); // Get the window info
+    var actorPos = actor.getActualPositionCoordinate().getComputedViewportValue(ren); // Get the window info
+    // const tileViewport = ren.getVTKWindow().getTileViewport();
     // Assume tile viewport is 0 1 based on vtkOpenGLRenderer
 
     var tileViewport = [0.0, 0.0, 1.0, 1.0];
-    var visVP = [0.0, 0.0, 1.0, 1.0];
+    var visVP = [0, 1, 0, 1];
     visVP[0] = vport[0] >= tileViewport[0] ? vport[0] : tileViewport[0];
     visVP[1] = vport[1] >= tileViewport[1] ? vport[1] : tileViewport[1];
-    visVP[2] = vport[2] <= tileViewport[2] ? vport[2] : tileViewport[2];
-    visVP[3] = vport[3] <= tileViewport[3] ? vport[3] : tileViewport[3];
+    visVP[2] = vport[2] >= tileViewport[2] ? vport[2] : tileViewport[2];
+    visVP[3] = vport[3] >= tileViewport[3] ? vport[3] : tileViewport[3];
 
     if (visVP[0] >= visVP[2]) {
       return;
@@ -565,16 +566,16 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
       return;
     }
 
-    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]));
+    size.usize = round(size.usize * (visVP[2] - visVP[0]) / (vport[2] - vport[0]));
+    size.vsize = round(size.vsize * (visVP[3] - visVP[1]) / (vport[3] - vport[1]));
     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
 
     var left = -xoff;
-    var right = -xoff + size[0];
+    var right = -xoff + size.usize;
     var bottom = -yoff;
-    var top = -yoff + size[1]; // it's an error to call glOrtho with
+    var top = -yoff + size.vsize; // it's an error to call glOrtho with
     // either left==right or top==bottom
 
     if (left === right) {

package/Rendering/OpenGL/Renderer.js

@@ -78,7 +78,8 @@ function vtkOpenGLRenderer(publicAPI, model) {
   };
 
   publicAPI.getAspectRatio = function () {
-    var size = model.parent.getSizeByReference();
+    var size = model._parent.getSizeByReference();
+
     var viewport = model.renderable.getViewportByReference();
     return size[0] * (viewport[2] - viewport[0]) / ((viewport[3] - viewport[1]) * size[1]);
   };
@@ -92,16 +93,19 @@ function vtkOpenGLRenderer(publicAPI, model) {
     var vpu = vport[0] - tileViewPort[0];
     var vpv = vport[1] - tileViewPort[1]; // store the result as a pixel value
 
-    var ndvp = model.parent.normalizedDisplayToDisplay(vpu, vpv);
+    var ndvp = model._parent.normalizedDisplayToDisplay(vpu, vpv);
+
     var lowerLeftU = Math.round(ndvp[0]);
     var lowerLeftV = Math.round(ndvp[1]); // find the upper right corner of the viewport, taking into account the
     // lower left boundary of this tile
 
     var vpu2 = vport[2] - tileViewPort[0];
     var vpv2 = vport[3] - tileViewPort[1];
-    var ndvp2 = model.parent.normalizedDisplayToDisplay(vpu2, vpv2); // now compute the size of the intersection of the viewport with the
+
+    var ndvp2 = model._parent.normalizedDisplayToDisplay(vpu2, vpv2); // now compute the size of the intersection of the viewport with the
     // current tile
 
+
     var usize = Math.round(ndvp2[0]) - lowerLeftU;
     var vsize = Math.round(ndvp2[1]) - lowerLeftV;
 
@@ -155,16 +159,16 @@ function vtkOpenGLRenderer(publicAPI, model) {
   };
 
   publicAPI.setOpenGLRenderWindow = function (rw) {
-    if (model.openGLRenderWindow === rw) {
+    if (model._openGLRenderWindow === rw) {
       return;
     }
 
     publicAPI.releaseGraphicsResources();
-    model.openGLRenderWindow = rw;
+    model._openGLRenderWindow = rw;
     model.context = null;
 
     if (rw) {
-      model.context = model.openGLRenderWindow.getContext();
+      model.context = model._openGLRenderWindow.getContext();
     }
   };
 } // ----------------------------------------------------------------------------
@@ -174,7 +178,7 @@ function vtkOpenGLRenderer(publicAPI, model) {
 
 var DEFAULT_VALUES = {
   context: null,
-  openGLRenderWindow: null,
+  _openGLRenderWindow: null,
   selector: null
 }; // ----------------------------------------------------------------------------
 

package/Rendering/OpenGL/ReplacementShaderMapper.js

@@ -22,7 +22,7 @@ function implementReplaceShaderCoincidentOffset(publicAPI, model) {
         }
       }
 
-      if (model.openGLRenderWindow.getWebgl2()) {
+      if (model._openGLRenderWindow.getWebgl2()) {
         if (cp.factor !== 0.0) {
           FSSource = vtkShaderProgram.substitute(FSSource, '//VTK::UniformFlow::Impl', ['float cscale = length(vec2(dFdx(gl_FragCoord.z),dFdy(gl_FragCoord.z)));', '//VTK::UniformFlow::Impl'], false).result;
           FSSource = vtkShaderProgram.substitute(FSSource, '//VTK::Depth::Impl', 'gl_FragDepth = gl_FragCoord.z + cfactor*cscale + 0.000016*coffset;').result;

package/Rendering/OpenGL/ScalarBarActor.js

@@ -12,7 +12,7 @@ function vtkOpenGLScalarBarActor(publicAPI, model) {
   publicAPI.buildPass = function (prepass) {
     if (prepass) {
       model.openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
-      model.openGLRenderWindow = model.openGLRenderer.getParent();
+      model._openGLRenderWindow = model.openGLRenderer.getParent();
 
       if (!model.scalarBarActorHelper.getRenderable()) {
         model.scalarBarActorHelper.setRenderable(model.renderable);
@@ -29,7 +29,7 @@ function vtkOpenGLScalarBarActor(publicAPI, model) {
     if (prepass) {
       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());
+      model.scalarBarActorHelper.updateAPISpecificData([tsize.usize, tsize.vsize], camera, model._openGLRenderWindow.getRenderable());
     }
   };
 } // ----------------------------------------------------------------------------

package/Rendering/OpenGL/ShaderCache.js

@@ -2,7 +2,7 @@ import Md5 from 'spark-md5';
 import macro from '../../macros.js';
 import vtkShaderProgram from './ShaderProgram.js';
 
-var SET_GET_FIELDS = ['lastShaderBound', 'context', 'openGLRenderWindow']; // ----------------------------------------------------------------------------
+var SET_GET_FIELDS = ['lastShaderBound', 'context', '_openGLRenderWindow']; // ----------------------------------------------------------------------------
 // vtkShaderCache methods
 // ----------------------------------------------------------------------------
 
@@ -22,7 +22,8 @@ function vtkShaderCache(publicAPI, model) {
       nFSSource = vtkShaderProgram.substitute(nFSSource, 'VSOut', 'GSOut').result;
     }
 
-    var gl2 = model.openGLRenderWindow.getWebgl2();
+    var gl2 = model._openGLRenderWindow.getWebgl2();
+
     var fragDepthString = '\n';
     var version = '#version 100\n';
 
@@ -165,8 +166,8 @@ function vtkShaderCache(publicAPI, model) {
 var DEFAULT_VALUES = {
   lastShaderBound: null,
   shaderPrograms: null,
-  context: null,
-  openGLRenderWindow: null
+  context: null // _openGLRenderWindow: null,
+
 }; // ----------------------------------------------------------------------------
 
 function extend(publicAPI, model) {
@@ -176,7 +177,8 @@ function extend(publicAPI, model) {
   model.shaderPrograms = {}; // Build VTK API
 
   macro.obj(publicAPI, model);
-  macro.setGet(publicAPI, model, SET_GET_FIELDS); // Object methods
+  macro.setGet(publicAPI, model, SET_GET_FIELDS);
+  macro.moveToProtected(publicAPI, model, ['openGLRenderWindow']); // Object methods
 
   vtkShaderCache(publicAPI, model);
 } // ----------------------------------------------------------------------------

package/Rendering/OpenGL/Skybox.js

@@ -18,10 +18,10 @@ function vtkOpenGLSkybox(publicAPI, model) {
   publicAPI.buildPass = function (prepass) {
     if (prepass) {
       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);
+      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());
     }
@@ -41,8 +41,10 @@ function vtkOpenGLSkybox(publicAPI, model) {
     if (prepass && !model.openGLRenderer.getSelector()) {
       publicAPI.updateBufferObjects();
       model.context.depthMask(true);
-      model.openGLRenderWindow.getShaderCache().readyShaderProgram(model.tris.getProgram());
-      model.openGLTexture.render(model.openGLRenderWindow);
+
+      model._openGLRenderWindow.getShaderCache().readyShaderProgram(model.tris.getProgram());
+
+      model.openGLTexture.render(model._openGLRenderWindow);
       var texUnit = model.openGLTexture.getTextureUnit();
       model.tris.getProgram().setUniformi('sbtexture', texUnit);
       var ren = model.openGLRenderer.getRenderable();
@@ -115,12 +117,12 @@ function vtkOpenGLSkybox(publicAPI, model) {
         // But now we're stuck with it.  From
         // https://stackoverflow.com/questions/11685608/convention-of-faces-in-opengl-cubemapping
         //
-        model.tris.setProgram(model.openGLRenderWindow.getShaderCache().readyShaderProgramArray("//VTK::System::Dec\n             attribute vec3 vertexMC;\n             uniform mat4 IMCPCMatrix;\n             varying vec3 TexCoords;\n             void main () {\n              gl_Position = vec4(vertexMC.xyz, 1.0);\n              vec4 wpos = IMCPCMatrix * gl_Position;\n              TexCoords = wpos.xyz/wpos.w;\n             }", "//VTK::System::Dec\n             //VTK::Output::Dec\n             varying vec3 TexCoords;\n             uniform samplerCube sbtexture;\n             uniform vec3 camPos;\n             void main () {\n               // skybox looks from inside out\n               // which means we have to adjust\n               // our tcoords. Otherwise text would\n               // be flipped\n               vec3 tc = normalize(TexCoords - camPos);\n               if (abs(tc.z) < max(abs(tc.x),abs(tc.y)))\n               {\n                 tc = vec3(1.0, 1.0, -1.0) * tc;\n               }\n               else\n               {\n                 tc = vec3(-1.0, 1.0, 1.0) * tc;\n               }\n               gl_FragData[0] = textureCube(sbtexture, tc);\n             }", ''));
+        model.tris.setProgram(model._openGLRenderWindow.getShaderCache().readyShaderProgramArray("//VTK::System::Dec\n             attribute vec3 vertexMC;\n             uniform mat4 IMCPCMatrix;\n             varying vec3 TexCoords;\n             void main () {\n              gl_Position = vec4(vertexMC.xyz, 1.0);\n              vec4 wpos = IMCPCMatrix * gl_Position;\n              TexCoords = wpos.xyz/wpos.w;\n             }", "//VTK::System::Dec\n             //VTK::Output::Dec\n             varying vec3 TexCoords;\n             uniform samplerCube sbtexture;\n             uniform vec3 camPos;\n             void main () {\n               // skybox looks from inside out\n               // which means we have to adjust\n               // our tcoords. Otherwise text would\n               // be flipped\n               vec3 tc = normalize(TexCoords - camPos);\n               if (abs(tc.z) < max(abs(tc.x),abs(tc.y)))\n               {\n                 tc = vec3(1.0, 1.0, -1.0) * tc;\n               }\n               else\n               {\n                 tc = vec3(-1.0, 1.0, 1.0) * tc;\n               }\n               gl_FragData[0] = textureCube(sbtexture, tc);\n             }", ''));
       }
 
       if (model.lastFormat === 'background') {
         // maps the texture to the window
-        model.tris.setProgram(model.openGLRenderWindow.getShaderCache().readyShaderProgramArray("//VTK::System::Dec\n             attribute vec3 vertexMC;\n             uniform mat4 IMCPCMatrix;\n             varying vec2 TexCoords;\n             void main () {\n              gl_Position = vec4(vertexMC.xyz, 1.0);\n              vec4 wpos = IMCPCMatrix * gl_Position;\n              TexCoords = vec2(vertexMC.x, vertexMC.y)*0.5 + 0.5;\n             }", "//VTK::System::Dec\n             //VTK::Output::Dec\n             varying vec2 TexCoords;\n             uniform sampler2D sbtexture;\n             void main () {\n               gl_FragData[0] = texture2D(sbtexture, TexCoords);\n             }", ''));
+        model.tris.setProgram(model._openGLRenderWindow.getShaderCache().readyShaderProgramArray("//VTK::System::Dec\n             attribute vec3 vertexMC;\n             uniform mat4 IMCPCMatrix;\n             varying vec2 TexCoords;\n             void main () {\n              gl_Position = vec4(vertexMC.xyz, 1.0);\n              vec4 wpos = IMCPCMatrix * gl_Position;\n              TexCoords = vec2(vertexMC.x, vertexMC.y)*0.5 + 0.5;\n             }", "//VTK::System::Dec\n             //VTK::Output::Dec\n             varying vec2 TexCoords;\n             uniform sampler2D sbtexture;\n             void main () {\n               gl_FragData[0] = texture2D(sbtexture, TexCoords);\n             }", ''));
       }
 
       model.tris.getShaderSourceTime().modified();
@@ -139,7 +141,7 @@ function vtkOpenGLSkybox(publicAPI, model) {
     }
 
     if (model.openGLTexture.getRenderable() !== tmaps[0]) {
-      model.openGLTexture.releaseGraphicsResources(model.openGLRenderWindow);
+      model.openGLTexture.releaseGraphicsResources(model._openGLRenderWindow);
       model.openGLTexture.setRenderable(tmaps[0]);
     }
   };

package/Rendering/OpenGL/SphereMapper.js

@@ -47,7 +47,7 @@ function vtkOpenGLSphereMapper(publicAPI, model) {
       fragString = 'gl_FragDepthEXT = (pos.z / pos.w + 1.0) / 2.0;\n';
     }
 
-    if (model.openGLRenderWindow.getWebgl2()) {
+    if (model._openGLRenderWindow.getWebgl2()) {
       fragString = 'gl_FragDepth = (pos.z / pos.w + 1.0) / 2.0;\n';
     }
 
@@ -157,7 +157,7 @@ function vtkOpenGLSphereMapper(publicAPI, model) {
         vbo.setColorBO(vtkBufferObject.newInstance());
       }
 
-      vbo.getColorBO().setOpenGLRenderWindow(model.openGLRenderWindow);
+      vbo.getColorBO().setOpenGLRenderWindow(model._openGLRenderWindow);
     } else if (vbo.getColorBO()) {
       vbo.setColorBO(null);
     }

package/Rendering/OpenGL/StickMapper.js

@@ -46,7 +46,7 @@ function vtkOpenGLStickMapper(publicAPI, model) {
       fragString = '  gl_FragDepthEXT = (pos.z / pos.w + 1.0) / 2.0;\n';
     }
 
-    if (model.openGLRenderWindow.getWebgl2()) {
+    if (model._openGLRenderWindow.getWebgl2()) {
       fragString = 'gl_FragDepth = (pos.z / pos.w + 1.0) / 2.0;\n';
     } // see https://www.cl.cam.ac.uk/teaching/1999/AGraphHCI/SMAG/node2.html
 
@@ -172,7 +172,7 @@ function vtkOpenGLStickMapper(publicAPI, model) {
       vbo.setColorBO(vtkBufferObject.newInstance());
     }
 
-    vbo.getColorBO().setOpenGLRenderWindow(model.openGLRenderWindow);
+    vbo.getColorBO().setOpenGLRenderWindow(model._openGLRenderWindow);
 
     if (c) {
       colorComponents = c.getNumberOfComponents();

package/Rendering/OpenGL/SurfaceLIC/LineIntegralConvolution2D/pingpong.js

@@ -95,20 +95,20 @@ function allocateVectorBuffer(openGLRenderWindow, size) {
 function vtkLICPingPongBufferManager(publicAPI, model) {
   model.classHierarchy.push('vtkLICPingPongBufferManager');
 
-  if (!model.openGLRenderWindow) {
+  if (!model._openGLRenderWindow) {
     console.error('Pass renderwindow to ping pong manager');
     return;
   } // Don't handle bind/restoring framebuffers, assume it has been done upstream
 
 
-  model.quad = getQuadPoly(model.openGLRenderWindow);
-  model.context = model.openGLRenderWindow.getContext();
-  model.licTexture0 = allocateLICBuffer(model.openGLRenderWindow, model.size);
-  model.seedTexture0 = allocateLICBuffer(model.openGLRenderWindow, model.size);
-  model.licTexture1 = allocateLICBuffer(model.openGLRenderWindow, model.size);
-  model.seedTexture1 = allocateLICBuffer(model.openGLRenderWindow, model.size);
-  model.eeTexture = model.doEEPass ? allocateNoiseBuffer(model.openGLRenderWindow, model.size) : null;
-  model.imageVectorTexture = model.doVTPass ? allocateVectorBuffer(model.openGLRenderWindow, model.size) : null;
+  model.quad = getQuadPoly(model._openGLRenderWindow);
+  model.context = model._openGLRenderWindow.getContext();
+  model.licTexture0 = allocateLICBuffer(model._openGLRenderWindow, model.size);
+  model.seedTexture0 = allocateLICBuffer(model._openGLRenderWindow, model.size);
+  model.licTexture1 = allocateLICBuffer(model._openGLRenderWindow, model.size);
+  model.seedTexture1 = allocateLICBuffer(model._openGLRenderWindow, model.size);
+  model.eeTexture = model.doEEPass ? allocateNoiseBuffer(model._openGLRenderWindow, model.size) : null;
+  model.imageVectorTexture = model.doVTPass ? allocateVectorBuffer(model._openGLRenderWindow, model.size) : null;
   model.pingTextures[0] = model.licTexture0;
   model.pingTextures[1] = model.seedTexture0;
   model.pongTextures[0] = model.licTexture1;
@@ -127,7 +127,7 @@ function vtkLICPingPongBufferManager(publicAPI, model) {
 
     if (!VAO) {
       VAO = vtkVertexArrayObject.newInstance();
-      VAO.setOpenGLRenderWindow(model.openGLRenderWindow);
+      VAO.setOpenGLRenderWindow(model._openGLRenderWindow);
       model.quadVAO = VAO;
     }
 
@@ -417,7 +417,7 @@ function vtkLICPingPongBufferManager(publicAPI, model) {
 }
 
 var DEFAULT_VALUES = {
-  openGLRenderWindow: null,
+  // _openGLRenderWindow: null,
   vectorTexture: null,
   maskVectorTexture: null,
   noiseTexture: null,
@@ -437,7 +437,8 @@ function extend(publicAPI, model) {
   Object.assign(model, DEFAULT_VALUES, initialValues);
   macro.obj(publicAPI, model);
   macro.get(publicAPI, model, ['readIndex']);
-  macro.setGet(publicAPI, model, ['doEEPass', 'doVTPass', 'openGLRenderWindow', 'vectorTexture', 'maskVectorTexture', 'noiseTexture', 'framebuffer', 'size']); // Object methods
+  macro.setGet(publicAPI, model, ['doEEPass', 'doVTPass', '_openGLRenderWindow', 'vectorTexture', 'maskVectorTexture', 'noiseTexture', 'framebuffer', 'size']);
+  macro.moveToProtected(publicAPI, model, ['openGLRenderWindow']); // Object methods
 
   vtkLICPingPongBufferManager(publicAPI, model);
 } // ----------------------------------------------------------------------------

package/Rendering/OpenGL/SurfaceLIC/LineIntegralConvolution2D.js

@@ -33,7 +33,7 @@ function vtkLineIntegralConvolution2D(publicAPI, model) {
   model.classHierarchy.push('vtkLineIntegralConvolution2D');
 
   publicAPI.buildAShader = function (fSource) {
-    return model.openGLRenderWindow.getShaderCache().readyShaderProgramArray(vtkLineIntegralConvolution2D_quadVS, fSource, '');
+    return model._openGLRenderWindow.getShaderCache().readyShaderProgramArray(vtkLineIntegralConvolution2D_quadVS, fSource, '');
   };
 
   publicAPI.dumpTextureValues = function (texture, _ref) {
@@ -42,7 +42,7 @@ function vtkLineIntegralConvolution2D(publicAPI, model) {
         height = _ref2[1];
 
     var context = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : model.context;
-    var openGLRenderWindow = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : model.openGLRenderWindow;
+    var openGLRenderWindow = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : model._openGLRenderWindow;
     var nComp = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 4;
     // To get texture values in es 2.0, we need to attach the texture to a fbo,
     // then use glReadPixels
@@ -62,7 +62,7 @@ function vtkLineIntegralConvolution2D(publicAPI, model) {
 
   publicAPI.getTextureMinMax = function (texture, size) {
     var context = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : model.context;
-    var openGLRenderWindow = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : model.openGLRenderWindow;
+    var openGLRenderWindow = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : model._openGLRenderWindow;
     var values = publicAPI.dumpTextureValues(texture, size, context, openGLRenderWindow, 4);
     var min = Number.MAX_VALUE;
     var max = Number.MIN_VALUE;
@@ -120,7 +120,7 @@ function vtkLineIntegralConvolution2D(publicAPI, model) {
   }
 
   publicAPI.executeLIC = function (size, vectorTexture, maskVectorTexture, noiseTexture, openGLRenderWindow, options) {
-    model.openGLRenderWindow = openGLRenderWindow;
+    model._openGLRenderWindow = openGLRenderWindow;
     model.context = openGLRenderWindow.getContext();
     Object.assign(model, options);
 
@@ -142,7 +142,7 @@ function vtkLineIntegralConvolution2D(publicAPI, model) {
       var _fb;
 
       fb = vtkOpenGLFramebuffer.newInstance();
-      fb.setOpenGLRenderWindow(model.openGLRenderWindow);
+      fb.setOpenGLRenderWindow(model._openGLRenderWindow);
       fb.saveCurrentBindingsAndBuffers();
 
       (_fb = fb).create.apply(_fb, _toConsumableArray(size));
@@ -182,7 +182,8 @@ function vtkLineIntegralConvolution2D(publicAPI, model) {
     var noiseBoundsPt1 = [(noiseTexture.getWidth() + 1) / size[0], (noiseTexture.getHeight() + 1) / size[1]];
     var dx = 1.0 / size[0];
     var dy = 1.0 / size[1];
-    var shaderCache = model.openGLRenderWindow.getShaderCache();
+
+    var shaderCache = model._openGLRenderWindow.getShaderCache();
 
     if (model.transformVectors) {
       var VTShaderProgram = model.VTProgram;
@@ -341,9 +342,9 @@ function vtkLineIntegralConvolution2D(publicAPI, model) {
   };
 
   publicAPI.contrastEnhance = function (isSecondStage, size) {
-    var shaderCache = model.openGLRenderWindow.getShaderCache();
+    var shaderCache = model._openGLRenderWindow.getShaderCache();
 
-    var _publicAPI$getTexture = publicAPI.getTextureMinMax(model.bufs.getLastLICBuffer(), size, model.context, model.openGLRenderWindow),
+    var _publicAPI$getTexture = publicAPI.getTextureMinMax(model.bufs.getLastLICBuffer(), size, model.context, model._openGLRenderWindow),
         min = _publicAPI$getTexture.min,
         max = _publicAPI$getTexture.max;
 
@@ -390,7 +391,8 @@ function extend(publicAPI, model) {
   var initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   Object.assign(model, DEFAULT_VALUES, initialValues);
   macro.obj(publicAPI, model);
-  macro.setGet(publicAPI, model, ['context', 'openGLRenderWindow', 'nuberOfSteps', 'stepSize', 'normalizeVectors', 'maskThreshold', 'enhancedLIC', 'enhanceContrast', 'lowLICContrastEnhancementFactor', 'highLICContrastEnhancementFactor', 'antiAlias', 'componentIds', 'isComposite']); // Object methods
+  macro.setGet(publicAPI, model, ['context', '_openGLRenderWindow', 'nuberOfSteps', 'stepSize', 'normalizeVectors', 'maskThreshold', 'enhancedLIC', 'enhanceContrast', 'lowLICContrastEnhancementFactor', 'highLICContrastEnhancementFactor', 'antiAlias', 'componentIds', 'isComposite']);
+  macro.moveToProtected(publicAPI, model, ['openGLRenderWindow']); // Object methods
 
   vtkLineIntegralConvolution2D(publicAPI, model);
 } // ----------------------------------------------------------------------------

package/Rendering/OpenGL/SurfaceLIC/SurfaceLICInterface.js

@@ -73,7 +73,7 @@ function vtkOpenGLSurfaceLICInterface(publicAPI, model) {
 
     if (!VAO) {
       VAO = vtkVertexArrayObject.newInstance();
-      VAO.setOpenGLRenderWindow(model.openGLRenderWindow);
+      VAO.setOpenGLRenderWindow(model._openGLRenderWindow);
       model.licQuadVAO = VAO;
     }
 
@@ -237,7 +237,7 @@ function vtkOpenGLSurfaceLICInterface(publicAPI, model) {
         maxLevel: 0,
         autoParameters: false
       });
-      texture.setOpenGLRenderWindow(model.openGLRenderWindow);
+      texture.setOpenGLRenderWindow(model._openGLRenderWindow);
       texture.create2DFromRaw(length, length, 4, 'Float32Array', values);
       texture.activate();
       texture.sendParameters();
@@ -247,13 +247,13 @@ function vtkOpenGLSurfaceLICInterface(publicAPI, model) {
   };
 
   publicAPI.buildAShader = function (fSource) {
-    return model.openGLRenderWindow.getShaderCache().readyShaderProgramArray(vtkLineIntegralConvolution2D_quadVS, fSource, '');
+    return model._openGLRenderWindow.getShaderCache().readyShaderProgramArray(vtkLineIntegralConvolution2D_quadVS, fSource, '');
   };
 
   publicAPI.allocateTextures = function () {
     var nearest = vtkOpenGLTexture.Filter.NEAREST;
     var linear = vtkOpenGLTexture.Filter.LINEAR;
-    var rw = model.openGLRenderWindow;
+    var rw = model._openGLRenderWindow;
 
     if (!model.geometryImage) {
       model.geometryImage = publicAPI.allocateTexture(rw, nearest);
@@ -326,7 +326,7 @@ function vtkOpenGLSurfaceLICInterface(publicAPI, model) {
       model.licHelper = null; // All buffers need rebuilding
 
       var fb = vtkOpenGLFramebuffer.newInstance();
-      fb.setOpenGLRenderWindow(model.openGLRenderWindow);
+      fb.setOpenGLRenderWindow(model._openGLRenderWindow);
       fb.saveCurrentBindingsAndBuffers();
       fb.create.apply(fb, _toConsumableArray(model.size));
       fb.populateFramebuffer();
@@ -362,7 +362,7 @@ function vtkOpenGLSurfaceLICInterface(publicAPI, model) {
     publicAPI.buildAllShaders();
 
     if (!model.licQuad) {
-      model.licQuad = getQuadPoly(model.openGLRenderWindow);
+      model.licQuad = getQuadPoly(model._openGLRenderWindow);
     }
 
     if (!model.licHelper) {
@@ -406,7 +406,9 @@ function vtkOpenGLSurfaceLICInterface(publicAPI, model) {
     }
 
     var copyPass = model.licCopyPass;
-    model.openGLRenderWindow.getShaderCache().readyShaderProgram(copyPass);
+
+    model._openGLRenderWindow.getShaderCache().readyShaderProgram(copyPass);
+
     var gl = model.context;
     gl.viewport.apply(gl, [0, 0].concat(_toConsumableArray(windowSize)));
     gl.scissor.apply(gl, [0, 0].concat(_toConsumableArray(windowSize)));
@@ -443,7 +445,9 @@ function vtkOpenGLSurfaceLICInterface(publicAPI, model) {
     }
 
     var colorPass = model.licColorPass;
-    model.openGLRenderWindow.getShaderCache().readyShaderProgram(colorPass);
+
+    model._openGLRenderWindow.getShaderCache().readyShaderProgram(colorPass);
+
     colorPass.setUniformi('texVectors', model.vectorImage.getTextureUnit());
     colorPass.setUniformi('texGeomColors', model.geometryImage.getTextureUnit());
 
@@ -490,7 +494,9 @@ function vtkOpenGLSurfaceLICInterface(publicAPI, model) {
       }
 
       var enhanceContrastPass = model.enhanceContrastPass;
-      model.openGLRenderWindow.getShaderCache().readyShaderProgram(enhanceContrastPass);
+
+      model._openGLRenderWindow.getShaderCache().readyShaderProgram(enhanceContrastPass);
+
       enhanceContrastPass.setUniformi('texGeomColors', model.geometryImage.getTextureUnit());
       enhanceContrastPass.setUniformi('texHSLColors', model.HSLColorImage.getTextureUnit());
       enhanceContrastPass.setUniformi('texLIC', model.LICImage.getTextureUnit());
@@ -509,7 +515,7 @@ function vtkOpenGLSurfaceLICInterface(publicAPI, model) {
 
   publicAPI.applyLIC = function () {
     var options = model.licInterface.get('stepSize', 'numberOfSteps', 'enhancedLIC', 'enhanceContrast', 'lowLICContrastEnhancementFactor', 'highLICContrastEnhancementFactor', 'antiAlias', 'normalizeVectors', 'maskThreshold', 'transformVectors');
-    var resultTexture = model.licHelper.executeLIC(model.size, model.vectorImage, model.maskVectorImage, model.noiseTexture, model.openGLRenderWindow, options);
+    var resultTexture = model.licHelper.executeLIC(model.size, model.vectorImage, model.maskVectorImage, model.noiseTexture, model._openGLRenderWindow, options);
 
     if (!resultTexture) {
       console.error('Failed to compute image LIC');
@@ -575,7 +581,7 @@ function vtkOpenGLSurfaceLICInterface(publicAPI, model) {
 
 var DEFAULT_VALUES = {
   context: null,
-  openGLRenderWindow: null,
+  // _openGLRenderWindow: null,
   shadersNeedBuilding: true,
   reallocateTextures: true,
   size: null,
@@ -587,7 +593,8 @@ function extend(publicAPI, model) {
 
   vtkSurfaceLICInterface.extend(publicAPI, model, initialValues);
   macro.obj(publicAPI, model);
-  macro.setGet(publicAPI, model, ['context', 'openGLRenderWindow', 'reallocateTextures', 'licInterface', 'size']); // Object methods
+  macro.setGet(publicAPI, model, ['context', '_openGLRenderWindow', 'reallocateTextures', 'licInterface', 'size']);
+  macro.moveToProtected(publicAPI, model, ['openGLRenderWindow']); // Object methods
 
   vtkOpenGLSurfaceLICInterface(publicAPI, model);
 } // ----------------------------------------------------------------------------

package/Rendering/OpenGL/SurfaceLIC/SurfaceLICMapper.js

@@ -104,7 +104,7 @@ function vtkOpenGLSurfaceLICMapper(publicAPI, model) {
   publicAPI.renderPiece = function (ren, actor) {
     var canDrawLIC = true; // Check for gl compatibility
 
-    var gl2 = model.openGLRenderWindow.getWebgl2();
+    var gl2 = model._openGLRenderWindow.getWebgl2();
 
     if (!gl2) {
       vtkErrorMacro('SurfaceLICMapper Requires WebGL 2');
@@ -171,21 +171,24 @@ function vtkOpenGLSurfaceLICMapper(publicAPI, model) {
     var frontfaceCulling = actor.getProperty().getFrontfaceCulling();
 
     if (!backfaceCulling && !frontfaceCulling) {
-      model.openGLRenderWindow.disableCullFace();
+      model._openGLRenderWindow.disableCullFace();
     } else if (frontfaceCulling) {
-      model.openGLRenderWindow.enableCullFace();
+      model._openGLRenderWindow.enableCullFace();
+
       gl.cullFace(gl.FRONT);
     } else {
-      model.openGLRenderWindow.enableCullFace();
+      model._openGLRenderWindow.enableCullFace();
+
       gl.cullFace(gl.BACK);
     }
 
-    var windowSize = model.openGLRenderWindow.getSize();
+    var windowSize = model._openGLRenderWindow.getSize();
+
     var size = windowSize.map(function (i) {
       return Math.round(i * licInterface.getViewPortScale());
     });
     model.openGLLicInterface.setSize(size);
-    model.openGLLicInterface.setOpenGLRenderWindow(model.openGLRenderWindow);
+    model.openGLLicInterface.setOpenGLRenderWindow(model._openGLRenderWindow);
     model.openGLLicInterface.setContext(model.context); // Pre-render
 
     publicAPI.pushState(model.context);