Merge pull request #7587 from avin/fix_same_calc

fix double calc of worldPos

materialsLibrary/src/cell/cell.vertex.fx

@@ -54,9 +54,10 @@ void main(void) {
 #include<instancesVertex>
 #include<bonesVertex>
 
-	gl_Position = viewProjection * finalWorld * vec4(position, 1.0);
-
 	vec4 worldPos = finalWorld * vec4(position, 1.0);
+
+	gl_Position = viewProjection * worldPos;
+
 	vPositionW = vec3(worldPos);
 
 #ifdef NORMAL

materialsLibrary/src/fire/fire.vertex.fx

@@ -54,9 +54,10 @@ void main(void) {
 #include<instancesVertex>
 #include<bonesVertex>
 
-	gl_Position = viewProjection * finalWorld * vec4(position, 1.0);
-
 	vec4 worldPos = finalWorld * vec4(position, 1.0);
+
+	gl_Position = viewProjection * worldPos;
+
 	vPositionW = vec3(worldPos);
 
 	// Texture coordinates

materialsLibrary/src/gradient/gradient.vertex.fx

@@ -47,9 +47,10 @@ void main(void) {
 #include<instancesVertex>
 #include<bonesVertex> 
 
-	gl_Position = viewProjection * finalWorld * vec4(position, 1.0);
-
 	vec4 worldPos = finalWorld * vec4(position, 1.0);
+
+	gl_Position = viewProjection * worldPos;
+
 	vPositionW = vec3(worldPos);
 	vPosition = position;
 

materialsLibrary/src/grid/grid.vertex.fx

@@ -31,13 +31,11 @@ uniform vec2 vOpacityInfos;
 void main(void) {
 	#include<instancesVertex>
 
-    #ifdef FOG
     vec4 worldPos = finalWorld * vec4(position, 1.0);
-    #endif
 
     #include<fogVertex>
 
-    vec4 cameraSpacePosition = view * finalWorld * vec4(position, 1.0);
+    vec4 cameraSpacePosition = view * worldPos;
     gl_Position = projection * cameraSpacePosition;
 
 #ifdef OPACITY

materialsLibrary/src/mix/mix.vertex.fx

@@ -50,10 +50,11 @@ varying vec4 vColor;
 void main(void) {
 	#include<instancesVertex>
     #include<bonesVertex>
-	
-	gl_Position = viewProjection * finalWorld * vec4(position, 1.0);
 
 	vec4 worldPos = finalWorld * vec4(position, 1.0);
+
+	gl_Position = viewProjection * worldPos;
+
 	vPositionW = vec3(worldPos);
 
 #ifdef NORMAL

materialsLibrary/src/normal/normal.vertex.fx

@@ -49,9 +49,10 @@ void main(void) {
 #include<instancesVertex>
 #include<bonesVertex>
 
-	gl_Position = viewProjection * finalWorld * vec4(position, 1.0);
-
 	vec4 worldPos = finalWorld * vec4(position, 1.0);
+
+	gl_Position = viewProjection * worldPos;
+
 	vPositionW = vec3(worldPos);
 
 #ifdef NORMAL

materialsLibrary/src/shadowOnly/shadowOnly.vertex.fx

@@ -39,9 +39,10 @@ void main(void) {
 #include<instancesVertex>
 #include<bonesVertex>
 
-	gl_Position = viewProjection * finalWorld * vec4(position, 1.0);
-
 	vec4 worldPos = finalWorld * vec4(position, 1.0);
+
+	gl_Position = viewProjection * worldPos;
+
 	vPositionW = vec3(worldPos);
 
 #ifdef NORMAL

materialsLibrary/src/simple/simple.vertex.fx

@@ -54,9 +54,10 @@ void main(void) {
 #include<instancesVertex>
 #include<bonesVertex>
 
-	gl_Position = viewProjection * finalWorld * vec4(position, 1.0);
-
 	vec4 worldPos = finalWorld * vec4(position, 1.0);
+
+	gl_Position = viewProjection * worldPos;
+
 	vPositionW = vec3(worldPos);
 
 #ifdef NORMAL

materialsLibrary/src/terrain/terrain.vertex.fx

@@ -50,10 +50,11 @@ varying vec4 vColor;
 void main(void) {
 	#include<instancesVertex>
     #include<bonesVertex>
-	
-	gl_Position = viewProjection * finalWorld * vec4(position, 1.0);
 
 	vec4 worldPos = finalWorld * vec4(position, 1.0);
+
+	gl_Position = viewProjection * worldPos;
+
 	vPositionW = vec3(worldPos);
 
 #ifdef NORMAL

materialsLibrary/src/triPlanar/triplanar.vertex.fx

@@ -55,10 +55,11 @@ void main(void)
 
 	#include<instancesVertex>
     #include<bonesVertex>
-	
-	gl_Position = viewProjection * finalWorld * vec4(position, 1.0);
 
 	vec4 worldPos = finalWorld * vec4(position, 1.0);
+
+	gl_Position = viewProjection * worldPos;
+
 	vPositionW = vec3(worldPos);
 
 #ifdef DIFFUSEX