public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-09-01 00:48:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix TexturedSurface

Browse source
This commit is contained in:
Grant Sanderson 2023-01-30 20:57:21 -08:00
parent 5ff44f5850
commit e7734ca84c
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manimlib/mobject/types/surface.py
View file

@ -320,7 +320,9 @@ class TexturedSurface(Surface):
surf = self.uv_surface surf = self.uv_surface
nu, nv = surf.resolution nu, nv = surf.resolution
self.resize_points(surf.get_num_points()) self.resize_points(surf.get_num_points())
self.resolution = surf.resolution
self.data['point'][:] = surf.data['point'] self.data['point'][:] = surf.data['point']
self.data['normal'][:] = surf.data['normal']
self.data['opacity'][:, 0] = surf.data["rgba"][:, 3] self.data['opacity'][:, 0] = surf.data["rgba"][:, 3]
self.data["im_coords"] = np.array([ self.data["im_coords"] = np.array([
[u, v] [u, v]

5
manimlib/shaders/textured_surface/vert.glsl
View file

@ -1,8 +1,7 @@
#version 330 #version 330
in vec3 point; in vec3 point;
in vec3 du_point; in vec3 normal;
in vec3 dv_point;
in vec2 im_coords; in vec2 im_coords;
in float opacity; in float opacity;
@ -16,7 +15,7 @@ out float v_opacity;
void main(){ void main(){
v_point = point; v_point = point;
v_normal = get_unit_normal(point, du_point, dv_point); v_normal = normal;
v_im_coords = im_coords; v_im_coords = im_coords;
v_opacity = opacity; v_opacity = opacity;
emit_gl_Position(point); emit_gl_Position(point);