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

some cleanups

Browse source
This commit is contained in:
TonyCrane 2022-01-27 16:43:45 +08:00
parent f895455264
commit 3ef5899a24
No known key found for this signature in database
GPG key ID: 2313A5058A9C637C
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
manimlib/mobject/svg/svg_mobject.py
View file

@ -156,8 +156,8 @@ class SVGMobject(VMobject):
self.add(*mobjects[0].submobjects) self.add(*mobjects[0].submobjects)
def get_mobjects_from(self, wrapper, style): def get_mobjects_from(self, wrapper, style):
element = wrapper.etree_element
result = [] result = []
element = wrapper.etree_element
if not isinstance(element, ElementTree.Element): if not isinstance(element, ElementTree.Element):
return result return result
@ -171,8 +171,6 @@ class SVGMobject(VMobject):
tag = element.tag.split("}")[-1] tag = element.tag.split("}")[-1]
if tag == 'defs': if tag == 'defs':
self.update_ref_to_element(element, style) self.update_ref_to_element(element, style)
elif tag == 'style':
pass
elif tag in ['g', 'svg', 'symbol']: elif tag in ['g', 'svg', 'symbol']:
result += it.chain(*( result += it.chain(*(
self.get_mobjects_from(child, style) self.get_mobjects_from(child, style)
@ -192,9 +190,11 @@ class SVGMobject(VMobject):
result.append(self.ellipse_to_mobject(element, style)) result.append(self.ellipse_to_mobject(element, style))
elif tag in ['polygon', 'polyline']: elif tag in ['polygon', 'polyline']:
result.append(self.polygon_to_mobject(element, style)) result.append(self.polygon_to_mobject(element, style))
elif tag == 'style':
pass
else: else:
log.warning(f"Unsupported element type: {tag}") log.warning(f"Unsupported element type: {tag}")
pass # TODO pass # TODO, support <line> and <text> tag
result = [m.insert_n_curves(0) for m in result if m is not None] result = [m.insert_n_curves(0) for m in result if m is not None]
self.handle_transforms(element, VGroup(*result)) self.handle_transforms(element, VGroup(*result))
if len(result) > 1 and not self.unpack_groups: if len(result) > 1 and not self.unpack_groups:
@ -246,9 +246,7 @@ class SVGMobject(VMobject):
def_element, def_style = self.ref_to_element[ref] def_element, def_style = self.ref_to_element[ref]
style = local_style.copy() style = local_style.copy()
style.update(def_style) style.update(def_style)
return self.get_mobjects_from( return self.get_mobjects_from(def_element, style)
def_element, style
)
def attribute_to_float(self, attr): def attribute_to_float(self, attr):
stripped_attr = "".join([ stripped_attr = "".join([
@ -341,7 +339,7 @@ class SVGMobject(VMobject):
] ]
transform_pattern = re.compile("|".join([x + r"[^)]*\)" for x in transform_names])) transform_pattern = re.compile("|".join([x + r"[^)]*\)" for x in transform_names]))
number_pattern = re.compile(r"[-+]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][-+]?\d+)?") number_pattern = re.compile(r"[-+]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][-+]?\d+)?")
transforms = transform_pattern.findall(element.get('transform', ''))[::-1] transforms = transform_pattern.findall(element.get("transform", ""))[::-1]
for transform in transforms: for transform in transforms:
op_name, op_args = transform.split("(") op_name, op_args = transform.split("(")