@xeokit/xeokit-sdk 2.6.109 → 2.6.112

package/src/viewer/scene/CameraControl/lib/CameraUpdater.js

@@ -117,26 +117,18 @@ class CameraUpdater {
 
             if (updates.rotateDeltaY !== 0 || updates.rotateDeltaX !== 0) {
 
-                if ((!configs.firstPerson) && configs.followPointer && pivotController.getPivoting()) {
-                    pivotController.continuePivot(updates.rotateDeltaY, updates.rotateDeltaX);
-                    pivotController.showPivot();
-
-                } else {
-
+                if (configs.firstPerson) {
                     if (updates.rotateDeltaX !== 0) {
-                        if (configs.firstPerson) {
-                            camera.pitch(-updates.rotateDeltaX);
-                        } else {
-                            camera.orbitPitch(updates.rotateDeltaX);
-                        }
+                        camera.pitch(-updates.rotateDeltaX);
                     }
-
                     if (updates.rotateDeltaY !== 0) {
-                        if (configs.firstPerson) {
-                            camera.yaw(updates.rotateDeltaY);
-                        } else {
-                            camera.orbitYaw(updates.rotateDeltaY);
-                        }
+                        camera.yaw(updates.rotateDeltaY);
+                    }
+                }
+                else {
+                    if (configs.followPointer && pivotController.getPivoting()){
+                        pivotController.continuePivot(updates.rotateDeltaY, updates.rotateDeltaX);
+                        pivotController.showPivot();
                     }
                 }
 

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

@@ -87,6 +87,20 @@ export declare type LoadGLTFModel = {
   parseOptions?: any;
   /** Create an entity for each mesh, instead of grouping leaf meshes under their common entity. */
   entityPerMesh?: boolean;
+  /**
+   * Alternative user-provided loaders.gl library.
+   * This feature has been tested with loaders.gl 4.3.4 version.
+   * Because loaders.gl is supplied externally, xeokit cannot guarantee compatibility with all loaders.gl versions.
+   */
+  loadersGl?: {
+    core: {
+      parse: (...args: any[]) => any;
+    };
+    gltf: {
+      GLTFLoader: any;
+      postProcessGLTF: (...args: any[]) => any;
+    };
+  };
 };
 
 /**

package/types/plugins/XKTLoaderPlugin/XKTLoaderPlugin.d.ts

@@ -1,5 +1,9 @@
 import {IFCObjectDefaults, Plugin, VBOSceneModel, Viewer} from "../../viewer";
 
+type ReuseGeometries =
+    | boolean
+    | ((geometryConfig: { instanceCount: number }) => boolean);
+
 export declare type XKTLoaderPluginConfiguration = {
     /** Optional ID for this plugin, so that we can find it within {@link Viewer.plugins}. */
     id?: string;
@@ -16,7 +20,7 @@ export declare type XKTLoaderPluginConfiguration = {
     /** When loading metadata and this is ````true````, will only load {@link Entity}s that have {@link MetaObject}s (that are not excluded). This is useful when we don't want Entitys in the Scene that are not represented within IFC navigation components, such as {@link TreeViewPlugin}. */
     excludeUnclassifiedObjects?: boolean;
     /** Indicates whether to enable geometry reuse */
-    reuseGeometries?: boolean;
+    reuseGeometries?: ReuseGeometries;
     /** Maximum geometry batch size, as number of vertices. */
     maxGeometryBatchSize?: number;
 };
@@ -32,6 +36,8 @@ export declare type LoadXKTModel = {
     metaModelSrc?: string;
     /** JSON model metadata, as an alternative to the ````metaModelSrc```` parameter. */
     metaModelData?: any;
+    /** Whether to load metadata into MetaScene, otherwise expose as SceneModel::metadata. Defaults to `true`. */
+    loadIntoMetaScene?: boolean;
     /** Path or URL to a JSON manifest file that provides paths or URLs to ````.xkt```` files to load as parts of the model. Use this option to load models that have been split into multiple XKT files. See [tutorial](https://xeokit.io/blog/automatically-splitting-large-models-for-better-performance) for more info.*/
     manifestSrc?: any;
     /** A JSON manifest object (as an alternative to a path or URL) that provides paths or URLs to ````.xkt```` files to load as parts of the model. Use this option to load models that have been split into multiple XKT files. See [tutorial](https://xeokit.io/blog/automatically-splitting-large-models-for-better-performance) for more info. */
@@ -72,7 +78,7 @@ export declare type LoadXKTModel = {
      * all geometry instances into batches (````false````), and not use instancing to render them. Setting this ````false```` can significantly
      * improve Viewer performance for models that have excessive geometry reuse, but may also increases the amount of
      * browser and GPU memory used by the model. See [#769](https://github.com/xeokit/xeokit-sdk/issues/769) for more info. */
-    reuseGeometries?: boolean;
+    reuseGeometries?: ReuseGeometries;
     /** 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
      * to non-textured triangle meshes, and that VBOs are always used for meshes that have textures, line segments, or point
@@ -265,7 +271,7 @@ export declare class XKTLoaderPlugin extends Plugin {
      *
      * @type {Boolean}
      */
-    set reuseGeometries(arg: boolean);
+    set reuseGeometries(arg: ReuseGeometries);
 
     /**
      * Gets whether XKTLoaderPlugin enables geometry reuse when loading models.
@@ -274,7 +280,7 @@ export declare class XKTLoaderPlugin extends Plugin {
      *
      * @type {Boolean}
      */
-    get reuseGeometries(): boolean;
+    get reuseGeometries(): ReuseGeometries;
 
     /**
      * Gets the ````.xkt```` format versions supported by this XKTLoaderPlugin/

package/types/viewer/metadata/MetaModel.d.ts

@@ -61,14 +61,24 @@ export declare class MetaModel {
   /**
    * The {@link PropertySet}s in this MetaModel.
    */
-  propertySets: {
-    String: PropertySet;
-  };
+  propertySets: PropertySet[];
 
   /**
    * The root {@link MetaObject} in this MetaModel's composition structure hierarchy.
    */
-  rootMetaObject: MetaObject;
+  rootMetaObject: MetaObject | null;
+
+  /**
+   * The root {@link MetaObject}s in this MetaModel's composition structure hierarchy.
+   */
+  rootMetaObjects: MetaObject[];
+
+  /**
+   * The {@link MetaObject}s in this MetaModel, each mapped to its ID.
+   */
+  metaObjects: {
+      String: MetaObject;
+  };
 
   /**
    * Finalizes this MetaModel.