Merge pull request #388 from tangrams/normalize-normals

tallytalwar · tallytalwar · commit a993763a584c · 2015-11-09T10:28:54.000-05:00
Normalize world normals
diff --git a/core/resources/shaders/polygon.fs b/core/resources/shaders/polygon.fs
@@ -35,7 +35,7 @@ varying vec2 v_texcoord;
 #pragma tangram: global
 
 vec3 worldNormal() {
-    return u_inverseNormalMatrix * v_normal;
+    return normalize(u_inverseNormalMatrix * v_normal);
 }
 
 void main(void) {
diff --git a/core/resources/shaders/polyline.fs b/core/resources/shaders/polyline.fs
@@ -31,7 +31,7 @@ varying vec2 v_texcoord;
 #endif
 
 vec3 worldNormal() {
-    return u_inverseNormalMatrix * v_normal;
+    return normalize(u_inverseNormalMatrix * v_normal);
 }
 
 #pragma tangram: material

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ varying vec2 v_texcoord;`
`35`	`35`	`#pragma tangram: global`
`36`	`36`
`37`	`37`	`vec3 worldNormal() {`
`38`		`- return u_inverseNormalMatrix * v_normal;`
	`38`	`+ return normalize(u_inverseNormalMatrix * v_normal);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`void main(void) {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ varying vec2 v_texcoord;`
`31`	`31`	`#endif`
`32`	`32`
`33`	`33`	`vec3 worldNormal() {`
`34`		`- return u_inverseNormalMatrix * v_normal;`
	`34`	`+ return normalize(u_inverseNormalMatrix * v_normal);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`#pragma tangram: material`