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

Remember triangle indices, rather than recomputing each frame

Browse source
This commit is contained in:
Grant Sanderson 2020-06-15 12:02:24 -07:00
parent c45fe52a70
commit e6f73073fe
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ from manimlib.mobject.mobject import Mobject
from manimlib.utils.bezier import interpolate from manimlib.utils.bezier import interpolate
from manimlib.utils.color import color_to_rgba from manimlib.utils.color import color_to_rgba
from manimlib.utils.color import rgb_to_hex from manimlib.utils.color import rgb_to_hex
from manimlib.utils.config_ops import digest_config
from manimlib.utils.images import get_full_raster_image_path from manimlib.utils.images import get_full_raster_image_path
from manimlib.utils.space_ops import normalize_along_axis from manimlib.utils.space_ops import normalize_along_axis
@ -40,7 +41,9 @@ class ParametricSurface(Mobject):
} }
def __init__(self, uv_func, **kwargs): def __init__(self, uv_func, **kwargs):
digest_config(self, kwargs)
self.uv_func = uv_func self.uv_func = uv_func
self.compute_triangle_indices()
super().__init__(**kwargs) super().__init__(**kwargs)
def init_points(self): def init_points(self):
@ -64,17 +67,25 @@ class ParametricSurface(Mobject):
# are still easily recoverable. # are still easily recoverable.
self.points = np.vstack(point_lists) self.points = np.vstack(point_lists)
def get_triangle_indices(self): def compute_triangle_indices(self):
# TODO, if there is an event which changes
# the resolution of the surface, make sure
# this is called.
nu, nv = self.resolution nu, nv = self.resolution
if nu == 0 and nv == 0:
return np.zeros(0, dtype=int)
index_grid = np.arange(nu * nv).reshape((nu, nv)) index_grid = np.arange(nu * nv).reshape((nu, nv))
result = np.zeros(6 * (nu - 1) * (nv - 1), dtype=int) indices = np.zeros(6 * (nu - 1) * (nv - 1), dtype=int)
result[0::6] = index_grid[:-1, :-1].flatten() # Top left indices[0::6] = index_grid[:-1, :-1].flatten() # Top left
result[1::6] = index_grid[+1:, :-1].flatten() # Bottom left indices[1::6] = index_grid[+1:, :-1].flatten() # Bottom left
result[2::6] = index_grid[:-1, +1:].flatten() # Top right indices[2::6] = index_grid[:-1, +1:].flatten() # Top right
result[3::6] = index_grid[:-1, +1:].flatten() # Top right indices[3::6] = index_grid[:-1, +1:].flatten() # Top right
result[4::6] = index_grid[+1:, :-1].flatten() # Bottom left indices[4::6] = index_grid[+1:, :-1].flatten() # Bottom left
result[5::6] = index_grid[+1:, +1:].flatten() # Bottom right indices[5::6] = index_grid[+1:, +1:].flatten() # Bottom right
return result self.triangle_indices = indices
def get_triangle_indices(self):
return self.triangle_indices
def init_colors(self): def init_colors(self):
self.set_color(self.color, self.opacity) self.set_color(self.color, self.opacity)