opensource/manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-07-30 05:24:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:3b1b/manim into video-work

Browse Source
This commit is contained in:
Grant Sanderson
2021-11-01 13:18:09 -07:00
parent 185782a2e7 5a0e5a16ea
commit 61b04079f5
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manimlib/mobject/mobject.py
View File

@ -82,6 +82,14 @@ class Mobject(object):
def __str__(self): def __str__(self):
return self.__class__.__name__ return self.__class__.__name__
def __add__(self, other : 'Mobject') -> 'Mobject':
assert(isinstance(other, Mobject))
return self.get_group_class()(self, other)
def __mul__(self, other : 'int') -> 'Mobject':
assert(isinstance(other, int))
return self.replicate(other)
def init_data(self): def init_data(self):
self.data = { self.data = {
"points": np.zeros((0, 3)), "points": np.zeros((0, 3)),
@ -1609,6 +1617,10 @@ class Group(Mobject):
raise Exception("All submobjects must be of type Mobject") raise Exception("All submobjects must be of type Mobject")
Mobject.__init__(self, **kwargs) Mobject.__init__(self, **kwargs)
self.add(*mobjects) self.add(*mobjects)
def __add__(self, other : 'Mobject' or 'Group'):
assert(isinstance(other, Mobject))
return self.add(other)
class Point(Mobject): class Point(Mobject):

4
manimlib/mobject/types/vectorized_mobject.py
View File

@ -999,6 +999,10 @@ class VGroup(VMobject):
raise Exception("All submobjects must be of type VMobject") raise Exception("All submobjects must be of type VMobject")
super().__init__(**kwargs) super().__init__(**kwargs)
self.add(*vmobjects) self.add(*vmobjects)
def __add__(self:'VGroup', other : 'VMobject' or 'VGroup'):
assert(isinstance(other, VMobject))
return self.add(other)
class VectorizedPoint(Point, VMobject): class VectorizedPoint(Point, VMobject):