@xeokit/xeokit-sdk 2.6.40 → 2.6.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.40",
+  "version": "2.6.41",
   "description": "Web Programming Toolkit for 3D/2D BIM and AEC Graphics",
   "module": "./dist/xeokit-sdk.es.js",
   "main": "./dist/xeokit-sdk.cjs.js",

package/src/plugins/TreeViewPlugin/TreeViewPlugin.js

@@ -701,6 +701,8 @@ export class TreeViewPlugin extends Plugin {
             return; // Node may not exist for the given object if (this._pruneEmptyNodes == true)
         }
 
+        this.collapse();
+
         const nodeId = node.nodeId;
 
         const switchElement = this._renderService.getSwitchElement(nodeId);

package/src/plugins/ZonesPlugin/ZonesPlugin.js

@@ -408,122 +408,6 @@ const mousePointSelector = function(viewer, ray2WorldPos) {
     };
 };
 
-const touchPointSelector = function(viewer, pointerCircle, ray2WorldPos) {
-    return function(onCancel, onChange, onCommit) {
-        const scene = viewer.scene;
-        const canvas = scene.canvas.canvas;
-        const longTouchTimeoutMs = 300;
-        const moveTolerance = 20;
-
-        const copyCanvasPos = (event, vec2) => {
-            vec2[0] = event.clientX;
-            vec2[1] = event.clientY;
-            transformToNode(canvas.ownerDocument.documentElement, canvas, vec2);
-            return vec2;
-        };
-
-        const pickWorldPos = canvasPos => {
-            const origin = math.vec3();
-            const direction = math.vec3();
-            math.canvasPosToWorldRay(canvas, scene.camera.viewMatrix, scene.camera.projMatrix, scene.camera.projection, canvasPos, origin, direction);
-            return ray2WorldPos(origin, direction);
-        };
-
-        let longTouchTimeout = null;
-        const nop = () => { };
-        let onSingleTouchMove = nop;
-        let startTouchIdentifier;
-
-        const resetAction = function() {
-            pointerCircle.stop();
-            clearTimeout(longTouchTimeout);
-            viewer.cameraControl.active = true;
-            onSingleTouchMove = nop;
-            startTouchIdentifier = null;
-        };
-
-        const cleanup = function() {
-            resetAction();
-            canvas.removeEventListener("touchstart", onCanvasTouchStart);
-            canvas.removeEventListener("touchmove",  onCanvasTouchMove);
-            canvas.removeEventListener("touchend",   onCanvasTouchEnd);
-        };
-
-        const onCanvasTouchStart = function(event) {
-            const touches = event.touches;
-
-            if (touches.length !== 1)
-            {
-                resetAction();
-                onCancel();
-            }
-            else
-            {
-                const startTouch = touches[0];
-                const startCanvasPos = copyCanvasPos(startTouch, math.vec2());
-
-                const startWorldPos = pickWorldPos(startCanvasPos);
-                if (startWorldPos)
-                {
-                    startTouchIdentifier = startTouch.identifier;
-
-                    onSingleTouchMove = canvasPos => {
-                        if (math.distVec2(startCanvasPos, canvasPos) > moveTolerance)
-                        {
-                            resetAction();
-                        }
-                    };
-
-                    longTouchTimeout = setTimeout(
-                        function() {
-                            pointerCircle.start(startCanvasPos);
-
-                            longTouchTimeout = setTimeout(
-                                function() {
-                                    pointerCircle.stop();
-
-                                    viewer.cameraControl.active = false;
-
-                                    onSingleTouchMove = canvasPos => {
-                                        onChange(canvasPos, pickWorldPos(canvasPos));
-                                    };
-
-                                    onSingleTouchMove(startCanvasPos);
-                                },
-                                longTouchTimeoutMs);
-                        },
-                        250);
-                }
-            }
-        };
-        canvas.addEventListener("touchstart", onCanvasTouchStart, {passive: true});
-
-        // canvas.addEventListener("touchcancel", e => console.log("touchcancel", e), {passive: true});
-
-        const onCanvasTouchMove = function(event) {
-            const touch = [...event.changedTouches].find(e => e.identifier === startTouchIdentifier);
-            if (touch)
-            {
-                onSingleTouchMove(copyCanvasPos(touch, math.vec2()));
-            }
-        };
-        canvas.addEventListener("touchmove", onCanvasTouchMove, {passive: true});
-
-        const onCanvasTouchEnd = function(event) {
-            const touch = [...event.changedTouches].find(e => e.identifier === startTouchIdentifier);
-            if (touch)
-            {
-                cleanup();
-                const canvasPos = copyCanvasPos(touch, math.vec2());
-                onCommit(canvasPos, pickWorldPos(canvasPos));
-            }
-        };
-        canvas.addEventListener("touchend", onCanvasTouchEnd, {passive: true});
-
-        return cleanup;
-    };
-};
-
 const planeIntersect = function(p0, n, origin, direction) {
     const t = - (math.dotVec3(origin, n) - p0) / math.dotVec3(direction, n);
     if (false) // (t < 0)

package/src/plugins/index.js

@@ -21,3 +21,4 @@ export * from "./LASLoaderPlugin/index.js";
 export * from "./CityJSONLoaderPlugin/index.js";
 export * from "./DotBIMLoaderPlugin/index.js";
 export * from "./ZonesPlugin/index.js";
+export * from "./lib/ui/index.js";

package/src/plugins/lib/ui/index.js

@@ -284,3 +284,119 @@ export function activateDraggableDots(cfg) {
         updatePointerLens(null);
     };
 }
+
+export const touchPointSelector = function(viewer, pointerCircle, ray2WorldPos) {
+    return function(onCancel, onChange, onCommit) {
+        const scene = viewer.scene;
+        const canvas = scene.canvas.canvas;
+        const longTouchTimeoutMs = 300;
+        const moveTolerance = 20;
+
+        const copyCanvasPos = (event, vec2) => {
+            vec2[0] = event.clientX;
+            vec2[1] = event.clientY;
+            transformToNode(canvas.ownerDocument.documentElement, canvas, vec2);
+            return vec2;
+        };
+
+        const pickWorldPos = canvasPos => {
+            const origin = math.vec3();
+            const direction = math.vec3();
+            math.canvasPosToWorldRay(canvas, scene.camera.viewMatrix, scene.camera.projMatrix, scene.camera.projection, canvasPos, origin, direction);
+            return ray2WorldPos(origin, direction);
+        };
+
+        let longTouchTimeout = null;
+        const nop = () => { };
+        let onSingleTouchMove = nop;
+        let startTouchIdentifier;
+
+        const resetAction = function() {
+            pointerCircle.stop();
+            clearTimeout(longTouchTimeout);
+            viewer.cameraControl.active = true;
+            onSingleTouchMove = nop;
+            startTouchIdentifier = null;
+        };
+
+        const cleanup = function() {
+            resetAction();
+            canvas.removeEventListener("touchstart", onCanvasTouchStart);
+            canvas.removeEventListener("touchmove",  onCanvasTouchMove);
+            canvas.removeEventListener("touchend",   onCanvasTouchEnd);
+        };
+
+        const onCanvasTouchStart = function(event) {
+            const touches = event.touches;
+
+            if (touches.length !== 1)
+            {
+                resetAction();
+                onCancel();
+            }
+            else
+            {
+                const startTouch = touches[0];
+                const startCanvasPos = copyCanvasPos(startTouch, math.vec2());
+
+                const startWorldPos = pickWorldPos(startCanvasPos);
+                if (startWorldPos)
+                {
+                    startTouchIdentifier = startTouch.identifier;
+
+                    onSingleTouchMove = canvasPos => {
+                        if (math.distVec2(startCanvasPos, canvasPos) > moveTolerance)
+                        {
+                            resetAction();
+                        }
+                    };
+
+                    longTouchTimeout = setTimeout(
+                        function() {
+                            pointerCircle.start(startCanvasPos);
+
+                            longTouchTimeout = setTimeout(
+                                function() {
+                                    pointerCircle.stop();
+
+                                    viewer.cameraControl.active = false;
+
+                                    onSingleTouchMove = canvasPos => {
+                                        onChange(canvasPos, pickWorldPos(canvasPos));
+                                    };
+
+                                    onSingleTouchMove(startCanvasPos);
+                                },
+                                longTouchTimeoutMs);
+                        },
+                        250);
+                }
+            }
+        };
+        canvas.addEventListener("touchstart", onCanvasTouchStart, {passive: true});
+
+        // canvas.addEventListener("touchcancel", e => console.log("touchcancel", e), {passive: true});
+
+        const onCanvasTouchMove = function(event) {
+            const touch = [...event.changedTouches].find(e => e.identifier === startTouchIdentifier);
+            if (touch)
+            {
+                onSingleTouchMove(copyCanvasPos(touch, math.vec2()));
+            }
+        };
+        canvas.addEventListener("touchmove", onCanvasTouchMove, {passive: true});
+
+        const onCanvasTouchEnd = function(event) {
+            const touch = [...event.changedTouches].find(e => e.identifier === startTouchIdentifier);
+            if (touch)
+            {
+                cleanup();
+                const canvasPos = copyCanvasPos(touch, math.vec2());
+                onCommit(canvasPos, pickWorldPos(canvasPos));
+            }
+        };
+        canvas.addEventListener("touchend", onCanvasTouchEnd, {passive: true});
+
+        return cleanup;
+    };
+};

package/src/viewer/scene/model/SceneModel.js

@@ -2505,7 +2505,21 @@ export class SceneModel extends Component {
         if (cfg.image) { // Ignore transcoder for Images
             const image = cfg.image;
             image.crossOrigin = "Anonymous";
-            texture.setImage(image, {minFilter, magFilter, wrapS, wrapT, wrapR, flipY: cfg.flipY, encoding});
+            if (image.compressed) {
+                // see `parsedImage` in @loaders.gl/gltf/src/lib/parsers/parse-gltf.ts
+                // NOTE: @loaders.gl in its current version discards potential mipmaps, leaving only a single one
+                const data = image.data;
+                texture.setCompressedData({
+                    mipmaps: data,
+                    props: {
+                        format: data[0].format,
+                        minFilter: minFilter,
+                        magFilter: magFilter
+                    }
+                });
+            } else {
+                texture.setImage(image, {minFilter, magFilter, wrapS, wrapT, wrapR, flipY: cfg.flipY, encoding});
+            }
         } else if (cfg.src) {
             const ext = cfg.src.split('.').pop();
             switch (ext) { // Don't transcode recognized image file types