Merge branch 'master' into fix-sps-vertexdata-serialization

materialsLibrary/src/cell/cell.fragment.fx

@@ -138,7 +138,7 @@ void main(void)
 	alpha *= vColor.a;
 #endif
 
-	vec3 finalDiffuse = clamp(diffuseBase * diffuseColor, 0.0, 1.0) * baseColor.rgb;;
+	vec3 finalDiffuse = clamp(diffuseBase * diffuseColor, 0.0, 1.0) * baseColor.rgb;
 
 	// Composition
 	vec4 color = vec4(finalDiffuse, alpha);

sandbox/index.css

@@ -107,7 +107,7 @@ a {
 }
 
 #droptext {
-    position: absolute;;
+    position: absolute;
     text-align: center;
     color: #fff;
     height: 50px;

src/Lights/babylon.spotLight.ts

@@ -67,7 +67,7 @@
             return this._projectionTextureMatrix;
         }
 
-        protected _projectionTextureLightNear : number = 1e-6;;
+        protected _projectionTextureLightNear : number = 1e-6;
         /**
          * Gets the near clip of the Spotlight for texture projection.
          */

src/Materials/Textures/babylon.dynamicTexture.ts

@@ -140,7 +140,7 @@
                 x = (size.width - textSize.width) / 2;
             }
             if (y === null || y === undefined) {
-                var fontSize = parseInt((font.replace(/\D/g, '')));;
+                var fontSize = parseInt((font.replace(/\D/g, '')));
                 y = (size.height / 2) + (fontSize / 3.65);
             }
 

src/Materials/babylon.material.ts

@@ -1368,7 +1368,7 @@
             }
 
             var materialType = Tools.Instantiate(parsedMaterial.customType);
-            return materialType.Parse(parsedMaterial, scene, rootUrl);;
+            return materialType.Parse(parsedMaterial, scene, rootUrl);
         }
     }
 } 

src/Materials/babylon.standardMaterial.ts

