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 pull request #1555 from 3b1b/revert-1543-master

Browse Source 
Scale `Text` correctly | Revert "Fixed the default size of Text"
This commit is contained in:
Grant Sanderson
2021-06-19 09:30:40 -07:00
committed by GitHub
parent 26e9b9cd7c 892df54c9f
commit bccc17a3ac
2 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
example_scenes.py
View File

@ -15,7 +15,7 @@ class OpeningManimExample(Scene):
The original motivation for manim was to The original motivation for manim was to
better illustrate mathematical functions better illustrate mathematical functions
as transformations. as transformations.
""", lsh=1.5) """)
intro_words.to_edge(UP) intro_words.to_edge(UP)
self.play(Write(intro_words)) self.play(Write(intro_words))

22
manimlib/mobject/svg/text_mobject.py
View File

@ -11,14 +11,14 @@ import manimpango
from manimlib.constants import * from manimlib.constants import *
from manimlib.mobject.geometry import Dot from manimlib.mobject.geometry import Dot
from manimlib.mobject.svg.svg_mobject import SVGMobject from manimlib.mobject.svg.svg_mobject import SVGMobject
from manimlib.mobject.svg.tex_mobject import TexText
from manimlib.mobject.types.vectorized_mobject import VGroup from manimlib.mobject.types.vectorized_mobject import VGroup
from manimlib.utils.config_ops import digest_config from manimlib.utils.config_ops import digest_config
from manimlib.utils.customization import get_customization from manimlib.utils.customization import get_customization
from manimlib.utils.directories import get_downloads_dir, get_text_dir, get_temp_dir from manimlib.utils.directories import get_downloads_dir, get_text_dir
from manimpango import PangoUtils from manimpango import PangoUtils
from manimpango import TextSetting from manimpango import TextSetting
TEXT_MOB_SCALE_FACTOR = 0.0076
DEFAULT_LINE_SPACING_SCALE = 0.3 DEFAULT_LINE_SPACING_SCALE = 0.3
class Text(SVGMobject): class Text(SVGMobject):
@ -42,7 +42,6 @@ class Text(SVGMobject):
"t2s": {}, "t2s": {},
"t2w": {}, "t2w": {},
"disable_ligatures": True, "disable_ligatures": True,
"debug": False,
} }
def __init__(self, text, **config): def __init__(self, text, **config):
@ -78,21 +77,8 @@ class Text(SVGMobject):
self.set_color_by_t2g() self.set_color_by_t2g()
# anti-aliasing # anti-aliasing
if self.height is None and not self.debug: if self.height is None:
self.load_scale_factor() self.scale(TEXT_MOB_SCALE_FACTOR)
self.scale(self.scale_factor * self.font_size)
def load_scale_factor(self):
factor_file = os.path.join(get_temp_dir(), "text_scale_factor.txt")
if os.path.exists(factor_file):
with open(factor_file, 'r') as f:
self.scale_factor = float(f.read())
else:
tex_height = TexText("b", font_size=1).get_height()
text_height = Text("b", font_size=1, debug=True).get_height()
self.scale_factor = tex_height / text_height
with open(factor_file, "w") as f:
f.write(str(self.scale_factor))
def remove_empty_path(self, file_name): def remove_empty_path(self, file_name):
with open(file_name, 'r') as fpr: with open(file_name, 'r') as fpr: