@xeokit/xeokit-sdk 2.6.78-rc2-no-las → 2.6.78

package/src/viewer/scene/sectionCaps/SectionCaps.js

@@ -12,6 +12,7 @@ const tempVec3a = math.vec3();
 const tempVec3b = math.vec3();
 const tempVec3c = math.vec3();
 const tempVec3d = math.vec3();
+const planeOff  = math.vec3();
 
 function pointsEqual(p1, p2) {
     return (
@@ -215,9 +216,9 @@ class SectionCaps {
                 const objects = sceneModel.objects;
                 // Preallocate arrays for triangle vertices to avoid repeated allocation
                 const triangle = [
-                    new Float32Array(3),
-                    new Float32Array(3),
-                    new Float32Array(3)
+                    math.vec3(),
+                    math.vec3(),
+                    math.vec3()
                 ];
 
                 this._dirtyMap[sceneModel.id].forEach((isDirty, objectId) => {
@@ -230,20 +231,29 @@ class SectionCaps {
                     if(!this._doesPlaneIntersectBoundingBox(object.aabb, plane)) return;
 
                     if(!this._sceneModelsData[sceneModel.id]) {
+                        const aabb = sceneModel.aabb;
                         this._sceneModelsData[sceneModel.id] = {
                             verticesMap: new Map(),
-                            indicesMap:  new Map()
+                            indicesMap:  new Map(),
+                            // modelOrigin is critical to use when handling models with large coordinates.
+                            // See XCD-306 and examples/slicing/SectionCaps_at_distance.html for more details.
+                            modelOrigin: math.vec3([
+                                (aabb[0] + aabb[3]) / 2,
+                                (aabb[1] + aabb[4]) / 2,
+                                (aabb[2] + aabb[5]) / 2
+                            ])
                         };
                     }
 
                     const sceneModelData = this._sceneModelsData[sceneModel.id];
+                    const modelOrigin = sceneModelData.modelOrigin;
 
                     if(!sceneModelData.verticesMap.has(objectId)) {
                         const isSolid = object.meshes[0].isSolid();
                         const vertices = [ ];
                         const indices  = [ ];
                         if(isSolid && object.capMaterial) {
-                            object.getEachVertex(v => vertices.push(v[0], v[1], v[2]));
+                            object.getEachVertex(v => vertices.push(v[0]-modelOrigin[0], v[1]-modelOrigin[1], v[2]-modelOrigin[2]));
                             object.getEachIndex(i  => indices.push(i));
                         }
                         sceneModelData.verticesMap.set(objectId, vertices);
@@ -252,6 +262,7 @@ class SectionCaps {
 
                     const vertices = sceneModelData.verticesMap.get(objectId);
                     const indices  = sceneModelData.indicesMap.get(objectId);
+                    const planeDist = -math.dotVec3(math.subVec3(plane.pos, modelOrigin, tempVec3a), plane.dir);
 
                     const capSegments = [];
                     const vertCount = indices.length;
@@ -273,8 +284,8 @@ class SectionCaps {
                             const p1 = triangle[i];
                             const p2 = triangle[(i + 1) % 3];
 
-                            const d1 = plane.dist + math.dotVec3(plane.dir, p1);
-                            const d2 = plane.dist + math.dotVec3(plane.dir, p2);
+                            const d1 = planeDist + math.dotVec3(plane.dir, p1);
+                            const d2 = planeDist + math.dotVec3(plane.dir, p2);
 
                             if (d1 * d2 > 0) continue;
 
@@ -364,6 +375,7 @@ class SectionCaps {
                 const caps = new Map();
                 let arr;
                 projectedSegments.forEach((segment, segmentId) => {
+                    const modelOrigin = this._sceneModelsData[sceneModel.id].modelOrigin;
                     arr = [];
                     const loops = segment;
 
@@ -446,7 +458,7 @@ class SectionCaps {
                             for (let j = 0; j < 3; j++) {
                                 const idx = triangles[i + j] * 2;
                                 const point2D = [vertices[idx], vertices[idx + 1]];
-                                const point3D = this._convertTo3D(point2D, plane);
+                                const point3D = this._convertTo3D(point2D, plane, modelOrigin);
                                 triangle.push(point3D);
                             }
 
@@ -509,11 +521,10 @@ class SectionCaps {
                     this._prevIntersectionModelsMap[sceneModel.id] = new Map();
 
                 // Cache plane direction values
-                const offsetX = plane.dir[0] * 0.001;
-                const offsetY = plane.dir[1] * 0.001;
-                const offsetZ = plane.dir[2] * 0.001;
+                math.mulVec3Scalar(plane.dir, 0.001, planeOff); // Use dedicated planeOff, as tempVec* are overwritten by _createUVs
 
                 geometryData.forEach((geometries, objectId) => {
+                    const modelOrigin = this._sceneModelsData[sceneModel.id].modelOrigin;
                     const meshArray = new Array(geometries.size); // Pre-allocate array with known size
                     let meshIndex = 0;
 
@@ -522,16 +533,10 @@ class SectionCaps {
                         const indices = geometry.indices;
                         const verticesLength = vertices.length;
 
-                        for (let i = 0; i < verticesLength; i += 3) {
-                            vertices[i] += offsetX;
-                            vertices[i + 1] += offsetY;
-                            vertices[i + 2] +=  offsetZ;
-                        }
-                        
                         // Build normals and UVs in parallel if possible
                         const meshNormals = math.buildNormals(vertices, indices);
-                        const uvs = this._createUVs(vertices, plane);
-                        
+                        const uvs = this._createUVs(vertices, plane, modelOrigin);
+
                         // Create mesh with transformed vertices
                         meshArray[meshIndex++] = new Mesh(this.scene, {
                             id: `${plane.id}-${objectId}-${index}`,
@@ -542,6 +547,7 @@ class SectionCaps {
                                 normals: meshNormals,
                                 uv: uvs
                             }),
+                            origin:   math.addVec3(modelOrigin, planeOff, tempVec3a),
                             position: [0, 0, 0],
                             rotation: [0, 0, 0],
                             material: sceneModel.objects[objectId].capMaterial
@@ -651,7 +657,7 @@ class SectionCaps {
         return inside;
     }
 
-    _convertTo3D(point2D, plane) {
+    _convertTo3D(point2D, plane, origin) {
         // Reconstruct the same basis vectors used in _projectTo2D
         let u, normal = plane.dir, planePosition = plane.pos;
         if (Math.abs(normal[0]) > Math.abs(normal[1])) {
@@ -677,9 +683,9 @@ class SectionCaps {
         // Project the point onto the cutting plane
 
         const t = math.dotVec3(normal, [
-            planePosition[0] - result[0],
-            planePosition[1] - result[1],
-            planePosition[2] - result[2]
+            planePosition[0] - result[0] - origin[0],
+            planePosition[1] - result[1] - origin[1],
+            planePosition[2] - result[2] - origin[2]
         ]);
 
         return [
@@ -708,7 +714,7 @@ class SectionCaps {
 
     }
 
-    _createUVs(vertices, plane) {
+    _createUVs(vertices, plane, origin) {
         const O = plane.pos;
         const D = tempVec3a;
         D.set(plane.dir);
@@ -717,9 +723,9 @@ class SectionCaps {
 
         const uvs = [ ];
         for (let i = 0; i < vertices.length; i += 3) {
-            P[0] = vertices[i];
-            P[1] = vertices[i + 1];
-            P[2] = vertices[i + 2];
+            P[0] = vertices[i]     + origin[0];
+            P[1] = vertices[i + 1] + origin[1];
+            P[2] = vertices[i + 2] + origin[2];
 
             // Project P onto the plane
             const OP = math.subVec3(P, O, tempVec3c);

package/src/viewer/scene/webgl/ArrayBuf.js

@@ -10,6 +10,7 @@ class ArrayBuf {
         this._gl = gl;
         this.type = type;
         this.allocated = false;
+        this.ConstructorType = data.constructor;
 
         switch (data.constructor) {
 
@@ -94,6 +95,25 @@ class ArrayBuf {
         }
     }
 
+    getData(baseIndex = 0, length = (this.numItems) - baseIndex) {
+        if (!this.allocated) {
+            return [];
+        }
+
+        const array = new (this.ConstructorType)(length * this.itemSize);
+
+        this._gl.bindBuffer(this.type, this._handle);
+        this._gl.getBufferSubData(
+            this.type,
+            baseIndex * this.itemByteSize * this.itemSize,
+            array,
+            0,
+            length * this.itemSize
+        );
+
+        return array;
+    }
+
     bind() {
         if (!this.allocated) {
             return;

package/types/plugins/AngleMeasurementsPlugin/AngleMeasurement.d.ts

@@ -13,64 +13,146 @@ export declare class AngleMeasurement extends Component {
   plugin: AngleMeasurementsPlugin;
   
   /**
-   * Whether this AngleMeasurement indicates that its measurement is approximate.
+   * Sets whether this AngleMeasurement indicates that its measurement is approximate.
    *
    * This is ````true```` by default.
+   *
+   * @type {Boolean}
    */
-  approximate: boolean;
+  set approximate(arg: boolean);
   /**
-   * Whether this AngleMeasurement is visible or not.
+   * Gets whether this AngleMeasurement indicates that its measurement is approximate.
+   *
+   * This is ````true```` by default.
+   *
+   * @type {Boolean}
    */
-  visible: boolean;
+  get approximate(): boolean;
+  /**
+   * Sets whether this AngleMeasurement is visible or not.
+   *
+   * @type {Boolean}
+   */
+  set visible(arg: boolean);
+  /**
+   * Gets whether this AngleMeasurement is visible or not.
+   *
+   * @type {Boolean}
+   */
+  get visible(): boolean;
 
   /**
-   * Whether this AngleMeasurement is highlighted or not.
+   * Sets whether this AngleMeasurement is highlighted or not.
+   *
+   * @type {Boolean}
    */
-  highlighted: boolean;
+  set highlighted(arg: boolean);
+  /**
+   * Gets whether this AngleMeasurement is highlighted or not.
+   *
+   * @type {Boolean}
+   */
+  get highlighted(): boolean;
 
   /**
-   * Whether the origin {@link Marker} is visible.
+   * Sets if the origin {@link Marker} is visible.
+   *
+   * @type {Boolean}
+   */
+  set originVisible(arg: boolean);
+  /**
+   * Gets if the origin {@link Marker} is visible.
+   *
+   * @type {Boolean}
+   */
+  get originVisible(): boolean;
+  /**
+   * Sets if the corner {@link Marker} is visible.
+   *
+   * @type {Boolean}
+   */
+  set cornerVisible(arg: boolean);
+  /**
+   * Gets if the corner {@link Marker} is visible.
+   *
+   * @type {Boolean}
    */
-  originVisible: boolean;
+  get cornerVisible(): boolean;
   /**
-   * Whether the corner {@link Marker} is visible.
+   * Sets if the target {@link Marker} is visible.
+   *
+   * @type {Boolean}
    */
-  cornerVisible: boolean;
+  set targetVisible(arg: boolean);
   /**
-   * Whether the target {@link Marker} is visible.
+   * Gets if the target {@link Marker} is visible.
+   *
+   * @type {Boolean}
    */
-  targetVisible: boolean;
+  get targetVisible(): boolean;
   /**
-   * Whether the wire between the origin and the corner is visible.
+   * Sets if the wire between the origin and the corner is visible.
+   *
+   * @type {Boolean}
    */
-  originWireVisible: boolean;
+  set originWireVisible(arg: boolean);
   /**
-   * Whether the wire between the target and the corner is visible.
+   * Gets if the wire between the origin and the corner is visible.
+   *
+   * @type {Boolean}
    */
-  targetWireVisible: boolean;
+  get originWireVisible(): boolean;
   /**
-   * Whether the angle label is visible.
+   * Sets if the wire between the target and the corner is visible.
+   *
+   * @type {Boolean}
+   */
+  set targetWireVisible(arg: boolean);
+  /**
+   * Gets if the wire between the target and the corner is visible.
+   *
+   * @type {Boolean}
    */
-  angleVisible: boolean;
+  get targetWireVisible(): boolean;
+  /**
+   * Sets if the angle label is visible.
+   *
+   * @type {Boolean}
+   */
+  set angleVisible(arg: boolean);
+  /**
+   * Gets if the angle label is visible.
+   *
+   * @type {Boolean}
+   */
+  get angleVisible(): boolean;
   
   /**
-   * The origin {@link Marker}.
+   * Gets the origin {@link Marker}.
+   *
+   * @type {Marker}
    */
-  readonly origin: Marker;
+  get origin(): Marker;
 
   /**
-   * The corner {@link Marker}.
+   * Gets the corner {@link Marker}.
+   *
+   * @type {Marker}
    */
-  readonly corner: Marker;
+  get corner(): Marker;
 
   /**
-   * The target {@link Marker}.
+   * Gets the target {@link Marker}.
+   *
+   * @type {Marker}
    */
-  readonly target: Marker;
+  get target(): Marker;
 
   /**
-   * The angle between two connected 3D line segments, given
+   * Gets the angle between two connected 3D line segments, given
    * as three positions on the surface(s) of one or more {@link Entity}s.
+   *
+   * @type {Number}
    */
-  readonly angle: number;
+  get angle(): number;
 }

package/types/plugins/CityJSONLoaderPlugin/CityJSONLoaderPlugin.d.ts

@@ -11,7 +11,9 @@ export declare interface ICityJSONDefaultDataSource {
    */
   getCityJSON(src: string | number, ok: (json: any)=> void, error: (e: Error)=> void): void;
 
-  cacheBuster: boolean;
+  get cacheBuster(): boolean;
+
+  set cacheBuster(value: boolean);
 }
 
 export declare type CityJSONLoaderPluginConfiguration = {
@@ -57,13 +59,22 @@ export declare class CityJSONLoaderPlugin extends Plugin {
   constructor(viewer: Viewer, cfg?: CityJSONLoaderPluginConfiguration);
 
   /**
-   * Custom data source through which the CityJSONLoaderPlugin can load CityJSON files.
+   * Sets a custom data source through which the CityJSONLoaderPlugin can load CityJSON files.
+   *
+   * Default value is {@link CityJSONDefaultDataSource}, which loads via HTTP.
+   *
+   * @type {Object}
+   */
+  set dataSource(arg: ICityJSONDefaultDataSource);
+
+  /**
+   * Gets the custom data source through which the CityJSONLoaderPlugin can load CityJSON files.
    *
    * Default value is {@link CityJSONDefaultDataSource}, which loads via HTTP.
    *
    * @type {Object}
    */
-  dataSource: ICityJSONDefaultDataSource;
+  get dataSource(): ICityJSONDefaultDataSource;
 
   /**
    * Loads an ````CityJSON```` model into this CityJSONLoaderPlugin's {@link Viewer}.

package/types/plugins/DotBIMLoaderPlugin/DotBIMLoaderPlugin.d.ts

@@ -10,7 +10,9 @@ export declare interface IDotBIMDefaultDataSource {
    */
   getDotBIM(dotBIMSrc: string | number, ok: (buffer: ArrayBuffer) => void, error: (e: Error) => void): void;
 
-  cacheBuster: boolean;
+  get cacheBuster(): boolean;
+
+  set cacheBuster(value: boolean);
 }
 
 export declare type DotBIMLoaderPluginConfiguration = {
@@ -71,20 +73,36 @@ export declare class DotBIMLoaderPlugin extends Plugin {
   constructor(viewer: Viewer, cfg?: DotBIMLoaderPluginConfiguration);
 
   /**
-   * Custom data source through which the DotBIMLoaderPlugin can load .BIM files.
+   * Sets a custom data source through which the DotBIMLoaderPlugin can .BIM files.
+   *
+   * Default value is {@link DotBIMDefaultDataSource}, which loads via an XMLHttpRequest.
+   *
+   * @type {IDotBIMDefaultDataSource}
+   */
+  set dataSource(arg: IDotBIMDefaultDataSource);
+
+  /**
+   * Gets the custom data source through which the DotBIMLoaderPlugin can load .BIM files.
    *
    * Default value is {@link DotBIMDefaultDataSource}, which loads via an XMLHttpRequest.
    *
    * @type {IDotBIMDefaultDataSource}
    */
-  dataSource: IDotBIMDefaultDataSource;
+  get dataSource(): IDotBIMDefaultDataSource;
+
+  /**
+     * Sets map of initial default states for each loaded {@link Entity} that represents an object.
+     *
+     * @type {IFCObjectDefaults}
+     */
+  set objectDefaults(arg: IFCObjectDefaults);
 
   /**
-   * Map of initial default states for each loaded {@link Entity} that represents an object.
+   * Gets map of initial default states for each loaded {@link Entity} that represents an object.
    *
    * @type {IFCObjectDefaults}
    */
-  objectDefaults: IFCObjectDefaults;
+  get objectDefaults(): IFCObjectDefaults;
 
   /**
    * Loads a .BIM model from a file into this DotBIMLoaderPlugin's {@link Viewer}.

package/types/plugins/GLTFLoaderPlugin/GLTFLoaderPlugin.d.ts

@@ -32,7 +32,9 @@ export declare interface IGLTFDefaultDataSource {
    */
   getArrayBuffer(glTFSrc: string | number, binarySrc: string | number, ok: Function, error: Function): void;
 
-  cacheBuster: boolean;
+  get cacheBuster(): boolean;
+
+  set cacheBuster(value: boolean);
 }
 
 export declare type GLTFLoaderPluginConfiguration =  {
@@ -99,22 +101,40 @@ export declare class GLTFLoaderPlugin extends Plugin {
   constructor(viewer: Viewer, cfg?:GLTFLoaderPluginConfiguration);
 
   /**
-   * Custom data source through which the GLTFLoaderPlugin can load metadata, glTF and binary attachments.
+   * Sets a custom data source through which the GLTFLoaderPlugin can load metadata, glTF and binary attachments.
+   *
+   * Default value is {@link GLTFDefaultDataSource}, which loads via an XMLHttpRequest.
+   *
+   * @type {Object}
+   */
+  set dataSource(arg: IGLTFDefaultDataSource);
+
+  /**
+   * Gets the custom data source through which the GLTFLoaderPlugin can load metadata, glTF and binary attachments.
    *
    * Default value is {@link GLTFDefaultDataSource}, which loads via an XMLHttpRequest.
    *
    * @type {Object}
    */
-  dataSource: IGLTFDefaultDataSource;
+  get dataSource(): IGLTFDefaultDataSource;
+
+  /**
+   * Sets map of initial default states for each loaded {@link Entity} that represents an object.
+   *
+   * Default value is {@link IFCObjectDefaults}.
+   *
+   * @type {IFCObjectDefaults}
+   */
+  set objectDefaults(arg: IFCObjectDefaults);
 
   /**
-   * Map of initial default states for each loaded {@link Entity} that represents an object.
+   * Gets map of initial default states for each loaded {@link Entity} that represents an object.
    *
    * Default value is {@link IFCObjectDefaults}.
    *
    * @type {IFCObjectDefaults}
    */
-  objectDefaults: IFCObjectDefaults;
+  get objectDefaults(): IFCObjectDefaults;
 
   /**
    * Loads a glTF model from a file into this GLTFLoaderPlugin's {@link Viewer}.