threejs bump to 0.138.2

Grid bounds and scaling #335 bump to 2.13.0
K3D-tools · Apr 6, 2022 · 7eb26f5 · 7eb26f5
1 parent 81215ae
commit 7eb26f5
Show file tree

Hide file tree

Showing 101 changed files with 39 additions and 30 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -3,8 +3,10 @@
 git add and git commit
 rm -rf build
 rm -rf dist
-python setup.py sdist upload
-python setup.py bdist_wheel upload
+pip install -ve .
+python setup.py sdist
+python setup.py bdist_wheel
+twine upload dist/*
 cd js
 grunt build
 npm publish

diff --git a/js/package.json b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "k3d",
-  "version": "2.12.0",
+  "version": "2.13.0",
   "description": "3D visualization library",
   "author": "k3d team",
   "main": "src/index.js",
@@ -68,7 +68,7 @@
     "screenfull": "^5.1.0",
     "stats.js": "^0.17.0",
     "style-loader": "^2.0.0",
-    "three": "^0.137.4",
+    "three": "^0.138.2",
     "three-mesh-bvh": "^0.3.7"
   }
 }
diff --git a/js/src/providers/threejs/initializers/Renderer.js b/js/src/providers/threejs/initializers/Renderer.js
@@ -32,12 +32,14 @@ module.exports = function (K3D) {
         antialias: K3D.parameters.antialias > 0,
         preserveDrawingBuffer: true,
         alpha: true,
+        stencil: true,
         powerPreference: 'high-performance',
     });
 
     self.renderer = new THREE.WebGLRenderer({
         alpha: true,
         precision: "highp",
+        premultipliedAlpha: true,
         antialias: K3D.parameters.antialias > 0,
         logarithmicDepthBuffer: K3D.parameters.logarithmicDepthBuffer,
         canvas,
@@ -75,6 +77,7 @@ module.exports = function (K3D) {
     console.log('K3D: (UNMASKED_VENDOR_WEBGL)', gl.getParameter(debugInfo.UNMASKED_VENDOR_WEBGL));
     console.log('K3D: (UNMASKED_RENDERER_WEBGL)', gl.getParameter(debugInfo.UNMASKED_RENDERER_WEBGL));
     console.log('K3D: (depth bits)', gl.getParameter(gl.DEPTH_BITS));
+    console.log('K3D: (stencil bits)', gl.getParameter(gl.STENCIL_BITS));
 
     function standardRender(scene, camera, rt) {
         if (typeof (rt) === 'undefined') {

diff --git a/js/src/providers/threejs/initializers/Scene.js b/js/src/providers/threejs/initializers/Scene.js
@@ -58,25 +58,11 @@ function generateAxesHelper(K3D, axesHelper) {
     return promises;
 }
 
-function ensureTwoTicksOnGrids(sceneBoundingBox, majorScale) {
-    const size = sceneBoundingBox.getSize(new THREE.Vector3());
-
-    ['x', 'y', 'z'].forEach((axis) => {
-        const dist = size[axis] / majorScale;
-
-        if (dist <= 2.0) {
-            sceneBoundingBox.min[axis] -= (1.0 - dist / 2.0 + 0.0001) * majorScale;
-            sceneBoundingBox.max[axis] += (1.0 - dist / 2.0 + 0.0001) * majorScale;
-        }
-    });
-}
-
 function getSceneBoundingBox() {
     /* jshint validthis:true */
 
     const sceneBoundingBox = new THREE.Box3();
     let objectBoundingBox;