@@ -120,49 +120,49 @@ module BABYLON {
 
     export class StandardMaterial extends PushMaterial {
         @serializeAsTexture("diffuseTexture")
-        private _diffuseTexture: Nullable<BaseTexture>;;
+        private _diffuseTexture: Nullable<BaseTexture>;
         @expandToProperty("_markAllSubMeshesAsTexturesAndMiscDirty")
-        public diffuseTexture: Nullable<BaseTexture>;;
+        public diffuseTexture: Nullable<BaseTexture>;
 
         @serializeAsTexture("ambientTexture")
-        private _ambientTexture: Nullable<BaseTexture>;;
+        private _ambientTexture: Nullable<BaseTexture>;
         @expandToProperty("_markAllSubMeshesAsTexturesDirty")
-        public ambientTexture: Nullable<BaseTexture>;;
+        public ambientTexture: Nullable<BaseTexture>;
 
         @serializeAsTexture("opacityTexture")
-        private _opacityTexture: Nullable<BaseTexture>;;
+        private _opacityTexture: Nullable<BaseTexture>;
         @expandToProperty("_markAllSubMeshesAsTexturesAndMiscDirty")
-        public opacityTexture: Nullable<BaseTexture>;;
+        public opacityTexture: Nullable<BaseTexture>;
 
         @serializeAsTexture("reflectionTexture")
-        private _reflectionTexture: Nullable<BaseTexture>;;
+        private _reflectionTexture: Nullable<BaseTexture>;
         @expandToProperty("_markAllSubMeshesAsTexturesDirty")
         public reflectionTexture: Nullable<BaseTexture>;
 
         @serializeAsTexture("emissiveTexture")
-        private _emissiveTexture: Nullable<BaseTexture>;;
+        private _emissiveTexture: Nullable<BaseTexture>;
         @expandToProperty("_markAllSubMeshesAsTexturesDirty")
-        public emissiveTexture: Nullable<BaseTexture>;;
+        public emissiveTexture: Nullable<BaseTexture>;
 
         @serializeAsTexture("specularTexture")
-        private _specularTexture: Nullable<BaseTexture>;;
+        private _specularTexture: Nullable<BaseTexture>;
         @expandToProperty("_markAllSubMeshesAsTexturesDirty")
-        public specularTexture: Nullable<BaseTexture>;;
+        public specularTexture: Nullable<BaseTexture>;
 
         @serializeAsTexture("bumpTexture")
-        private _bumpTexture: Nullable<BaseTexture>;;
+        private _bumpTexture: Nullable<BaseTexture>;
         @expandToProperty("_markAllSubMeshesAsTexturesDirty")
-        public bumpTexture: Nullable<BaseTexture>;;
+        public bumpTexture: Nullable<BaseTexture>;
 
         @serializeAsTexture("lightmapTexture")
-        private _lightmapTexture: Nullable<BaseTexture>;;
+        private _lightmapTexture: Nullable<BaseTexture>;
         @expandToProperty("_markAllSubMeshesAsTexturesDirty")
-        public lightmapTexture: Nullable<BaseTexture>;;
+        public lightmapTexture: Nullable<BaseTexture>;
 
         @serializeAsTexture("refractionTexture")
-        private _refractionTexture: Nullable<BaseTexture>;;
+        private _refractionTexture: Nullable<BaseTexture>;
         @expandToProperty("_markAllSubMeshesAsTexturesDirty")
-        public refractionTexture: Nullable<BaseTexture>;;
+        public refractionTexture: Nullable<BaseTexture>;
 
         @serializeAsColor3("ambient")
         public ambientColor = new Color3(0, 0, 0);

src/Mesh/babylon.abstractMesh.ts

@@ -1151,7 +1151,7 @@
          * @returns true if the mesh is completely in the frustum planes 
          */
         public isCompletelyInFrustum(frustumPlanes: Plane[]): boolean {
-            return this._boundingInfo !== null && this._boundingInfo.isCompletelyInFrustum(frustumPlanes);;
+            return this._boundingInfo !== null && this._boundingInfo.isCompletelyInFrustum(frustumPlanes);
         }
 
         /** 

src/Mesh/babylon.meshBuilder.ts

@@ -649,7 +649,7 @@
             var p = 0;
             var step = pi2 / tessellation * arc;
             var rotated;
-            var path = new Array<Vector3>();;
+            var path = new Array<Vector3>();
             for (i = 0; i <= tessellation; i++) {
                 var path: Vector3[] = [];
                 if (cap == Mesh.CAP_START || cap == Mesh.CAP_ALL) {

src/Particles/EmitterTypes/babylon.boxParticleEmitter.ts

@@ -107,10 +107,10 @@ module BABYLON {
             var serializationObject: any = {};
 
             serializationObject.type = this.getClassName();
-            serializationObject.direction1  = this.direction1.asArray();;
-            serializationObject.direction2  = this.direction2.asArray();;
-            serializationObject.minEmitBox  = this.minEmitBox.asArray();;
-            serializationObject.maxEmitBox  = this.maxEmitBox.asArray();;
+            serializationObject.direction1  = this.direction1.asArray();
+            serializationObject.direction2  = this.direction2.asArray();
+            serializationObject.minEmitBox  = this.minEmitBox.asArray();
+            serializationObject.maxEmitBox  = this.maxEmitBox.asArray();
 
             return serializationObject;
         }

src/Particles/EmitterTypes/babylon.sphereParticleEmitter.ts

@@ -199,10 +199,10 @@ module BABYLON {
          * @returns the JSON object
          */        
         public serialize(): any {
-            var serializationObject = super.serialize();;
+            var serializationObject = super.serialize();
 
-            serializationObject.direction1 = this.direction1.asArray();;
-            serializationObject.direction2 = this.direction2.asArray();;
+            serializationObject.direction1 = this.direction1.asArray();
+            serializationObject.direction2 = this.direction2.asArray();
 
             return serializationObject;
         }    

src/Particles/babylon.solidParticleSystem.ts

@@ -200,8 +200,9 @@
                 vertexData.indices = (this._depthSort) ? this._indices : this._indices32;
                 vertexData.set(this._positions32, VertexBuffer.PositionKind);
                 vertexData.set(this._normals32, VertexBuffer.NormalKind);
+
                 if (this._uvs32.length > 0) {
-                    vertexData.set(this._uvs32, VertexBuffer.UVKind);;
+                    vertexData.set(this._uvs32, VertexBuffer.UVKind);
                 }
                 if (this._colors32.length > 0) {
                     vertexData.set(this._colors32, VertexBuffer.ColorKind);