public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-08-05 16:49:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small edits

Browse source
This commit is contained in:
Grant Sanderson 2020-02-20 15:52:23 -08:00
parent ec017bd1ae
commit eb121c922b
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
manimlib/mobject/mobject.py
View file

@ -370,7 +370,7 @@ class Mobject(Container):
if about_edge is None: if about_edge is None:
about_edge = ORIGIN about_edge = ORIGIN
about_point = self.get_bounding_box_point(about_edge) about_point = self.get_bounding_box_point(about_edge)
for mob in self.get_family(): for mob in self.family_members_with_points():
mob.points -= about_point mob.points -= about_point
mob.points[:] = func(mob.points) mob.points[:] = func(mob.points)
mob.points += about_point mob.points += about_point
@ -1013,7 +1013,7 @@ class Mobject(Container):
return self return self
def push_self_into_submobjects(self): def push_self_into_submobjects(self):
copy = self.copy() copy = self.deepcopy()
copy.submobjects = [] copy.submobjects = []
self.reset_points() self.reset_points()
self.add(copy) self.add(copy)
@ -1027,7 +1027,7 @@ class Mobject(Container):
if curr == 0: if curr == 0:
# If empty, simply add n point mobjects # If empty, simply add n point mobjects
self.submobjects = [ self.submobjects = [
self.get_point_mobject() self.copy().scale(0)
for k in range(n) for k in range(n)
] ]
return return
@ -1037,16 +1037,14 @@ class Mobject(Container):
# with VMobject.insert_n_curves # with VMobject.insert_n_curves
repeat_indices = (np.arange(target) * curr) // target repeat_indices = (np.arange(target) * curr) // target
split_factors = [ split_factors = [
sum(repeat_indices == i) (repeat_indices == i).sum()
for i in range(curr) for i in range(curr)
] ]
new_submobs = [] new_submobs = []
for submob, sf in zip(self.submobjects, split_factors): for submob, sf in zip(self.submobjects, split_factors):
new_submobs.append(submob) new_submobs.append(submob)
for k in range(1, sf): for k in range(1, sf):
new_submobs.append( new_submobs.append(submob.copy().fade(1))
submob.copy().fade(1)
)
self.submobjects = new_submobs self.submobjects = new_submobs
return self return self
@ -1173,10 +1171,9 @@ class Mobject(Container):
shader = camera.get_shader(shader_info) shader = camera.get_shader(shader_info)
if shader is None: if shader is None:
continue continue
render_primative = int(shader_info["render_primative"])
vbo = self.get_vbo(camera.ctx, data) vbo = self.get_vbo(camera.ctx, data)
vao = camera.ctx.simple_vertex_array(shader, vbo, *data.dtype.names) vao = camera.ctx.simple_vertex_array(shader, vbo, *data.dtype.names)
vao.render(render_primative) vao.render(int(shader_info["render_primative"]))
# Errors # Errors
def throw_error_if_no_points(self): def throw_error_if_no_points(self):
@ -1218,4 +1215,4 @@ class Point(Mobject):
return self.get_location() return self.get_location()
def set_location(self, new_loc): def set_location(self, new_loc):
self.points[:] = np.array(new_loc, ndmin=2) self.points = np.array(new_loc, ndmin=2)