allow to disable lighting for line imposters

LiangliangNan · Jan 19, 2024 · 0ff53cb · 0ff53cb
1 parent 037c5ba
commit 0ff53cb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 15 deletions.
diff --git a/resources/shaders/lines/lines_cones_texture.frag b/resources/shaders/lines/lines_cones_texture.frag
@@ -162,9 +162,13 @@ void main()
 
 	gl_FragDepth = depth;
 
-	vec3 light_dir = normalize(eLightPos);
-
-	vec3 color = texture(textureID, gOutTexcoord).rgb;
-	vec3 final_color = ComputeLight(normal, light_dir, view_dir, ambient, specular, shininess, color);
-	outputF = vec4(final_color, 1.0);
+	vec4 color = texture(textureID, gOutTexcoord);
+	if (lighting) {
+		vec3 light_dir = normalize(eLightPos);
+		vec3 final_color = ComputeLight(normal, light_dir, view_dir, ambient, specular, shininess, color.rgb);
+		outputF = vec4(final_color, 1.0);
+	}
+	else {
+		outputF = color;
+	}
 }
diff --git a/resources/shaders/lines/lines_cylinders_color.frag b/resources/shaders/lines/lines_cylinders_color.frag
@@ -164,13 +164,12 @@ void main()
 
 	gl_FragDepth = depth;
 
-	if (!lighting) {
-		outputF = gOutColor;
-	}
-
-	else {
+	if (lighting) {
 		vec3 light_dir = normalize(eLightPos);
 		vec3 final_color = shade(normal, light_dir, view_dir, ambient, specular, shininess, gOutColor.xyz);
 		outputF = vec4(final_color, gOutColor.a);
 	}
+	else {
+		outputF = gOutColor;
+	}
 }
diff --git a/resources/shaders/lines/lines_cylinders_texture.frag b/resources/shaders/lines/lines_cylinders_texture.frag
@@ -166,9 +166,13 @@ void main()
 
 	gl_FragDepth = depth;
 
-	vec3 light_dir = normalize(eLightPos);
-
-	vec3 color = texture(textureID, gOutTexcoord).rgb;
-	vec3 final_color = ComputeLight(normal, light_dir, view_dir, ambient, specular, shininess, color);
-	outputF = vec4(final_color, 1.0);
+	vec4 color = texture(textureID, gOutTexcoord);
+	if (lighting) {
+		vec3 light_dir = normalize(eLightPos);
+		vec3 final_color = ComputeLight(normal, light_dir, view_dir, ambient, specular, shininess, color.rgb);
+		outputF = vec4(final_color, 1.0);
+	}
+	else {
+		outputF = color;
+	}
 }