@xeokit/xeokit-sdk 2.6.0-beta-14 → 2.6.0-beta-16

package/dist/xeokit-sdk.cjs.js

@@ -12403,13 +12403,16 @@ class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
                         this._currentAngleMeasurement = this.angleMeasurementsPlugin.createMeasurement({
                             id: math.createUUID(),
                             origin: {
-                                worldPos: mouseWorldPos
+                                worldPos: mouseWorldPos,
+                                entity: hoveredEntity
                             },
                             corner: {
-                                worldPos: mouseWorldPos
+                                worldPos: mouseWorldPos,
+                                entity: hoveredEntity
                             },
                             target: {
-                                worldPos: mouseWorldPos
+                                worldPos: mouseWorldPos,
+                                entity: hoveredEntity
                             },
                             approximate: true
                         });
@@ -13245,13 +13248,16 @@ class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                             this._currentAngleMeasurement = plugin.createMeasurement({
                                 id: math.createUUID(),
                                 origin: {
-                                    worldPos: snapPickResult.worldPos
+                                    worldPos: snapPickResult.worldPos,
+                                    entity: snapPickResult.entity
                                 },
                                 corner: {
-                                    worldPos: snapPickResult.worldPos
+                                    worldPos: snapPickResult.worldPos,
+                                    entity: snapPickResult.entity
                                 },
                                 target: {
-                                    worldPos: snapPickResult.worldPos
+                                    worldPos: snapPickResult.worldPos,
+                                    entity: snapPickResult.entity
                                 }
                             });
                             this._currentAngleMeasurement.clickable = false;
@@ -13320,6 +13326,7 @@ class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                                 this.pointerCircle.start(snapPickResult.snappedCanvasPos);
                                 pointerWorldPos.set(snapPickResult.worldPos);
                                 this._currentAngleMeasurement.corner.worldPos = snapPickResult.worldPos;
+                                this._currentAngleMeasurement.corner.entity = snapPickResult.entity;
                                 this._currentAngleMeasurement.originVisible = true;
                                 this._currentAngleMeasurement.originWireVisible = true;
                                 this._currentAngleMeasurement.cornerVisible = true;
@@ -13341,6 +13348,7 @@ class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                                     this.pointerCircle.start(pickResult.canvasPos);
                                     pointerWorldPos.set(pickResult.worldPos);
                                     this._currentAngleMeasurement.corner.worldPos = pickResult.worldPos;
+                                    this._currentAngleMeasurement.corner.entity = pickResult.entity;
                                     this._currentAngleMeasurement.originVisible = true;
                                     this._currentAngleMeasurement.originWireVisible = true;
                                     this._currentAngleMeasurement.cornerVisible = true;
@@ -13411,6 +13419,7 @@ class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                                 this.pointerCircle.start(snapPickResult.snappedCanvasPos);
                                 pointerWorldPos.set(snapPickResult.worldPos);
                                 this._currentAngleMeasurement.target.worldPos = snapPickResult.worldPos;
+                                this._currentAngleMeasurement.target.entity = snapPickResult.entity;
                                 this._currentAngleMeasurement.originVisible = true;
                                 this._currentAngleMeasurement.originWireVisible = true;
                                 this._currentAngleMeasurement.cornerVisible = true;
@@ -13432,6 +13441,7 @@ class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                                     this.pointerCircle.start(pickResult.canvasPos);
                                     pointerWorldPos.set(pickResult.worldPos);
                                     this._currentAngleMeasurement.target.worldPos = pickResult.worldPos;
+                                    this._currentAngleMeasurement.target.entity = pickResult.entity;
                                     this._currentAngleMeasurement.originVisible = true;
                                     this._currentAngleMeasurement.originWireVisible = true;
                                     this._currentAngleMeasurement.cornerVisible = true;
@@ -83349,7 +83359,7 @@ class SceneModel extends Component {
             return;
         }
         let parentTransform;
-        if (this.parentTransformId) {
+        if (cfg.parentTransformId) {
             parentTransform = this._transforms[cfg.parentTransformId];
             if (!parentTransform) {
                 this.error("[createTransform] SceneModel.createTransform() config missing: id");
@@ -87192,10 +87202,12 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
                     this._currentDistanceMeasurement = distanceMeasurementsPlugin.createMeasurement({
                         id: math.createUUID(),
                         origin: {
-                            worldPos: pointerWorldPos.slice()
+                            worldPos: pointerWorldPos.slice(),
+                            entity: hoveredEntity
                         },
                         target: {
-                            worldPos: pointerWorldPos.slice()
+                            worldPos: pointerWorldPos.slice(),
+                            entity: hoveredEntity
                         },
                         approximate: true
                     });
@@ -87208,7 +87220,7 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
                     this._currentDistanceMeasurement.clickable = false;
                     this._currentDistanceMeasurement.origin.entity = hoveredEntity;
                     hoveredEntity = null;
-                    this.fire("measurementStart", this._currentDistanceMeasurement);
+                    this.distanceMeasurementsPlugin.fire("measurementStart", this._currentDistanceMeasurement);
                 }
             }
         });
@@ -88093,10 +88105,12 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                             this._currentDistanceMeasurement = plugin.createMeasurement({
                                 id: math.createUUID(),
                                 origin: {
-                                    worldPos: pointerWorldPos
+                                    worldPos: pointerWorldPos,
+                                    entity: snapPickResult.entity
                                 },
                                 target: {
-                                    worldPos: pointerWorldPos
+                                    worldPos: pointerWorldPos,
+                                    entity: snapPickResult.entity
                                 }
                             });
                             this._currentDistanceMeasurement.labelsVisible = false;
@@ -88166,6 +88180,7 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                                 this.pointerCircle.start(snapPickResult.snappedCanvasPos);
                                 pointerWorldPos.set(snapPickResult.worldPos);
                                 this._currentDistanceMeasurement.target.worldPos = snapPickResult.worldPos;
+                                this._currentDistanceMeasurement.target.entity = snapPickResult.entity;
                                 this._currentDistanceMeasurement.targetVisible = true;
                                 this._currentDistanceMeasurement.wireVisible = true;
                                 this._currentDistanceMeasurement.labelsVisible = true;
@@ -88183,6 +88198,7 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                                     this.pointerCircle.start(pickResult.canvasPos);
                                     pointerWorldPos.set(pickResult.worldPos);
                                     this._currentDistanceMeasurement.target.worldPos = pickResult.worldPos;
+                                    this._currentDistanceMeasurement.target.entity = pickResult.entity;
                                     this._currentDistanceMeasurement.targetVisible = true;
                                     this._currentDistanceMeasurement.wireVisible = true;
                                     this._currentDistanceMeasurement.labelsVisible = true;
@@ -88273,10 +88289,12 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                             this._currentDistanceMeasurement = plugin.createMeasurement({
                                 id: math.createUUID(),
                                 origin: {
-                                    worldPos: snapPickResult.worldPos
+                                    worldPos: snapPickResult.worldPos,
+                                    entity: snapPickResult.entity
                                 },
                                 target: {
-                                    worldPos: snapPickResult.worldPos
+                                    worldPos: snapPickResult.worldPos,
+                                    entity: snapPickResult.entity
                                 }
                             });
                             this._currentDistanceMeasurement.labelsVisible = false;
@@ -88307,10 +88325,12 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                                 this._currentDistanceMeasurement = plugin.createMeasurement({
                                     id: math.createUUID(),
                                     origin: {
-                                        worldPos: pickResult.worldPos
+                                        worldPos: pickResult.worldPos,
+                                        entity: pickResult.entity
                                     },
                                     target: {
-                                        worldPos: pickResult.worldPos
+                                        worldPos: pickResult.worldPos,
+                                        entity: pickResult.entity
                                     }
                                 });
                                 this._currentDistanceMeasurement.labelsVisible = false;
@@ -88367,6 +88387,7 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                             this.pointerLens.snapped = true;
                         }
                         this._currentDistanceMeasurement.target.worldPos = snapPickResult.worldPos;
