@babylonjs/loaders 5.0.0-beta.9 → 5.0.0-rc.10

package/OBJ/index.d.ts

@@ -1,4 +1,4 @@
-export * from "./mtlFileLoader";
-export * from "./objLoadingOptions";
-export * from "./solidParser";
-export * from "./objFileLoader";
+export * from "./mtlFileLoader";
+export * from "./objLoadingOptions";
+export * from "./solidParser";
+export * from "./objFileLoader";

package/OBJ/index.js

@@ -1,5 +1,5 @@
-export * from "./mtlFileLoader.js";
-export * from "./objLoadingOptions.js";
-export * from "./solidParser.js";
-export * from "./objFileLoader.js";
+export * from "./mtlFileLoader.js";
+export * from "./objLoadingOptions.js";
+export * from "./solidParser.js";
+export * from "./objFileLoader.js";
 //# sourceMappingURL=index.js.map

package/OBJ/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../sourceES6/loaders/src/OBJ/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC","sourcesContent":["export * from \"./mtlFileLoader\";\r\nexport * from \"./objLoadingOptions\";\r\nexport * from \"./solidParser\";\r\nexport * from \"./objFileLoader\";\r\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lts/loaders/generated/OBJ/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC","sourcesContent":["export * from \"./mtlFileLoader\";\r\nexport * from \"./objLoadingOptions\";\r\nexport * from \"./solidParser\";\r\nexport * from \"./objFileLoader\";\r\n"]}

package/OBJ/mtlFileLoader.d.ts

@@ -1,40 +1,41 @@
-import { Nullable } from "@babylonjs/core/types";
-import { StandardMaterial } from "@babylonjs/core/Materials/standardMaterial";
-import { Scene } from "@babylonjs/core/scene";
-import { AssetContainer } from "@babylonjs/core/assetContainer";
-/**
- * Class reading and parsing the MTL file bundled with the obj file.
- */
-export declare class MTLFileLoader {
-    /**
-     * Invert Y-Axis of referenced textures on load
-     */
-    static INVERT_TEXTURE_Y: boolean;
-    /**
-     * All material loaded from the mtl will be set here
-     */
-    materials: StandardMaterial[];
-    /**
-     * This function will read the mtl file and create each material described inside
-     * This function could be improve by adding :
-     * -some component missing (Ni, Tf...)
-     * -including the specific options available
-     *
-     * @param scene defines the scene the material will be created in
-     * @param data defines the mtl data to parse
-     * @param rootUrl defines the rooturl to use in order to load relative dependencies
-     * @param assetContainer defines the asset container to store the material in (can be null)
-     */
-    parseMTL(scene: Scene, data: string | ArrayBuffer, rootUrl: string, assetContainer: Nullable<AssetContainer>): void;
-    /**
-     * Gets the texture for the material.
-     *
-     * If the material is imported from input file,
-     * We sanitize the url to ensure it takes the textre from aside the material.
-     *
-     * @param rootUrl The root url to load from
-     * @param value The value stored in the mtl
-     * @return The Texture
-     */
-    private static _getTexture;
-}
+import type { Nullable } from "@babylonjs/core/types.js";
+import { StandardMaterial } from "@babylonjs/core/Materials/standardMaterial.js";
+import type { Scene } from "@babylonjs/core/scene.js";
+import type { AssetContainer } from "@babylonjs/core/assetContainer.js";
+/**
+ * Class reading and parsing the MTL file bundled with the obj file.
+ */
+export declare class MTLFileLoader {
+    /**
+     * Invert Y-Axis of referenced textures on load
+     */
+    static INVERT_TEXTURE_Y: boolean;
+    /**
+     * All material loaded from the mtl will be set here
+     */
+    materials: StandardMaterial[];
+    /**
+     * This function will read the mtl file and create each material described inside
+     * This function could be improve by adding :
+     * -some component missing (Ni, Tf...)
+     * -including the specific options available
+     *
+     * @param scene defines the scene the material will be created in
+     * @param data defines the mtl data to parse
+     * @param rootUrl defines the rooturl to use in order to load relative dependencies
+     * @param assetContainer defines the asset container to store the material in (can be null)
+     */
+    parseMTL(scene: Scene, data: string | ArrayBuffer, rootUrl: string, assetContainer: Nullable<AssetContainer>): void;
+    /**
+     * Gets the texture for the material.
+     *
+     * If the material is imported from input file,
+     * We sanitize the url to ensure it takes the texture from aside the material.
+     *
+     * @param rootUrl The root url to load from
+     * @param value The value stored in the mtl
+     * @param scene
+     * @return The Texture
+     */
+    private static _GetTexture;
+}

