@kitware/vtk.js 26.0.0-beta.4 → 26.0.0-beta.5

package/BREAKING_CHANGES.md

@@ -4,6 +4,7 @@
 Instead, a `vtkSphereHandleRepresentation` is used for `rotation` and `center` handles,
 and a `vtkLineHandleRepresenttion` is used for the axes. `rotateLineInView()` now
 takes an axis name (string, e.g. 'XinY') instead of a substate.
+- SVGRepresentation and SVG widget support has been fully removed.
 
 ## From 24.x to 25
 

package/Interaction/Manipulators/MouseBoxSelectorManipulator.js

@@ -129,8 +129,13 @@ function vtkMouseBoxSelectionManipulator(publicAPI, model) {
 
 
   publicAPI.onButtonUp = function (interactor, renderer) {
-    if (!previousPosition || !currentPosition) {
+    if (!previousPosition || !currentPosition && !model.boxChangeOnClick) {
       return;
+    } // needed because of boxChangeOnClick
+
+
+    if (!currentPosition) {
+      currentPosition = previousPosition;
     }
 
     publicAPI.invokeBoxSelectChange({
@@ -158,6 +163,7 @@ function vtkMouseBoxSelectionManipulator(publicAPI, model) {
 function DEFAULT_VALUES(initialValues) {
   return _objectSpread(_objectSpread({
     // container: null,
+    boxChangeOnClick: false,
     renderSelection: true
   }, initialValues), {}, {
     selectionStyle: _objectSpread(_objectSpread({}, DEFAULT_STYLE), initialValues.selectionStyle)
@@ -175,7 +181,7 @@ function extend(publicAPI, model) {
 
   event(publicAPI, model, 'BoxSelectInput'); // Trigger while dragging
 
-  setGet(publicAPI, model, ['renderSelection', 'selectionStyle', 'container']); // Object specific methods
+  setGet(publicAPI, model, ['renderSelection', 'boxChangeOnClick', 'selectionStyle', 'container']); // Object specific methods
 
   vtkMouseBoxSelectionManipulator(publicAPI, model);
 } // ----------------------------------------------------------------------------

package/Interaction/UI/Icons/Logo.svg.js

@@ -1,3 +1,3 @@
-var svgLogo = "<svg viewBox=\"0 0 196 196\" xmlns=\"http://www.w3.org/2000/svg\"><g fill=\"none\" fill-rule=\"evenodd\"><path d=\"M67.77 157.024a86.095 86.095 0 01-2.3 9.306c-.977 3.206-2.44 6.116-4.392 8.73-1.952 2.614-4.531 4.758-7.738 6.43-3.206 1.674-7.284 2.51-12.233 2.51-6.343 0-11.501-1.55-15.474-4.653-3.974-3.102-6.518-7.301-7.633-12.599l16.102-5.228c.279 1.882 1.01 3.485 2.196 4.81 1.185 1.324 2.753 1.986 4.705 1.986 3.067 0 5.262-1.08 6.587-3.24 1.324-2.162 2.265-4.88 2.823-8.156l8.574-48.933h17.565l-8.783 49.037zm58.029-31.053c-1.394-1.883-3.137-3.311-5.228-4.287-2.091-.976-4.426-1.464-7.005-1.464-1.185 0-2.44.157-3.764.47a10.815 10.815 0 00-3.608 1.569 9.806 9.806 0 00-2.718 2.77c-.732 1.116-1.098 2.475-1.098 4.078 0 2.091.819 3.747 2.457 4.967 1.638 1.22 3.921 2.352 6.849 3.398 3.206 1.115 6.064 2.352 8.573 3.712 2.51 1.359 4.636 2.91 6.378 4.652 1.743 1.743 3.067 3.712 3.974 5.908.906 2.196 1.359 4.688 1.359 7.476 0 4.461-.924 8.26-2.77 11.397-1.848 3.136-4.236 5.698-7.163 7.685-2.928 1.986-6.204 3.433-9.829 4.339-3.624.906-7.214 1.359-10.769 1.359-2.649 0-5.298-.244-7.946-.732a42.608 42.608 0 01-7.633-2.143 31.681 31.681 0 01-6.796-3.608c-2.092-1.463-3.869-3.136-5.333-5.018l12.86-10.456c1.465 2.23 3.625 4.043 6.483 5.437 2.858 1.394 5.751 2.091 8.679 2.091 1.533 0 3.014-.157 4.443-.47 1.43-.314 2.701-.837 3.817-1.569a8.267 8.267 0 002.666-2.823c.662-1.15.993-2.527.993-4.13 0-2.579-1.045-4.618-3.136-6.117-2.092-1.498-4.88-2.84-8.365-4.025a58.492 58.492 0 01-6.849-2.823c-2.126-1.046-3.973-2.335-5.541-3.869-1.569-1.533-2.823-3.363-3.764-5.489-.941-2.126-1.412-4.688-1.412-7.685 0-3.764.784-7.162 2.353-10.194a23.324 23.324 0 016.43-7.738c2.719-2.126 5.89-3.764 9.515-4.914 3.624-1.15 7.493-1.725 11.606-1.725 2.16 0 4.356.21 6.587.627a35.853 35.853 0 016.43 1.83 28.502 28.502 0 015.699 2.98c1.742 1.185 3.206 2.544 4.39 4.078L125.8 125.97z\" fill=\"#8A8B8A\"/><rect fill=\"#1C4678\" transform=\"rotate(45 169.749 159.749)\" x=\"152.249\" y=\"142.249\" width=\"35\" height=\"35\" rx=\"17.5\"/><path fill=\"#1C4678\" d=\"M7.775 11l20.483 86.069h22.53l34.24-71.408H63.841L42.91 70.03 28.259 11zM88.663 25.344h50.476l-8.093 16.562-17.246-.049-9.652 54.62H85.609l9.572-54.535H80.99zM141.366 25.344l16.072.066-4.414 24.987h2.388l16.856-25.053h20.975l-22.442 33.403 13.203 54.063h-20.94l-10.652-44.43h-2.296l-5.125 28.135h-21.024l9.763-55.043z\"/><path fill=\"#8A8B8A\" d=\"M3 11h3.182l20.864 85.944h-3.187zM58.102 25.344h2.788L43.747 61.155l-.955-3.866zM88.608 44.469h2.883l-9.157 52.096H79.4zM126.785 44.469h2.924l-9.186 52.046H117.6zM166.38 25.344h3.594l-12.582 18.854 1.316-7.545zM150.902 74.75l8.917 37.613h-3.311l-7.075-29.073z\"/></g></svg>";
+var svgLogo = "<svg viewBox=\"0 0 196 196\" xmlns=\"http://www.w3.org/2000/svg\"><g fill=\"none\" fill-rule=\"evenodd\"><path d=\"M67.77 157.024a86.095 86.095 0 0 1-2.3 9.306c-.977 3.206-2.44 6.116-4.392 8.73-1.952 2.614-4.531 4.758-7.738 6.43-3.206 1.674-7.284 2.51-12.233 2.51-6.343 0-11.501-1.55-15.474-4.653-3.974-3.102-6.518-7.301-7.633-12.599l16.102-5.228c.279 1.882 1.01 3.485 2.196 4.81 1.185 1.324 2.753 1.986 4.705 1.986 3.067 0 5.262-1.08 6.587-3.24 1.324-2.162 2.265-4.88 2.823-8.156l8.574-48.933h17.565l-8.783 49.037Zm58.029-31.053c-1.394-1.883-3.137-3.311-5.228-4.287-2.091-.976-4.426-1.464-7.005-1.464-1.185 0-2.44.157-3.764.47a10.815 10.815 0 0 0-3.608 1.569 9.806 9.806 0 0 0-2.718 2.77c-.732 1.116-1.098 2.475-1.098 4.078 0 2.091.819 3.747 2.457 4.967 1.638 1.22 3.921 2.352 6.849 3.398 3.206 1.115 6.064 2.352 8.573 3.712 2.51 1.359 4.636 2.91 6.378 4.652 1.743 1.743 3.067 3.712 3.974 5.908.906 2.196 1.359 4.688 1.359 7.476 0 4.461-.924 8.26-2.77 11.397-1.848 3.136-4.236 5.698-7.163 7.685-2.928 1.986-6.204 3.433-9.829 4.339-3.624.906-7.214 1.359-10.769 1.359-2.649 0-5.298-.244-7.946-.732a42.608 42.608 0 0 1-7.633-2.143 31.681 31.681 0 0 1-6.796-3.608c-2.092-1.463-3.869-3.136-5.333-5.018l12.86-10.456c1.465 2.23 3.625 4.043 6.483 5.437 2.858 1.394 5.751 2.091 8.679 2.091 1.533 0 3.014-.157 4.443-.47 1.43-.314 2.701-.837 3.817-1.569a8.267 8.267 0 0 0 2.666-2.823c.662-1.15.993-2.527.993-4.13 0-2.579-1.045-4.618-3.136-6.117-2.092-1.498-4.88-2.84-8.365-4.025a58.492 58.492 0 0 1-6.849-2.823c-2.126-1.046-3.973-2.335-5.541-3.869-1.569-1.533-2.823-3.363-3.764-5.489-.941-2.126-1.412-4.688-1.412-7.685 0-3.764.784-7.162 2.353-10.194a23.324 23.324 0 0 1 6.43-7.738c2.719-2.126 5.89-3.764 9.515-4.914 3.624-1.15 7.493-1.725 11.606-1.725 2.16 0 4.356.21 6.587.627a35.853 35.853 0 0 1 6.43 1.83 28.502 28.502 0 0 1 5.699 2.98c1.742 1.185 3.206 2.544 4.39 4.078L125.8 125.97Z\" fill=\"#8A8B8A\"/><rect fill=\"#1C4678\" transform=\"rotate(45 169.749 159.749)\" x=\"152.249\" y=\"142.249\" width=\"35\" height=\"35\" rx=\"17.5\"/><path fill=\"#1C4678\" d=\"m7.775 11 20.483 86.069h22.53l34.24-71.408H63.841L42.91 70.03 28.259 11zM88.663 25.344h50.476l-8.093 16.562-17.246-.049-9.652 54.62H85.609l9.572-54.535H80.99zM141.366 25.344l16.072.066-4.414 24.987h2.388l16.856-25.053h20.975l-22.442 33.403 13.203 54.063h-20.94l-10.652-44.43h-2.296l-5.125 28.135h-21.024l9.763-55.043z\"/><path fill=\"#8A8B8A\" d=\"M3 11h3.182l20.864 85.944h-3.187zM58.102 25.344h2.788L43.747 61.155l-.955-3.866zM88.608 44.469h2.883l-9.157 52.096H79.4zM126.785 44.469h2.924l-9.186 52.046H117.6zM166.38 25.344h3.594l-12.582 18.854 1.316-7.545zM150.902 74.75l8.917 37.613h-3.311l-7.075-29.073z\"/></g></svg>";
 
 export { svgLogo as s };

package/Interaction/UI/Icons/Tint.svg.js

@@ -1,3 +1,3 @@
-var Tint = "<svg viewBox=\"0 0 180 180\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M90 24c20 29.485 45 58.5 45 86s-17.5 46.485-45 46.485S45 137.5 45 110s25-56.515 45-86z\" stroke=\"#000\" stroke-width=\"10\" fill=\"#000\" fill-rule=\"evenodd\"/></svg>";
+var Tint = "<svg viewBox=\"0 0 180 180\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M90 24c20 29.485 45 58.5 45 86s-17.5 46.485-45 46.485S45 137.5 45 110s25-56.515 45-86Z\" stroke=\"#000\" stroke-width=\"10\" fill=\"#000\" fill-rule=\"evenodd\"/></svg>";
 
 export { Tint as T };

package/Interaction/Widgets/OrientationMarkerWidget.js

@@ -173,6 +173,8 @@ function vtkOrientationMarkerWidget(publicAPI, model) {
       publicAPI.updateMarkerOrientation();
       model.enabled = true;
     } else {
+      var _model$_interactor, _model$_interactor$fi;
+
       if (!model.enabled) {
         return;
       }
@@ -190,7 +192,7 @@ function vtkOrientationMarkerWidget(publicAPI, model) {
       model.actor.setVisibility(false);
       selfRenderer.removeViewProp(model.actor);
 
-      var _renderWindow = model._interactor.findPokedRenderer().getRenderWindow();
+      var _renderWindow = (_model$_interactor = model._interactor) === null || _model$_interactor === void 0 ? void 0 : (_model$_interactor$fi = _model$_interactor.findPokedRenderer()) === null || _model$_interactor$fi === void 0 ? void 0 : _model$_interactor$fi.getRenderWindow();
 
       if (_renderWindow) {
         _renderWindow.removeRenderer(selfRenderer);

package/Rendering/Core/RenderWindowInteractor.d.ts

@@ -1,4 +1,5 @@
 import { vtkObject, vtkSubscription } from './../../interfaces';
+import { Nullable } from './../../types';
 import vtkRenderer from './Renderer';
 import { Axis, Device, Input } from './RenderWindowInteractor/Constants';
 
@@ -1152,7 +1153,7 @@ export interface vtkRenderWindowInteractor extends vtkObject {
 	 * @param {Number} x 
 	 * @param {Number} y 
 	 */
-	findPokedRenderer(x: number, y: number): vtkRenderer;
+	findPokedRenderer(x: number, y: number): Nullable<vtkRenderer>;
 
 	/**
 	 * only render if we are not animating. If we are animating

package/Rendering/Core/RenderWindowInteractor.js

@@ -779,7 +779,7 @@ function vtkRenderWindowInteractor(publicAPI, model) {
 
     var rc = (_model$_view2 = model._view) === null || _model$_view2 === void 0 ? void 0 : (_model$_view2$getRend = _model$_view2.getRenderable()) === null || _model$_view2$getRend === void 0 ? void 0 : _model$_view2$getRend.getRenderers();
 
-    if (!rc) {
+    if (!rc || rc.length === 0) {
       return null;
     }
 

package/Rendering/Core/SphereMapper.d.ts

@@ -16,6 +16,11 @@ export interface vtkSphereMapper extends vtkMapper {
 	 */
 	getScaleArray(): any;
 
+	/**
+	 * 
+	 */
+	getScaleFactor(): number;
+
 	/**
 	 * 
 	 * @param {Number} radius 
@@ -27,6 +32,13 @@ export interface vtkSphereMapper extends vtkMapper {
 	 * @param scaleArray 
 	 */
 	setScaleArray(scaleArray: any): boolean;
+
+/**
+	 * Factor multiplied with scale array elements. Radius is used when no scale array is given.
+	 * @param scaleFactor number to multiply with when a scale array is provided. 1 by default.
+	 * @see getScaleFactor(), setScaleArray(), setRadius()
+	 */ 
+	setScaleFactor(scaleFactor: number): boolean;
 }
 
 /**

package/Rendering/Core/SphereMapper.js

@@ -14,7 +14,8 @@ function vtkSphereMapper(publicAPI, model) {
 
 var DEFAULT_VALUES = {
   scaleArray: null,
-  radius: 0.05
+  radius: 0.05,
+  scaleFactor: 1.0
 }; // ----------------------------------------------------------------------------
 
 function extend(publicAPI, model) {
@@ -22,7 +23,7 @@ function extend(publicAPI, model) {
   Object.assign(model, DEFAULT_VALUES, initialValues); // Inheritance
 
   vtkMapper.extend(publicAPI, model, initialValues);
-  macro.setGet(publicAPI, model, ['radius', 'scaleArray']); // Object methods
+  macro.setGet(publicAPI, model, ['radius', 'scaleArray', 'scaleFactor']); // Object methods
 
   vtkSphereMapper(publicAPI, model);
 } // ----------------------------------------------------------------------------

package/Rendering/OpenGL/ImageMapper.js

@@ -101,7 +101,8 @@ function vtkOpenGLImageMapper(publicAPI, model) {
   };
 
   publicAPI.buildShaders = function (shaders, ren, actor) {
-    publicAPI.getShaderTemplate(shaders, ren, actor); // apply any renderPassReplacements
+    publicAPI.getShaderTemplate(shaders, ren, actor);
+    model.lastRenderPassShaderReplacement = model.currentRenderPass ? model.currentRenderPass.getShaderReplacement() : null; // apply any renderPassReplacements
 
     if (model.lastRenderPassShaderReplacement) {
       model.lastRenderPassShaderReplacement(shaders);
@@ -254,18 +255,13 @@ function vtkOpenGLImageMapper(publicAPI, model) {
     // property modified (representation interpolation and lighting)
     // input modified
     // light complexity changed
+    // render pass shader replacement changed
     var tNumComp = model.openGLTexture.getComponents();
     var iComp = actor.getProperty().getIndependentComponents(); // has the render pass shader replacement changed? Two options
 
     var needRebuild = false;
 
-    if (!model.currentRenderPass && model.lastRenderPassShaderReplacement) {
-      needRebuild = true;
-      model.lastRenderPassShaderReplacement = null;
-    }
-
-    if (model.currentRenderPass && model.currentRenderPass.getShaderReplacement() !== model.lastRenderPassShaderReplacement) {
-      model.lastRenderPassShaderReplacement = model.currentRenderPass.getShaderReplacement();
+    if (!model.currentRenderPass && model.lastRenderPassShaderReplacement || model.currentRenderPass && model.currentRenderPass.getShaderReplacement() !== model.lastRenderPassShaderReplacement) {
       needRebuild = true;
     }
 
@@ -568,6 +564,7 @@ function vtkOpenGLImageMapper(publicAPI, model) {
       model.pwfTexture.setMagnificationFilter(Filter.LINEAR);
     }
 
+    var dataType = imgScalars.getDataType();
     var numComp = imgScalars.getNumberOfComponents();
     var iComps = actorProperty.getIndependentComponents();
     var numIComps = iComps ? numComp : 1;
@@ -702,7 +699,7 @@ function vtkOpenGLImageMapper(publicAPI, model) {
       var dims = image.getDimensions();
 
       if (iType === InterpolationType.NEAREST) {
-        if (numComp === 4) {
+        if (new Set([1, 3, 4]).has(numComp) && dataType === VtkDataTypes.UNSIGNED_CHAR && !iComps) {
           model.openGLTexture.setGenerateMipmap(true);
           model.openGLTexture.setMinificationFilter(Filter.NEAREST);
         } else {
@@ -711,7 +708,7 @@ function vtkOpenGLImageMapper(publicAPI, model) {
 
         model.openGLTexture.setMagnificationFilter(Filter.NEAREST);
       } else {
-        if (numComp === 4) {
+        if (numComp === 4 && dataType === VtkDataTypes.UNSIGNED_CHAR && !iComps) {
           model.openGLTexture.setGenerateMipmap(true);
           model.openGLTexture.setMinificationFilter(Filter.LINEAR_MIPMAP_LINEAR);
         } else {

package/Rendering/OpenGL/PolyDataMapper.js

@@ -106,7 +106,8 @@ function vtkOpenGLPolyDataMapper(publicAPI, model) {
   };
 
   publicAPI.buildShaders = function (shaders, ren, actor) {
-    publicAPI.getShaderTemplate(shaders, ren, actor); // apply any renderPassReplacements
+    publicAPI.getShaderTemplate(shaders, ren, actor);
+    model.lastRenderPassShaderReplacement = model.currentRenderPass ? model.currentRenderPass.getShaderReplacement() : null; // apply any renderPassReplacements
 
     if (model.lastRenderPassShaderReplacement) {
       model.lastRenderPassShaderReplacement(shaders);
@@ -651,19 +652,14 @@ function vtkOpenGLPolyDataMapper(publicAPI, model) {
     } // has the render pass shader replacement changed? Two options
 
 
-    if (!model.currentRenderPass && model.lastRenderPassShaderReplacement) {
-      needRebuild = true;
-      model.lastRenderPassShaderReplacement = null;
-    }
-
-    if (model.currentRenderPass && model.currentRenderPass.getShaderReplacement() !== model.lastRenderPassShaderReplacement) {
-      model.lastRenderPassShaderReplacement = model.currentRenderPass.getShaderReplacement();
+    if (!model.currentRenderPass && model.lastRenderPassShaderReplacement || model.currentRenderPass && model.currentRenderPass.getShaderReplacement() !== model.lastRenderPassShaderReplacement) {
       needRebuild = true;
     } // has something changed that would require us to recreate the shader?
     // candidates are
     // property modified (representation interpolation and lighting)
     // input modified
     // light complexity changed
+    // render pass shader replacement changed
 
 
     if (model.lastHaveSeenDepthRequest !== model.haveSeenDepthRequest || cellBO.getShaderSourceTime().getMTime() < model.renderable.getMTime() || cellBO.getShaderSourceTime().getMTime() < model.currentInput.getMTime() || cellBO.getShaderSourceTime().getMTime() < model.selectionStateChanged.getMTime() || needRebuild) {

package/Rendering/OpenGL/RenderWindow/ContextProxy.js

@@ -1,3 +1,5 @@
+// This is used to access the underlying 3D context
+var GET_UNDERLYING_CONTEXT = '__getUnderlyingContext';
 function createContextProxyHandler() {
   var cache = new Map();
   var getParameterHandler = {
@@ -41,6 +43,9 @@ function createContextProxyHandler() {
 
   return {
     get: function get(gl, prop, receiver) {
+      if (prop === GET_UNDERLYING_CONTEXT) return function () {
+        return gl;
+      };
       var value = Reflect.get(gl, prop, gl);
 
       if (value instanceof Function) {
@@ -62,4 +67,4 @@ var ContextProxy = {
   createContextProxyHandler: createContextProxyHandler
 };
 
-export { createContextProxyHandler, ContextProxy as default };
+export { GET_UNDERLYING_CONTEXT, createContextProxyHandler, ContextProxy as default };

package/Rendering/OpenGL/RenderWindow.d.ts

@@ -270,7 +270,7 @@ export interface vtkOpenGLRenderWindow extends vtkOpenGLRenderWindowBase {
 	 * @param {Number} numComps 
 	 * @param {Boolean} useFloat 
 	 */
-	getDefaultTextureInternalFormat(vtktype: VtkDataTypes, numComps: number, useFloat: boolean): void;
+	getDefaultTextureInternalFormat(vtktype: VtkDataTypes, numComps: number, oglNorm16Ext?: unknown): void;
 
 	/**
 	 * 

package/Rendering/OpenGL/RenderWindow.js

@@ -12,7 +12,7 @@ import vtkTextureUnitManager from './TextureUnitManager.js';
 import vtkViewNodeFactory from './ViewNodeFactory.js';
 import vtkRenderPass from '../SceneGraph/RenderPass.js';
 import vtkRenderWindowViewNode from '../SceneGraph/RenderWindowViewNode.js';
-import { createContextProxyHandler } from './RenderWindow/ContextProxy.js';
+import { createContextProxyHandler, GET_UNDERLYING_CONTEXT } from './RenderWindow/ContextProxy.js';
 
 var vtkDebugMacro = macro.vtkDebugMacro,
     vtkErrorMacro = macro.vtkErrorMacro;
@@ -310,7 +310,8 @@ function vtkOpenGLRenderWindow(publicAPI, model) {
               return gl.makeXRCompatible();
 
             case 6:
-              glLayer = new global.XRWebGLLayer(model.xrSession, gl);
+              glLayer = new global.XRWebGLLayer(model.xrSession, // constructor needs unproxied context
+              gl[GET_UNDERLYING_CONTEXT]());
               publicAPI.setSize(glLayer.framebufferWidth, glLayer.framebufferHeight);
               model.xrSession.updateRenderState({
                 baseLayer: glLayer
@@ -535,7 +536,9 @@ function vtkOpenGLRenderWindow(publicAPI, model) {
     return -1;
   };
 
-  publicAPI.getDefaultTextureInternalFormat = function (vtktype, numComps, useFloat) {
+  publicAPI.getDefaultTextureInternalFormat = function (vtktype, numComps) {
+    var oglNorm16Ext = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+
     if (model.webgl2) {
       switch (vtktype) {
         case VtkDataTypes.UNSIGNED_CHAR:
@@ -554,6 +557,40 @@ function vtkOpenGLRenderWindow(publicAPI, model) {
               return model.context.RGBA8;
           }
 
+        case oglNorm16Ext && VtkDataTypes.UNSIGNED_SHORT:
+          switch (numComps) {
+            case 1:
+              return oglNorm16Ext.R16_EXT;
+
+            case 2:
+              return oglNorm16Ext.RG16_EXT;
+
+            case 3:
+              return oglNorm16Ext.RGB16_EXT;
+
+            case 4:
+            default:
+              return oglNorm16Ext.RGBA16_EXT;
+          }
+
+        // prioritize norm16 over float
+
+        case oglNorm16Ext && VtkDataTypes.SHORT:
+          switch (numComps) {
+            case 1:
+              return oglNorm16Ext.R16_SNORM_EXT;
+
+            case 2:
+              return oglNorm16Ext.RG16_SNORM_EXT;
+
+            case 3:
+              return oglNorm16Ext.RGB16_SNORM_EXT;
+
+            case 4:
+            default:
+              return oglNorm16Ext.RGBA16_SNORM_EXT;
+          }
+
         case VtkDataTypes.FLOAT:
         default:
           switch (numComps) {

package/Rendering/OpenGL/SphereMapper.js

@@ -88,6 +88,18 @@ function vtkOpenGLSphereMapper(publicAPI, model) {
       cellBO.getProgram().setUniformf('invertedDepth', model.invert ? -1.0 : 1.0);
     }
 
+    if (cellBO.getProgram().isUniformUsed('scaleFactor')) {
+      // apply scaling factor only if a scale array has been provided.
+      var poly = model.currentInput;
+      var pointData = poly.getPointData();
+
+      if (model.renderable.getScaleArray() != null && pointData.hasArray(model.renderable.getScaleArray())) {
+        cellBO.getProgram().setUniformf('scaleFactor', model.renderable.getScaleFactor());
+      } else {
+        cellBO.getProgram().setUniformf('scaleFactor', 1.0);
+      }
+    }
+
     superClass.setMapperShaderParameters(cellBO, ren, actor);
   };
 

package/Rendering/OpenGL/Texture.js

@@ -20,8 +20,6 @@ var vtkDebugMacro = vtkDebugMacro$1,
 // ----------------------------------------------------------------------------
 
 function vtkOpenGLTexture(publicAPI, model) {
-  var _this = this;
-
   // Set our className
   model.classHierarchy.push('vtkOpenGLTexture'); // Renders myself
 
@@ -313,14 +311,11 @@ function vtkOpenGLTexture(publicAPI, model) {
   publicAPI.getDefaultInternalFormat = function (vtktype, numComps) {
     var result = 0; // try default next
 
-    result = model._openGLRenderWindow.getDefaultTextureInternalFormat(vtktype, numComps, false);
+    result = model._openGLRenderWindow.getDefaultTextureInternalFormat(vtktype, numComps, model.oglNorm16Ext);
 
     if (result) {
       return result;
-    } // try floating point
-
-
-    result = _this._openGLRenderWindow.getDefaultTextureInternalFormat(vtktype, numComps, true);
+    }
 
     if (!result) {
       vtkDebugMacro('Unsupported internal texture type!');
@@ -396,8 +391,6 @@ function vtkOpenGLTexture(publicAPI, model) {
 
 
   publicAPI.getDefaultDataType = function (vtkScalarType) {
-    var useHalfFloatType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
     // DON'T DEAL with VTK_CHAR as this is platform dependent.
     if (model._openGLRenderWindow.getWebgl2()) {
       switch (vtkScalarType) {
@@ -405,11 +398,20 @@ function vtkOpenGLTexture(publicAPI, model) {
         //   return model.context.BYTE;
         case VtkDataTypes.UNSIGNED_CHAR:
           return model.context.UNSIGNED_BYTE;
+        // prefer norm16 since that is accurate compared to
+        // half float which is not
+
+        case model.oglNorm16Ext && VtkDataTypes.SHORT:
+          return model.context.SHORT;
 
-        case useHalfFloatType && VtkDataTypes.SHORT:
+        case model.oglNorm16Ext && VtkDataTypes.UNSIGNED_SHORT:
+          return model.context.UNSIGNED_SHORT;
+        // use half float type
+
+        case model.useHalfFloat && VtkDataTypes.SHORT:
           return model.context.HALF_FLOAT;
 
-        case useHalfFloatType && VtkDataTypes.UNSIGNED_SHORT:
+        case model.useHalfFloat && VtkDataTypes.UNSIGNED_SHORT:
           return model.context.HALF_FLOAT;
         // case VtkDataTypes.INT:
         //   return model.context.INT;
@@ -459,10 +461,10 @@ function vtkOpenGLTexture(publicAPI, model) {
 
 
   publicAPI.getOpenGLDataType = function (vtkScalarType) {
-    var useHalfFloatType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var forceUpdate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
 
-    if (!model.openGLDataType) {
-      model.openGLDataType = publicAPI.getDefaultDataType(vtkScalarType, useHalfFloatType);
+    if (!model.openGLDataType || forceUpdate) {
+      model.openGLDataType = publicAPI.getDefaultDataType(vtkScalarType);
     }
 
     return model.openGLDataType;
@@ -1000,8 +1002,7 @@ function vtkOpenGLTexture(publicAPI, model) {
   }
 
   function checkUseHalfFloat(dataType, offset, scale, preferSizeOverAccuracy) {
-    var useHalfFloatType = true;
-    publicAPI.getOpenGLDataType(dataType, useHalfFloatType);
+    publicAPI.getOpenGLDataType(dataType);
     var useHalfFloat = false;
 
     if (model._openGLRenderWindow.getWebgl2()) {
@@ -1027,8 +1028,7 @@ function vtkOpenGLTexture(publicAPI, model) {
 
   publicAPI.create3DFromRaw = function (width, height, depth, numComps, dataType, data) {
     // Permit OpenGLDataType to be half float, if applicable, for 3D
-    var useHalfFloatType = true;
-    publicAPI.getOpenGLDataType(dataType, useHalfFloatType); // Now determine the texture parameters using the arguments.
+    publicAPI.getOpenGLDataType(dataType); // Now determine the texture parameters using the arguments.
 
     publicAPI.getInternalFormat(dataType, numComps);
     publicAPI.getFormat(dataType, numComps);
@@ -1056,6 +1056,7 @@ function vtkOpenGLTexture(publicAPI, model) {
     var scaledData = scaleTextureToHighestPowerOfTwo(pixData); // Source texture data from the PBO.
     // model.context.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, true);
     // model.context.pixelStorei(model.context.UNPACK_ALIGNMENT, 1);
+    // openGLDataType
 
     model.context.texImage3D(model.target, 0, model.internalFormat, model.width, model.height, model.depth, 0, model.format, model.openGLDataType, scaledData[0]);
 
@@ -1100,17 +1101,40 @@ function vtkOpenGLTexture(publicAPI, model) {
         computedScale = _computeScaleOffsets.scale;
 
     model.volumeInfo.dataComputedScale = computedScale;
-    model.volumeInfo.dataComputedOffset = computedOffset;
-    var useHalfFloat = checkUseHalfFloat(dataType, computedOffset, computedScale, preferSizeOverAccuracy); // WebGL2 path, we have 3d textures etc
+    model.volumeInfo.dataComputedOffset = computedOffset; // if we can use norm16, there is no need to use halfFloat then
+
+    model.useHalfFloat = model.oglNorm16Ext ? false : checkUseHalfFloat(dataType, computedOffset, computedScale, preferSizeOverAccuracy); // since our default is to use half float, in case that we can't use it
+    // we need to use another type
+
+    if (!model.useHalfFloat) {
+      publicAPI.getOpenGLDataType(dataType, true);
+    } // WebGL2 path, we have 3d textures etc
+
 
     if (model._openGLRenderWindow.getWebgl2()) {
-      if (dataType === VtkDataTypes.FLOAT || useHalfFloat && (dataType === VtkDataTypes.SHORT || dataType === VtkDataTypes.UNSIGNED_SHORT)) {
+      if (dataType === VtkDataTypes.FLOAT || model.useHalfFloat && (dataType === VtkDataTypes.SHORT || dataType === VtkDataTypes.UNSIGNED_SHORT)) {
         return publicAPI.create3DFromRaw(width, height, depth, numComps, dataType, data);
       }
 
-      if (dataType === VtkDataTypes.UNSIGNED_CHAR) {
+      if (model.oglNorm16Ext && dataType === VtkDataTypes.SHORT) {
         for (var _c3 = 0; _c3 < numComps; ++_c3) {
-          model.volumeInfo.scale[_c3] = 255.0;
+          model.volumeInfo.scale[_c3] = 32767.0;
+        }
+
+        return publicAPI.create3DFromRaw(width, height, depth, numComps, dataType, data);
+      }
+
+      if (model.oglNorm16Ext && dataType === VtkDataTypes.UNSIGNED_SHORT) {
+        for (var _c4 = 0; _c4 < numComps; ++_c4) {
+          model.volumeInfo.scale[_c4] = 65535.0;
+        }
+
+        return publicAPI.create3DFromRaw(width, height, depth, numComps, dataType, data);
+      }
+
+      if (dataType === VtkDataTypes.UNSIGNED_CHAR) {
+        for (var _c5 = 0; _c5 < numComps; ++_c5) {
+          model.volumeInfo.scale[_c5] = 255.0;
         }
 
         return publicAPI.create3DFromRaw(width, height, depth, numComps, dataType, data);
@@ -1149,9 +1173,9 @@ function vtkOpenGLTexture(publicAPI, model) {
     var dataTypeToUse = VtkDataTypes.UNSIGNED_CHAR; // unsigned char gets used as is
 
     if (dataType === VtkDataTypes.UNSIGNED_CHAR) {
-      for (var _c4 = 0; _c4 < numComps; ++_c4) {
-        res.offset[_c4] = 0.0;
-        res.scale[_c4] = 255.0;
+      for (var _c6 = 0; _c6 < numComps; ++_c6) {
+        res.offset[_c6] = 0.0;
+        res.scale[_c6] = 255.0;
       }
     } else if (model.context.getExtension('OES_texture_float') && model.context.getExtension('OES_texture_float_linear')) {
       // use float textures scaled to 0.0 to 1.0
@@ -1326,7 +1350,13 @@ var DEFAULT_VALUES = {
   maxLOD: 1000.0,
   baseLevel: 0,
   maxLevel: 1000,
-  generateMipmap: false
+  generateMipmap: false,
+  // use half float by default, but it will get set
+  // to false if the context does not support it or
+  // the voxel intensity range is out of the accurate
+  // range of half float
+  useHalfFloat: true,
+  oglNorm16Ext: null
 }; // ----------------------------------------------------------------------------
 
 function extend(publicAPI, model) {
@@ -1344,7 +1374,7 @@ function extend(publicAPI, model) {
   }); // Build VTK API
 
   set(publicAPI, model, ['format', 'openGLDataType']);
-  setGet(publicAPI, model, ['keyMatrixTime', 'minificationFilter', 'magnificationFilter', 'wrapS', 'wrapT', 'wrapR', 'generateMipmap']);
+  setGet(publicAPI, model, ['keyMatrixTime', 'minificationFilter', 'magnificationFilter', 'wrapS', 'wrapT', 'wrapR', 'generateMipmap', 'oglNorm16Ext']);
   get(publicAPI, model, ['width', 'height', 'volumeInfo', 'components', 'handle', 'target']);
   moveToProtected(publicAPI, model, ['openGLRenderWindow']); // Object methods
 

package/Rendering/OpenGL/VolumeMapper.js

@@ -180,7 +180,7 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
 
     if (model.zBufferTexture !== null) {
       FSSource = vtkShaderProgram.substitute(FSSource, '//VTK::ZBuffer::Dec', ['uniform sampler2D zBufferTexture;', 'uniform float vpWidth;', 'uniform float vpHeight;']).result;
-      FSSource = vtkShaderProgram.substitute(FSSource, '//VTK::ZBuffer::Impl', ['vec4 depthVec = texture2D(zBufferTexture, vec2(gl_FragCoord.x / vpWidth, gl_FragCoord.y/vpHeight));', 'float zdepth = (depthVec.r*256.0 + depthVec.g)/257.0;', 'zdepth = zdepth * 2.0 - 1.0;', 'zdepth = -2.0 * camFar * camNear / (zdepth*(camFar-camNear)-(camFar+camNear)) - camNear;', 'zdepth = -zdepth/rayDir.z;', 'dists.y = min(zdepth,dists.y);']).result;
+      FSSource = vtkShaderProgram.substitute(FSSource, '//VTK::ZBuffer::Impl', ['vec4 depthVec = texture2D(zBufferTexture, vec2(gl_FragCoord.x / vpWidth, gl_FragCoord.y/vpHeight));', 'float zdepth = (depthVec.r*256.0 + depthVec.g)/257.0;', 'zdepth = zdepth * 2.0 - 1.0;', 'if (cameraParallel == 0) {', 'zdepth = -2.0 * camFar * camNear / (zdepth*(camFar-camNear)-(camFar+camNear)) - camNear;}', 'else {', 'zdepth = (zdepth + 1.0) * 0.5 * (camFar - camNear);}\n', 'zdepth = -zdepth/rayDir.z;', 'dists.y = min(zdepth,dists.y);']).result;
     } // Set the BlendMode approach
 
 
@@ -673,8 +673,10 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
       program.setUniformf("oscale".concat(_i3), oscale);
       var cfun = vprop.getRGBTransferFunction(target);
       var cRange = cfun.getRange();
-      program.setUniformf("cshift".concat(_i3), (volInfo.offset[_i3] - cRange[0]) / (cRange[1] - cRange[0]));
-      program.setUniformf("cscale".concat(_i3), sscale / (cRange[1] - cRange[0]));
+      var cshift = (volInfo.offset[_i3] - cRange[0]) / (cRange[1] - cRange[0]);
+      var cScale = sscale / (cRange[1] - cRange[0]);
+      program.setUniformf("cshift".concat(_i3), cshift);
+      program.setUniformf("cscale".concat(_i3), cScale);
     }
 
     if (model.gopacity) {
@@ -1096,7 +1098,9 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
 
     if (model.scalarTextureString !== toString) {
       // Build the textures
-      var dims = image.getDimensions();
+      var dims = image.getDimensions(); // Use norm16 for scalar texture if the extension is available
+
+      model.scalarTexture.setOglNorm16Ext(model.context.getExtension('EXT_texture_norm16'));
       model.scalarTexture.releaseGraphicsResources(model._openGLRenderWindow);
       model.scalarTexture.resetFormatAndType();
       model.scalarTexture.create3DFilterableFromRaw(dims[0], dims[1], dims[2], numComp, scalars.getDataType(), scalars.getData(), model.renderable.getPreferSizeOverAccuracy());

package/Rendering/OpenGL/glsl/vtkSphereMapperVS.glsl.js

@@ -1,3 +1,3 @@
-var vtkSphereMapperVS = "//VTK::System::Dec\n\n/*=========================================================================\n\n  Program:   Visualization Toolkit\n  Module:    vtkSphereMapperVS.glsl\n\n  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen\n  All rights reserved.\n  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.\n\n     This software is distributed WITHOUT ANY WARRANTY; without even\n     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\n     PURPOSE.  See the above copyright notice for more information.\n\n=========================================================================*/\n// this shader implements imposters in OpenGL for Spheres\n\nattribute vec4 vertexMC;\nattribute vec2 offsetMC;\n\n// optional normal declaration\n//VTK::Normal::Dec\n\n// Texture coordinates\n//VTK::TCoord::Dec\n\nuniform mat3 normalMatrix; // transform model coordinate directions to view coordinates\n\n// material property values\n//VTK::Color::Dec\n\n// clipping plane vars\n//VTK::Clip::Dec\n\n// camera and actor matrix values\n//VTK::Camera::Dec\n\nvarying vec4 vertexVCVSOutput;\nvarying float radiusVCVSOutput;\nvarying vec3 centerVCVSOutput;\n\nuniform int cameraParallel;\n\nvoid main()\n{\n  //VTK::Color::Impl\n\n  //VTK::Normal::Impl\n\n  //VTK::TCoord::Impl\n\n  //VTK::Clip::Impl\n\n  // compute the projected vertex position\n  vertexVCVSOutput = MCVCMatrix * vertexMC;\n  centerVCVSOutput = vertexVCVSOutput.xyz;\n  radiusVCVSOutput = length(offsetMC)*0.5;\n\n  // make the triangle face the camera\n  if (cameraParallel == 0)\n    {\n    vec3 dir = normalize(-vertexVCVSOutput.xyz);\n    vec3 base2 = normalize(cross(dir,vec3(1.0,0.0,0.0)));\n    vec3 base1 = cross(base2,dir);\n    vertexVCVSOutput.xyz = vertexVCVSOutput.xyz + offsetMC.x*base1 + offsetMC.y*base2;\n    }\n  else\n    {\n    // add in the offset\n    vertexVCVSOutput.xy = vertexVCVSOutput.xy + offsetMC;\n    }\n\n  gl_Position = VCPCMatrix * vertexVCVSOutput;\n}\n";
+var vtkSphereMapperVS = "//VTK::System::Dec\n\n/*=========================================================================\n\n  Program:   Visualization Toolkit\n  Module:    vtkSphereMapperVS.glsl\n\n  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen\n  All rights reserved.\n  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.\n\n     This software is distributed WITHOUT ANY WARRANTY; without even\n     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\n     PURPOSE.  See the above copyright notice for more information.\n\n=========================================================================*/\n// this shader implements imposters in OpenGL for Spheres\n\nattribute vec4 vertexMC;\nattribute vec2 offsetMC;\n\n// optional normal declaration\n//VTK::Normal::Dec\n\n// Texture coordinates\n//VTK::TCoord::Dec\n\nuniform mat3 normalMatrix; // transform model coordinate directions to view coordinates\n\n// material property values\n//VTK::Color::Dec\n\n// clipping plane vars\n//VTK::Clip::Dec\n\n// camera and actor matrix values\n//VTK::Camera::Dec\n\nvarying vec4 vertexVCVSOutput;\nvarying float radiusVCVSOutput;\nvarying vec3 centerVCVSOutput;\n\nuniform int cameraParallel;\nuniform float scaleFactor;\n\nvoid main()\n{\n  //VTK::Color::Impl\n\n  //VTK::Normal::Impl\n\n  //VTK::TCoord::Impl\n\n  //VTK::Clip::Impl\n\n  // compute the projected vertex position\n  vec2 scaledOffsetMC = scaleFactor * offsetMC;\n  vertexVCVSOutput = MCVCMatrix * vertexMC;\n  centerVCVSOutput = vertexVCVSOutput.xyz;\n  radiusVCVSOutput = length(scaledOffsetMC)*0.5;\n\n  // make the triangle face the camera\n  if (cameraParallel == 0)\n    {\n    vec3 dir = normalize(-vertexVCVSOutput.xyz);\n    vec3 base2 = normalize(cross(dir,vec3(1.0,0.0,0.0)));\n    vec3 base1 = cross(base2,dir);\n    vertexVCVSOutput.xyz = vertexVCVSOutput.xyz + scaledOffsetMC.x*base1 + scaledOffsetMC.y*base2;\n    }\n  else\n    {\n    // add in the offset\n    vertexVCVSOutput.xy = vertexVCVSOutput.xy + scaledOffsetMC;\n    }\n\n  gl_Position = VCPCMatrix * vertexVCVSOutput;\n}\n";
 
 export { vtkSphereMapperVS as v };

package/Rendering/WebGPU/SphereMapper.js

@@ -134,7 +134,7 @@ function vtkWebGPUSphereMapper(publicAPI, model) {
           var radius = model.renderable.getRadius();
 
           if (scales) {
-            radius = scales[_id];
+            radius = scales[_id] * model.renderable.getScaleFactor();
           }
 
           _tmpVBO[_vboIdx++] = -2.0 * radius * cos30;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitware/vtk.js",
-  "version": "26.0.0-beta.4",
+  "version": "26.0.0-beta.5",
   "description": "Visualization Toolkit for the Web",
   "keywords": [
     "3d",
@@ -64,7 +64,7 @@
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",
     "buffer": "6.0.3",
-    "commitizen": "4.2.4",
+    "commitizen": "4.2.5",
     "concurrently": "7.1.0",
     "copy-webpack-plugin": "10.2.4",
     "cross-env": "7.0.3",
@@ -110,7 +110,7 @@
     "rollup-plugin-polyfill-node": "0.9.0",
     "rollup-plugin-postcss": "4.0.2",
     "rollup-plugin-string": "3.0.0",
-    "rollup-plugin-svgo": "1.1.0",
+    "rollup-plugin-svgo": "2.0.0",
     "rollup-plugin-web-worker-loader": "1.6.1",
     "semantic-release": "19.0.3",
     "snabbdom": "^3.5.1",