mirror of
https://github.com/ManimCommunity/manim.git
synced 2026-06-22 10:01:47 +00:00
Merge d8d3b07325 into 733a1fa3d3
This commit is contained in:
commit
e31213aec5
3 changed files with 3 additions and 3 deletions
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
layout(std140) uniform ubo_mobject
|
||||
{
|
||||
vec3 light_source_position;
|
||||
vec4 light_source_position;
|
||||
float gloss;
|
||||
float shadow;
|
||||
float reflectiveness;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ const vec2 uv_coords_arr[3] = vec2[3](vec2(0, 0), vec2(0.5, 0), vec2(1, 1));
|
|||
|
||||
void emit_vertex_wrapper(vec3 point, int index)
|
||||
{
|
||||
color = finalize_color(v_color[index], point, v_global_unit_normal[index], light_source_position, gloss, shadow,
|
||||
color = finalize_color(v_color[index], point, v_global_unit_normal[index], light_source_position.xyz, gloss, shadow,
|
||||
reflectiveness);
|
||||
gl_Position = get_gl_Position(point);
|
||||
uv_coords = uv_coords_arr[index];
|
||||
|
|
|
|||
|
|
@ -248,7 +248,7 @@ void main()
|
|||
// vec3 xyz_coords = vec3(corners[i], controls[index_map[i]].z);
|
||||
vec3 xyz_coords = vec3(corners[i], controls[index_map[i]].z);
|
||||
color = finalize_color(v_color[index_map[i]], xyz_coords, v_global_unit_normal[index_map[i]],
|
||||
light_source_position, gloss, shadow, reflectiveness);
|
||||
light_source_position.xyz, gloss, shadow, reflectiveness);
|
||||
gl_Position = vec4(get_gl_Position(vec3(corners[i], 0.0)).xy, get_gl_Position(controls[index_map[i]]).zw);
|
||||
EmitVertex();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue