@xeokit/xeokit-sdk 2.6.98 → 2.6.100

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.98",
+  "version": "2.6.100",
   "description": "3D BIM IFC Viewer SDK for AEC engineering applications. Open Source JavaScript Toolkit based on pure WebGL for top performance, real-world coordinates and full double precision",
   "module": "./dist/xeokit-sdk.es.js",
   "main": "./dist/xeokit-sdk.cjs.js",

package/src/plugins/GLTFLoaderPlugin/GLTFLoaderPlugin.js

@@ -323,6 +323,7 @@ class GLTFLoaderPlugin extends Plugin {
      * primitives. Only works while {@link DTX#enabled} is also ````true````.
      * @param {Boolean} [params.autoMetaModel] When supplied, creates a default MetaModel with a single MetaObject.
      * @param {Boolean} [params.globalizeObjectIds=false] Indicates whether to globalize each {@link Entity#id} and {@link MetaObject#id}, in case you need to prevent ID clashes with other models.
+     * @param {*} [params.parseOptions={}] Options to pass to loaders.gl parse method, eg. ````{ gltf: { excludeExtensions: { "KHR_texture_transform": false } } }````.
      * @returns {Entity} Entity representing the model, which will have {@link Entity#isModel} set ````true```` and will be registered by {@link Entity#id} in {@link Scene#models}
      */
     load(params = {}) {

package/src/plugins/GLTFLoaderPlugin/GLTFSceneModelLoader.js

@@ -102,6 +102,7 @@ function parseGLTF(plugin, src, gltf, metaModelJSON, options, sceneModel, ok, er
     const spinner = plugin.viewer.scene.canvas.spinner;
     spinner.processes++;
     parse(gltf, GLTFLoader, {
+        ...(options.parseOptions || { }),
         baseUri: options.basePath
     }).then((gltfData) => {
         const processedGLTF = postProcessGLTF(gltfData);

package/src/plugins/NavCubePlugin/NavCubePlugin.js

@@ -193,6 +193,7 @@ class NavCubePlugin extends Plugin {
 
         this._cubeSampler = new Texture(navCubeScene, {
             image: this._cubeTextureCanvas.getImage(),
+            maxAnisotropy: 4,
             flipY: true,
             wrapS: ClampToEdgeWrapping,
             wrapT: ClampToEdgeWrapping

package/src/viewer/scene/materials/Texture.js

@@ -103,6 +103,7 @@ class Texture extends Component {
      * @param {HTMLImageElement} [cfg.image=null] HTML Image object to load into this Texture. See the {@link Texture#image} property for more info.
      * @param {Number} [cfg.minFilter=LinearMipmapLinearFilter] How the texture is sampled when a texel covers less than one pixel.
      * Supported values are {@link LinearMipmapLinearFilter}, {@link LinearMipMapNearestFilter}, {@link NearestMipMapNearestFilter}, {@link NearestMipMapLinearFilter} and {@link LinearMipMapLinearFilter}.
+     * @param {Number} [cfg.maxAnisotropy=false] Max anisotropy to use for texture filtering (see EXT_texture_filter_anisotropic).
      * @param {Number} [cfg.magFilter=LinearFilter] How the texture is sampled when a texel covers more than one pixel. Supported values are {@link LinearFilter} and {@link NearestFilter}.
      * @param {Number} [cfg.wrapS=RepeatWrapping] Wrap parameter for texture coordinate *S*. Supported values are {@link ClampToEdgeWrapping}, {@link MirroredRepeatWrapping} and {@link RepeatWrapping}.
      * @param {Number} [cfg.wrapT=RepeatWrapping] Wrap parameter for texture coordinate *T*. Supported values are {@link ClampToEdgeWrapping}, {@link MirroredRepeatWrapping} and {@link RepeatWrapping}..
@@ -120,6 +121,7 @@ class Texture extends Component {
             texture: new Texture2D({gl: this.scene.canvas.gl}),
             matrix: math.identityMat4(),
             hasMatrix: (cfg.translate && (cfg.translate[0] !== 0 || cfg.translate[1] !== 0)) || (!!cfg.rotate) || (cfg.scale && (cfg.scale[0] !== 0 || cfg.scale[1] !== 0)),
+            maxAnisotropy: cfg.maxAnisotropy,
             minFilter: this._checkMinFilter(cfg.minFilter),
             magFilter: this._checkMagFilter(cfg.magFilter),
             wrapS: this._checkWrapS(cfg.wrapS),

package/src/viewer/scene/math/math.js

@@ -253,6 +253,16 @@ const math = {
         return a;
     },
 
+    /**
+     * Returns true if the two 2-element vectors are the same.
+     * @param v1
+     * @param v2
+     * @returns {Boolean}
+     */
+    compareVec2(v1, v2) {
+        return (v1[0] === v2[0] && v1[1] === v2[1]);
+    },
+
     /**
      * Returns true if the two 3-element vectors are the same.
      * @param v1
@@ -350,6 +360,24 @@ const math = {
         return dest;
     },
 
+    /**
+     * Adds one two-element vector to another.
+     * @method addVec3
+     * @static
+     * @param {Array(Number)} u First vector
+     * @param {Array(Number)} v Second vector
+     * @param  {Array(Number)} [dest] Destination vector
+     * @return {Array(Number)} dest if specified, u otherwise
+     */
+    addVec2(u, v, dest) {
+        if (!dest) {
+            dest = u;
+        }
+        dest[0] = u[0] + v[0];
+        dest[1] = u[1] + v[1];
+        return dest;
+    },
+
     /**
      * Adds one three-element vector to another.
      * @method addVec3
@@ -504,8 +532,26 @@ const math = {
     },
 
     /**
-     * Multiplies one three-element vector by another.
-     * @method mulVec3
+     * Multiplies one two-element vector by another.
+     * @method mulVec2
+     * @static
+     * @param {Array(Number)} u First vector
+     * @param {Array(Number)} v Second vector
+     * @param  {Array(Number)} [dest] Destination vector
+     * @return {Array(Number)} dest if specified, u otherwise
+     */
+    mulVec2(u, v, dest) {
+        if (!dest) {
+            dest = u;
+        }
+        dest[0] = u[0] * v[0];
+        dest[1] = u[1] * v[1];
+        return dest;
+    },
+
+    /**
+     * Multiplies one four-element vector by another.
+     * @method mulVec4
      * @static
      * @param {Array(Number)} u First vector
      * @param {Array(Number)} v Second vector

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

@@ -108,6 +108,7 @@ class Texture2D {
         if (props.unpackAlignment !== undefined) {
             this.unpackAlignment = props.unpackAlignment;
         }
+        this.maxAnisotropy = props.maxAnisotropy;
         if (props.minFilter !== undefined) {
             this.minFilter = props.minFilter;
         }
@@ -140,6 +141,12 @@ class Texture2D {
         const bak4 = gl.getParameter(gl.UNPACK_COLORSPACE_CONVERSION_WEBGL);;
         gl.pixelStorei(gl.UNPACK_COLORSPACE_CONVERSION_WEBGL, gl.NONE);
 
+        const anisoExt = this.maxAnisotropy && getExtension(gl, "EXT_texture_filter_anisotropic");
+        if (anisoExt) {
+            const max = gl.getParameter(anisoExt.MAX_TEXTURE_MAX_ANISOTROPY_EXT);
+            gl.texParameterf(gl.TEXTURE_2D, anisoExt.TEXTURE_MAX_ANISOTROPY_EXT, Math.min(max, this.maxAnisotropy));
+        }
+
         const minFilter = convertConstant(gl, this.minFilter);
         gl.texParameteri(this.target, gl.TEXTURE_MIN_FILTER, minFilter);
 

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

@@ -83,6 +83,8 @@ export declare type LoadGLTFModel = {
   performance?: boolean;
   /** When true, generate a single MetaObject that represents the entire glTF model, and a MetaObject for each entity within it. */
   autoMetaModel?: boolean;
+  /** Options to pass to loaders.gl parse method, eg. ````{ gltf: { excludeExtensions: { "KHR_texture_transform": false } } }````. */
+  parseOptions?: any;
 };
 
 /**

package/types/viewer/scene/materials/Texture.d.ts

@@ -7,6 +7,8 @@ export declare type TextureConfiguration = {
     src?: string;
     /** HTML Image object to load into this Texture. See the {@link Texture#image} property for more info. */
     image?: HTMLImageElement;
+    /** Max anisotropy to use for texture filtering (see EXT_texture_filter_anisotropic). */
+    maxAnisotropy?: number;
     /** How the texture is sampled when a texel covers less than one pixel. */
     minFilter?: "LinearFilter" | "LinearMipMapNearestFilter" | "NearestMipMapNearestFilter" | "NearestMipMapLinearFilter" | "LinearMipMapLinearFilter";
     /** How the texture is sampled when a texel covers more than one pixel. Supported values are {@link LinearFilter} and {@link NearestFilter}. */