Port of 1a2ba70fcf59ed063668ba91cdd600cf0e729928 to OpenGL ES

resources/shaders/ES/gouraud.vs

@@ -27,7 +27,7 @@ struct SlopeDetection
 
 uniform mat4 view_model_matrix;
 uniform mat4 projection_matrix;
-uniform mat3 normal_matrix;
+uniform mat3 view_normal_matrix;
 uniform mat4 volume_world_matrix;
 uniform SlopeDetection slope;
 
@@ -51,7 +51,7 @@ varying vec3 eye_normal;
 void main()
 {
 	// First transform the normal into camera space and normalize the result.
-    eye_normal = normalize(normal_matrix * v_normal);
+    eye_normal = normalize(view_normal_matrix * v_normal);
 
 	// Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex.
 	// Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range.

resources/shaders/ES/gouraud_light.vs

@@ -16,7 +16,7 @@ const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074);
 
 uniform mat4 view_model_matrix;
 uniform mat4 projection_matrix;
-uniform mat3 normal_matrix;
+uniform mat3 view_normal_matrix;
 
 attribute vec3 v_position;
 attribute vec3 v_normal;
@@ -27,7 +27,7 @@ varying vec2 intensity;
 void main()
 {
     // First transform the normal into camera space and normalize the result.
-    vec3 normal = normalize(normal_matrix * v_normal);
+    vec3 normal = normalize(view_normal_matrix * v_normal);
     
     // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex.
     // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range.

resources/shaders/ES/gouraud_light_instanced.vs

@@ -16,7 +16,7 @@ const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074);
 
 uniform mat4 view_model_matrix;
 uniform mat4 projection_matrix;
-uniform mat3 normal_matrix;
+uniform mat3 view_normal_matrix;
 
 // vertex attributes
 attribute vec3 v_position;
@@ -31,7 +31,7 @@ varying vec2 intensity;
 void main()
 {
     // First transform the normal into camera space and normalize the result.
-    vec3 eye_normal = normalize(normal_matrix * v_normal);
+    vec3 eye_normal = normalize(view_normal_matrix * v_normal);
     
     // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex.
     // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range.

resources/shaders/ES/mm_gouraud.fs

@@ -25,7 +25,7 @@ uniform vec4 uniform_color;
 uniform bool volume_mirrored;
 
 uniform mat4 view_model_matrix;
-uniform mat3 normal_matrix;
+uniform mat3 view_normal_matrix;
 
 varying vec3 clipping_planes_dots;
 varying vec4 model_pos;
@@ -46,7 +46,7 @@ void main()
         triangle_normal = -triangle_normal;
 
     // First transform the normal into camera space and normalize the result.
-    vec3 eye_normal = normalize(normal_matrix * triangle_normal);
+    vec3 eye_normal = normalize(view_normal_matrix * triangle_normal);
 
     // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex.
     // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range.

resources/shaders/ES/toolpaths_cog.vs

@@ -16,7 +16,7 @@ const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074);
 
 uniform mat4 view_model_matrix;
 uniform mat4 projection_matrix;
-uniform mat3 normal_matrix;
+uniform mat3 view_normal_matrix;
 
 attribute vec3 v_position;
 attribute vec3 v_normal;
@@ -28,7 +28,7 @@ varying vec3 world_position;
 void main()
 {
     // First transform the normal into camera space and normalize the result.
-    vec3 normal = normalize(normal_matrix * v_normal);
+    vec3 normal = normalize(view_normal_matrix * v_normal);
     
     // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex.
     // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range.

resources/shaders/ES/variable_layer_height.vs

@@ -16,7 +16,7 @@ const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074);
 
 uniform mat4 view_model_matrix;
 uniform mat4 projection_matrix;
-uniform mat3 normal_matrix;
+uniform mat3 view_normal_matrix;
 uniform mat4 volume_world_matrix;
 uniform float object_max_z;
 
@@ -38,7 +38,7 @@ void main()
 	// =====================================================
 
     // First transform the normal into camera space and normalize the result.
-    vec3 normal = (object_max_z > 0.0) ? vec3(0.0, 0.0, 1.0) : normalize(normal_matrix * v_normal);
+    vec3 normal = (object_max_z > 0.0) ? vec3(0.0, 0.0, 1.0) : normalize(view_normal_matrix * v_normal);
     
     // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex.
     // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range.