renaming Base64String to base64String

dist/preview release - alpha/babylon.2.2.max.js

@@ -19129,7 +19129,12 @@ var BABYLON;
                 texture._waitingRenderList = parsedTexture.renderList;
             }
             else {
-                texture = new BABYLON.Texture(rootUrl + parsedTexture.name, scene);
+                if (parsedTexture.base64String) {
+                    texture = BABYLON.Texture.CreateFromBase64String(parsedTexture.base64String, parsedTexture.name, scene);
+                }
+                else {
+                    texture = new BABYLON.Texture(rootUrl + parsedTexture.name, scene);
+                }
             }
             texture.name = parsedTexture.name;
             texture.hasAlpha = parsedTexture.hasAlpha;
@@ -19225,6 +19230,9 @@ var BABYLON;
             if (parsedMaterial.bumpTexture) {
                 material.bumpTexture = loadTexture(rootUrl, parsedMaterial.bumpTexture, scene);
             }
+            if (parsedMaterial.checkReadyOnlyOnce) {
+                material.checkReadyOnlyOnce = parsedMaterial.checkReadyOnlyOnce;
+            }
             return material;
         };
         var parseMaterialById = function (id, parsedData, scene, rootUrl) {
@@ -19447,6 +19455,11 @@ var BABYLON;
                 // Free Camera is the default value
                 camera = new BABYLON.FreeCamera(parsedCamera.name, position, scene);
             }
+            // apply 3d rig, when found
+            if (parsedCamera.cameraRigMode) {
+                var rigParams = (parsedCamera.interaxial_distance) ? { interaxialDistance: parsedCamera.interaxial_distance } : {};
+                camera.setCameraRigMode(parsedCamera.cameraRigMode, rigParams);
+            }
             // Test for lockedTargetMesh & FreeCamera outside of if-else-if nest, since things like GamepadCamera extend FreeCamera
             if (lockedTargetMesh && camera instanceof BABYLON.FreeCamera) {
                 camera.lockedTarget = lockedTargetMesh;
@@ -19495,7 +19508,7 @@ var BABYLON;
                 camera.layerMask = Math.abs(parseInt(parsedCamera.layerMask));
             }
             else {
-                camera.layerMask = 0xFFFFFFFF;
+                camera.layerMask = 0x0FFFFFFF;
             }
             return camera;
         };
@@ -19651,6 +19664,10 @@ var BABYLON;
             }
             mesh.checkCollisions = parsedMesh.checkCollisions;
             mesh._shouldGenerateFlatShading = parsedMesh.useFlatShading;
+            // freezeWorldMatrix
+            if (parsedMesh.freezeWorldMatrix) {
+                mesh._waitingFreezeWorldMatrix = parsedMesh.freezeWorldMatrix;
+            }
             // Parent
             if (parsedMesh.parentId) {
                 mesh._waitingParentId = parsedMesh.parentId;
@@ -19725,7 +19742,7 @@ var BABYLON;
                 mesh.layerMask = Math.abs(parseInt(parsedMesh.layerMask));
             }
             else {
-                mesh.layerMask = 0xFFFFFFFF;
+                mesh.layerMask = 0x0FFFFFFF;
             }
             // Instances
             if (parsedMesh.instances) {
@@ -20229,6 +20246,14 @@ var BABYLON;
                         currentMesh._waitingParentId = undefined;
                     }
                 }
+                // freeze world matrix application
+                for (index = 0; index < scene.meshes.length; index++) {
+                    var currentMesh = scene.meshes[index];
+                    if (currentMesh._waitingFreezeWorldMatrix) {
+                        currentMesh.freezeWorldMatrix();
+                        currentMesh._waitingFreezeWorldMatrix = undefined;
+                    }
+                }
                 // Particles
                 if (parsedData.particleSystems) {
                     for (index = 0; index < parsedData.particleSystems.length; index++) {
@@ -20401,6 +20426,14 @@ var BABYLON;
                         mesh._waitingActions = undefined;
                     }
                 }
+                // freeze world matrix application
+                for (index = 0; index < scene.meshes.length; index++) {
+                    var currentMesh = scene.meshes[index];
+                    if (currentMesh._waitingFreezeWorldMatrix) {
+                        currentMesh.freezeWorldMatrix();
+                        currentMesh._waitingFreezeWorldMatrix = undefined;
+                    }
+                }
                 // Particles Systems
                 if (parsedData.particleSystems) {
                     for (index = 0; index < parsedData.particleSystems.length; index++) {

src/Loading/Plugins/babylon.babylonFileLoader.js

@@ -43,7 +43,12 @@ var BABYLON;
                 texture._waitingRenderList = parsedTexture.renderList;
             }
             else {
-                texture = new BABYLON.Texture(rootUrl + parsedTexture.name, scene);
+                if (parsedTexture.base64String) {
+                    texture = BABYLON.Texture.CreateFromBase64String(parsedTexture.base64String, parsedTexture.name, scene);
+                }
+                else {
+                    texture = new BABYLON.Texture(rootUrl + parsedTexture.name, scene);
+                }
             }
             texture.name = parsedTexture.name;
             texture.hasAlpha = parsedTexture.hasAlpha;
@@ -139,6 +144,9 @@ var BABYLON;
             if (parsedMaterial.bumpTexture) {
                 material.bumpTexture = loadTexture(rootUrl, parsedMaterial.bumpTexture, scene);
             }
+            if (parsedMaterial.checkReadyOnlyOnce) {
+                material.checkReadyOnlyOnce = parsedMaterial.checkReadyOnlyOnce;
+            }
             return material;
         };
         var parseMaterialById = function (id, parsedData, scene, rootUrl) {
@@ -361,6 +369,11 @@ var BABYLON;
                 // Free Camera is the default value
                 camera = new BABYLON.FreeCamera(parsedCamera.name, position, scene);
             }
