opensource/manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-07-28 20:43:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

DEFAULT_MOBJECT_TO_MOBJECT_BUFFER -> DEFAULT_MOBJECT_TO_MOBJECT_BUFF

Browse Source 
And likewise DEFAULT_MOBJECT_TO_MOBJECT_BUFFER -> DEFAULT_MOBJECT_TO_MOBJECT_BUFF
This commit is contained in:
Grant Sanderson
2024-12-10 19:23:15 -06:00
parent c9b6ee57a8
commit d5c36de3c5
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/source/documentation/constants.rst
View File

@ -30,8 +30,8 @@ Buffs
MED_LARGE_BUFF = 0.5 MED_LARGE_BUFF = 0.5
LARGE_BUFF = 1 LARGE_BUFF = 1
DEFAULT_MOBJECT_TO_EDGE_BUFFER = MED_LARGE_BUFF # Distance between object and edge DEFAULT_MOBJECT_TO_EDGE_BUFF = MED_LARGE_BUFF # Distance between object and edge
DEFAULT_MOBJECT_TO_MOBJECT_BUFFER = MED_SMALL_BUFF # Distance between objects DEFAULT_MOBJECT_TO_MOBJECT_BUFF = MED_SMALL_BUFF # Distance between objects
Run times Run times
--------- ---------

4
manimlib/constants.py
View File

@ -30,8 +30,8 @@ MED_SMALL_BUFF: float = GLOBAL_CONFIG["sizes"]["med_small_buff"]
MED_LARGE_BUFF: float = GLOBAL_CONFIG["sizes"]["med_large_buff"] MED_LARGE_BUFF: float = GLOBAL_CONFIG["sizes"]["med_large_buff"]
LARGE_BUFF: float = GLOBAL_CONFIG["sizes"]["large_buff"] LARGE_BUFF: float = GLOBAL_CONFIG["sizes"]["large_buff"]
DEFAULT_MOBJECT_TO_EDGE_BUFFER: float = GLOBAL_CONFIG["sizes"]["default_mobject_to_edge_buff"] DEFAULT_MOBJECT_TO_EDGE_BUFF: float = GLOBAL_CONFIG["sizes"]["default_mobject_to_edge_buff"]
DEFAULT_MOBJECT_TO_MOBJECT_BUFFER: float = GLOBAL_CONFIG["sizes"]["default_mobject_to_mobject_buff"] DEFAULT_MOBJECT_TO_MOBJECT_BUFF: float = GLOBAL_CONFIG["sizes"]["default_mobject_to_mobject_buff"]
# Standard vectors # Standard vectors

14
manimlib/mobject/mobject.py
View File

@ -12,8 +12,8 @@ import moderngl
import numbers import numbers
import numpy as np import numpy as np
from manimlib.constants import DEFAULT_MOBJECT_TO_EDGE_BUFFER from manimlib.constants import DEFAULT_MOBJECT_TO_EDGE_BUFF
from manimlib.constants import DEFAULT_MOBJECT_TO_MOBJECT_BUFFER from manimlib.constants import DEFAULT_MOBJECT_TO_MOBJECT_BUFF
from manimlib.constants import DOWN, IN, LEFT, ORIGIN, OUT, RIGHT, UP from manimlib.constants import DOWN, IN, LEFT, ORIGIN, OUT, RIGHT, UP
from manimlib.constants import FRAME_X_RADIUS, FRAME_Y_RADIUS from manimlib.constants import FRAME_X_RADIUS, FRAME_Y_RADIUS
from manimlib.constants import MED_SMALL_BUFF from manimlib.constants import MED_SMALL_BUFF
@ -1055,7 +1055,7 @@ class Mobject(object):
def align_on_border( def align_on_border(
self, self,
direction: Vect3, direction: Vect3,
buff: float = DEFAULT_MOBJECT_TO_EDGE_BUFFER buff: float = DEFAULT_MOBJECT_TO_EDGE_BUFF
) -> Self: ) -> Self:
""" """
Direction just needs to be a vector pointing towards side or Direction just needs to be a vector pointing towards side or
@ -1071,14 +1071,14 @@ class Mobject(object):
def to_corner( def to_corner(
self, self,
corner: Vect3 = LEFT + DOWN, corner: Vect3 = LEFT + DOWN,
buff: float = DEFAULT_MOBJECT_TO_EDGE_BUFFER buff: float = DEFAULT_MOBJECT_TO_EDGE_BUFF
) -> Self: ) -> Self:
return self.align_on_border(corner, buff) return self.align_on_border(corner, buff)
def to_edge( def to_edge(
self, self,
edge: Vect3 = LEFT, edge: Vect3 = LEFT,
buff: float = DEFAULT_MOBJECT_TO_EDGE_BUFFER buff: float = DEFAULT_MOBJECT_TO_EDGE_BUFF
) -> Self: ) -> Self:
return self.align_on_border(edge, buff) return self.align_on_border(edge, buff)
@ -1086,7 +1086,7 @@ class Mobject(object):
self, self,
mobject_or_point: Mobject | Vect3, mobject_or_point: Mobject | Vect3,
direction: Vect3 = RIGHT, direction: Vect3 = RIGHT,
buff: float = DEFAULT_MOBJECT_TO_MOBJECT_BUFFER, buff: float = DEFAULT_MOBJECT_TO_MOBJECT_BUFF,
aligned_edge: Vect3 = ORIGIN, aligned_edge: Vect3 = ORIGIN,
submobject_to_align: Mobject | None = None, submobject_to_align: Mobject | None = None,
index_of_submobject_to_align: int | slice | None = None, index_of_submobject_to_align: int | slice | None = None,
@ -1117,7 +1117,7 @@ class Mobject(object):
space_lengths = [FRAME_X_RADIUS, FRAME_Y_RADIUS] space_lengths = [FRAME_X_RADIUS, FRAME_Y_RADIUS]
for vect in UP, DOWN, LEFT, RIGHT: for vect in UP, DOWN, LEFT, RIGHT:
dim = np.argmax(np.abs(vect)) dim = np.argmax(np.abs(vect))
buff = kwargs.get("buff", DEFAULT_MOBJECT_TO_EDGE_BUFFER) buff = kwargs.get("buff", DEFAULT_MOBJECT_TO_EDGE_BUFF)
max_val = space_lengths[dim] - buff max_val = space_lengths[dim] - buff
edge_center = self.get_edge_center(vect) edge_center = self.get_edge_center(vect)
if np.dot(edge_center, vect) > max_val: if np.dot(edge_center, vect) > max_val:

6
manimlib/mobject/svg/brace.py
View File

@ -5,7 +5,7 @@ import copy
import numpy as np import numpy as np
from manimlib.constants import DEFAULT_MOBJECT_TO_MOBJECT_BUFFER, SMALL_BUFF from manimlib.constants import DEFAULT_MOBJECT_TO_MOBJECT_BUFF, SMALL_BUFF
from manimlib.constants import DOWN, LEFT, ORIGIN, RIGHT, DL, DR, UL from manimlib.constants import DOWN, LEFT, ORIGIN, RIGHT, DL, DR, UL
from manimlib.constants import PI from manimlib.constants import PI
from manimlib.animation.composition import AnimationGroup from manimlib.animation.composition import AnimationGroup
@ -79,7 +79,7 @@ class Brace(Tex):
) )
else: else:
mob.move_to(self.get_tip()) mob.move_to(self.get_tip())
buff = kwargs.get("buff", DEFAULT_MOBJECT_TO_MOBJECT_BUFFER) buff = kwargs.get("buff", DEFAULT_MOBJECT_TO_MOBJECT_BUFF)
shift_distance = mob.get_width() / 2.0 + buff shift_distance = mob.get_width() / 2.0 + buff
mob.shift(self.get_direction() * shift_distance) mob.shift(self.get_direction() * shift_distance)
return self return self
@ -116,7 +116,7 @@ class BraceLabel(VMobject):
text: str | Iterable[str], text: str | Iterable[str],
brace_direction: np.ndarray = DOWN, brace_direction: np.ndarray = DOWN,
label_scale: float = 1.0, label_scale: float = 1.0,
label_buff: float = DEFAULT_MOBJECT_TO_MOBJECT_BUFFER, label_buff: float = DEFAULT_MOBJECT_TO_MOBJECT_BUFF,
**kwargs **kwargs
) -> None: ) -> None:
super().__init__(**kwargs) super().__init__(**kwargs)