Merge pull request #146 from K3D-tools/devel

sandboxing THREE.js for K3D
K3D-tools · May 2, 2019 · d804c9f · d804c9f
2 parents 50a42a9 + d62e893
commit d804c9f
Show file tree

Hide file tree

Showing 46 changed files with 3,459 additions and 784 deletions.
diff --git a/js/.jshintrc b/js/.jshintrc
@@ -25,7 +25,6 @@
   "globals": {
     "$": true,
     "K3D": true,
-    "THREE": true,
     "_": true,
     "ImageData": true,
     "jsonpatch": true,

diff --git a/js/package.json b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "k3d",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "3D visualization library",
   "author": "k3d team",
   "main": "src/index.js",
@@ -81,7 +81,6 @@
     "requirejs": "^2.3.6",
     "screenfull": "^4.1.0",
     "stats.js": "^0.17.0",
-    "three": "^0.102.1",
-    "three-octree": "^0.6.1"
+    "three": "^0.102.1"
   }
 }
diff --git a/js/src/core/Core.js b/js/src/core/Core.js
@@ -97,10 +97,9 @@ function K3D(provider, targetDOMNode, parameters) {
         if (!self.disabling) {
             self.gui.domElement.parentNode.style['max-height'] = world.targetDOMNode.offsetHeight + 'px';
             self.Provider.Helpers.resizeListener(world);
+            dispatch(self.events.RESIZED);
             self.render();
         }
-
-        dispatch(self.events.RESIZED);
     };
 
     world.overlayDOMNode = currentWindow.document.createElement('div');
@@ -772,13 +771,6 @@ function K3D(provider, targetDOMNode, parameters) {
         GUI.info.__controllers[1].__input.readOnly = true;
     }
 
-    if (self.parameters.specVersion) {
-        GUI.info.add({
-            version: self.parameters.specVersion.substr(1)
-        }, 'version').name('Spec version:');
-        GUI.info.__controllers[1].__input.readOnly = true;
-    }
-
     self.setMenuVisibility(self.parameters.menuVisibility);
     self.setTime(self.parameters.time);
     self.setGridAutoFit(self.parameters.gridAutoFit);

diff --git a/js/src/core/lib/clippingPlanesGUIProvider.js b/js/src/core/lib/clippingPlanesGUIProvider.js
@@ -1,5 +1,7 @@
 'use strict';
 
