@babylonjs/core 5.33.2 → 5.34.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@babylonjs/core",
-    "version": "5.33.2",
+    "version": "5.34.0",
     "main": "index.js",
     "module": "index.js",
     "types": "index.d.ts",

package/scene.d.ts

@@ -1522,18 +1522,28 @@ export declare class Scene extends AbstractScene implements IAnimatable, IClipPl
      * @returns the animation group or null if none found.
      */
     getAnimationGroupByName(name: string): Nullable<AnimationGroup>;
+    private _getMaterial;
     /**
      * Get a material using its unique id
      * @param uniqueId defines the material's unique id
+     * @param allowMultiMaterials determines whether multimaterials should be considered
      * @returns the material or null if none found.
      */
-    getMaterialByUniqueID(uniqueId: number): Nullable<Material>;
+    getMaterialByUniqueID(uniqueId: number, allowMultiMaterials?: boolean): Nullable<Material>;
     /**
      * get a material using its id
      * @param id defines the material's Id
+     * @param allowMultiMaterials determines whether multimaterials should be considered
      * @returns the material or null if none found.
      */
-    getMaterialById(id: string): Nullable<Material>;
+    getMaterialById(id: string, allowMultiMaterials?: boolean): Nullable<Material>;
+    /**
+     * Gets a material using its name
+     * @param name defines the material's name
+     * @param allowMultiMaterials determines whether multimaterials should be considered
+     * @returns the material or null if none found.
+     */
+    getMaterialByName(name: string, allowMultiMaterials?: boolean): Nullable<Material>;
     /**
      * Gets a the last added material using a given id
      * @param id defines the material's Id
@@ -1541,12 +1551,6 @@ export declare class Scene extends AbstractScene implements IAnimatable, IClipPl
      * @returns the last material with the given id or null if none found.
      */
     getLastMaterialById(id: string, allowMultiMaterials?: boolean): Nullable<Material>;
-    /**
-     * Gets a material using its name
-     * @param name defines the material's name
-     * @returns the material or null if none found.
-     */
-    getMaterialByName(name: string): Nullable<Material>;
     /**
      * Get a texture using its unique id
      * @param uniqueId defines the texture's unique id

package/scene.js

@@ -2292,31 +2292,49 @@ export class Scene extends AbstractScene {
         }
         return null;
     }
+    _getMaterial(allowMultiMaterials, predicate) {
+        for (let index = 0; index < this.materials.length; index++) {
+            const material = this.materials[index];
+            if (predicate(material)) {
+                return material;
+            }
+        }
+        if (allowMultiMaterials) {
+            for (let index = 0; index < this.multiMaterials.length; index++) {
+                const material = this.multiMaterials[index];
+                if (predicate(material)) {
+                    return material;
+                }
+            }
+        }
+        return null;
+    }
     /**
      * Get a material using its unique id
      * @param uniqueId defines the material's unique id
+     * @param allowMultiMaterials determines whether multimaterials should be considered
      * @returns the material or null if none found.
      */
-    getMaterialByUniqueID(uniqueId) {
-        for (let index = 0; index < this.materials.length; index++) {
-            if (this.materials[index].uniqueId === uniqueId) {
-                return this.materials[index];
-            }
-        }
-        return null;
+    getMaterialByUniqueID(uniqueId, allowMultiMaterials = false) {
+        return this._getMaterial(allowMultiMaterials, (m) => m.uniqueId === uniqueId);
     }
     /**
      * get a material using its id
      * @param id defines the material's Id
+     * @param allowMultiMaterials determines whether multimaterials should be considered
      * @returns the material or null if none found.
      */
-    getMaterialById(id) {
-        for (let index = 0; index < this.materials.length; index++) {
-            if (this.materials[index].id === id) {
-                return this.materials[index];
-            }
-        }
-        return null;
+    getMaterialById(id, allowMultiMaterials = false) {
+        return this._getMaterial(allowMultiMaterials, (m) => m.id === id);
+    }
+    /**
+     * Gets a material using its name
+     * @param name defines the material's name
+     * @param allowMultiMaterials determines whether multimaterials should be considered
+     * @returns the material or null if none found.
+     */
+    getMaterialByName(name, allowMultiMaterials = false) {
+        return this._getMaterial(allowMultiMaterials, (m) => m.name === name);
     }
     /**
      * Gets a the last added material using a given id
@@ -2339,19 +2357,6 @@ export class Scene extends AbstractScene {
         }
         return null;
     }
-    /**
-     * Gets a material using its name
-     * @param name defines the material's name
-     * @returns the material or null if none found.
-     */
-    getMaterialByName(name) {
-        for (let index = 0; index < this.materials.length; index++) {
-            if (this.materials[index].name === name) {
-                return this.materials[index];
-            }
-        }
-        return null;
-    }
     /**
      * Get a texture using its unique id
      * @param uniqueId defines the texture's unique id