Merge pull request #1309 from julien-moreau/master

Fixing materials library (shadows vertex)

materialsLibrary/materials/fire/fire.vertex.fx

@@ -38,7 +38,6 @@ varying vec4 vColor;
 #include<clipPlaneVertexDeclaration>
 
 #include<fogVertexDeclaration>
-#include<shadowsVertexDeclaration>
 
 // Fire
 uniform float time;

materialsLibrary/materials/fur/fur.vertex.fx

@@ -62,7 +62,7 @@ varying vec4 vColor;
 
 #include<clipPlaneVertexDeclaration>
 #include<fogVertexDeclaration>
-#include<shadowsVertexDeclaration>
+#include<shadowsVertexDeclaration>[0..maxSimultaneousLights]
 
 float Rand(vec3 rv) {
 	float x = dot(rv, vec3(12.9898,78.233, 24.65487));
@@ -158,7 +158,7 @@ float r = Rand(position);
 	#include<fogVertex>
 
 	// Shadows
-	#include<shadowsVertex>
+	#include<shadowsVertex>[0..maxSimultaneousLights]
 
 	// Vertex color
 #ifdef VERTEXCOLOR

materialsLibrary/materials/gradient/gradient.vertex.fx

@@ -46,7 +46,7 @@ varying vec4 vColor;
 #include<clipPlaneVertexDeclaration>
 
 #include<fogVertexDeclaration>
-#include<shadowsVertexDeclaration>
+#include<shadowsVertexDeclaration>[0..maxSimultaneousLights]
 
 void main(void) {
 #include<instancesVertex>
@@ -85,7 +85,7 @@ void main(void) {
 
     // Fog
 #include<fogVertex>
-#include<shadowsVertex>
+#include<shadowsVertex>[0..maxSimultaneousLights]
 
 	// Vertex color
 #ifdef VERTEXCOLOR

materialsLibrary/materials/lava/babylon.lavaMaterial.ts

@@ -1,8 +1,6 @@
 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
 
 module BABYLON {
-    var maxSimultaneousLights = 4;
-
     class LavaMaterialDefines extends MaterialDefines {
         public DIFFUSE = false;
         public CLIPPLANE = false;
@@ -87,6 +85,9 @@ module BABYLON {
         @serialize()
         public disableLighting = false;
 
+        @serialize()
+        public maxSimultaneousLights = 4;
+
         private _worldViewProjectionMatrix = Matrix.Zero();
         private _scaledDiffuse = new Color3();
         private _renderId: number;
@@ -182,9 +183,8 @@ module BABYLON {
                 this._defines.FOG = true;
             }
 
-            var lightIndex = 0;
             if (scene.lightsEnabled && !this.disableLighting) {
-                MaterialHelper.PrepareDefinesForLights(scene, mesh, this._defines);
+                MaterialHelper.PrepareDefinesForLights(scene, mesh, this._defines, this.maxSimultaneousLights);
             }
 
             // Attribs

materialsLibrary/materials/lava/lava.vertex.fx

@@ -52,7 +52,7 @@ varying vec4 vColor;
 #include<clipPlaneVertexDeclaration>
 
 #include<fogVertexDeclaration>
-#include<shadowsVertexDeclaration>
+#include<shadowsVertexDeclaration>[0..maxSimultaneousLights]
 
 /* NOISE FUNCTIONS */
 ////// ASHIMA webgl noise
@@ -210,7 +210,7 @@ void main(void) {
 
 	// Fog
 #include<fogVertex>
-#include<shadowsVertex>
+#include<shadowsVertex>[0..maxSimultaneousLights]
 
 	// Vertex color
 #ifdef VERTEXCOLOR

materialsLibrary/materials/normal/normal.vertex.fx

@@ -47,7 +47,7 @@ varying vec4 vColor;
 #include<clipPlaneVertexDeclaration>
 
 #include<fogVertexDeclaration>
-#include<shadowsVertexDeclaration>
+#include<shadowsVertexDeclaration>[0..maxSimultaneousLights]
 
 void main(void) {
 
@@ -87,7 +87,7 @@ void main(void) {
 
     // Fog
 #include<fogVertex>
-#include<shadowsVertex>
+#include<shadowsVertex>[0..maxSimultaneousLights]
 
 	// Vertex color
 #ifdef VERTEXCOLOR

materialsLibrary/materials/simple/babylon.simpleMaterial.ts

@@ -1,8 +1,6 @@
 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
 
 module BABYLON {
-    var maxSimultaneousLights = 4;
-
     class SimpleMaterialDefines extends MaterialDefines {
         public DIFFUSE = false;
         public CLIPPLANE = false;

materialsLibrary/materials/simple/simple.vertex.fx

@@ -47,7 +47,7 @@ varying vec4 vColor;
 #include<clipPlaneVertexDeclaration>
 
 #include<fogVertexDeclaration>
-#include<shadowsVertexDeclaration>
+#include<shadowsVertexDeclaration>[0..maxSimultaneousLights]
 
 void main(void) {
 
@@ -87,7 +87,7 @@ void main(void) {
 
     // Fog
 #include<fogVertex>
-#include<shadowsVertex>
+#include<shadowsVertex>[0..maxSimultaneousLights]
 
 	// Vertex color
 #ifdef VERTEXCOLOR

materialsLibrary/materials/terrain/terrain.vertex.fx

@@ -45,7 +45,7 @@ varying vec4 vColor;
 
 #include<clipPlaneVertexDeclaration>
 #include<fogVertexDeclaration>
-#include<shadowsVertexDeclaration>
+#include<shadowsVertexDeclaration>[0..maxSimultaneousLights]
 
 void main(void) {
 	#include<instancesVertex>
@@ -88,7 +88,7 @@ void main(void) {
 	#include<fogVertex>
 	
 	// Shadows
-    #include<shadowsVertex>
+    #include<shadowsVertex>[0..maxSimultaneousLights]
 
 	// Vertex color
 #ifdef VERTEXCOLOR

materialsLibrary/materials/triPlanar/triplanar.vertex.fx

@@ -48,7 +48,7 @@ varying vec4 vColor;
 #include<clipPlaneVertexDeclaration>
 
 #include<fogVertexDeclaration>
-#include<shadowsVertexDeclaration>
+#include<shadowsVertexDeclaration>[0..maxSimultaneousLights]
 
 void main(void)
 {
@@ -106,7 +106,7 @@ void main(void)
 	#include<fogVertex>
 
 	// Shadows
-	#include<shadowsVertex>
+	#include<shadowsVertex>[0..maxSimultaneousLights]
 
 	// Vertex color
 #ifdef VERTEXCOLOR

materialsLibrary/materials/water/water.vertex.fx

@@ -46,7 +46,7 @@ varying vec4 vColor;
 #include<clipPlaneVertexDeclaration>
 
 #include<fogVertexDeclaration>
-#include<shadowsVertexDeclaration>
+#include<shadowsVertexDeclaration>[0..maxSimultaneousLights]
 
 // Water uniforms
 uniform mat4 worldReflectionViewProjection;
@@ -100,7 +100,7 @@ void main(void) {
     #include<fogVertex>
 	
 	// Shadows
-    #include<shadowsVertex>
+    #include<shadowsVertex>[0..maxSimultaneousLights]
     
 	// Vertex color
 #ifdef VERTEXCOLOR