[3d] fix shading of 3D point symbols

wonder-sk · wonder-sk · commit 893a22865a01 · 2019-04-22T20:35:15.000Z
The vertex shader was incorrectly transforming world position and normal
vectors for phong shading. This was causing wrong appearance that was noticeable
when moving/rotating camera (e.g. specular reflection was always in the same place).
This was caused by involving view matrix (i.e. camera position and orientation)
to the vectors, but the world position and normal should be independent from camera.
diff --git a/src/3d/shaders/instanced.vert b/src/3d/shaders/instanced.vert
@@ -21,8 +21,8 @@ void main()
     // which all keep "w" set to 1. correctly we should use translation matrix...
     vec4 offsetPos = inst * vec4(vertexPosition, 1.0) + vec4(pos, 0.0);
 
-    worldNormal = normalize(modelViewNormal * mat3(instNormal) * vertexNormal);
-    worldPosition = vec3(modelView * offsetPos);
+    worldNormal = normalize(mat3(instNormal) * vertexNormal);
+    worldPosition = vec3(offsetPos);
 
     gl_Position = modelViewProjection * offsetPos;
 }

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ void main()`
`21`	`21`	`// which all keep "w" set to 1. correctly we should use translation matrix...`
`22`	`22`	`vec4 offsetPos = inst * vec4(vertexPosition, 1.0) + vec4(pos, 0.0);`
`23`	`23`
`24`		`- worldNormal = normalize(modelViewNormal * mat3(instNormal) * vertexNormal);`
`25`		`- worldPosition = vec3(modelView * offsetPos);`
	`24`	`+ worldNormal = normalize(mat3(instNormal) * vertexNormal);`
	`25`	`+ worldPosition = vec3(offsetPos);`
`26`	`26`
`27`	`27`	`gl_Position = modelViewProjection * offsetPos;`
`28`	`28`	`}`