+                        this._currentDistanceMeasurement.target.entity = snapPickResult.entity;
                         this._currentDistanceMeasurement.targetVisible = true;
                         this._currentDistanceMeasurement.wireVisible = true;
                         this._currentDistanceMeasurement.labelsVisible = true;
@@ -88381,6 +88402,7 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                                 this.pointerLens.snapped = false;
                             }
                             this._currentDistanceMeasurement.target.worldPos = pickResult.worldPos;
+                            this._currentDistanceMeasurement.target.entity = pickResult.entity;
                             this._currentDistanceMeasurement.targetVisible = true;
                             this._currentDistanceMeasurement.wireVisible = true;
                             this._currentDistanceMeasurement.labelsVisible = true;
@@ -88436,10 +88458,12 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                         this._currentDistanceMeasurement = plugin.createMeasurement({
                             id: math.createUUID(),
                             origin: {
-                                worldPos: pickResult.worldPos
+                                worldPos: pickResult.worldPos,
+                                entity: pickResult.entity
                             },
                             target: {
-                                worldPos: pickResult.worldPos
+                                worldPos: pickResult.worldPos,
+                                entity: pickResult.entity
                             }
                         });
                         this._currentDistanceMeasurement.labelsVisible = false;
@@ -88451,6 +88475,7 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                         this._currentDistanceMeasurement.targetVisible = false;
                         this._currentDistanceMeasurement.clickable = false;
                         this._touchState = WAITING_FOR_TARGET_TOUCH_START;
