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

Small inconsequential edits to get_triangulation

Browse source
This commit is contained in:
Grant Sanderson 2022-12-27 15:54:12 -08:00
parent f2859a9a8c
commit 6d50be55d3
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
manimlib/mobject/types/vectorized_mobject.py
View file

@ -965,28 +965,23 @@ class VMobject(Mobject):
return self.triangulation return self.triangulation
normal_vector = self.get_unit_normal() normal_vector = self.get_unit_normal()
if not np.isclose(normal_vector, OUT).all():
# Rotate points such that unit normal vector is OUT
points = np.dot(points, z_to_vector(normal_vector))
indices = np.arange(len(points), dtype=int) indices = np.arange(len(points), dtype=int)
b0s = points[0::3] # Rotate points such that unit normal vector is OUT
b1s = points[1::3] if not np.isclose(normal_vector, OUT).all():
b2s = points[2::3] points = np.dot(points, z_to_vector(normal_vector))
v01s = b1s - b0s
v12s = b2s - b1s
crosses = cross2d(v01s, v12s)
convexities = np.sign(crosses)
orientations = np.sign(convexities.repeat(3))
self.data["orientation"] = orientations.reshape((len(orientations), 1))
atol = self.tolerance_for_point_equality atol = self.tolerance_for_point_equality
end_of_loop = np.zeros(len(b0s), dtype=bool) end_of_loop = np.zeros(len(points) // 3, dtype=bool)
end_of_loop[:-1] = (np.abs(b2s[:-1] - b0s[1:]) > atol).any(1) end_of_loop[:-1] = (np.abs(points[2:-3:3] - points[3::3]) > atol).any(1)
end_of_loop[-1] = True end_of_loop[-1] = True
concave_parts = convexities < 0 v01s = points[1::3] - points[0::3]
v12s = points[2::3] - points[1::3]
curve_orientations = np.sign(cross2d(v01s, v12s))
self.data["orientation"] = np.transpose([curve_orientations.repeat(3)])
concave_parts = curve_orientations < 0
# These are the vertices to which we'll apply a polygon triangulation # These are the vertices to which we'll apply a polygon triangulation
inner_vert_indices = np.hstack([ inner_vert_indices = np.hstack([
@ -1073,8 +1068,8 @@ class VMobject(Mobject):
return self return self
def get_fill_shader_wrapper(self) -> ShaderWrapper: def get_fill_shader_wrapper(self) -> ShaderWrapper:
self.fill_shader_wrapper.vert_data = self.get_fill_shader_data()
self.fill_shader_wrapper.vert_indices = self.get_fill_shader_vert_indices() self.fill_shader_wrapper.vert_indices = self.get_fill_shader_vert_indices()
self.fill_shader_wrapper.vert_data = self.get_fill_shader_data()
self.fill_shader_wrapper.uniforms = self.get_shader_uniforms() self.fill_shader_wrapper.uniforms = self.get_shader_uniforms()
self.fill_shader_wrapper.depth_test = self.depth_test self.fill_shader_wrapper.depth_test = self.depth_test
return self.fill_shader_wrapper return self.fill_shader_wrapper