Correct Normal State + Attach Local

materialsLibrary/src/custom/babylon.customMaterial.ts

@@ -10,9 +10,7 @@ module BABYLON {
 
        constructor(){
 
-       }
-
-     
+       }  
   }
 
   export class  ShaderSpecialParts{
@@ -51,9 +49,7 @@ module BABYLON {
             
             this.FragmentStore = "#include<__decl__defaultFragment>\n\
 #[Fragment_Begin]\n\
-#ifdef BUMP\n\
 #extension GL_OES_standard_derivatives : enable\n\
-#endif\n\
 #ifdef LOGARITHMICDEPTH\n\
 #extension GL_EXT_frag_depth : enable\n\
 #endif\n\
@@ -64,7 +60,10 @@ uniform vec3 vAmbientColor;\n\
 \n\
 varying vec3 vPositionW;\n\
 #ifdef NORMAL\n\
-varying vec3 vNormalW;\n\
+varying vec3 vNormalW_helper;\n\
+varying vec3 localNormal;\n\
+varying vec3 localPosition;\n\
+vec3 vNormalW;\n\
 #endif\n\
 #ifdef VERTEXCOLOR\n\
 varying vec4 vColor;\n\
@@ -142,6 +141,7 @@ varying vec3 vDirectionW;\n\
 \n\
 void main(void) {\n\
 \n\
+vNormalW = vNormalW_helper;\n\
 #[Fragment_MainBegin]\n\
 \n\
 #include<clipPlaneFragment>\n\
@@ -392,9 +392,11 @@ varying vec2 vSpecularUV;\n\
 varying vec2 vBumpUV;\n\
 #endif\n\
 \n\
+varying vec3 localPosition;\n\
 varying vec3 vPositionW;\n\
 #ifdef NORMAL\n\
-varying vec3 vNormalW;\n\
+varying vec3 vNormalW_helper;\n\
+varying vec3 localNormal;\n\
 #endif\n\
 #ifdef VERTEXCOLOR\n\
 varying vec4 vColor;\n\
@@ -433,6 +435,7 @@ vPositionUVW=positionUpdated;\n\
 #include<instancesVertex>\n\
 #include<bonesVertex>\n\
 \n\
+localPosition = positionUpdated;\n\
 #[Vertex_Before_PositionUpdated]\n\
 \n\
 gl_Position=viewProjection*finalWorld*vec4(positionUpdated,1.0);\n\
@@ -442,7 +445,8 @@ vPositionW=vec3(worldPos);\n\
 \n\
 #[Vertex_Before_NormalUpdated]\n\
 \n\
-vNormalW=normalize(vec3(finalWorld*vec4(normalUpdated,0.0)));\n\
+localNormal = normalUpdated;\n\
+vNormalW_helper=normalize(vec3(finalWorld*vec4(normalUpdated,0.0)));\n\
 #endif\n\
 #if defined(REFLECTIONMAP_EQUIRECTANGULAR_FIXED) || defined(REFLECTIONMAP_MIRROREDEQUIRECTANGULAR_FIXED)\n\
 vDirectionW=normalize(vec3(finalWorld*vec4(positionUpdated,0.0)));\n\
@@ -548,7 +552,7 @@ vColor=color;\n\
 
    } 
 
-    export class CustomMaterial extends StandardMaterial {
+    export class CustomMaterial  extends StandardMaterial {
          public static ShaderIndexer = 1;
          public CustomParts :  ShaderSpecialParts;
          public ShaderVersion : CustomShaderStructure ;
@@ -592,7 +596,8 @@ vColor=color;\n\
              return arr;
          }
          public Builder(shaderName: string, uniforms: string[], uniformBuffers: string[], samplers: string[], defines: StandardMaterialDefines) : string {
-          
+            
+           
             CustomMaterial.ShaderIndexer++;
             var name = name+"custom_"+CustomMaterial.ShaderIndexer;