Commit fb69893e authored by Michele Bosi's avatar Michele Bosi

Use solid color for 3D outlines

parent 99b81a7a
......@@ -35,7 +35,12 @@ vec3 AdjustSaturation( vec3 rgb, float adjustment )
vec4 LightingStage()
{
vec4 color;
if ( vl_Vivid.enableLighting ) {
if ( vl_Vivid.outline3DRendering || ! vl_Vivid.enableLighting )
{
color = Color;
}
else
{
vec3 l = normalize( gl_LightSource[0].position.xyz - CP.xyz );
vec3 e = normalize( vec3( 0, 0, 0 ) - CP.xyz ); // vec3( 0.0, 0.0 ,1.0 ) for GL_LIGHT_MODEL_LOCAL_VIEWER = FALSE
vec3 n = normalize( N );
......@@ -64,10 +69,6 @@ vec4 LightingStage()
color.rgb = ambient + emission + diffuse + specular;
color.a = gl_FrontMaterial.diffuse.a;
}
else
{
color = Color;
}
if ( vl_Vivid.enablePointSprite ) {
color = color * texture2D( vl_UserTexture, gl_PointCoord.st );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment