Fixing custom types for mat lib

materialsLibrary/dist/babylon.fireMaterial.js

@@ -279,7 +279,7 @@ var BABYLON;
         };
         FireMaterial.prototype.serialize = function () {
             var serializationObject = _super.prototype.serialize.call(this);
-            serializationObject.customType = "fire";
+            serializationObject.customType = "BABYLON.FireMaterial";
             serializationObject.diffuseColor = this.diffuseColor.asArray();
             serializationObject.speed = this.speed;
             serializationObject.disableLighting = this.disableLighting;

materialsLibrary/dist/babylon.normalMaterial.js

@@ -424,9 +424,12 @@ var BABYLON;
         };
         NormalMaterial.prototype.serialize = function () {
             var serializationObject = _super.prototype.serialize.call(this);
-            serializationObject.customType = "normal";
+            serializationObject.customType = "BABYLON.NormalMaterial";
             serializationObject.diffuseColor = this.diffuseColor.asArray();
             serializationObject.disableLighting = this.disableLighting;
+            if (this.diffuseTexture) {
+                serializationObject.diffuseTexture = this.diffuseTexture.serialize();
+            }
             return serializationObject;
         };
         NormalMaterial.Parse = function (source, scene, rootUrl) {

materialsLibrary/dist/babylon.pbrMaterial.js

@@ -913,6 +913,7 @@ var BABYLON;
         };
         PBRMaterial.prototype.serialize = function () {
             var serializationObject = _super.prototype.serialize.call(this);
+            serializationObject.customType = "BABYLON.PBRMaterial";
             serializationObject.directIntensity = this.directIntensity;
             serializationObject.emissiveIntensity = this.emissiveIntensity;
             serializationObject.environmentIntensity = this.environmentIntensity;

materialsLibrary/dist/babylon.simpleMaterial.js

@@ -422,6 +422,33 @@ var BABYLON;
             newMaterial.diffuseColor = this.diffuseColor.clone();
             return newMaterial;
         };
+        SimpleMaterial.prototype.serialize = function () {
+            var serializationObject = _super.prototype.serialize.call(this);
+            serializationObject.customType = "BABYLON.SimpleMaterial";
+            serializationObject.diffuseColor = this.diffuseColor.asArray();
+            serializationObject.disableLighting = this.disableLighting;
+            if (this.diffuseTexture) {
+                serializationObject.diffuseTexture = this.diffuseTexture.serialize();
+            }
+            return serializationObject;
+        };
+        SimpleMaterial.Parse = function (source, scene, rootUrl) {
+            var material = new SimpleMaterial(source.name, scene);
+            material.diffuseColor = BABYLON.Color3.FromArray(source.diffuseColor);
+            material.disableLighting = source.disableLighting;
+            material.alpha = source.alpha;
+            material.id = source.id;
+            BABYLON.Tags.AddTagsTo(material, source.tags);
+            material.backFaceCulling = source.backFaceCulling;
+            material.wireframe = source.wireframe;
+            if (source.diffuseTexture) {
+                material.diffuseTexture = BABYLON.Texture.Parse(source.diffuseTexture, scene, rootUrl);
+            }
+            if (source.checkReadyOnlyOnce) {
+                material.checkReadyOnlyOnce = source.checkReadyOnlyOnce;
+            }
+            return material;
+        };
         return SimpleMaterial;
     })(BABYLON.Material);
     BABYLON.SimpleMaterial = SimpleMaterial;

materialsLibrary/dist/babylon.waterMaterial.js

@@ -603,7 +603,7 @@ var BABYLON;
         };
         WaterMaterial.prototype.serialize = function () {
             var serializationObject = _super.prototype.serialize.call(this);
-            serializationObject.customType = "water";
+            serializationObject.customType = "BABYLON.WaterMaterial";
             serializationObject.diffuseColor = this.diffuseColor.asArray();
             serializationObject.specularColor = this.specularColor.asArray();
             serializationObject.specularPower = this.specularPower;

materialsLibrary/materials/fire/babylon.fireMaterial.ts

@@ -356,7 +356,7 @@ module BABYLON {
 		public serialize(): any {
 		
             var serializationObject = super.serialize();
-            serializationObject.customType 		= "fire";
+            serializationObject.customType      = "BABYLON.FireMaterial";
             serializationObject.diffuseColor    = this.diffuseColor.asArray();
             serializationObject.speed           = this.speed;
             serializationObject.disableLighting = this.disableLighting;

materialsLibrary/materials/normal/babylon.normalMaterial.ts

@@ -515,9 +515,13 @@ module BABYLON {
 		public serialize(): any {
 		
             var serializationObject = super.serialize();
-            serializationObject.customType 		= "normal";
+            serializationObject.customType      = "BABYLON.NormalMaterial";
             serializationObject.diffuseColor    = this.diffuseColor.asArray();
             serializationObject.disableLighting = this.disableLighting;
+            
+            if (this.diffuseTexture) {
+                serializationObject.diffuseTexture = this.diffuseTexture.serialize();
+            }
 
             return serializationObject;
         }

materialsLibrary/materials/pbr/babylon.pbrMaterial.ts

@@ -1122,6 +1122,8 @@ module BABYLON {
         
         public serialize(): any {
             var serializationObject = super.serialize();
+                        
+            serializationObject.customType = "BABYLON.PBRMaterial";
 
             serializationObject.directIntensity = this.directIntensity;
             serializationObject.emissiveIntensity = this.emissiveIntensity;

materialsLibrary/materials/water/babylon.waterMaterial.ts

@@ -724,7 +724,7 @@ module BABYLON {
 		        		
             var serializationObject = super.serialize();
 			
-            serializationObject.customType 			= "water";
+             serializationObject.customType         = "BABYLON.WaterMaterial";
             serializationObject.diffuseColor    	= this.diffuseColor.asArray();
 			serializationObject.specularColor   	= this.specularColor.asArray();
             serializationObject.specularPower   	= this.specularPower;