Merge branch 'master' into renderwindow_ts_defs

Author: richhaar

Documentation/content/docs/develop_webgpu.md

@@ -32,7 +32,7 @@ title: WebGPU Examples
   }
 </style>
 
-WebGPU is the upcoming high performance rendering API coming soon to browsers across all major platforms. vtk.js has preliminary support for WebGPU and you can explore some of its features in the examples below. Note that both WebGPU and our support for it are still under development so these example may break as the API changes. Most of these examples have been tested with Chrome Canary on Windows and MacOS.
+WebGPU is the upcoming high performance rendering API coming soon to browsers across all major platforms. vtk.js has preliminary support for WebGPU and you can explore some of its features in the examples below. Note that both WebGPU and our support for it are still under development so these examples may break as the API changes. Most of these examples have been tested with Chrome Canary on Windows and MacOS.
 
 <div class="gallery">
 
@@ -43,7 +43,9 @@ WebGPU is the upcoming high performance rendering API coming soon to browsers ac
 [![HttpSceneLoader Example][HttpSceneLoader]](../examples/HttpSceneLoader.html)
 [![CubeAxes Example][CubeAxes]](../examples/CubeAxes.html)
 [![OBJReader Example][OBJReader]](../examples/OBJReader.html)
-
+[![MultiSliceImageMapper Example][MultiSliceImageMapper]](../examples/MultiSliceImageMapper.html)
+[![ZipHttpReader Example][ZipHttpReader]](../examples/ZipHttpReader.html)
+[![GeometryViewer Example][GeometryViewer]](../examples/GeometryViewer.html?fileURL=https://data.kitware.com/api/v1/item/59de9de58d777f31ac641dc5/download)
 
 </div>
 
@@ -54,3 +56,6 @@ WebGPU is the upcoming high performance rendering API coming soon to browsers ac
 [CubeAxes]: ../docs/gallery/CubeAxes.jpg
 [OBJReader]: ../docs/gallery/OBJReader.jpg
 [HttpSceneLoader]: ../docs/gallery/HttpSceneLoader.jpg
+[MultiSliceImageMapper]: ../docs/gallery/MultiSliceImageMapper.jpg
+[GeometryViewer]: ../docs/gallery/GeometryViewer.jpg
+[ZipHttpReader]: ../docs/gallery/ZipHttpReader.jpg

Documentation/content/docs/gallery/GeometryViewer.jpg

@@ -14,9 +14,9 @@ import { areEquals } from 'vtk.js/Sources/Common/Core/Math';
 
 import baseline from './testColorTransferFunction.png';
 
-test('Test Interpolate Scalars Before Colors', (t) => {
+test('Test Color Transfer Function', (t) => {
   const gc = testUtils.createGarbageCollector(t);
-  t.ok('rendering', 'vtkOpenGLPolyDataMapper ColorTransferFunction');
+  t.ok('rendering', 'vtkMapper ColorTransferFunction');
 
   // Create some control UI
   const container = document.querySelector('body');

Sources/Rendering/Core/ColorTransferFunction/test/testColorTransferFunction.js

@@ -10,9 +10,9 @@ import colorMaps from '../ColorMaps.json';
 import createScalarMap from './createScalarMap';
 import baseline from './testColorTransferFunctionInterpolation.png';
 
-test('Test Interpolate Scalars Before Colors', (t) => {
+test('Test ColorTransferFunction Interpolation', (t) => {
   const gc = testUtils.createGarbageCollector(t);
-  t.ok('rendering', 'vtkOpenGLPolyDataMapper ColorTransferFunction Presets');
+  t.ok('rendering', 'vtkMapper ColorTransferFunction Interpolaiton');
 
   // testUtils.keepDOM();
 

Sources/Rendering/Core/ColorTransferFunction/test/testColorTransferFunctionInterpolation.js

@@ -13,9 +13,9 @@ import baseline from './testColorTransferFunctionPresets.png';
 const MAX_NUMBER_OF_PRESETS = 200;
 const NUMBER_PER_LINE = 20;
 
-test('Test Interpolate Scalars Before Colors', (t) => {
+test('Test ColorTransferFunction Presets', (t) => {
   const gc = testUtils.createGarbageCollector(t);
-  t.ok('rendering', 'vtkOpenGLPolyDataMapper ColorTransferFunction Presets');
+  t.ok('rendering', 'vtkMapper ColorTransferFunction Presets');
 
   // Create some control UI
   const container = document.querySelector('body');

Sources/Rendering/Core/ColorTransferFunction/test/testColorTransferFunctionPresets.js

@@ -1,7 +1,7 @@
 import test from 'tape-catch';
 import testUtils from 'vtk.js/Sources/Testing/testUtils';
 
-import vtkOpenGLRenderWindow from 'vtk.js/Sources/Rendering/OpenGL/RenderWindow';
+import 'vtk.js/Sources/Rendering/Misc/RenderingAPIs';
 import vtkRenderWindow from 'vtk.js/Sources/Rendering/Core/RenderWindow';
 import vtkRenderer from 'vtk.js/Sources/Rendering/Core/Renderer';
 import vtkLookupTable from 'vtk.js/Sources/Common/Core/LookupTable';
@@ -12,9 +12,9 @@ import vtkPolyData from 'vtk.js/Sources/Common/DataModel/PolyData';
 
 import baseline from './testInterpolateScalarsBeforeMapping.png';
 
-test.onlyIfWebGL('Test Interpolate Scalars Before Mapping', (t) => {
+test('Test Interpolate Scalars Before Mapping', (t) => {
   const gc = testUtils.createGarbageCollector(t);
-  t.ok('rendering', 'vtkOpenGLPolyDataMapper InterpolateScalarsBeforeColors');
+  t.ok('rendering', 'vtkMapper InterpolateScalarsBeforeColors');
 
   // Create some control UI
   const container = document.querySelector('body');
@@ -97,8 +97,8 @@ test.onlyIfWebGL('Test Interpolate Scalars Before Mapping', (t) => {
   mapper.setInputData(pd);
   mapper.setInterpolateScalarsBeforeMapping(true);
 
-  // now create something to view it, in this case webgl
-  const glwindow = gc.registerResource(vtkOpenGLRenderWindow.newInstance());
+  // now create something to view it
+  const glwindow = gc.registerResource(renderWindow.newAPISpecificView());
   glwindow.setContainer(renderWindowContainer);
   renderWindow.addView(glwindow);
   glwindow.setSize(400, 400);
@@ -107,7 +107,7 @@ test.onlyIfWebGL('Test Interpolate Scalars Before Mapping', (t) => {
     testUtils.compareImages(
       image,
       [baseline],
-      'Rendering/OpenGL/PolyDataMapper/testInterpolateScalarsBeforeMapping',
+      'Rendering/Core/Mapper/testInterpolateScalarsBeforeMapping',
       t,
       1.5,
       gc.releaseResources

Sources/Rendering/OpenGL/PolyDataMapper/test/testInterpolateScalarsBeforeMapping.js renamed to Sources/Rendering/Core/Mapper/test/testInterpolateScalarsBeforeMapping.js

@@ -3,7 +3,7 @@ import testUtils from 'vtk.js/Sources/Testing/testUtils';
 
 import vtkColorTransferFunction from 'vtk.js/Sources/Rendering/Core/ColorTransferFunction';
 import vtkHttpDataSetReader from 'vtk.js/Sources/IO/Core/HttpDataSetReader';
-import vtkOpenGLRenderWindow from 'vtk.js/Sources/Rendering/OpenGL/RenderWindow';
+import 'vtk.js/Sources/Rendering/Misc/RenderingAPIs';
 import vtkPiecewiseFunction from 'vtk.js/Sources/Common/DataModel/PiecewiseFunction';
 import vtkRenderWindow from 'vtk.js/Sources/Rendering/Core/RenderWindow';
 import vtkRenderWindowInteractor from 'vtk.js/Sources/Rendering/Core/RenderWindowInteractor';
@@ -14,9 +14,9 @@ import Constants from 'vtk.js/Sources/Rendering/Core/VolumeMapper/Constants';
 
 import baseline from './testAverageIntensityProjection.png';
 
-test.onlyIfWebGL('Test Average Intensity Projection Volume Rendering', (t) => {
+test('Test Average Intensity Projection Volume Rendering', (t) => {
   const gc = testUtils.createGarbageCollector(t);
-  t.ok('rendering', 'vtkOpenGLVolumeMapper AverageIP');
+  t.ok('rendering', 'vtkVolumeMapper AverageIP');
   // testUtils.keepDOM();
 
   // Create some control UI
@@ -63,8 +63,8 @@ test.onlyIfWebGL('Test Average Intensity Projection Volume Rendering', (t) => {
 
   mapper.setInputConnection(reader.getOutputPort());
 
-  // now create something to view it, in this case webgl
-  const glwindow = gc.registerResource(vtkOpenGLRenderWindow.newInstance());
+  // now create something to view it
+  const glwindow = gc.registerResource(renderWindow.newAPISpecificView());
   glwindow.setContainer(renderWindowContainer);
   renderWindow.addView(glwindow);
   glwindow.setSize(400, 400);
@@ -85,7 +85,7 @@ test.onlyIfWebGL('Test Average Intensity Projection Volume Rendering', (t) => {
         testUtils.compareImages(
           image,
           [baseline],
-          'Rendering/OpenGL/VolumeMapper/testAverageIntensityProjection',
+          'Rendering/Core/VolumeMapper/testAverageIntensityProjection',
           t,
           1.5,
           gc.releaseResources

Sources/Rendering/OpenGL/PolyDataMapper/test/testInterpolateScalarsBeforeMapping.png renamed to Sources/Rendering/Core/Mapper/test/testInterpolateScalarsBeforeMapping.png

@@ -1,9 +1,9 @@
 import test from 'tape-catch';
 import testUtils from 'vtk.js/Sources/Testing/testUtils';
 
+import 'vtk.js/Sources/Rendering/Misc/RenderingAPIs';
 import vtkColorTransferFunction from 'vtk.js/Sources/Rendering/Core/ColorTransferFunction';
 import vtkHttpDataSetReader from 'vtk.js/Sources/IO/Core/HttpDataSetReader';
-import vtkOpenGLRenderWindow from 'vtk.js/Sources/Rendering/OpenGL/RenderWindow';
 import vtkPiecewiseFunction from 'vtk.js/Sources/Common/DataModel/PiecewiseFunction';
 import vtkRenderWindow from 'vtk.js/Sources/Rendering/Core/RenderWindow';
 import vtkRenderWindowInteractor from 'vtk.js/Sources/Rendering/Core/RenderWindowInteractor';
@@ -14,9 +14,9 @@ import vtkVolumeMapper from 'vtk.js/Sources/Rendering/Core/VolumeMapper';
 import baseline1 from './testComposite.png';
 import baseline2 from './testComposite_2.png';
 
-test.onlyIfWebGL('Test Composite Volume Rendering', (t) => {
+test('Test Composite Volume Rendering', (t) => {
   const gc = testUtils.createGarbageCollector(t);
-  t.ok('rendering', 'vtkOpenGLVolumeMapper Composite');
+  t.ok('rendering', 'vtkVolumeMapper Composite');
   // testUtils.keepDOM();
 
   // Create some control UI
@@ -55,8 +55,8 @@ test.onlyIfWebGL('Test Composite Volume Rendering', (t) => {
 
   mapper.setInputConnection(reader.getOutputPort());
 
-  // now create something to view it, in this case webgl
-  const glwindow = gc.registerResource(vtkOpenGLRenderWindow.newInstance());
+  // now create something to view it
+  const glwindow = gc.registerResource(renderWindow.newAPISpecificView());
   glwindow.setContainer(renderWindowContainer);
   renderWindow.addView(glwindow);
   glwindow.setSize(400, 400);
@@ -80,7 +80,7 @@ test.onlyIfWebGL('Test Composite Volume Rendering', (t) => {
         testUtils.compareImages(
           image,
           [baseline1, baseline2],
-          'Rendering/OpenGL/VolumeMapper/testComposite',
+          'Rendering/Core/VolumeMapper/testComposite',
           t,
           1.5,
           gc.releaseResources