package/OBJ/mtlFileLoader.js

@@ -1,222 +1,233 @@
-import { Color3 } from '@babylonjs/core/Maths/math.color.js';
-import { Texture } from "@babylonjs/core/Materials/Textures/texture.js";
-import { StandardMaterial } from "@babylonjs/core/Materials/standardMaterial.js";
-/**
- * Class reading and parsing the MTL file bundled with the obj file.
- */
-var MTLFileLoader = /** @class */ (function () {
-    function MTLFileLoader() {
-        /**
-         * All material loaded from the mtl will be set here
-         */
-        this.materials = [];
-    }
-    /**
-     * This function will read the mtl file and create each material described inside
-     * This function could be improve by adding :
-     * -some component missing (Ni, Tf...)
-     * -including the specific options available
-     *
-     * @param scene defines the scene the material will be created in
-     * @param data defines the mtl data to parse
-     * @param rootUrl defines the rooturl to use in order to load relative dependencies
-     * @param assetContainer defines the asset container to store the material in (can be null)
-     */
-    MTLFileLoader.prototype.parseMTL = function (scene, data, rootUrl, assetContainer) {
-        if (data instanceof ArrayBuffer) {
-            return;
-        }
-        //Split the lines from the file
-        var lines = data.split('\n');
-        //Space char
-        var delimiter_pattern = /\s+/;
-        //Array with RGB colors
-        var color;
-        //New material
-        var material = null;
-        //Look at each line
-        for (var i = 0; i < lines.length; i++) {
-            var line = lines[i].trim();
-            // Blank line or comment
-            if (line.length === 0 || line.charAt(0) === '#') {
-                continue;
-            }
-            //Get the first parameter (keyword)
-            var pos = line.indexOf(' ');
-            var key = (pos >= 0) ? line.substring(0, pos) : line;
-            key = key.toLowerCase();
-            //Get the data following the key
-            var value = (pos >= 0) ? line.substring(pos + 1).trim() : "";
-            //This mtl keyword will create the new material
-            if (key === "newmtl") {
-                //Check if it is the first material.
-                // Materials specifications are described after this keyword.
-                if (material) {
-                    //Add the previous material in the material array.
-                    this.materials.push(material);
-                }
-                //Create a new material.
-                // value is the name of the material read in the mtl file
-                scene._blockEntityCollection = !!assetContainer;
-                material = new StandardMaterial(value, scene);
-                material._parentContainer = assetContainer;
-                scene._blockEntityCollection = false;
-            }
-            else if (key === "kd" && material) {
-                // Diffuse color (color under white light) using RGB values
-                //value  = "r g b"
-                color = value.split(delimiter_pattern, 3).map(parseFloat);
-                //color = [r,g,b]
-                //Set tghe color into the material
-                material.diffuseColor = Color3.FromArray(color);
-            }
-            else if (key === "ka" && material) {
-                // Ambient color (color under shadow) using RGB values
-                //value = "r g b"
-                color = value.split(delimiter_pattern, 3).map(parseFloat);
-                //color = [r,g,b]
-                //Set tghe color into the material
-                material.ambientColor = Color3.FromArray(color);
-            }
-            else if (key === "ks" && material) {
-                // Specular color (color when light is reflected from shiny surface) using RGB values
-                //value = "r g b"
-                color = value.split(delimiter_pattern, 3).map(parseFloat);
-                //color = [r,g,b]
-                //Set the color into the material
-                material.specularColor = Color3.FromArray(color);
-            }
-            else if (key === "ke" && material) {
-                // Emissive color using RGB values
-                color = value.split(delimiter_pattern, 3).map(parseFloat);
-                material.emissiveColor = Color3.FromArray(color);
-            }
-            else if (key === "ns" && material) {
-                //value = "Integer"
-                material.specularPower = parseFloat(value);
-            }
-            else if (key === "d" && material) {
-                //d is dissolve for current material. It mean alpha for BABYLON
-                material.alpha = parseFloat(value);
-                //Texture
-                //This part can be improved by adding the possible options of texture
-            }
-            else if (key === "map_ka" && material) {
-                // ambient texture map with a loaded image
-                //We must first get the folder of the image
-                material.ambientTexture = MTLFileLoader._getTexture(rootUrl, value, scene);
-            }
-            else if (key === "map_kd" && material) {
-                // Diffuse texture map with a loaded image
-                material.diffuseTexture = MTLFileLoader._getTexture(rootUrl, value, scene);
-            }
-            else if (key === "map_ks" && material) {
-                // Specular texture map with a loaded image
-                //We must first get the folder of the image
-                material.specularTexture = MTLFileLoader._getTexture(rootUrl, value, scene);
-            }
-            else if (key === "map_ns") {
-                //Specular
-                //Specular highlight component
-                //We must first get the folder of the image
-                //
-                //Not supported by BABYLON
-                //
-                //    continue;
-            }
-            else if (key === "map_bump" && material) {
-                //The bump texture
-                material.bumpTexture = MTLFileLoader._getTexture(rootUrl, value, scene);
-            }
-            else if (key === "map_d" && material) {
-                // The dissolve of the material
-                material.opacityTexture = MTLFileLoader._getTexture(rootUrl, value, scene);
-                //Options for illumination
-            }
-            else if (key === "illum") {
-                //Illumination
-                if (value === "0") {
-                    //That mean Kd == Kd
-                }
-                else if (value === "1") {
-                    //Color on and Ambient on
-                }
-                else if (value === "2") {
-                    //Highlight on
-                }
-                else if (value === "3") {
-                    //Reflection on and Ray trace on
-                }
-                else if (value === "4") {
-                    //Transparency: Glass on, Reflection: Ray trace on
-                }
-                else if (value === "5") {
-                    //Reflection: Fresnel on and Ray trace on
-                }
-                else if (value === "6") {
-                    //Transparency: Refraction on, Reflection: Fresnel off and Ray trace on
-                }
-                else if (value === "7") {
-                    //Transparency: Refraction on, Reflection: Fresnel on and Ray trace on
-                }
-                else if (value === "8") {
-                    //Reflection on and Ray trace off
-                }
-                else if (value === "9") {
-                    //Transparency: Glass on, Reflection: Ray trace off
-                }
-                else if (value === "10") {
-                    //Casts shadows onto invisible surfaces
-                }
-            }
-            else {
-                // console.log("Unhandled expression at line : " + i +'\n' + "with value : " + line);
-            }
-        }
-        //At the end of the file, add the last material
-        if (material) {
-            this.materials.push(material);
-        }
-    };
-    /**
-     * Gets the texture for the material.
-     *
-     * If the material is imported from input file,
-     * We sanitize the url to ensure it takes the textre from aside the material.
-     *
-     * @param rootUrl The root url to load from
-     * @param value The value stored in the mtl
-     * @return The Texture
-     */
-    MTLFileLoader._getTexture = function (rootUrl, value, scene) {
-        if (!value) {
-            return null;
-        }
-        var url = rootUrl;
-        // Load from input file.
-        if (rootUrl === "file:") {
-            var lastDelimiter = value.lastIndexOf("\\");
-            if (lastDelimiter === -1) {
-                lastDelimiter = value.lastIndexOf("/");
-            }
-            if (lastDelimiter > -1) {
-                url += value.substr(lastDelimiter + 1);
-            }
-            else {
-                url += value;
-            }
-        }
-        // Not from input file.
-        else {
-            url += value;
-        }
-        return new Texture(url, scene, false, MTLFileLoader.INVERT_TEXTURE_Y);
-    };
-    /**
-     * Invert Y-Axis of referenced textures on load
-     */
-    MTLFileLoader.INVERT_TEXTURE_Y = true;
-    return MTLFileLoader;
-}());
-export { MTLFileLoader };
+import { Color3 } from "@babylonjs/core/Maths/math.color.js";
+import { Texture } from "@babylonjs/core/Materials/Textures/texture.js";
+import { StandardMaterial } from "@babylonjs/core/Materials/standardMaterial.js";
+/**
+ * Class reading and parsing the MTL file bundled with the obj file.
+ */
+var MTLFileLoader = /** @class */ (function () {
+    function MTLFileLoader() {
+        /**
+         * All material loaded from the mtl will be set here
+         */
+        this.materials = [];
+    }
+    /**
+     * This function will read the mtl file and create each material described inside
+     * This function could be improve by adding :
+     * -some component missing (Ni, Tf...)
+     * -including the specific options available
+     *
+     * @param scene defines the scene the material will be created in
+     * @param data defines the mtl data to parse
+     * @param rootUrl defines the rooturl to use in order to load relative dependencies
+     * @param assetContainer defines the asset container to store the material in (can be null)
+     */
+    MTLFileLoader.prototype.parseMTL = function (scene, data, rootUrl, assetContainer) {
+        if (data instanceof ArrayBuffer) {
+            return;
+        }
+        //Split the lines from the file
+        var lines = data.split("\n");
+        // whitespace char ie: [ \t\r\n\f]
+        var delimiter_pattern = /\s+/;
+        //Array with RGB colors
+        var color;
+        //New material
+        var material = null;
+        //Look at each line
+        for (var i = 0; i < lines.length; i++) {
+            var line = lines[i].trim();
+            // Blank line or comment
+            if (line.length === 0 || line.charAt(0) === "#") {
+                continue;
+            }
+            //Get the first parameter (keyword)
+            var pos = line.indexOf(" ");
+            var key = pos >= 0 ? line.substring(0, pos) : line;
+            key = key.toLowerCase();
+            //Get the data following the key
+            var value = pos >= 0 ? line.substring(pos + 1).trim() : "";
+            //This mtl keyword will create the new material
+            if (key === "newmtl") {
+                //Check if it is the first material.
+                // Materials specifications are described after this keyword.
+                if (material) {
+                    //Add the previous material in the material array.
+                    this.materials.push(material);
+                }
+                //Create a new material.
+                // value is the name of the material read in the mtl file
+                scene._blockEntityCollection = !!assetContainer;
+                material = new StandardMaterial(value, scene);
+                material._parentContainer = assetContainer;
+                scene._blockEntityCollection = false;
+            }
+            else if (key === "kd" && material) {
+                // Diffuse color (color under white light) using RGB values
+                //value  = "r g b"
+                color = value.split(delimiter_pattern, 3).map(parseFloat);
+                //color = [r,g,b]
+                //Set tghe color into the material
+                material.diffuseColor = Color3.FromArray(color);
+            }
+            else if (key === "ka" && material) {
+                // Ambient color (color under shadow) using RGB values
+                //value = "r g b"
+                color = value.split(delimiter_pattern, 3).map(parseFloat);
+                //color = [r,g,b]
+                //Set tghe color into the material
+                material.ambientColor = Color3.FromArray(color);
+            }
+            else if (key === "ks" && material) {
+                // Specular color (color when light is reflected from shiny surface) using RGB values
+                //value = "r g b"
+                color = value.split(delimiter_pattern, 3).map(parseFloat);
+                //color = [r,g,b]
+                //Set the color into the material
+                material.specularColor = Color3.FromArray(color);
+            }
+            else if (key === "ke" && material) {
+                // Emissive color using RGB values
+                color = value.split(delimiter_pattern, 3).map(parseFloat);
+                material.emissiveColor = Color3.FromArray(color);
+            }
+            else if (key === "ns" && material) {
+                //value = "Integer"
+                material.specularPower = parseFloat(value);
+            }
+            else if (key === "d" && material) {
+                //d is dissolve for current material. It mean alpha for BABYLON
+                material.alpha = parseFloat(value);
+                //Texture
+                //This part can be improved by adding the possible options of texture
+            }
+            else if (key === "map_ka" && material) {
+                // ambient texture map with a loaded image
+                //We must first get the folder of the image
+                material.ambientTexture = MTLFileLoader._GetTexture(rootUrl, value, scene);
+            }
+            else if (key === "map_kd" && material) {
+                // Diffuse texture map with a loaded image
+                material.diffuseTexture = MTLFileLoader._GetTexture(rootUrl, value, scene);
+            }
+            else if (key === "map_ks" && material) {
+                // Specular texture map with a loaded image
+                //We must first get the folder of the image
+                material.specularTexture = MTLFileLoader._GetTexture(rootUrl, value, scene);
+            }
+            else if (key === "map_ns") {
+                //Specular
+                //Specular highlight component
+                //We must first get the folder of the image
+                //
+                //Not supported by BABYLON
+                //
+                //    continue;
+            }
+            else if (key === "map_bump" && material) {
+                //The bump texture
+                var values = value.split(delimiter_pattern);
+                var bumpMultiplierIndex = values.indexOf("-bm");
+                var bumpMultiplier = null;
+                if (bumpMultiplierIndex >= 0) {
+                    bumpMultiplier = values[bumpMultiplierIndex + 1];
+                    values.splice(bumpMultiplierIndex, 2); // remove
+                }
+                material.bumpTexture = MTLFileLoader._GetTexture(rootUrl, values.join(" "), scene);
+                if (material.bumpTexture && bumpMultiplier !== null) {
+                    material.bumpTexture.level = parseFloat(bumpMultiplier);
+                }
+            }
+            else if (key === "map_d" && material) {
+                // The dissolve of the material
+                material.opacityTexture = MTLFileLoader._GetTexture(rootUrl, value, scene);
+                //Options for illumination
+            }
+            else if (key === "illum") {
+                //Illumination
+                if (value === "0") {
+                    //That mean Kd == Kd
+                }
+                else if (value === "1") {
+                    //Color on and Ambient on
+                }
+                else if (value === "2") {
+                    //Highlight on
+                }
+                else if (value === "3") {
+                    //Reflection on and Ray trace on
+                }
+                else if (value === "4") {
+                    //Transparency: Glass on, Reflection: Ray trace on
+                }
+                else if (value === "5") {
+                    //Reflection: Fresnel on and Ray trace on
+                }
+                else if (value === "6") {
+                    //Transparency: Refraction on, Reflection: Fresnel off and Ray trace on
+                }
+                else if (value === "7") {
+                    //Transparency: Refraction on, Reflection: Fresnel on and Ray trace on
+                }
+                else if (value === "8") {
+                    //Reflection on and Ray trace off
+                }
+                else if (value === "9") {
+                    //Transparency: Glass on, Reflection: Ray trace off
+                }
+                else if (value === "10") {
+                    //Casts shadows onto invisible surfaces
+                }
+            }
+            else {
+                // console.log("Unhandled expression at line : " + i +'\n' + "with value : " + line);
+            }
+        }
+        //At the end of the file, add the last material
+        if (material) {
+            this.materials.push(material);
+        }
+    };
+    /**
+     * Gets the texture for the material.
+     *
+     * If the material is imported from input file,
+     * We sanitize the url to ensure it takes the texture from aside the material.
+     *
+     * @param rootUrl The root url to load from
+     * @param value The value stored in the mtl
+     * @param scene
+     * @return The Texture
+     */
+    MTLFileLoader._GetTexture = function (rootUrl, value, scene) {
+        if (!value) {
+            return null;
+        }
+        var url = rootUrl;
+        // Load from input file.
+        if (rootUrl === "file:") {
+            var lastDelimiter = value.lastIndexOf("\\");
+            if (lastDelimiter === -1) {
+                lastDelimiter = value.lastIndexOf("/");
+            }
+            if (lastDelimiter > -1) {
+                url += value.substr(lastDelimiter + 1);
+            }
+            else {
+                url += value;
+            }
+        }
+        // Not from input file.
+        else {
+            url += value;
+        }
+        return new Texture(url, scene, false, MTLFileLoader.INVERT_TEXTURE_Y);
+    };
+    /**
+     * Invert Y-Axis of referenced textures on load
+     */
+    MTLFileLoader.INVERT_TEXTURE_Y = true;
+    return MTLFileLoader;
+}());
+export { MTLFileLoader };
 //# sourceMappingURL=mtlFileLoader.js.map