+var THREE = require('three');
+
 function clippingPlanesGUIProvider(K3D, clippingPlanesGUI) {
 
     function dispatch() {

diff --git a/js/src/core/lib/colorMapLegend.js b/js/src/core/lib/colorMapLegend.js
@@ -60,6 +60,7 @@ module.exports = function getColorLegend(K3D, object) {
         intervalOffset,
         intervalCount = 0,
         strokeWidth = 0.5,
+        resizeListenerId = null,
         i, y;
 
     if (K3D.colorMapNode) {
@@ -152,13 +153,30 @@ module.exports = function getColorLegend(K3D, object) {
 
     K3D.getWorld().targetDOMNode.appendChild(svg);
 
-    maxTextWidth = texts.reduce(function (max, text) {
-        return Math.max(max, text.getBBox().width);
-    }, 0);
+    function tryPosLabels() {
+        if (K3D.getWorld().width < 10 || K3D.getWorld().height < 10) {
+            if (resizeListenerId === null) {
+                resizeListenerId = K3D.on(K3D.events.RESIZED, function () {
+                    tryPosLabels();
+                });
+            }
+        } else {
+            if (resizeListenerId !== null) {
+                K3D.off(K3D.events.RESIZED, resizeListenerId);
+                resizeListenerId = null;
+            }
+
+            maxTextWidth = texts.reduce(function (max, text) {
+                return Math.max(max, text.getBBox().width);
+            }, 0);
+
+            texts.forEach(function (text) {
+                text.setAttribute('x', (maxTextWidth + 20).toString(10));
+            });
+        }
+    }
 
-    texts.forEach(function (text) {
-        text.setAttribute('x', (maxTextWidth + 20).toString(10));
-    });
+    tryPosLabels();
 
     K3D.colorMapNode = svg;
 };
diff --git a/js/src/k3d.js b/js/src/k3d.js
@@ -1,4 +1,5 @@
 'use strict';
+//jshint maxstatements:false
 
 var widgets = require('@jupyter-widgets/base'),
     K3D = require('./core/Core'),
@@ -9,7 +10,7 @@ var widgets = require('@jupyter-widgets/base'),
     ChunkModel,
     ObjectModel,
     ObjectView,
-    semverRange = require('./version').EXTENSION_SPEC_VERSION,
+    semverRange = require('./version').version,
     objectsList = {},
     chunkList = {},
     plotsList = [];
@@ -212,7 +213,6 @@ PlotView = widgets.DOMWidgetView.extend({
         try {
             this.K3DInstance = new K3D(ThreeJsProvider, this.container, {
                 antialias: this.model.get('antialias'),
-                specVersion: this.model.get('_view_module_version'),
                 backendVersion: this.model.get('_backend_version'),
                 screenshotScale: this.model.get('screenshot_scale'),
                 menuVisibility: this.model.get('menu_visibility'),

diff --git a/js/src/labplugin.js b/js/src/labplugin.js
@@ -5,7 +5,7 @@
 require('./deps');
 
 var k3d = require('./index'),
-    EXTENSION_SPEC_VERSION = require('./version').EXTENSION_SPEC_VERSION,
+    version = require('./version').version,
     base = require('@jupyter-widgets/base');
 
 module.exports = {
@@ -14,7 +14,7 @@ module.exports = {
     activate: function (app, widgets) {
         widgets.registerWidget({
             name: 'k3d',
-            version: EXTENSION_SPEC_VERSION,
+            version: version,
             exports: k3d
         });
     },

diff --git a/js/src/providers/threejs/helpers/Fn.js b/js/src/providers/threejs/helpers/Fn.js
@@ -1,5 +1,6 @@
 'use strict';
-var lut = require('./../../../core/lib/helpers/lut'),
+var THREE = require('three'),
+    lut = require('./../../../core/lib/helpers/lut'),
     Float16Array = require('./../../../core/lib/helpers/float16Array');
 
 function getSpaceDimensionsFromTargetElement(world) {

diff --git a/js/src/providers/threejs/helpers/SSAAChunkedRender.js b/js/src/providers/threejs/helpers/SSAAChunkedRender.js
@@ -6,37 +6,38 @@
 //
 // Sample patterns reference: https://msdn.microsoft.com/en-us/library/windows/desktop/ff476218%28v=vs.85%29.aspx?f=255&MSPPError=-2147217396
 
-var JitterVectors = [
-    [
-        [0, 0]
-    ],
-    [
-        [4, 4], [-4, -4]
-    ],
-    [
-        [-2, -6], [6, -2], [-6, 2], [2, 6]
-    ],
-    [
-        [1, -3], [-1, 3], [5, 1], [-3, -5],
-        [-5, 5], [-7, -1], [3, 7], [7, -7]
-    ],
-    [
-        [1, 1], [-1, -3], [-3, 2], [4, -1],
-        [-5, -2], [2, 5], [5, 3], [3, -5],
-        [-2, 6], [0, -7], [-4, -6], [-6, 4],
-        [-8, 0], [7, -4], [6, 7], [-7, -8]
-    ],
-    [
-        [-4, -7], [-7, -5], [-3, -5], [-5, -4],
-        [-1, -4], [-2, -2], [-6, -1], [-4, 0],
-        [-7, 1], [-1, 2], [-6, 3], [-3, 3],
-        [-7, 6], [-3, 6], [-5, 7], [-1, 7],
-        [5, -7], [1, -6], [6, -5], [4, -4],
-        [2, -3], [7, -2], [1, -1], [4, -1],
-        [2, 1], [6, 2], [0, 4], [4, 4],
-        [2, 5], [7, 5], [5, 6], [3, 7]
-    ]
-];
+var THREE = require('three'),
+    JitterVectors = [
+        [
+            [0, 0]
+        ],
+        [
+            [4, 4], [-4, -4]
+        ],
+        [
+            [-2, -6], [6, -2], [-6, 2], [2, 6]
+        ],
+        [
+            [1, -3], [-1, 3], [5, 1], [-3, -5],
+            [-5, 5], [-7, -1], [3, 7], [7, -7]
+        ],
+        [
+            [1, 1], [-1, -3], [-3, 2], [4, -1],
+            [-5, -2], [2, 5], [5, 3], [3, -5],
+            [-2, 6], [0, -7], [-4, -6], [-6, 4],
+            [-8, 0], [7, -4], [6, 7], [-7, -8]
+        ],
+        [
+            [-4, -7], [-7, -5], [-3, -5], [-5, -4],
+            [-1, -4], [-2, -2], [-6, -1], [-4, 0],
+            [-7, 1], [-1, 2], [-6, 3], [-3, 3],
+            [-7, 6], [-3, 6], [-5, 7], [-1, 7],
+            [5, -7], [1, -6], [6, -5], [4, -4],
+            [2, -3], [7, -2], [1, -1], [4, -1],
+            [2, 1], [6, 2], [0, 4], [4, 4],
+            [2, 5], [7, 5], [5, 6], [3, 7]
+        ]
+    ];
 
 function getArrayFromRenderTarget(renderer, rt) {
     var array = new Uint8Array(rt.width * rt.height * 4);

diff --git a/js/src/providers/threejs/helpers/Streamline.js b/js/src/providers/threejs/helpers/Streamline.js
@@ -1,6 +1,8 @@
 'use strict';
 //jshint maxstatements:false
 
+var THREE = require('three');
+
 module.exports = function (points, attributes, radius, radialSegments, color, verticesColors, colorRange) {
 
     var geometry = new THREE.BufferGeometry(),

diff --git a/js/src/providers/threejs/helpers/THREE.CopyShader.js b/js/src/providers/threejs/helpers/THREE.CopyShader.js
@@ -0,0 +1,53 @@
+'use strict';
+// jshint ignore: start
+// jscs:disable
+
+module.exports = function (THREE) {
+    /**
+     * @author alteredq / http://alteredqualia.com/
+     *
+     * Full-screen textured quad shader
+     */
+
+    THREE.CopyShader = {
+
+        uniforms: {
+
+            "tDiffuse": { value: null },
+            "opacity":  { value: 1.0 }
+
+        },
+
+        vertexShader: [
+
+            "varying vec2 vUv;",
+
+            "void main() {",
+
+            "vUv = uv;",
+            "gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
+
+            "}"
+
+        ].join( "\n" ),
+
+        fragmentShader: [
+
+            "uniform float opacity;",
+
+            "uniform sampler2D tDiffuse;",
+
+            "varying vec2 vUv;",
+
+            "void main() {",
+
+            "vec4 texel = texture2D( tDiffuse, vUv );",
+            "gl_FragColor = opacity * texel;",
+
+            "}"
+
+        ].join( "\n" )
+
+    };
+
+};
diff --git a/js/src/providers/threejs/helpers/THREE.MeshLine.js b/js/src/providers/threejs/helpers/THREE.MeshLine.js
@@ -1,16 +1,8 @@
-//jshint maxstatements:false, maxcomplexity:false, maxdepth:false
-
-;(function () {
-    'use strict';
-
-    var root = this,
-        has_require = typeof require !== 'undefined',
-        THREE = root.THREE || has_require && require('three');
-
-    if (!THREE) {
-        throw new Error('MeshLine requires three.js');
-    }
+'use strict';
+//jshint ignore: start
+//jscs:disable
 
+module.exports = function (THREE) {
     function MeshLine() {
         this.positions = [];
         this.previous = [];
@@ -393,14 +385,8 @@
         return this;
     };
 
-    if (typeof exports !== 'undefined') {
-        if (typeof module !== 'undefined' && module.exports) {
-            exports = module.exports = {MeshLine: MeshLine, MeshLineMaterial: MeshLineMaterial};
-        }
-        exports.MeshLine = MeshLine;
-        exports.MeshLineMaterial = MeshLineMaterial;
-    } else {
-        root.MeshLine = MeshLine;
-        root.MeshLineMaterial = MeshLineMaterial;
-    }
-}).call(this);
+    return {
+        MeshLine: MeshLine,
+        MeshLineMaterial: MeshLineMaterial
+    };
+};