+            // apply 3d rig, when found
+            if (parsedCamera.cameraRigMode) {
+                var rigParams = (parsedCamera.interaxial_distance) ? { interaxialDistance: parsedCamera.interaxial_distance } : {};
+                camera.setCameraRigMode(parsedCamera.cameraRigMode, rigParams);
+            }
             // Test for lockedTargetMesh & FreeCamera outside of if-else-if nest, since things like GamepadCamera extend FreeCamera
             if (lockedTargetMesh && camera instanceof BABYLON.FreeCamera) {
                 camera.lockedTarget = lockedTargetMesh;
@@ -409,7 +422,7 @@ var BABYLON;
                 camera.layerMask = Math.abs(parseInt(parsedCamera.layerMask));
             }
             else {
-                camera.layerMask = 0xFFFFFFFF;
+                camera.layerMask = 0x0FFFFFFF;
             }
             return camera;
         };
@@ -565,6 +578,10 @@ var BABYLON;
             }
             mesh.checkCollisions = parsedMesh.checkCollisions;
             mesh._shouldGenerateFlatShading = parsedMesh.useFlatShading;
+            // freezeWorldMatrix
+            if (parsedMesh.freezeWorldMatrix) {
+                mesh._waitingFreezeWorldMatrix = parsedMesh.freezeWorldMatrix;
+            }
             // Parent
             if (parsedMesh.parentId) {
                 mesh._waitingParentId = parsedMesh.parentId;
@@ -639,7 +656,7 @@ var BABYLON;
                 mesh.layerMask = Math.abs(parseInt(parsedMesh.layerMask));
             }
             else {
-                mesh.layerMask = 0xFFFFFFFF;
+                mesh.layerMask = 0x0FFFFFFF;
             }
             // Instances
             if (parsedMesh.instances) {
@@ -1143,6 +1160,14 @@ var BABYLON;
                         currentMesh._waitingParentId = undefined;
                     }
                 }
+                // freeze world matrix application
+                for (index = 0; index < scene.meshes.length; index++) {
+                    var currentMesh = scene.meshes[index];
+                    if (currentMesh._waitingFreezeWorldMatrix) {
+                        currentMesh.freezeWorldMatrix();
+                        currentMesh._waitingFreezeWorldMatrix = undefined;
+                    }
+                }
                 // Particles
                 if (parsedData.particleSystems) {
                     for (index = 0; index < parsedData.particleSystems.length; index++) {
@@ -1315,6 +1340,14 @@ var BABYLON;
                         mesh._waitingActions = undefined;
                     }
                 }
+                // freeze world matrix application
+                for (index = 0; index < scene.meshes.length; index++) {
+                    var currentMesh = scene.meshes[index];
+                    if (currentMesh._waitingFreezeWorldMatrix) {
+                        currentMesh.freezeWorldMatrix();
+                        currentMesh._waitingFreezeWorldMatrix = undefined;
+                    }
+                }
                 // Particles Systems
                 if (parsedData.particleSystems) {
                     for (index = 0; index < parsedData.particleSystems.length; index++) {

src/Loading/Plugins/babylon.babylonFileLoader.ts

@@ -47,9 +47,9 @@
             texture = new BABYLON.RenderTargetTexture(parsedTexture.name, parsedTexture.renderTargetSize, scene);
             texture._waitingRenderList = parsedTexture.renderList;
         } else {
-            if (parsedTexture.Base64String){
-                texture = BABYLON.Texture.CreateFromBase64String(parsedTexture.Base64String, parsedTexture.name, scene);
-            }else{
+            if (parsedTexture.base64String) {
+                texture = BABYLON.Texture.CreateFromBase64String(parsedTexture.base64String, parsedTexture.name, scene);
+            } else {
                 texture = new BABYLON.Texture(rootUrl + parsedTexture.name, scene);
             }
         }
@@ -179,10 +179,10 @@
             material.bumpTexture = loadTexture(rootUrl, parsedMaterial.bumpTexture, scene);
         }
 
-        if (parsedMaterial.checkReadyOnlyOnce){
+        if (parsedMaterial.checkReadyOnlyOnce) {
             material.checkReadyOnlyOnce = parsedMaterial.checkReadyOnlyOnce;
         }
-        
+
         return material;
     };
 
@@ -448,7 +448,7 @@
         }
         
         // apply 3d rig, when found
-        if (parsedCamera.cameraRigMode){
+        if (parsedCamera.cameraRigMode) {
             var rigParams = (parsedCamera.interaxial_distance) ? { interaxialDistance: parsedCamera.interaxial_distance } : {};
             camera.setCameraRigMode(parsedCamera.cameraRigMode, rigParams);
         }
@@ -1665,4 +1665,4 @@
             return true;
         }
     });
-}
+}

src/Mesh/babylon.abstractMesh.ts

@@ -118,7 +118,7 @@
 
         // Loading properties
         public _waitingActions: any;
-        public _waitingFreezeWorldMatrix : boolean;
+        public _waitingFreezeWorldMatrix: boolean;
 
         constructor(name: string, scene: Scene) {
             super(name, scene);