-
     this.K3DObjects.traverse((object) => {
         let isK3DObject = false;
         let ref = object;
@@ -92,6 +78,7 @@ function getSceneBoundingBox() {
 
         if (isK3DObject
             && typeof (object.position.z) !== 'undefined'
+            && object.visible
             && (object.geometry || object.boundingBox)) {
             if (object.geometry && object.geometry.boundingBox) {
                 objectBoundingBox = object.geometry.boundingBox.clone();
@@ -239,7 +226,7 @@ function rebuildSceneData(K3D, grids, axesHelper, force) {
         axesHelper.width = 100;
         axesHelper.height = 100;
     }
-    
+
     if (updateAxesHelper) {
         if (K3D.parameters.axesHelper > 0) {
             generateAxesHelper(K3D, axesHelper).forEach((p) => {
@@ -261,7 +248,13 @@ function rebuildSceneData(K3D, grids, axesHelper, force) {
         majorScale = pow10ceil(Math.max(size.x, size.y, size.z)) / 10.0;
         minorScale = majorScale / 10.0;
 
-        ensureTwoTicksOnGrids(sceneBoundingBox, majorScale);
+        ['x', 'y', 'z'].forEach(function (axis) {
+            if (sceneBoundingBox.min[axis] === sceneBoundingBox.max[axis]) {
+                sceneBoundingBox.min[axis] -= majorScale / 2.0;
+                sceneBoundingBox.max[axis] += majorScale / 2.0;
+            }
+        });
+        size = sceneBoundingBox.getSize(new THREE.Vector3());
 
         sceneBoundingBox.min = new THREE.Vector3(
             Math.floor(sceneBoundingBox.min.x / majorScale) * majorScale,
@@ -329,16 +322,28 @@ function rebuildSceneData(K3D, grids, axesHelper, force) {
         // create labels
         Object.keys(grids.labelsOnEdges).forEach((key) => {
             const iterateAxis = _.difference(['x', 'y', 'z'], key.replace(/[^xyz]/g, '').split(''))[0];
-            const iterationCount = size[iterateAxis] / majorScale;
-            const deltaValue = unitVectors[iterateAxis].clone().multiplyScalar(majorScale);
-            const deltaPosition = unitVectors[iterateAxis].clone().multiplyScalar(
+            let iterationCount = size[iterateAxis] / majorScale;
+
+            let deltaValue = unitVectors[iterateAxis].clone().multiplyScalar(majorScale);
+            let deltaPosition = unitVectors[iterateAxis].clone().multiplyScalar(
                 grids.labelsOnEdges[key].p[0].distanceTo(grids.labelsOnEdges[key].p[1]) / iterationCount,
             );
             let j;
             let v;
             let p;
             let label;
 
+            if (iterationCount <= 2) {
+                let originalIterationCount = iterationCount;
+
+                iterationCount = originalIterationCount * 5;
+                deltaValue = unitVectors[iterateAxis].clone()
+                    .multiplyScalar(originalIterationCount * majorScale / iterationCount);
+                deltaPosition = unitVectors[iterateAxis].clone().multiplyScalar(
+                    grids.labelsOnEdges[key].p[0].distanceTo(grids.labelsOnEdges[key].p[1]) / iterationCount,
+                );
+            }
+
             for (j = 1; j <= iterationCount - 1; j++) {
                 v = grids.labelsOnEdges[key].v[0].clone().add(deltaValue.clone().multiplyScalar(j));
                 p = grids.labelsOnEdges[key].p[0].clone().add(deltaPosition.clone().multiplyScalar(j));
@@ -408,8 +413,7 @@ function rebuildSceneData(K3D, grids, axesHelper, force) {
                     const delta = unitVectors[iterateAxis].clone().multiplyScalar(minorScale);
                     let p1;
                     let p2;
-                    let
-                        j;
+                    let j;
 
                     for (j = 0; j <= size[iterateAxis] / minorScale; j++) {
                         p1 = plane.p1.clone().add(delta.clone().multiplyScalar(j));

diff --git a/js/src/providers/threejs/objects/MIP.js b/js/src/providers/threejs/objects/MIP.js
@@ -39,7 +39,7 @@ module.exports = {
         modelMatrix.set.apply(modelMatrix, config.model_matrix.data);
         modelMatrix.decompose(translation, rotation, scale);
 
-        const texture = new THREE.DataTexture3D(
+        const texture = new THREE.Data3DTexture(
             config.volume.data,
             config.volume.shape[2],
             config.volume.shape[1],

diff --git a/js/src/providers/threejs/objects/MeshVolume.js b/js/src/providers/threejs/objects/MeshVolume.js
@@ -38,7 +38,7 @@ module.exports = {
         geometry.setAttribute('position', new THREE.BufferAttribute(vertices, 3));
         geometry.setIndex(new THREE.BufferAttribute(indices, 1));
 
-        const texture = new THREE.DataTexture3D(
+        const texture = new THREE.Data3DTexture(
             config.volume.data,
             config.volume.shape[2],
             config.volume.shape[1],

diff --git a/js/src/providers/threejs/objects/Volume.js b/js/src/providers/threejs/objects/Volume.js
@@ -66,7 +66,7 @@ module.exports = {
         modelMatrix.set.apply(modelMatrix, config.model_matrix.data);
         modelMatrix.decompose(translation, rotation, scale);
 
-        const texture = new THREE.DataTexture3D(
+        const texture = new THREE.Data3DTexture(
             config.volume.data,
             config.volume.shape[2],
             config.volume.shape[1],

diff --git a/k3d/test/references/line_advanced.png b/k3d/test/references/line_advanced.png
diff --git a/k3d/test/references/line_mesh.png b/k3d/test/references/line_mesh.png
diff --git a/k3d/test/references/line_mesh_clipping_plane.png b/k3d/test/references/line_mesh_clipping_plane.png
diff --git a/k3d/test/references/line_simple.png b/k3d/test/references/line_simple.png
diff --git a/k3d/test/references/line_simple_clipping_plane.png b/k3d/test/references/line_simple_clipping_plane.png
diff --git a/k3d/test/references/line_simple_red.png b/k3d/test/references/line_simple_red.png
diff --git a/k3d/test/references/line_simplified_mesh.png b/k3d/test/references/line_simplified_mesh.png
diff --git a/k3d/test/references/line_thick.png b/k3d/test/references/line_thick.png
diff --git a/k3d/test/references/line_thick_clipping_plane.png b/k3d/test/references/line_thick_clipping_plane.png
diff --git a/k3d/test/references/linux/labels.png b/k3d/test/references/linux/labels.png
diff --git a/k3d/test/references/linux/labels_without_box.png b/k3d/test/references/linux/labels_without_box.png
diff --git a/k3d/test/references/linux/text.png b/k3d/test/references/linux/text.png
diff --git a/k3d/test/references/linux/text2d.png b/k3d/test/references/linux/text2d.png
diff --git a/k3d/test/references/linux/text2d_without_box.png b/k3d/test/references/linux/text2d_without_box.png
diff --git a/k3d/test/references/linux/text_without_box.png b/k3d/test/references/linux/text_without_box.png
diff --git a/k3d/test/references/linux/texture_text.png b/k3d/test/references/linux/texture_text.png
diff --git a/k3d/test/references/linux/vectors_labels.png b/k3d/test/references/linux/vectors_labels.png
diff --git a/k3d/test/references/linux/vectors_labels_dynamic_head_size.png b/k3d/test/references/linux/vectors_labels_dynamic_head_size.png
diff --git a/k3d/test/references/marching_cubes.png b/k3d/test/references/marching_cubes.png
diff --git a/k3d/test/references/marching_cubes_dynamic_level.png b/k3d/test/references/marching_cubes_dynamic_level.png
diff --git a/k3d/test/references/marching_cubes_non_uniformly_spaced.png b/k3d/test/references/marching_cubes_non_uniformly_spaced.png
diff --git a/k3d/test/references/marching_cubes_smoothed.png b/k3d/test/references/marching_cubes_smoothed.png
diff --git a/k3d/test/references/marching_cubes_wireframe.png b/k3d/test/references/marching_cubes_wireframe.png
diff --git a/k3d/test/references/mesh.png b/k3d/test/references/mesh.png
diff --git a/k3d/test/references/mesh_advanced.png b/k3d/test/references/mesh_advanced.png
diff --git a/k3d/test/references/mesh_advanced_opacity.png b/k3d/test/references/mesh_advanced_opacity.png
diff --git a/k3d/test/references/mesh_advanced_smoothed.png b/k3d/test/references/mesh_advanced_smoothed.png
diff --git a/k3d/test/references/mesh_advanced_wireframe.png b/k3d/test/references/mesh_advanced_wireframe.png
diff --git a/k3d/test/references/mesh_attribute.png b/k3d/test/references/mesh_attribute.png
diff --git a/k3d/test/references/mesh_attribute_advanced.png b/k3d/test/references/mesh_attribute_advanced.png
diff --git a/k3d/test/references/mesh_attribute_advanced_clipping_planes.png b/k3d/test/references/mesh_attribute_advanced_clipping_planes.png
diff --git a/k3d/test/references/mesh_triangle_attribute.png b/k3d/test/references/mesh_triangle_attribute.png
diff --git a/k3d/test/references/mesh_volume_data.png b/k3d/test/references/mesh_volume_data.png
diff --git a/k3d/test/references/mip.png b/k3d/test/references/mip.png
diff --git a/k3d/test/references/mip_opacity_function.png b/k3d/test/references/mip_opacity_function.png
diff --git a/k3d/test/references/points_3d.png b/k3d/test/references/points_3d.png
diff --git a/k3d/test/references/points_3dSpecular.png b/k3d/test/references/points_3dSpecular.png
diff --git a/k3d/test/references/points_3dSpecular_sizes.png b/k3d/test/references/points_3dSpecular_sizes.png
diff --git a/k3d/test/references/points_3d_clipping_plane.png b/k3d/test/references/points_3d_clipping_plane.png
diff --git a/k3d/test/references/points_3d_no_opacity.png b/k3d/test/references/points_3d_no_opacity.png
diff --git a/k3d/test/references/points_3d_no_opacity_with_plane.png b/k3d/test/references/points_3d_no_opacity_with_plane.png
diff --git a/k3d/test/references/points_dot.png b/k3d/test/references/points_dot.png
diff --git a/k3d/test/references/points_flat.png b/k3d/test/references/points_flat.png
diff --git a/k3d/test/references/points_mesh.png b/k3d/test/references/points_mesh.png
diff --git a/k3d/test/references/points_mesh_clipping_plane.png b/k3d/test/references/points_mesh_clipping_plane.png
diff --git a/k3d/test/references/points_mesh_high_detail.png b/k3d/test/references/points_mesh_high_detail.png
diff --git a/k3d/test/references/points_mesh_low_detail.png b/k3d/test/references/points_mesh_low_detail.png
diff --git a/k3d/test/references/points_mesh_sizes.png b/k3d/test/references/points_mesh_sizes.png
diff --git a/k3d/test/references/stl.png b/k3d/test/references/stl.png
diff --git a/k3d/test/references/stl_color.png b/k3d/test/references/stl_color.png
diff --git a/k3d/test/references/stl_smooth.png b/k3d/test/references/stl_smooth.png
diff --git a/k3d/test/references/stl_wireframe.png b/k3d/test/references/stl_wireframe.png
diff --git a/k3d/test/references/surface.png b/k3d/test/references/surface.png
diff --git a/k3d/test/references/surface_attribute.png b/k3d/test/references/surface_attribute.png
diff --git a/k3d/test/references/surface_attribute_low.png b/k3d/test/references/surface_attribute_low.png
diff --git a/k3d/test/references/surface_attribute_low_dynamic_smooth.png b/k3d/test/references/surface_attribute_low_dynamic_smooth.png
diff --git a/k3d/test/references/surface_attribute_low_dynamic_wireframe.png b/k3d/test/references/surface_attribute_low_dynamic_wireframe.png
diff --git a/k3d/test/references/surface_dynamic_color.png b/k3d/test/references/surface_dynamic_color.png
diff --git a/k3d/test/references/texture.png b/k3d/test/references/texture.png
diff --git a/k3d/test/references/texture_attribute.png b/k3d/test/references/texture_attribute.png
diff --git a/k3d/test/references/texture_attribute_dynamic_interpolation.png b/k3d/test/references/texture_attribute_dynamic_interpolation.png
diff --git a/k3d/test/references/texture_dynamic_change.png b/k3d/test/references/texture_dynamic_change.png
diff --git a/k3d/test/references/vector_field.png b/k3d/test/references/vector_field.png
diff --git a/k3d/test/references/vector_field_3d.png b/k3d/test/references/vector_field_3d.png
diff --git a/k3d/test/references/vector_field_3d_no_head.png b/k3d/test/references/vector_field_3d_no_head.png
diff --git a/k3d/test/references/vector_field_3d_scale.png b/k3d/test/references/vector_field_3d_scale.png
diff --git a/k3d/test/references/vector_field_no_head.png b/k3d/test/references/vector_field_no_head.png
diff --git a/k3d/test/references/vector_field_scale.png b/k3d/test/references/vector_field_scale.png
diff --git a/k3d/test/references/vectors.png b/k3d/test/references/vectors.png
diff --git a/k3d/test/references/vectors_advance.png b/k3d/test/references/vectors_advance.png
diff --git a/k3d/test/references/volume.png b/k3d/test/references/volume.png
diff --git a/k3d/test/references/volume_alpha_coef.png b/k3d/test/references/volume_alpha_coef.png
diff --git a/k3d/test/references/volume_opacity_function.png b/k3d/test/references/volume_opacity_function.png
diff --git a/k3d/test/references/voxels.png b/k3d/test/references/voxels.png
diff --git a/k3d/test/references/voxels_box.png b/k3d/test/references/voxels_box.png
diff --git a/k3d/test/references/voxels_group.png b/k3d/test/references/voxels_group.png
diff --git a/k3d/test/references/voxels_group_opacity.png b/k3d/test/references/voxels_group_opacity.png
diff --git a/k3d/test/references/voxels_group_wireframe.png b/k3d/test/references/voxels_group_wireframe.png
diff --git a/k3d/test/references/voxels_outline.png b/k3d/test/references/voxels_outline.png
diff --git a/k3d/test/references/voxels_outline_clipping_plane.png b/k3d/test/references/voxels_outline_clipping_plane.png
diff --git a/k3d/test/references/voxels_outline_dynamic_outlines_color.png b/k3d/test/references/voxels_outline_dynamic_outlines_color.png
diff --git a/k3d/test/references/voxels_outline_opacity.png b/k3d/test/references/voxels_outline_opacity.png
diff --git a/k3d/test/references/voxels_sparse.png b/k3d/test/references/voxels_sparse.png
diff --git a/k3d/test/references/voxels_wireframe.png b/k3d/test/references/voxels_wireframe.png
diff --git a/k3d/test/references/win32/labels.png b/k3d/test/references/win32/labels.png
diff --git a/k3d/test/references/win32/labels_without_box.png b/k3d/test/references/win32/labels_without_box.png
diff --git a/k3d/test/references/win32/text.png b/k3d/test/references/win32/text.png
diff --git a/k3d/test/references/win32/text2d.png b/k3d/test/references/win32/text2d.png
diff --git a/k3d/test/references/win32/text2d_without_box.png b/k3d/test/references/win32/text2d_without_box.png
diff --git a/k3d/test/references/win32/text_without_box.png b/k3d/test/references/win32/text_without_box.png
diff --git a/k3d/test/references/win32/texture_text.png b/k3d/test/references/win32/texture_text.png
diff --git a/k3d/test/references/win32/vectors_labels.png b/k3d/test/references/win32/vectors_labels.png
diff --git a/k3d/test/references/win32/vectors_labels_dynamic_head_size.png b/k3d/test/references/win32/vectors_labels_dynamic_head_size.png
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "k3d",
-  "version": "2.12.0",
+  "version": "2.13.0",
   "description": "3D visualization library",
   "keywords": [
     "jupyter",
@@ -52,7 +52,7 @@
     "screenfull": "^5.1.0",
     "stats.js": "^0.17.0",
     "style-loader": "^2.0.0",
-    "three": "^0.137.4",
+    "three": "^0.138.2",
     "three-mesh-bvh": "^0.3.7"
   },
   "devDependencies": {