+                        this.distanceMeasurementsPlugin.fire("measurementStart", this._currentDistanceMeasurement);
                         //  console.log("touchend: this._touchState= WAITING_FOR_ORIGIN_QUICK_TOUCH_END -> WAITING_FOR_ORIGIN_TOUCH_START")
                     } else {
                         if (this._currentDistanceMeasurement) {
@@ -88496,6 +88521,7 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                     });
                     if (pickResult && pickResult.worldPos) {
                         this._currentDistanceMeasurement.target.worldPos = pickResult.worldPos;
+                        this._currentDistanceMeasurement.target.entity = pickResult.entity;
                         this._currentDistanceMeasurement.targetVisible = true;
                         this._currentDistanceMeasurement.wireVisible = true;
                         this._currentDistanceMeasurement.labelsVisible = true;
@@ -94873,6 +94899,7 @@ class PickController {
         if (this.snappedOrPicked) {
             if (this.snapPickResult) {
                 const pickResult = new PickResult();
+                pickResult.entity = this.snapPickResult.entity;
                 pickResult.snappedToVertex = this.snapPickResult.snappedToVertex;
                 pickResult.snappedToEdge = this.snapPickResult.snappedToEdge;
                 pickResult.worldPos = this.snapPickResult.worldPos;
@@ -95081,7 +95108,7 @@ class MousePanRotateDollyHandler {
             }
         });
 
-        document.addEventListener("mousemove", this._documentMouseMoveHandler = () => {
+        document.addEventListener("mousemove", this._documentMouseMoveHandler = (e) => {
 
             if (!(configs.active && configs.pointerEnabled)) {
                 return;
@@ -95102,10 +95129,10 @@ class MousePanRotateDollyHandler {
 
             const panning = keyDown[scene.input.KEY_SHIFT] || configs.planView || (!configs.panRightClick && mouseDownMiddle) || (configs.panRightClick && mouseDownRight);
 
-            if (panning) {
+            const xDelta = document.pointerLockElement ? e.movementX : (x - lastX);
+            const yDelta = document.pointerLockElement ? e.movementY : (y - lastY);
 
-                const xPanDelta = (x - lastX);
-                const yPanDelta = (y - lastY);
+            if (panning) {
 
                 const camera = scene.camera;
 
@@ -95116,13 +95143,13 @@ class MousePanRotateDollyHandler {
                     const depth = Math.abs(mouseDownPicked ? math.lenVec3(math.subVec3(pickedWorldPos, scene.camera.eye, [])) : scene.camera.eyeLookDist);
                     const targetDistance = depth * Math.tan((camera.perspective.fov / 2) * Math.PI / 180.0);
 
-                    updates.panDeltaX += (1.5 * xPanDelta * targetDistance / canvasHeight);
-                    updates.panDeltaY += (1.5 * yPanDelta * targetDistance / canvasHeight);
+                    updates.panDeltaX += (1.5 * xDelta * targetDistance / canvasHeight);
+                    updates.panDeltaY += (1.5 * yDelta * targetDistance / canvasHeight);
 
                 } else {
 
-                    updates.panDeltaX += 0.5 * camera.ortho.scale * (xPanDelta / canvasHeight);
-                    updates.panDeltaY += 0.5 * camera.ortho.scale * (yPanDelta / canvasHeight);
+                    updates.panDeltaX += 0.5 * camera.ortho.scale * (xDelta / canvasHeight);
+                    updates.panDeltaY += 0.5 * camera.ortho.scale * (yDelta / canvasHeight);
                 }
 
             } else if (mouseDownLeft && !mouseDownMiddle && !mouseDownRight) {
@@ -95130,12 +95157,12 @@ class MousePanRotateDollyHandler {
                 if (!configs.planView) { // No rotating in plan-view mode
 
                     if (configs.firstPerson) {
-                        updates.rotateDeltaY -= ((x - lastX) / canvasWidth) * configs.dragRotationRate / 2;
-                        updates.rotateDeltaX += ((y - lastY) / canvasHeight) * (configs.dragRotationRate / 4);
+                        updates.rotateDeltaY -= (xDelta / canvasWidth) * configs.dragRotationRate / 2;
+                        updates.rotateDeltaX += (yDelta / canvasHeight) * (configs.dragRotationRate / 4);
 
                     } else {
-                        updates.rotateDeltaY -= ((x - lastX) / canvasWidth) * (configs.dragRotationRate * 1.5);
-                        updates.rotateDeltaX += ((y - lastY) / canvasHeight) * (configs.dragRotationRate * 1.5);
+                        updates.rotateDeltaY -= (xDelta / canvasWidth) * (configs.dragRotationRate * 1.5);
+                        updates.rotateDeltaX += (yDelta / canvasHeight) * (configs.dragRotationRate * 1.5);
                     }
                 }
             }
@@ -115503,6 +115530,7 @@ function parseGLTF(plugin, src, gltf, metaModelJSON, options, sceneModel, ok) {
             loadBuffer: options.loadBuffer,
             basePath: options.basePath,
             handlenode: options.handlenode,
+            backfaces: !!options.backfaces,
             gltfData: gltfData,
             scene: sceneModel.scene,
             plugin: plugin,
@@ -115708,7 +115736,8 @@ function loadMaterialAttributes(ctx, material) { // Substitute RGBA for material
         color: new Float32Array([1, 1, 1, 1]),
         opacity: 1,
         metallic: 0,
-        roughness: 1
+        roughness: 1,
+        doubleSided : true
     };
     if (extensions) {
         const specularPBR = extensions["KHR_materials_pbrSpecularGlossiness"];
@@ -115759,6 +115788,7 @@ function loadMaterialAttributes(ctx, material) { // Substitute RGBA for material
             materialAttributes.roughness = roughnessFactor;
         }
     }
+    materialAttributes.doubleSided = (material.doubleSided !== false);
     return materialAttributes;
 }
 
@@ -115869,6 +115899,20 @@ function loadNode(ctx, node, depth, matrix) {
                     id: sceneModel.id + "." + ctx.numObjects++
                 };
 
+                const material = primitive.material;
+                if (material) {
+                    meshCfg.textureSetId = material._textureSetId;
+                    meshCfg.color = material._attributes.color;
+                    meshCfg.opacity = material._attributes.opacity;
+                    meshCfg.metallic = material._attributes.metallic;
+                    meshCfg.roughness = material._attributes.roughness;
+                } else {
+                    meshCfg.color = new Float32Array([1.0, 1.0, 1.0]);
+                    meshCfg.opacity = 1.0;
+                }
+
+                const backfaces = ((ctx.backfaces !== false) || (material.doubleSided !== false));
+
                 switch (primitive.mode) {
                     case 0: // POINTS
                         meshCfg.primitive = "points";
@@ -115883,16 +115927,16 @@ function loadNode(ctx, node, depth, matrix) {
                         meshCfg.primitive = "lines";
                         break;
                     case 4: // TRIANGLES
-                        meshCfg.primitive = "triangles";
+                        meshCfg.primitive = backfaces ? "triangles" : "solid";
                         break;
                     case 5: // TRIANGLE_STRIP
-                        meshCfg.primitive = "triangles";
+                        meshCfg.primitive = backfaces ? "triangles" : "solid";
                         break;
                     case 6: // TRIANGLE_FAN
-                        meshCfg.primitive = "triangles";
+                        meshCfg.primitive = backfaces ? "triangles" : "solid";
                         break;
                     default:
-                        meshCfg.primitive = "triangles";
+                        meshCfg.primitive = backfaces ? "triangles" : "solid";
                 }
 
                 const POSITION = primitive.attributes.POSITION;
@@ -115921,17 +115965,6 @@ function loadNode(ctx, node, depth, matrix) {
                     meshCfg.origin = origin;
                 }
 
-                const material = primitive.material;
-                if (material) {
-                    meshCfg.textureSetId = material._textureSetId;
-                    meshCfg.color = material._attributes.color;
-                    meshCfg.opacity = material._attributes.opacity;
-                    meshCfg.metallic = material._attributes.metallic;
-                    meshCfg.roughness = material._attributes.roughness;
-                } else {
-                    meshCfg.color = new Float32Array([1.0, 1.0, 1.0]);
-                    meshCfg.opacity = 1.0;
-                }
                 // if (createEntity) {
                 //     if (createEntity.colorize) {
                 //         meshCfg.color = createEntity.colorize;
@@ -116274,7 +116307,7 @@ class GLTFLoaderPlugin extends Plugin {
      * @param {Boolean} [params.saoEnabled=true] Indicates if Scalable Ambient Obscurance (SAO) is enabled for the model. SAO is configured by the Scene's {@link SAO} component. Only works when {@link SAO#enabled} is also ````true````
      * @param {Boolean} [params.pbrEnabled=true] Indicates if physically-based rendering (PBR) is enabled for the model. Overrides ````colorTextureEnabled````. Only works when {@link Scene#pbrEnabled} is also ````true````.
      * @param {Boolean} [params.colorTextureEnabled=true] Indicates if base color texture rendering is enabled for the model. Overridden by ````pbrEnabled````.  Only works when {@link Scene#colorTextureEnabled} is also ````true````.
-     * @param {Boolean} [params.backfaces=false] When true, allows visible backfaces, wherever specified in the glTF. When false, ignores backfaces.
+     * @param {Boolean} [params.backfaces=true] When true, always show backfaces, even on objects for which the glTF material is single-sided. When false, only show backfaces on geometries whenever the glTF material is double-sided.
      * @param {Number} [params.edgeThreshold=10] When xraying, highlighting, selecting or edging, this is the threshold angle between normals of adjacent triangles, below which their shared wireframe edge is not drawn.
      * @param {Boolean} [params.dtxEnabled=true] When ````true```` (default) use data textures (DTX), where appropriate, to
      * represent the returned model. Set false to always use vertex buffer objects (VBOs). Note that DTX is only applicable
@@ -136401,6 +136434,7 @@ exports.PNGMediaType = PNGMediaType;
 exports.Path = Path;
 exports.PerformanceModel = PerformanceModel;
 exports.PhongMaterial = PhongMaterial;
+exports.PickResult = PickResult;
 exports.Plugin = Plugin;
 exports.PointLight = PointLight;
 exports.PointerCircle = PointerCircle;