@kitware/vtk.js 20.1.4 → 20.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Common/Core/Base64.d.ts +14 -2
- package/Common/Core/Base64.js +31 -2
- package/Common/Core/Math/index.js +1 -1
- package/Common/Core/Math.d.ts +168 -158
- package/Common/Core/Math.js +1 -1
- package/Common/Core/MatrixBuilder.js +39 -41
- package/Common/DataModel/Box.d.ts +73 -0
- package/Common/DataModel/ImageData.js +12 -14
- package/Common/Transform/LandmarkTransform.js +6 -7
- package/Filters/General/PaintFilter/PaintFilter.worker.js +8 -8
- package/Filters/General/PaintFilter.js +11 -11
- package/Filters/Sources/CubeSource.d.ts +7 -6
- package/Filters/Sources/PlaneSource.js +12 -13
- package/IO/Core/BinaryHelper.js +2 -4
- package/IO/Core/DataAccessHelper/HtmlDataAccessHelper.js +1 -1
- package/IO/Core/DataAccessHelper/HttpDataAccessHelper.js +1 -1
- package/IO/Core/DataAccessHelper/JSZipDataAccessHelper.js +2 -2
- package/IO/Core/ZipMultiDataSetReader.js +1 -1
- package/IO/Core/ZipMultiDataSetWriter.js +1 -1
- package/IO/Geometry/STLWriter.js +4 -4
- package/IO/Misc/OBJReader.d.ts +9 -8
- package/IO/Misc/SkyboxReader.js +1 -1
- package/IO/XML/XMLReader.js +3 -4
- package/IO/XML/XMLWriter.js +5 -6
- package/Imaging/Core/ImageReslice.js +18 -19
- package/Interaction/Manipulators/MouseCameraAxisRotateManipulator.js +27 -28
- package/Interaction/Manipulators/MouseCameraTrackballRollManipulator.js +8 -9
- package/Interaction/Manipulators/MouseCameraTrackballRotateManipulator.js +14 -15
- package/Interaction/Manipulators/MouseCameraUnicamRotateManipulator.js +12 -13
- package/Interaction/Widgets/ImageCroppingRegionsWidget.js +5 -6
- package/Interaction/Widgets/PiecewiseGaussianWidget/ComputeHistogram.worker.js +1 -1
- package/Interaction/Widgets/PiecewiseGaussianWidget.js +2 -2
- package/Interaction/Widgets/ResliceCursor/ResliceCursorRepresentation.js +8 -9
- package/Rendering/Core/Actor.js +3 -4
- package/Rendering/Core/AnnotatedCubeActor.d.ts +5 -6
- package/Rendering/Core/Camera.js +81 -84
- package/Rendering/Core/CellPicker.js +2 -2
- package/Rendering/Core/CubeAxesActor.js +37 -34
- package/Rendering/Core/Follower.js +20 -21
- package/Rendering/Core/Glyph3DMapper.js +30 -32
- package/Rendering/Core/ImageMapper.js +2 -2
- package/Rendering/Core/ImageSlice.js +5 -6
- package/Rendering/Core/Picker.d.ts +5 -5
- package/Rendering/Core/Picker.js +5 -6
- package/Rendering/Core/PixelSpaceCallbackMapper.js +3 -4
- package/Rendering/Core/Prop3D.js +24 -25
- package/Rendering/Core/Renderer.js +11 -12
- package/Rendering/Core/ScalarBarActor.js +37 -34
- package/Rendering/Core/Volume.js +3 -4
- package/Rendering/OpenGL/Actor.js +9 -10
- package/Rendering/OpenGL/Camera.js +8 -9
- package/Rendering/OpenGL/CellArrayBufferObject.js +6 -8
- package/Rendering/OpenGL/Glyph3DMapper.js +8 -9
- package/Rendering/OpenGL/ImageMapper.js +7 -7
- package/Rendering/OpenGL/ImageSlice.js +4 -4
- package/Rendering/OpenGL/PolyDataMapper.js +11 -13
- package/Rendering/OpenGL/RenderWindow.d.ts +21 -35
- package/Rendering/OpenGL/ShaderCache.js +1 -1
- package/Rendering/OpenGL/Skybox.js +4 -5
- package/Rendering/OpenGL/SphereMapper.js +2 -2
- package/Rendering/OpenGL/StickMapper.js +3 -4
- package/Rendering/OpenGL/SurfaceLIC/SurfaceLICInterface.js +1 -1
- package/Rendering/OpenGL/Volume.js +6 -7
- package/Rendering/OpenGL/VolumeMapper.js +47 -49
- package/Rendering/OpenGL/glsl/vtkPolyDataFS.glsl.js +1 -1
- package/Rendering/WebGPU/Actor.js +8 -8
- package/Rendering/WebGPU/Camera.js +8 -8
- package/Rendering/WebGPU/ImageMapper.js +18 -19
- package/Rendering/WebGPU/ImageSlice.js +9 -9
- package/Rendering/WebGPU/PolyDataMapper.js +3 -4
- package/Rendering/WebGPU/Renderer.js +6 -7
- package/Rendering/WebGPU/Volume.js +3 -3
- package/Rendering/WebGPU/VolumePassFSQ.js +10 -10
- package/ThirdParty/index.js +2 -2
- package/Widgets/Manipulators/TrackballManipulator.js +5 -6
- package/Widgets/Representations/ArrowHandleRepresentation.js +10 -12
- package/Widgets/Representations/CircleContextRepresentation.js +4 -5
- package/Widgets/Representations/RectangleContextRepresentation.js +3 -3
- package/Widgets/Widgets3D/EllipseWidget/behavior.js +5 -5
- package/Widgets/Widgets3D/ImageCroppingWidget/helpers.js +6 -8
- package/Widgets/Widgets3D/PaintWidget/behavior.js +2 -2
- package/Widgets/Widgets3D/ResliceCursorWidget.js +6 -7
- package/Widgets/Widgets3D/ShapeWidget/behavior.js +10 -10
- package/Widgets/Widgets3D/SplineWidget/behavior.js +5 -5
- package/_virtual/rollup-plugin-worker-loader__module_Sources/Filters/General/PaintFilter/PaintFilter.worker.js +1 -1
- package/_virtual/rollup-plugin-worker-loader__module_Sources/Interaction/Widgets/PiecewiseGaussianWidget/ComputeHistogram.worker.js +1 -1
- package/package.json +2 -2
- package/types.d.ts +1 -0
- package/vtk.js +2 -2
- package/_vendor/base64-js/index.js_commonjs-exports.js +0 -1
- package/_vendor/blueimp-md5/js/md5.js_commonjs-module.js +0 -3
- package/_vendor/define-properties/index.js_commonjs-proxy.js +0 -1
- package/_vendor/globalthis/implementation.browser.js_commonjs-module.js +0 -3
- package/_vendor/globalthis/implementation.browser.js_commonjs-proxy.js +0 -1
- package/_vendor/globalthis/polyfill.js_commonjs-proxy.js +0 -1
- package/_vendor/globalthis/shim.js_commonjs-proxy.js +0 -2
- package/_vendor/jszip/dist/jszip.min.js_commonjs-module.js +0 -3
- package/_vendor/object-keys/implementation.js_commonjs-proxy.js +0 -1
- package/_vendor/object-keys/index.js_commonjs-proxy.js +0 -1
- package/_vendor/object-keys/isArguments.js_commonjs-proxy.js +0 -1
- package/_vendor/seedrandom/lib/alea.js_commonjs-module.js +0 -3
- package/_vendor/seedrandom/lib/alea.js_commonjs-proxy.js +0 -1
- package/_vendor/seedrandom/lib/tychei.js_commonjs-module.js +0 -3
- package/_vendor/seedrandom/lib/tychei.js_commonjs-proxy.js +0 -1
- package/_vendor/seedrandom/lib/xor128.js_commonjs-module.js +0 -3
- package/_vendor/seedrandom/lib/xor128.js_commonjs-proxy.js +0 -1
- package/_vendor/seedrandom/lib/xor4096.js_commonjs-module.js +0 -3
- package/_vendor/seedrandom/lib/xor4096.js_commonjs-proxy.js +0 -1
- package/_vendor/seedrandom/lib/xorshift7.js_commonjs-module.js +0 -3
- package/_vendor/seedrandom/lib/xorshift7.js_commonjs-proxy.js +0 -1
- package/_vendor/seedrandom/lib/xorwow.js_commonjs-module.js +0 -3
- package/_vendor/seedrandom/lib/xorwow.js_commonjs-proxy.js +0 -1
- package/_vendor/seedrandom/seedrandom.js_commonjs-module.js +0 -3
- package/_vendor/seedrandom/seedrandom.js_commonjs-proxy.js +0 -1
- package/_vendor/webworker-promise/lib/register.js_commonjs-module.js +0 -3
- package/_vendor/webworker-promise/lib/tiny-emitter.js_commonjs-proxy.js +0 -1
- package/_vendor/webworker-promise/src/tiny-emitter.js_commonjs-proxy.js +0 -1
- package/_vendor/xmlbuilder2/lib/xmlbuilder2.min.js_commonjs-module.js +0 -3
- package/_virtual/_rollup_plugin_ignore_empty_module_placeholder_commonjs-proxy.js +0 -6
- package/_virtual/commonjsHelpers.js +0 -22
- package/_virtual/polyfill-node.buffer.js +0 -1971
- package/_virtual/polyfill-node.global.js +0 -5
- package/_virtual/rollup_plugin_ignore_empty_module_placeholder.js +0 -8
- package/vendor/base64-js/index.js +0 -72
- package/vendor/blueimp-md5/js/md5.js +0 -402
- package/vendor/d3-array/src/array.js +0 -1
- package/vendor/d3-array/src/ascending.js +0 -5
- package/vendor/d3-array/src/bin.js +0 -1
- package/vendor/d3-array/src/bisect.js +0 -10
- package/vendor/d3-array/src/bisector.js +0 -46
- package/vendor/d3-array/src/constant.js +0 -1
- package/vendor/d3-array/src/count.js +0 -1
- package/vendor/d3-array/src/cross.js +0 -1
- package/vendor/d3-array/src/cumsum.js +0 -1
- package/vendor/d3-array/src/descending.js +0 -1
- package/vendor/d3-array/src/deviation.js +0 -1
- package/vendor/d3-array/src/difference.js +0 -1
- package/vendor/d3-array/src/disjoint.js +0 -1
- package/vendor/d3-array/src/every.js +0 -1
- package/vendor/d3-array/src/extent.js +0 -1
- package/vendor/d3-array/src/filter.js +0 -1
- package/vendor/d3-array/src/fsum.js +0 -1
- package/vendor/d3-array/src/greatest.js +0 -1
- package/vendor/d3-array/src/greatestIndex.js +0 -1
- package/vendor/d3-array/src/group.js +0 -1
- package/vendor/d3-array/src/groupSort.js +0 -1
- package/vendor/d3-array/src/identity.js +0 -1
- package/vendor/d3-array/src/index.js +0 -1
- package/vendor/d3-array/src/intersection.js +0 -1
- package/vendor/d3-array/src/least.js +0 -1
- package/vendor/d3-array/src/leastIndex.js +0 -1
- package/vendor/d3-array/src/map.js +0 -1
- package/vendor/d3-array/src/max.js +0 -1
- package/vendor/d3-array/src/maxIndex.js +0 -1
- package/vendor/d3-array/src/mean.js +0 -1
- package/vendor/d3-array/src/median.js +0 -1
- package/vendor/d3-array/src/merge.js +0 -1
- package/vendor/d3-array/src/min.js +0 -1
- package/vendor/d3-array/src/minIndex.js +0 -1
- package/vendor/d3-array/src/mode.js +0 -1
- package/vendor/d3-array/src/nice.js +0 -1
- package/vendor/d3-array/src/number.js +0 -5
- package/vendor/d3-array/src/pairs.js +0 -1
- package/vendor/d3-array/src/permute.js +0 -1
- package/vendor/d3-array/src/quantile.js +0 -1
- package/vendor/d3-array/src/quickselect.js +0 -1
- package/vendor/d3-array/src/range.js +0 -1
- package/vendor/d3-array/src/reduce.js +0 -1
- package/vendor/d3-array/src/reverse.js +0 -1
- package/vendor/d3-array/src/scan.js +0 -1
- package/vendor/d3-array/src/set.js +0 -1
- package/vendor/d3-array/src/shuffle.js +0 -1
- package/vendor/d3-array/src/some.js +0 -1
- package/vendor/d3-array/src/sort.js +0 -1
- package/vendor/d3-array/src/subset.js +0 -1
- package/vendor/d3-array/src/sum.js +0 -1
- package/vendor/d3-array/src/superset.js +0 -1
- package/vendor/d3-array/src/threshold/freedmanDiaconis.js +0 -1
- package/vendor/d3-array/src/threshold/scott.js +0 -1
- package/vendor/d3-array/src/threshold/sturges.js +0 -1
- package/vendor/d3-array/src/ticks.js +0 -56
- package/vendor/d3-array/src/transpose.js +0 -1
- package/vendor/d3-array/src/union.js +0 -1
- package/vendor/d3-array/src/variance.js +0 -1
- package/vendor/d3-array/src/zip.js +0 -1
- package/vendor/d3-color/src/color.js +0 -373
- package/vendor/d3-color/src/cubehelix.js +0 -1
- package/vendor/d3-color/src/define.js +0 -12
- package/vendor/d3-color/src/index.js +0 -1
- package/vendor/d3-color/src/lab.js +0 -1
- package/vendor/d3-color/src/math.js +0 -1
- package/vendor/d3-format/src/defaultLocale.js +0 -20
- package/vendor/d3-format/src/exponent.js +0 -7
- package/vendor/d3-format/src/formatDecimal.js +0 -22
- package/vendor/d3-format/src/formatGroup.js +0 -20
- package/vendor/d3-format/src/formatNumerals.js +0 -9
- package/vendor/d3-format/src/formatPrefixAuto.js +0 -18
- package/vendor/d3-format/src/formatRounded.js +0 -13
- package/vendor/d3-format/src/formatSpecifier.js +0 -49
- package/vendor/d3-format/src/formatTrim.js +0 -13
- package/vendor/d3-format/src/formatTypes.js +0 -21
- package/vendor/d3-format/src/identity.js +0 -5
- package/vendor/d3-format/src/index.js +0 -1
- package/vendor/d3-format/src/locale.js +0 -150
- package/vendor/d3-format/src/precisionFixed.js +0 -7
- package/vendor/d3-format/src/precisionPrefix.js +0 -7
- package/vendor/d3-format/src/precisionRound.js +0 -8
- package/vendor/d3-interpolate/src/array.js +0 -19
- package/vendor/d3-interpolate/src/basis.js +0 -1
- package/vendor/d3-interpolate/src/basisClosed.js +0 -1
- package/vendor/d3-interpolate/src/color.js +0 -26
- package/vendor/d3-interpolate/src/constant.js +0 -3
- package/vendor/d3-interpolate/src/cubehelix.js +0 -1
- package/vendor/d3-interpolate/src/date.js +0 -8
- package/vendor/d3-interpolate/src/discrete.js +0 -1
- package/vendor/d3-interpolate/src/hcl.js +0 -1
- package/vendor/d3-interpolate/src/hsl.js +0 -1
- package/vendor/d3-interpolate/src/hue.js +0 -1
- package/vendor/d3-interpolate/src/index.js +0 -1
- package/vendor/d3-interpolate/src/lab.js +0 -1
- package/vendor/d3-interpolate/src/number.js +0 -7
- package/vendor/d3-interpolate/src/numberArray.js +0 -16
- package/vendor/d3-interpolate/src/object.js +0 -25
- package/vendor/d3-interpolate/src/piecewise.js +0 -1
- package/vendor/d3-interpolate/src/quantize.js +0 -1
- package/vendor/d3-interpolate/src/rgb.js +0 -26
- package/vendor/d3-interpolate/src/round.js +0 -7
- package/vendor/d3-interpolate/src/string.js +0 -66
- package/vendor/d3-interpolate/src/transform/decompose.js +0 -1
- package/vendor/d3-interpolate/src/transform/index.js +0 -1
- package/vendor/d3-interpolate/src/transform/parse.js +0 -1
- package/vendor/d3-interpolate/src/value.js +0 -24
- package/vendor/d3-interpolate/src/zoom.js +0 -1
- package/vendor/d3-scale/src/band.js +0 -1
- package/vendor/d3-scale/src/constant.js +0 -7
- package/vendor/d3-scale/src/continuous.js +0 -129
- package/vendor/d3-scale/src/diverging.js +0 -1
- package/vendor/d3-scale/src/identity.js +0 -1
- package/vendor/d3-scale/src/index.js +0 -1
- package/vendor/d3-scale/src/init.js +0 -10
- package/vendor/d3-scale/src/linear.js +0 -72
- package/vendor/d3-scale/src/log.js +0 -1
- package/vendor/d3-scale/src/nice.js +0 -1
- package/vendor/d3-scale/src/number.js +0 -5
- package/vendor/d3-scale/src/ordinal.js +0 -1
- package/vendor/d3-scale/src/pow.js +0 -1
- package/vendor/d3-scale/src/quantile.js +0 -1
- package/vendor/d3-scale/src/quantize.js +0 -1
- package/vendor/d3-scale/src/radial.js +0 -1
- package/vendor/d3-scale/src/sequential.js +0 -1
- package/vendor/d3-scale/src/sequentialQuantile.js +0 -1
- package/vendor/d3-scale/src/symlog.js +0 -1
- package/vendor/d3-scale/src/threshold.js +0 -1
- package/vendor/d3-scale/src/tickFormat.js +0 -35
- package/vendor/d3-scale/src/time.js +0 -1
- package/vendor/d3-scale/src/utcTime.js +0 -1
- package/vendor/d3-time/src/day.js +0 -1
- package/vendor/d3-time/src/duration.js +0 -1
- package/vendor/d3-time/src/hour.js +0 -1
- package/vendor/d3-time/src/index.js +0 -1
- package/vendor/d3-time/src/interval.js +0 -1
- package/vendor/d3-time/src/millisecond.js +0 -1
- package/vendor/d3-time/src/minute.js +0 -1
- package/vendor/d3-time/src/month.js +0 -1
- package/vendor/d3-time/src/second.js +0 -1
- package/vendor/d3-time/src/ticks.js +0 -1
- package/vendor/d3-time/src/utcDay.js +0 -1
- package/vendor/d3-time/src/utcHour.js +0 -1
- package/vendor/d3-time/src/utcMinute.js +0 -1
- package/vendor/d3-time/src/utcMonth.js +0 -1
- package/vendor/d3-time/src/utcWeek.js +0 -1
- package/vendor/d3-time/src/utcYear.js +0 -1
- package/vendor/d3-time/src/week.js +0 -1
- package/vendor/d3-time/src/year.js +0 -1
- package/vendor/d3-time-format/src/defaultLocale.js +0 -1
- package/vendor/d3-time-format/src/index.js +0 -1
- package/vendor/d3-time-format/src/isoFormat.js +0 -1
- package/vendor/d3-time-format/src/isoParse.js +0 -1
- package/vendor/d3-time-format/src/locale.js +0 -1
- package/vendor/define-properties/index.js +0 -60
- package/vendor/gl-matrix/esm/common.js +0 -30
- package/vendor/gl-matrix/esm/index.js +0 -1
- package/vendor/gl-matrix/esm/mat2.js +0 -1
- package/vendor/gl-matrix/esm/mat2d.js +0 -1
- package/vendor/gl-matrix/esm/mat3.js +0 -817
- package/vendor/gl-matrix/esm/mat4.js +0 -1868
- package/vendor/gl-matrix/esm/quat.js +0 -330
- package/vendor/gl-matrix/esm/quat2.js +0 -1
- package/vendor/gl-matrix/esm/vec2.js +0 -1
- package/vendor/gl-matrix/esm/vec3.js +0 -842
- package/vendor/gl-matrix/esm/vec4.js +0 -153
- package/vendor/globalthis/implementation.browser.js +0 -11
- package/vendor/globalthis/index.js +0 -25
- package/vendor/globalthis/polyfill.js +0 -14
- package/vendor/globalthis/shim.js +0 -25
- package/vendor/internmap/src/index.js +0 -1
- package/vendor/jszip/dist/jszip.min.js +0 -11
- package/vendor/object-keys/implementation.js +0 -124
- package/vendor/object-keys/index.js +0 -35
- package/vendor/object-keys/isArguments.js +0 -17
- package/vendor/pako/dist/pako.esm.mjs.js +0 -6707
- package/vendor/seedrandom/index.js +0 -77
- package/vendor/seedrandom/lib/alea.js +0 -117
- package/vendor/seedrandom/lib/tychei.js +0 -105
- package/vendor/seedrandom/lib/xor128.js +0 -84
- package/vendor/seedrandom/lib/xor4096.js +0 -150
- package/vendor/seedrandom/lib/xorshift7.js +0 -101
- package/vendor/seedrandom/lib/xorwow.js +0 -89
- package/vendor/seedrandom/seedrandom.js +0 -256
- package/vendor/webworker-promise/lib/register.js +0 -158
- package/vendor/webworker-promise/lib/tiny-emitter.js +0 -89
- package/vendor/webworker-promise/src/index.js +0 -110
- package/vendor/webworker-promise/src/tiny-emitter.js +0 -51
- package/vendor/xmlbuilder2/lib/xmlbuilder2.min.js +0 -13
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
|
|
2
2
|
import _defineProperty from '@babel/runtime/helpers/defineProperty';
|
|
3
|
+
import { mat4, vec3 } from 'gl-matrix';
|
|
4
|
+
import * as d3 from 'd3-scale';
|
|
3
5
|
import { K as nearestPowerOfTwo, L as normalize2D } from '../../Common/Core/Math/index.js';
|
|
4
6
|
import macro from '../../macros.js';
|
|
5
7
|
import vtkActor from './Actor.js';
|
|
@@ -9,9 +11,6 @@ import vtkMapper from './Mapper.js';
|
|
|
9
11
|
import vtkPixelSpaceCallbackMapper from './PixelSpaceCallbackMapper.js';
|
|
10
12
|
import vtkPolyData from '../../Common/DataModel/PolyData.js';
|
|
11
13
|
import vtkTexture from './Texture.js';
|
|
12
|
-
import { l as linear } from '../../vendor/d3-scale/src/linear.js';
|
|
13
|
-
import { j as transpose, g as invert } from '../../vendor/gl-matrix/esm/mat4.js';
|
|
14
|
-
import { t as transformMat4, a as subtract, n as normalize, d as dot, b as scale, j as add } from '../../vendor/gl-matrix/esm/vec3.js';
|
|
15
14
|
|
|
16
15
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
|
|
17
16
|
|
|
@@ -70,7 +69,7 @@ function vtkCubeAxesActor(publicAPI, model) {
|
|
|
70
69
|
|
|
71
70
|
publicAPI.computeFacesToDraw = function () {
|
|
72
71
|
var cmat = model.camera.getViewMatrix();
|
|
73
|
-
transpose(cmat, cmat);
|
|
72
|
+
mat4.transpose(cmat, cmat);
|
|
74
73
|
var changed = false;
|
|
75
74
|
var length = vtkBoundingBox.getDiagonalLength(model.dataBounds);
|
|
76
75
|
var faceDot = Math.sin(model.faceVisibilityAngle * Math.PI / 180.0);
|
|
@@ -86,17 +85,17 @@ function vtkCubeAxesActor(publicAPI, model) {
|
|
|
86
85
|
ptv3[faceAxis] = model.dataBounds[f] - 0.1 * length * faceNormals[f][faceAxis];
|
|
87
86
|
ptv3[otherAxis1] = 0.5 * (model.dataBounds[otherAxis1 * 2] + model.dataBounds[otherAxis1 * 2 + 1]);
|
|
88
87
|
ptv3[otherAxis2] = 0.5 * (model.dataBounds[otherAxis2 * 2] + model.dataBounds[otherAxis2 * 2 + 1]);
|
|
89
|
-
transformMat4(tmpv3, ptv3, cmat);
|
|
88
|
+
vec3.transformMat4(tmpv3, ptv3, cmat);
|
|
90
89
|
ptv3[faceAxis] = model.dataBounds[f];
|
|
91
|
-
transformMat4(tmp2v3, ptv3, cmat);
|
|
92
|
-
subtract(tmpv3, tmp2v3, tmpv3);
|
|
93
|
-
normalize(tmpv3, tmpv3); // tmpv3 now holds the face normal vector
|
|
90
|
+
vec3.transformMat4(tmp2v3, ptv3, cmat);
|
|
91
|
+
vec3.subtract(tmpv3, tmp2v3, tmpv3);
|
|
92
|
+
vec3.normalize(tmpv3, tmpv3); // tmpv3 now holds the face normal vector
|
|
94
93
|
|
|
95
94
|
drawit = tmpv3[2] > faceDot; // for perspctive we need the view direction to the plane
|
|
96
95
|
|
|
97
96
|
if (!model.camera.getParallelProjection()) {
|
|
98
|
-
normalize(tmp2v3, tmp2v3);
|
|
99
|
-
drawit = dot(tmp2v3, tmpv3) > faceDot;
|
|
97
|
+
vec3.normalize(tmp2v3, tmp2v3);
|
|
98
|
+
drawit = vec3.dot(tmp2v3, tmpv3) > faceDot;
|
|
100
99
|
}
|
|
101
100
|
}
|
|
102
101
|
|
|
@@ -327,7 +326,7 @@ function vtkCubeAxesActor(publicAPI, model) {
|
|
|
327
326
|
var tickStrings = [];
|
|
328
327
|
|
|
329
328
|
for (var _i = 0; _i < 3; _i++) {
|
|
330
|
-
var scale =
|
|
329
|
+
var scale = d3.scaleLinear().domain([model.dataBounds[_i * 2], model.dataBounds[_i * 2 + 1]]);
|
|
331
330
|
ticks[_i] = scale.ticks(5);
|
|
332
331
|
var format = scale.tickFormat(5);
|
|
333
332
|
tickStrings[_i] = ticks[_i].map(format);
|
|
@@ -449,17 +448,17 @@ function vtkCubeAxesActor(publicAPI, model) {
|
|
|
449
448
|
ptv3[0] = coords[pos * 3];
|
|
450
449
|
ptv3[1] = coords[pos * 3 + 1];
|
|
451
450
|
ptv3[2] = coords[pos * 3 + 2];
|
|
452
|
-
transformMat4(tmpv3, ptv3, cmat); // moving 0.1 in NDC
|
|
451
|
+
vec3.transformMat4(tmpv3, ptv3, cmat); // moving 0.1 in NDC
|
|
453
452
|
|
|
454
453
|
tmpv3[0] += 0.1;
|
|
455
|
-
transformMat4(pt2v3, tmpv3, imat); // results in WC move of
|
|
454
|
+
vec3.transformMat4(pt2v3, tmpv3, imat); // results in WC move of
|
|
456
455
|
|
|
457
|
-
subtract(xDir, pt2v3, ptv3);
|
|
456
|
+
vec3.subtract(xDir, pt2v3, ptv3);
|
|
458
457
|
tmpv3[0] -= 0.1;
|
|
459
458
|
tmpv3[1] += 0.1;
|
|
460
|
-
transformMat4(pt2v3, tmpv3, imat); // results in WC move of
|
|
459
|
+
vec3.transformMat4(pt2v3, tmpv3, imat); // results in WC move of
|
|
461
460
|
|
|
462
|
-
subtract(yDir, pt2v3, ptv3);
|
|
461
|
+
vec3.subtract(yDir, pt2v3, ptv3);
|
|
463
462
|
|
|
464
463
|
for (var i = 0; i < 3; i++) {
|
|
465
464
|
xDir[i] /= 0.5 * 0.1 * size[0];
|
|
@@ -475,40 +474,40 @@ function vtkCubeAxesActor(publicAPI, model) {
|
|
|
475
474
|
ptv3[2] = coords[pos * 3 + 2]; // horizontal left, right, or middle alignment based on dir[0]
|
|
476
475
|
|
|
477
476
|
if (dir[0] < -0.5) {
|
|
478
|
-
scale(tmpv3, xDir, dir[0] * offset - value.width);
|
|
477
|
+
vec3.scale(tmpv3, xDir, dir[0] * offset - value.width);
|
|
479
478
|
} else if (dir[0] > 0.5) {
|
|
480
|
-
scale(tmpv3, xDir, dir[0] * offset);
|
|
479
|
+
vec3.scale(tmpv3, xDir, dir[0] * offset);
|
|
481
480
|
} else {
|
|
482
|
-
scale(tmpv3, xDir, dir[0] * offset - value.width / 2.0);
|
|
481
|
+
vec3.scale(tmpv3, xDir, dir[0] * offset - value.width / 2.0);
|
|
483
482
|
}
|
|
484
483
|
|
|
485
|
-
add(ptv3, ptv3, tmpv3);
|
|
486
|
-
scale(tmpv3, yDir, dir[1] * offset - value.height / 2.0);
|
|
487
|
-
add(ptv3, ptv3, tmpv3);
|
|
484
|
+
vec3.add(ptv3, ptv3, tmpv3);
|
|
485
|
+
vec3.scale(tmpv3, yDir, dir[1] * offset - value.height / 2.0);
|
|
486
|
+
vec3.add(ptv3, ptv3, tmpv3);
|
|
488
487
|
results.points[ptIdx * 3] = ptv3[0];
|
|
489
488
|
results.points[ptIdx * 3 + 1] = ptv3[1];
|
|
490
489
|
results.points[ptIdx * 3 + 2] = ptv3[2];
|
|
491
490
|
results.tcoords[ptIdx * 2] = value.tcoords[0];
|
|
492
491
|
results.tcoords[ptIdx * 2 + 1] = value.tcoords[1];
|
|
493
492
|
ptIdx++;
|
|
494
|
-
scale(tmpv3, xDir, value.width);
|
|
495
|
-
add(ptv3, ptv3, tmpv3);
|
|
493
|
+
vec3.scale(tmpv3, xDir, value.width);
|
|
494
|
+
vec3.add(ptv3, ptv3, tmpv3);
|
|
496
495
|
results.points[ptIdx * 3] = ptv3[0];
|
|
497
496
|
results.points[ptIdx * 3 + 1] = ptv3[1];
|
|
498
497
|
results.points[ptIdx * 3 + 2] = ptv3[2];
|
|
499
498
|
results.tcoords[ptIdx * 2] = value.tcoords[2];
|
|
500
499
|
results.tcoords[ptIdx * 2 + 1] = value.tcoords[3];
|
|
501
500
|
ptIdx++;
|
|
502
|
-
scale(tmpv3, yDir, value.height);
|
|
503
|
-
add(ptv3, ptv3, tmpv3);
|
|
501
|
+
vec3.scale(tmpv3, yDir, value.height);
|
|
502
|
+
vec3.add(ptv3, ptv3, tmpv3);
|
|
504
503
|
results.points[ptIdx * 3] = ptv3[0];
|
|
505
504
|
results.points[ptIdx * 3 + 1] = ptv3[1];
|
|
506
505
|
results.points[ptIdx * 3 + 2] = ptv3[2];
|
|
507
506
|
results.tcoords[ptIdx * 2] = value.tcoords[4];
|
|
508
507
|
results.tcoords[ptIdx * 2 + 1] = value.tcoords[5];
|
|
509
508
|
ptIdx++;
|
|
510
|
-
scale(tmpv3, xDir, value.width);
|
|
511
|
-
subtract(ptv3, ptv3, tmpv3);
|
|
509
|
+
vec3.scale(tmpv3, xDir, value.width);
|
|
510
|
+
vec3.subtract(ptv3, ptv3, tmpv3);
|
|
512
511
|
results.points[ptIdx * 3] = ptv3[0];
|
|
513
512
|
results.points[ptIdx * 3 + 1] = ptv3[1];
|
|
514
513
|
results.points[ptIdx * 3 + 2] = ptv3[2];
|
|
@@ -534,7 +533,7 @@ function vtkCubeAxesActor(publicAPI, model) {
|
|
|
534
533
|
|
|
535
534
|
publicAPI.updateTexturePolyData = function () {
|
|
536
535
|
var cmat = model.camera.getCompositeProjectionMatrix(model.lastAspectRatio, -1, 1);
|
|
537
|
-
transpose(cmat, cmat); // update the polydata
|
|
536
|
+
mat4.transpose(cmat, cmat); // update the polydata
|
|
538
537
|
|
|
539
538
|
var numLabels = model.textValues.length;
|
|
540
539
|
var numPts = numLabels * 4;
|
|
@@ -542,7 +541,7 @@ function vtkCubeAxesActor(publicAPI, model) {
|
|
|
542
541
|
var points = new Float64Array(numPts * 3);
|
|
543
542
|
var polys = new Uint16Array(numTris * 4);
|
|
544
543
|
var tcoords = new Float32Array(numPts * 2);
|
|
545
|
-
invert(invmat, cmat);
|
|
544
|
+
mat4.invert(invmat, cmat);
|
|
546
545
|
var results = {
|
|
547
546
|
ptIdx: 0,
|
|
548
547
|
cellIdx: 0,
|
|
@@ -560,12 +559,12 @@ function vtkCubeAxesActor(publicAPI, model) {
|
|
|
560
559
|
ptv3[0] = coords[ptIdx * 3];
|
|
561
560
|
ptv3[1] = coords[ptIdx * 3 + 1];
|
|
562
561
|
ptv3[2] = coords[ptIdx * 3 + 2];
|
|
563
|
-
transformMat4(tmpv3, ptv3, cmat);
|
|
562
|
+
vec3.transformMat4(tmpv3, ptv3, cmat);
|
|
564
563
|
ptv3[0] = coords[ptIdx * 3 + 3];
|
|
565
564
|
ptv3[1] = coords[ptIdx * 3 + 4];
|
|
566
565
|
ptv3[2] = coords[ptIdx * 3 + 5];
|
|
567
|
-
transformMat4(tmp2v3, ptv3, cmat);
|
|
568
|
-
subtract(tmpv3, tmpv3, tmp2v3);
|
|
566
|
+
vec3.transformMat4(tmp2v3, ptv3, cmat);
|
|
567
|
+
vec3.subtract(tmpv3, tmpv3, tmp2v3);
|
|
569
568
|
var dir = [tmpv3[0], tmpv3[1]];
|
|
570
569
|
normalize2D(dir); // write the axis label
|
|
571
570
|
|
|
@@ -608,7 +607,11 @@ function vtkCubeAxesActor(publicAPI, model) {
|
|
|
608
607
|
model.forceUpdate = true;
|
|
609
608
|
publicAPI.update();
|
|
610
609
|
});
|
|
611
|
-
|
|
610
|
+
var setVisibility = macro.chain(publicAPI.setVisibility, model.pixelActor.setVisibility, model.tmActor.setVisibility);
|
|
611
|
+
|
|
612
|
+
publicAPI.setVisibility = function () {
|
|
613
|
+
return setVisibility.apply(void 0, arguments).some(Boolean);
|
|
614
|
+
};
|
|
612
615
|
|
|
613
616
|
publicAPI.setTickTextStyle = function (tickStyle) {
|
|
614
617
|
model.tickTextStyle = _objectSpread(_objectSpread({}, model.tickTextStyle), tickStyle);
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
|
|
2
2
|
import _defineProperty from '@babel/runtime/helpers/defineProperty';
|
|
3
|
-
import {
|
|
4
|
-
import { s as set, v as vec3, a as subtract, n as normalize, c as cross } from '../../vendor/gl-matrix/esm/vec3.js';
|
|
3
|
+
import { mat4, vec3 } from 'gl-matrix';
|
|
5
4
|
import macro from '../../macros.js';
|
|
6
5
|
import vtkActor from './Actor.js';
|
|
7
6
|
|
|
@@ -31,43 +30,43 @@ function vtkFollower(publicAPI, model) {
|
|
|
31
30
|
publicAPI.computeMatrix = function () {
|
|
32
31
|
// check whether or not need to rebuild the matrix
|
|
33
32
|
if (publicAPI.getMTime() > model.matrixMTime.getMTime()) {
|
|
34
|
-
identity(model.matrix);
|
|
33
|
+
mat4.identity(model.matrix);
|
|
35
34
|
|
|
36
35
|
if (model.userMatrix) {
|
|
37
|
-
multiply(model.matrix, model.matrix, model.userMatrix);
|
|
36
|
+
mat4.multiply(model.matrix, model.matrix, model.userMatrix);
|
|
38
37
|
}
|
|
39
38
|
|
|
40
|
-
translate(model.matrix, model.matrix, model.origin);
|
|
41
|
-
translate(model.matrix, model.matrix, model.position);
|
|
42
|
-
multiply(model.matrix, model.matrix, model.rotation);
|
|
43
|
-
scale(model.matrix, model.matrix, model.scale);
|
|
39
|
+
mat4.translate(model.matrix, model.matrix, model.origin);
|
|
40
|
+
mat4.translate(model.matrix, model.matrix, model.position);
|
|
41
|
+
mat4.multiply(model.matrix, model.matrix, model.rotation);
|
|
42
|
+
mat4.scale(model.matrix, model.matrix, model.scale);
|
|
44
43
|
|
|
45
44
|
if (model.camera) {
|
|
46
45
|
// first compute our target viewUp
|
|
47
46
|
var vup = new Float64Array(model.viewUp);
|
|
48
47
|
|
|
49
48
|
if (!model.useViewUp) {
|
|
50
|
-
set.apply(vec3, [vup].concat(_toConsumableArray(model.camera.getViewUp())));
|
|
49
|
+
vec3.set.apply(vec3, [vup].concat(_toConsumableArray(model.camera.getViewUp())));
|
|
51
50
|
} // compute a vpn
|
|
52
51
|
|
|
53
52
|
|
|
54
53
|
var vpn = new Float64Array(3);
|
|
55
54
|
|
|
56
55
|
if (model.camera.getParallelProjection()) {
|
|
57
|
-
set(vpn, model.camera.getViewPlaneNormal());
|
|
56
|
+
vec3.set(vpn, model.camera.getViewPlaneNormal());
|
|
58
57
|
} else {
|
|
59
|
-
set.apply(vec3, [vpn].concat(_toConsumableArray(model.position)));
|
|
60
|
-
subtract(vpn, model.camera.getPosition(), vpn);
|
|
61
|
-
normalize(vpn, vpn);
|
|
58
|
+
vec3.set.apply(vec3, [vpn].concat(_toConsumableArray(model.position)));
|
|
59
|
+
vec3.subtract(vpn, model.camera.getPosition(), vpn);
|
|
60
|
+
vec3.normalize(vpn, vpn);
|
|
62
61
|
} // compute vright
|
|
63
62
|
|
|
64
63
|
|
|
65
64
|
var vright = new Float64Array(3);
|
|
66
|
-
cross(vright, vup, vpn);
|
|
67
|
-
normalize(vright, vright); // now recompute the vpn so that it is orthogonal to vup
|
|
65
|
+
vec3.cross(vright, vup, vpn);
|
|
66
|
+
vec3.normalize(vright, vright); // now recompute the vpn so that it is orthogonal to vup
|
|
68
67
|
|
|
69
|
-
cross(vpn, vright, vup);
|
|
70
|
-
normalize(vpn, vpn);
|
|
68
|
+
vec3.cross(vpn, vright, vup);
|
|
69
|
+
vec3.normalize(vpn, vpn);
|
|
71
70
|
model.followerMatrix[0] = vright[0];
|
|
72
71
|
model.followerMatrix[1] = vright[1];
|
|
73
72
|
model.followerMatrix[2] = vright[2];
|
|
@@ -77,11 +76,11 @@ function vtkFollower(publicAPI, model) {
|
|
|
77
76
|
model.followerMatrix[8] = vpn[0];
|
|
78
77
|
model.followerMatrix[9] = vpn[1];
|
|
79
78
|
model.followerMatrix[10] = vpn[2];
|
|
80
|
-
multiply(model.matrix, model.followerMatrix, model.matrix);
|
|
79
|
+
mat4.multiply(model.matrix, model.followerMatrix, model.matrix);
|
|
81
80
|
}
|
|
82
81
|
|
|
83
|
-
translate(model.matrix, model.matrix, [-model.origin[0], -model.origin[1], -model.origin[2]]);
|
|
84
|
-
transpose(model.matrix, model.matrix); // check for identity
|
|
82
|
+
mat4.translate(model.matrix, model.matrix, [-model.origin[0], -model.origin[1], -model.origin[2]]);
|
|
83
|
+
mat4.transpose(model.matrix, model.matrix); // check for identity
|
|
85
84
|
|
|
86
85
|
model.isIdentity = false;
|
|
87
86
|
model.matrixMTime.modified();
|
|
@@ -103,7 +102,7 @@ function extend(publicAPI, model) {
|
|
|
103
102
|
Object.assign(model, DEFAULT_VALUES, initialValues); // Inheritance
|
|
104
103
|
|
|
105
104
|
vtkActor.extend(publicAPI, model, initialValues);
|
|
106
|
-
model.followerMatrix = identity(new Float64Array(16)); // Build VTK API
|
|
105
|
+
model.followerMatrix = mat4.identity(new Float64Array(16)); // Build VTK API
|
|
107
106
|
|
|
108
107
|
macro.setGet(publicAPI, model, ['useViewUp', 'camera']);
|
|
109
108
|
macro.setGetArray(publicAPI, model, ['viewUp'], 3); // Object methods
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
import _defineProperty from '@babel/runtime/helpers/defineProperty';
|
|
2
2
|
import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
|
|
3
|
+
import { mat4, vec3, mat3 } from 'gl-matrix';
|
|
3
4
|
import Constants from './Glyph3DMapper/Constants.js';
|
|
4
5
|
import macro from '../../macros.js';
|
|
5
6
|
import vtkMapper from './Mapper.js';
|
|
6
7
|
import { M as createUninitializedBounds, n as norm } from '../../Common/Core/Math/index.js';
|
|
7
8
|
import vtkBoundingBox from '../../Common/DataModel/BoundingBox.js';
|
|
8
|
-
import { i as identity, t as translate, b as rotateY, r as rotate, c as rotateZ, a as rotateX, m as multiply, s as scale } from '../../vendor/gl-matrix/esm/mat4.js';
|
|
9
|
-
import { t as transformMat4 } from '../../vendor/gl-matrix/esm/vec3.js';
|
|
10
|
-
import { f as fromMat4, a as invert, t as transpose } from '../../vendor/gl-matrix/esm/mat3.js';
|
|
11
9
|
|
|
12
10
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
|
|
13
11
|
|
|
@@ -141,9 +139,9 @@ function vtkGlyph3DMapper(publicAPI, model) {
|
|
|
141
139
|
model.bounds[5] = vtkBoundingBox.INIT_BOUNDS[5];
|
|
142
140
|
var tcorner = new Float64Array(3);
|
|
143
141
|
var oArray = publicAPI.getOrientationArrayData();
|
|
144
|
-
var identity
|
|
142
|
+
var identity = mat4.identity(new Float64Array(16));
|
|
145
143
|
var trans = [];
|
|
146
|
-
var scale
|
|
144
|
+
var scale = [];
|
|
147
145
|
var numPts = pts.length / 3;
|
|
148
146
|
model.matrixArray = new Float32Array(16 * numPts);
|
|
149
147
|
var mbuff = model.matrixArray.buffer;
|
|
@@ -156,7 +154,7 @@ function vtkGlyph3DMapper(publicAPI, model) {
|
|
|
156
154
|
trans[0] = pts[i * 3];
|
|
157
155
|
trans[1] = pts[i * 3 + 1];
|
|
158
156
|
trans[2] = pts[i * 3 + 2];
|
|
159
|
-
translate(z, identity
|
|
157
|
+
mat4.translate(z, identity, trans);
|
|
160
158
|
|
|
161
159
|
if (oArray) {
|
|
162
160
|
var orientation = [];
|
|
@@ -167,20 +165,20 @@ function vtkGlyph3DMapper(publicAPI, model) {
|
|
|
167
165
|
{
|
|
168
166
|
// prettier-ignore
|
|
169
167
|
var rotMat4 = [].concat(_toConsumableArray(orientation.slice(0, 3)), [0], _toConsumableArray(orientation.slice(3, 6)), [0], _toConsumableArray(orientation.slice(6, 9)), [0, 0, 0, 0, 1]);
|
|
170
|
-
multiply(z, z, rotMat4);
|
|
168
|
+
mat4.multiply(z, z, rotMat4);
|
|
171
169
|
break;
|
|
172
170
|
}
|
|
173
171
|
|
|
174
172
|
case OrientationModes.ROTATION:
|
|
175
|
-
rotateZ(z, z, orientation[2]);
|
|
176
|
-
rotateX(z, z, orientation[0]);
|
|
177
|
-
rotateY(z, z, orientation[1]);
|
|
173
|
+
mat4.rotateZ(z, z, orientation[2]);
|
|
174
|
+
mat4.rotateX(z, z, orientation[0]);
|
|
175
|
+
mat4.rotateY(z, z, orientation[1]);
|
|
178
176
|
break;
|
|
179
177
|
|
|
180
178
|
case OrientationModes.DIRECTION:
|
|
181
179
|
if (orientation[1] === 0.0 && orientation[2] === 0.0) {
|
|
182
180
|
if (orientation[0] < 0) {
|
|
183
|
-
rotateY(z, z, 3.1415926);
|
|
181
|
+
mat4.rotateY(z, z, 3.1415926);
|
|
184
182
|
}
|
|
185
183
|
} else {
|
|
186
184
|
var vMag = norm(orientation);
|
|
@@ -188,7 +186,7 @@ function vtkGlyph3DMapper(publicAPI, model) {
|
|
|
188
186
|
vNew[0] = (orientation[0] + vMag) / 2.0;
|
|
189
187
|
vNew[1] = orientation[1] / 2.0;
|
|
190
188
|
vNew[2] = orientation[2] / 2.0;
|
|
191
|
-
rotate(z, z, 3.1415926, vNew);
|
|
189
|
+
mat4.rotate(z, z, 3.1415926, vNew);
|
|
192
190
|
}
|
|
193
191
|
|
|
194
192
|
break;
|
|
@@ -197,9 +195,9 @@ function vtkGlyph3DMapper(publicAPI, model) {
|
|
|
197
195
|
|
|
198
196
|
|
|
199
197
|
if (model.scaling) {
|
|
200
|
-
scale
|
|
201
|
-
scale
|
|
202
|
-
scale
|
|
198
|
+
scale[0] = model.scaleFactor;
|
|
199
|
+
scale[1] = model.scaleFactor;
|
|
200
|
+
scale[2] = model.scaleFactor; // Get the scalar and vector data
|
|
203
201
|
|
|
204
202
|
if (sArray) {
|
|
205
203
|
switch (model.scaleMode) {
|
|
@@ -208,9 +206,9 @@ function vtkGlyph3DMapper(publicAPI, model) {
|
|
|
208
206
|
tuple[t] = sData[i * numSComp + t];
|
|
209
207
|
}
|
|
210
208
|
|
|
211
|
-
scale
|
|
212
|
-
scale
|
|
213
|
-
scale
|
|
209
|
+
scale[0] *= norm(tuple, numSComp);
|
|
210
|
+
scale[1] = scale[0];
|
|
211
|
+
scale[2] = scale[0];
|
|
214
212
|
break;
|
|
215
213
|
|
|
216
214
|
case ScaleModes.SCALE_BY_COMPONENTS:
|
|
@@ -218,33 +216,33 @@ function vtkGlyph3DMapper(publicAPI, model) {
|
|
|
218
216
|
tuple[_t] = sData[i * numSComp + _t];
|
|
219
217
|
}
|
|
220
218
|
|
|
221
|
-
scale
|
|
222
|
-
scale
|
|
223
|
-
scale
|
|
219
|
+
scale[0] *= tuple[0];
|
|
220
|
+
scale[1] *= tuple[1];
|
|
221
|
+
scale[2] *= tuple[2];
|
|
224
222
|
break;
|
|
225
223
|
|
|
226
224
|
case ScaleModes.SCALE_BY_CONSTANT:
|
|
227
225
|
}
|
|
228
226
|
}
|
|
229
227
|
|
|
230
|
-
if (scale
|
|
231
|
-
scale
|
|
228
|
+
if (scale[0] === 0.0) {
|
|
229
|
+
scale[0] = 1.0e-10;
|
|
232
230
|
}
|
|
233
231
|
|
|
234
|
-
if (scale
|
|
235
|
-
scale
|
|
232
|
+
if (scale[1] === 0.0) {
|
|
233
|
+
scale[1] = 1.0e-10;
|
|
236
234
|
}
|
|
237
235
|
|
|
238
|
-
if (scale
|
|
239
|
-
scale
|
|
236
|
+
if (scale[2] === 0.0) {
|
|
237
|
+
scale[2] = 1.0e-10;
|
|
240
238
|
}
|
|
241
239
|
|
|
242
|
-
scale(z, z, scale
|
|
240
|
+
mat4.scale(z, z, scale);
|
|
243
241
|
} // update bounds
|
|
244
242
|
|
|
245
243
|
|
|
246
244
|
for (var p = 0; p < 8; ++p) {
|
|
247
|
-
transformMat4(tcorner, corners[p], z);
|
|
245
|
+
vec3.transformMat4(tcorner, corners[p], z);
|
|
248
246
|
|
|
249
247
|
if (tcorner[0] < model.bounds[0]) {
|
|
250
248
|
model.bounds[0] = tcorner[0];
|
|
@@ -272,9 +270,9 @@ function vtkGlyph3DMapper(publicAPI, model) {
|
|
|
272
270
|
}
|
|
273
271
|
|
|
274
272
|
var n = new Float32Array(nbuff, i * 36, 9);
|
|
275
|
-
fromMat4(n, z);
|
|
276
|
-
invert(n, n);
|
|
277
|
-
transpose(n, n);
|
|
273
|
+
mat3.fromMat4(n, z);
|
|
274
|
+
mat3.invert(n, n);
|
|
275
|
+
mat3.transpose(n, n);
|
|
278
276
|
} // map scalars as well
|
|
279
277
|
|
|
280
278
|
|
|
@@ -5,7 +5,7 @@ import vtkAbstractMapper from './AbstractMapper.js';
|
|
|
5
5
|
import { A as clampValue, N as multiply3x3_vect3, M as createUninitializedBounds } from '../../Common/Core/Math/index.js';
|
|
6
6
|
import vtkPlane from '../../Common/DataModel/Plane.js';
|
|
7
7
|
import CoincidentTopologyHelper from './Mapper/CoincidentTopologyHelper.js';
|
|
8
|
-
import {
|
|
8
|
+
import { vec3 } from 'gl-matrix';
|
|
9
9
|
|
|
10
10
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
|
|
11
11
|
|
|
@@ -368,7 +368,7 @@ function vtkImageMapper(publicAPI, model) {
|
|
|
368
368
|
worldNormal[0] -= worldOrigin[0];
|
|
369
369
|
worldNormal[1] -= worldOrigin[1];
|
|
370
370
|
worldNormal[2] -= worldOrigin[2];
|
|
371
|
-
normalize(worldNormal, worldNormal);
|
|
371
|
+
vec3.normalize(worldNormal, worldNormal);
|
|
372
372
|
var intersect = vtkPlane.intersectWithLine(p1, p2, worldOrigin, worldNormal);
|
|
373
373
|
|
|
374
374
|
if (intersect.intersection) {
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
+
import { mat4, vec3 } from 'gl-matrix';
|
|
1
2
|
import macro from '../../macros.js';
|
|
2
3
|
import vtkBoundingBox from '../../Common/DataModel/BoundingBox.js';
|
|
3
4
|
import vtkProp3D from './Prop3D.js';
|
|
4
5
|
import vtkImageProperty from './ImageProperty.js';
|
|
5
|
-
import { j as transpose } from '../../vendor/gl-matrix/esm/mat4.js';
|
|
6
|
-
import { t as transformMat4 } from '../../vendor/gl-matrix/esm/vec3.js';
|
|
7
6
|
|
|
8
7
|
var vtkDebugMacro = macro.vtkDebugMacro; // ----------------------------------------------------------------------------
|
|
9
8
|
// vtkImageSlice methods
|
|
@@ -106,9 +105,9 @@ function vtkImageSlice(publicAPI, model) {
|
|
|
106
105
|
vtkBoundingBox.getCorners(bds, bbox);
|
|
107
106
|
publicAPI.computeMatrix();
|
|
108
107
|
var tmp4 = new Float64Array(16);
|
|
109
|
-
transpose(tmp4, model.matrix);
|
|
108
|
+
mat4.transpose(tmp4, model.matrix);
|
|
110
109
|
bbox.forEach(function (pt) {
|
|
111
|
-
return transformMat4(pt, pt, tmp4);
|
|
110
|
+
return vec3.transformMat4(pt, pt, tmp4);
|
|
112
111
|
});
|
|
113
112
|
/* eslint-disable no-multi-assign */
|
|
114
113
|
|
|
@@ -147,9 +146,9 @@ function vtkImageSlice(publicAPI, model) {
|
|
|
147
146
|
vtkBoundingBox.getCorners(bds, bbox);
|
|
148
147
|
publicAPI.computeMatrix();
|
|
149
148
|
var tmp4 = new Float64Array(16);
|
|
150
|
-
transpose(tmp4, model.matrix);
|
|
149
|
+
mat4.transpose(tmp4, model.matrix);
|
|
151
150
|
bbox.forEach(function (pt) {
|
|
152
|
-
return transformMat4(pt, pt, tmp4);
|
|
151
|
+
return vec3.transformMat4(pt, pt, tmp4);
|
|
153
152
|
});
|
|
154
153
|
var newBounds = [Number.MAX_VALUE, -Number.MAX_VALUE, Number.MAX_VALUE, -Number.MAX_VALUE, Number.MAX_VALUE, -Number.MAX_VALUE];
|
|
155
154
|
newBounds = newBounds.map(function (d, i) {
|
|
@@ -86,14 +86,14 @@ export interface vtkPicker extends vtkAbstractPicker {
|
|
|
86
86
|
setMapperPosition(x: number, y: number, z: number): boolean;
|
|
87
87
|
|
|
88
88
|
/**
|
|
89
|
-
*
|
|
90
|
-
* @param {Vector3} mapperPosition
|
|
89
|
+
* Set position in mapper coordinates of pick point.
|
|
90
|
+
* @param {Vector3} mapperPosition The mapper coordinates of pick point.
|
|
91
91
|
*/
|
|
92
92
|
setMapperPositionFrom(mapperPosition: Vector3): boolean;
|
|
93
93
|
|
|
94
94
|
/**
|
|
95
95
|
* Specify tolerance for performing pick operation.
|
|
96
|
-
* @param {Number} tolerance
|
|
96
|
+
* @param {Number} tolerance The tolerance value.
|
|
97
97
|
*/
|
|
98
98
|
setTolerance(tolerance: number): boolean;
|
|
99
99
|
}
|
|
@@ -103,7 +103,7 @@ export interface vtkPicker extends vtkAbstractPicker {
|
|
|
103
103
|
*
|
|
104
104
|
* @param publicAPI object on which methods will be bounds (public)
|
|
105
105
|
* @param model object on which data structure will be bounds (protected)
|
|
106
|
-
* @param {IPickerInitialValues} initialValues
|
|
106
|
+
* @param {IPickerInitialValues} [initialValues]
|
|
107
107
|
*/
|
|
108
108
|
export function extend(publicAPI: object, model: object, initialValues?: IPickerInitialValues): void;
|
|
109
109
|
|
|
@@ -111,7 +111,7 @@ export function extend(publicAPI: object, model: object, initialValues?: IPicker
|
|
|
111
111
|
* Method use to create a new instance of vtkPicker with its focal point at the origin,
|
|
112
112
|
* and position=(0,0,1). The view up is along the y-axis, view angle is 30 degrees,
|
|
113
113
|
* and the clipping range is (.1,1000).
|
|
114
|
-
* @param {IPickerInitialValues} initialValues for pre-setting some of its content
|
|
114
|
+
* @param {IPickerInitialValues} [initialValues] for pre-setting some of its content
|
|
115
115
|
*/
|
|
116
116
|
export function newInstance(initialValues?: IPickerInitialValues): vtkPicker;
|
|
117
117
|
|
package/Rendering/Core/Picker.js
CHANGED
|
@@ -3,8 +3,7 @@ import macro from '../../macros.js';
|
|
|
3
3
|
import vtkAbstractPicker from './AbstractPicker.js';
|
|
4
4
|
import vtkBoundingBox from '../../Common/DataModel/BoundingBox.js';
|
|
5
5
|
import { d as dot, l as normalize, n as norm, f as distance2BetweenPoints } from '../../Common/Core/Math/index.js';
|
|
6
|
-
import {
|
|
7
|
-
import { t as transformMat4 } from '../../vendor/gl-matrix/esm/vec4.js';
|
|
6
|
+
import { mat4, vec4 } from 'gl-matrix';
|
|
8
7
|
|
|
9
8
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
|
|
10
9
|
|
|
@@ -207,8 +206,8 @@ function vtkPicker(publicAPI, model) {
|
|
|
207
206
|
model.transformMatrix = prop.getMatrix().slice(0); // Webgl need a transpose matrix but we need the untransposed one to project world points
|
|
208
207
|
// into the right referential
|
|
209
208
|
|
|
210
|
-
transpose(model.transformMatrix, model.transformMatrix);
|
|
211
|
-
invert(model.transformMatrix, model.transformMatrix); // Extract scale
|
|
209
|
+
mat4.transpose(model.transformMatrix, model.transformMatrix);
|
|
210
|
+
mat4.invert(model.transformMatrix, model.transformMatrix); // Extract scale
|
|
212
211
|
|
|
213
212
|
var col1 = [model.transformMatrix[0], model.transformMatrix[1], model.transformMatrix[2]];
|
|
214
213
|
var col2 = [model.transformMatrix[4], model.transformMatrix[5], model.transformMatrix[6]];
|
|
@@ -216,8 +215,8 @@ function vtkPicker(publicAPI, model) {
|
|
|
216
215
|
scale[0] = norm(col1);
|
|
217
216
|
scale[1] = norm(col2);
|
|
218
217
|
scale[2] = norm(col3);
|
|
219
|
-
transformMat4(p1Mapper, p1World, model.transformMatrix);
|
|
220
|
-
transformMat4(p2Mapper, p2World, model.transformMatrix);
|
|
218
|
+
vec4.transformMat4(p1Mapper, p1World, model.transformMatrix);
|
|
219
|
+
vec4.transformMat4(p2Mapper, p2World, model.transformMatrix);
|
|
221
220
|
p1Mapper[0] /= p1Mapper[3];
|
|
222
221
|
p1Mapper[1] /= p1Mapper[3];
|
|
223
222
|
p1Mapper[2] /= p1Mapper[3];
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
+
import { mat4, vec3 } from 'gl-matrix';
|
|
1
2
|
import macro from '../../macros.js';
|
|
2
3
|
import vtkMapper from './Mapper.js';
|
|
3
|
-
import { j as transpose } from '../../vendor/gl-matrix/esm/mat4.js';
|
|
4
|
-
import { t as transformMat4 } from '../../vendor/gl-matrix/esm/vec3.js';
|
|
5
4
|
|
|
6
5
|
// vtkPixelSpaceCallbackMapper methods
|
|
7
6
|
// ----------------------------------------------------------------------------
|
|
@@ -19,7 +18,7 @@ function vtkPixelSpaceCallbackMapper(publicAPI, model) {
|
|
|
19
18
|
}
|
|
20
19
|
|
|
21
20
|
var matrix = camera.getCompositeProjectionMatrix(aspect, -1, 1);
|
|
22
|
-
transpose(matrix, matrix);
|
|
21
|
+
mat4.transpose(matrix, matrix);
|
|
23
22
|
var dataPoints = dataset.getPoints();
|
|
24
23
|
var result = new Float64Array(3);
|
|
25
24
|
var width = windowSize.usize;
|
|
@@ -30,7 +29,7 @@ function vtkPixelSpaceCallbackMapper(publicAPI, model) {
|
|
|
30
29
|
|
|
31
30
|
for (var pidx = 0; pidx < dataPoints.getNumberOfPoints(); pidx += 1) {
|
|
32
31
|
var point = dataPoints.getPoint(pidx);
|
|
33
|
-
transformMat4(result, point, matrix);
|
|
32
|
+
vec3.transformMat4(result, point, matrix);
|
|
34
33
|
var coord = [result[0] * hw + hw, result[1] * hh + hh, result[2], 0];
|
|
35
34
|
|
|
36
35
|
if (depthValues) {
|