songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore compatibility shader code

This commit is contained in:
Maxime Gimeno 2021-08-30 11:11:57 +02:00
parent c25c7c4668
commit 66f92a336e
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
GraphicsView/include/CGAL/Basic_shaders.h
View File

@ -176,17 +176,17 @@ void main(void)
// compatibility shaders // compatibility shaders
const char vertex_source_color_comp[]=R"DELIM( const char vertex_source_color_comp[]=R"DELIM(
in highp vec4 vertex; varying highp vec4 vertex;
in highp vec3 normal; varying highp vec3 normal;
in highp vec3 color; varying highp vec3 color;
uniform highp mat4 mvp_matrix; uniform highp mat4 mvp_matrix;
uniform highp mat4 mv_matrix; uniform highp mat4 mv_matrix;
uniform highp float point_size; uniform highp float point_size;
out highp vec4 fP; varying highp vec4 fP;
out highp vec3 fN; varying highp vec3 fN;
out highp vec4 fColor; varying highp vec4 fColor;
void main(void) void main(void)
{ {
@ -204,9 +204,9 @@ void main(void)
)DELIM"; )DELIM";
const char fragment_source_color_comp[]=R"DELIM( const char fragment_source_color_comp[]=R"DELIM(
in highp vec4 fP; varying highp vec4 fP;
in highp vec3 fN; varying highp vec3 fN;
in highp vec4 fColor; varying highp vec4 fColor;
uniform highp vec4 light_pos; uniform highp vec4 light_pos;
uniform highp vec4 light_diff; uniform highp vec4 light_diff;
@ -214,8 +214,6 @@ uniform highp vec4 light_spec;
uniform highp vec4 light_amb; uniform highp vec4 light_amb;
uniform highp float spec_power ; uniform highp float spec_power ;
out highp vec4 out_color;
void main(void) void main(void)
{ {
highp vec3 L = light_pos.xyz - fP.xyz; highp vec3 L = light_pos.xyz - fP.xyz;
@ -229,18 +227,18 @@ void main(void)
highp vec4 diffuse = max(dot(N,L), 0.0) * light_diff * fColor; highp vec4 diffuse = max(dot(N,L), 0.0) * light_diff * fColor;
highp vec4 specular = pow(max(dot(R,V), 0.0), spec_power) * light_spec; highp vec4 specular = pow(max(dot(R,V), 0.0), spec_power) * light_spec;
out_color = light_amb*fColor + diffuse; gl_FragColor = light_amb*fColor + diffuse;
} }
)DELIM"; )DELIM";
const char vertex_source_p_l_comp[]=R"DELIM( const char vertex_source_p_l_comp[]=R"DELIM(
in highp vec4 vertex; varying highp vec4 vertex;
in highp vec3 color; varying highp vec3 color;
uniform highp mat4 mvp_matrix; uniform highp mat4 mvp_matrix;
uniform highp float point_size; uniform highp float point_size;
out highp vec4 fColor; varying highp vec4 fColor;
void main(void) void main(void)
{ {
@ -251,11 +249,10 @@ void main(void)
)DELIM"; )DELIM";
const char fragment_source_p_l_comp[]=R"DELIM( const char fragment_source_p_l_comp[]=R"DELIM(
in highp vec4 fColor; varying highp vec4 fColor;
out highp vec4 out_color;
void main(void) void main(void)
{ {
out_color = fColor; gl_FragColor = fColor;
} }
)DELIM"; )DELIM";