A community-maintained Python framework for creating mathematical animations.
Improved structure of the :mod:`.mobject` module (#2476)
Laith Bahodie040bcacd383
diff --git a/.flake8 b/.flake8index 24aa4d019..4907a2f6d 100644--- a/.flake8+++ b/.flake8@@ -40,4 +40,4 @@ extend-ignore = E203, W503, D202, D212, D213, D404# Plug-in: flake8-rst-docstringsRST201, RST203, RST210, RST212, RST213, RST215,- RST301,+ RST301, RST303,diff --git a/docs/source/reference.rst b/docs/source/reference.rstindex 19687ac72..3b9d15dc9 100644--- a/docs/source/reference.rst+++ b/docs/source/reference.rst@@ -16,6 +16,7 @@ Animations.. inheritance-diagram::manim.animation.animation+ manim.animation.changingmanim.animation.compositionmanim.animation.creationmanim.animation.fading@@ -27,7 +28,9 @@ Animationsmanim.animation.specializedmanim.animation.transformmanim.animation.transform_matching_parts- manim.animation.update+ manim.animation.updaters.mobject_update_utils+ manim.animation.updaters.update+ manim.animation.updaters.value_tracker:parts: 1:top-classes: manim.animation.animation.Animation@@ -47,34 +50,36 @@ Mobjects********.. inheritance-diagram::- manim.mobject.boolean_ops- manim.mobject.changing- manim.mobject.coordinate_systemsmanim.mobject.frame- manim.mobject.functions- manim.mobject.geometry+ manim.mobject.geometry.arc+ manim.mobject.geometry.boolean_ops+ manim.mobject.geometry.line+ manim.mobject.geometry.polygram+ manim.mobject.geometry.shape_matchers+ manim.mobject.geometry.tipsmanim.mobject.graph+ manim.mobject.graphing.coordinate_system+ manim.mobject.graphing.functions+ manim.mobject.graphing.number_line+ manim.mobject.graphing.probability+ manim.mobject.graphing.scalemanim.mobject.logomanim.mobject.matrixmanim.mobject.mobject- manim.mobject.mobject_update_utils- manim.mobject.number_line- manim.mobject.numbers- manim.mobject.probability- manim.mobject.shape_matchersmanim.mobject.table- manim.mobject.three_d_utils- manim.mobject.three_dimensions- manim.mobject.value_tracker- manim.mobject.vector_field+ manim.mobject.three_d.polyhedra+ manim.mobject.three_d.three_d_utils+ manim.mobject.three_d.three_dimensionsmanim.mobject.svg.brace- manim.mobject.svg.code_mobjectmanim.mobject.svg.svg_mobject- manim.mobject.svg.tex_mobject- manim.mobject.svg.text_mobject+ manim.mobject.text.code_mobject+ manim.mobject.text.tex_mobject+ manim.mobject.text.text_mobject+ manim.mobject.text.numbersmanim.mobject.types.image_mobjectmanim.mobject.types.point_cloud_mobjectmanim.mobject.types.vectorized_mobject+ manim.mobject.vector_field:parts: 1:top-classes: manim.mobject.mobject.Mobjectdiff --git a/docs/source/reference_index/animations.rst b/docs/source/reference_index/animations.rstindex fcb60a063..2afb09180 100644--- a/docs/source/reference_index/animations.rst+++ b/docs/source/reference_index/animations.rst@@ -7,6 +7,7 @@ Animations:toctree: ../reference~animation.animation+ ~animation.changing~animation.composition~animation.creation~animation.fading@@ -18,4 +19,4 @@ Animations~animation.specialized~animation.transform~animation.transform_matching_parts- ~animation.update+ ~animation.updatersdiff --git a/docs/source/reference_index/mobjects.rst b/docs/source/reference_index/mobjects.rstindex 251ebc5f3..5fe19558c 100644--- a/docs/source/reference_index/mobjects.rst+++ b/docs/source/reference_index/mobjects.rst@@ -6,34 +6,16 @@ Mobjects.. autosummary:::toctree: ../reference- ~mobject.boolean_ops- ~mobject.changing- ~mobject.coordinate_systems~mobject.frame- ~mobject.functions~mobject.geometry~mobject.graph+ ~mobject.graphing~mobject.logo~mobject.matrix~mobject.mobject- ~mobject.mobject_update_utils- ~mobject.number_line- ~mobject.numbers- ~mobject.polyhedra- ~mobject.probability- ~mobject.shape_matchers+ ~mobject.svg~mobject.table- ~mobject.three_d_utils- ~mobject.three_dimensions- ~mobject.value_tracker+ ~mobject.text+ ~mobject.three_d+ ~mobject.types~mobject.vector_field- ~mobject.svg.brace- ~mobject.svg.code_mobject- ~mobject.svg.style_utils- ~mobject.svg.svg_path- ~mobject.svg.svg_mobject- ~mobject.svg.tex_mobject- ~mobject.svg.text_mobject- ~mobject.types.image_mobject- ~mobject.types.point_cloud_mobject- ~mobject.types.vectorized_mobjectdiff --git a/docs/source/reference_index/utilities_misc.rst b/docs/source/reference_index/utilities_misc.rstindex 26ec07020..862a0930e 100644--- a/docs/source/reference_index/utilities_misc.rst+++ b/docs/source/reference_index/utilities_misc.rst@@ -22,7 +22,6 @@ Module Index~utils.iterables~utils.paths~utils.rate_functions- ~utils.scale~utils.simple_functions~utils.sounds~utils.space_opsdiff --git a/manim/__init__.py b/manim/__init__.pyindex de272aa69..7e16ae0f0 100644--- a/manim/__init__.py+++ b/manim/__init__.py@@ -34,6 +34,7 @@ for i, arg in enumerate(sys.argv):from .utils.commands import * # isort:skipfrom .animation.animation import *+from .animation.changing import *from .animation.composition import *from .animation.creation import *from .animation.fading import *@@ -45,43 +46,46 @@ from .animation.rotation import *from .animation.specialized import *from .animation.transform import *from .animation.transform_matching_parts import *-from .animation.update import *+from .animation.updaters.mobject_update_utils import *+from .animation.updaters.update import *+from .animation.updaters.value_tracker import *from .camera.camera import *from .camera.mapping_camera import *from .camera.moving_camera import *from .camera.multi_camera import *from .camera.three_d_camera import *from .constants import *-from .mobject.boolean_ops import *-from .mobject.changing import *-from .mobject.coordinate_systems import *from .mobject.frame import *-from .mobject.functions import *-from .mobject.geometry import *+from .mobject.geometry.arc import *+from .mobject.geometry.boolean_ops import *+from .mobject.geometry.line import *+from .mobject.geometry.polygram import *+from .mobject.geometry.shape_matchers import *+from .mobject.geometry.tips import *from .mobject.graph import *+from .mobject.graphing.coordinate_systems import *+from .mobject.graphing.functions import *+from .mobject.graphing.number_line import *+from .mobject.graphing.probability import *+from .mobject.graphing.scale import *from .mobject.logo import *from .mobject.matrix import *from .mobject.mobject import *-from .mobject.mobject_update_utils import *-from .mobject.number_line import *-from .mobject.numbers import *-from .mobject.polyhedra import *-from .mobject.probability import *-from .mobject.shape_matchers import *+from .mobject.opengl.dot_cloud import *+from .mobject.opengl.opengl_point_cloud_mobject import *from .mobject.svg.brace import *-from .mobject.svg.code_mobject import *from .mobject.svg.svg_mobject import *-from .mobject.svg.tex_mobject import *-from .mobject.svg.text_mobject import *from .mobject.table import *-from .mobject.three_d_utils import *-from .mobject.three_dimensions import *-from .mobject.types.dot_cloud import *+from .mobject.text.code_mobject import *+from .mobject.text.numbers import *+from .mobject.text.tex_mobject import *+from .mobject.text.text_mobject import *+from .mobject.three_d.polyhedra import *+from .mobject.three_d.three_d_utils import *+from .mobject.three_d.three_dimensions import *from .mobject.types.image_mobject import *-from .mobject.types.opengl_point_cloud_mobject import *from .mobject.types.point_cloud_mobject import *from .mobject.types.vectorized_mobject import *-from .mobject.value_tracker import *from .mobject.vector_field import *from .renderer.cairo_renderer import *from .scene.moving_camera_scene import *@@ -101,7 +105,6 @@ from .utils.images import *from .utils.iterables import *from .utils.paths import *from .utils.rate_functions import *-from .utils.scale import *from .utils.simple_functions import *from .utils.sounds import *from .utils.space_ops import *diff --git a/manim/_config/utils.py b/manim/_config/utils.pyindex cb5533507..823d1ad41 100644--- a/manim/_config/utils.py+++ b/manim/_config/utils.py@@ -1188,10 +1188,11 @@ class ManimConfig(MutableMapping):def renderer(self, val: str) -> None:"""Renderer for animations."""try:+ from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+ from manim.mobject.opengl.opengl_mobject import OpenGLMobject+ from manim.mobject.opengl.opengl_vectorized_mobject import OpenGLVMobject+from ..mobject.mobject import Mobject- from ..mobject.opengl_compatibility import ConvertToOpenGL- from ..mobject.opengl_mobject import OpenGLMobject- from ..mobject.types.opengl_vectorized_mobject import OpenGLVMobjectfrom ..mobject.types.vectorized_mobject import VMobjectfor cls in ConvertToOpenGL._converted_classes:diff --git a/manim/animation/animation.py b/manim/animation/animation.pyindex 86de9c346..039cc93ba 100644--- a/manim/animation/animation.py+++ b/manim/animation/animation.py@@ -3,10 +3,12 @@from __future__ import annotations+from manim.mobject.opengl.opengl_mobject import OpenGLMobject+from .. import config, logger-from ..mobject import mobject, opengl_mobject+from ..mobject import mobjectfrom ..mobject.mobject import Mobject-from ..mobject.opengl_mobject import OpenGLMobject+from ..mobject.opengl import opengl_mobjectfrom ..utils.rate_functions import smooth__all__ = ["Animation", "Wait", "override_animation"]diff --git a/manim/mobject/changing.py b/manim/animation/changing.pysimilarity index 94%rename from manim/mobject/changing.pyrename to manim/animation/changing.pyindex b5bb17215..501932e9f 100644--- a/manim/mobject/changing.py+++ b/manim/animation/changing.py@@ -8,11 +8,11 @@ from typing import Callablefrom colour import Color-from .._config import config-from ..mobject.types.vectorized_mobject import VGroup, VMobject-from ..utils.color import BLUE_B, BLUE_D, BLUE_E, GREY_BROWN, WHITE-from ..utils.rate_functions import smooth-from .opengl_compatibility import ConvertToOpenGL+from manim._config import config+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from manim.mobject.types.vectorized_mobject import VGroup, VMobject+from manim.utils.color import BLUE_B, BLUE_D, BLUE_E, GREY_BROWN, WHITE+from manim.utils.rate_functions import smoothclass AnimatedBoundary(VGroup):diff --git a/manim/animation/composition.py b/manim/animation/composition.pyindex c42f75d92..6a541c97c 100644--- a/manim/animation/composition.py+++ b/manim/animation/composition.py@@ -7,16 +7,18 @@ from typing import TYPE_CHECKING, Callable, Sequenceimport numpy as np+from manim.mobject.opengl.opengl_mobject import OpenGLGroup+from .._config import configfrom ..animation.animation import Animation, prepare_animationfrom ..mobject.mobject import Group, Mobject-from ..mobject.opengl_mobject import OpenGLGroupfrom ..scene.scene import Scenefrom ..utils.iterables import remove_list_redundanciesfrom ..utils.rate_functions import linearif TYPE_CHECKING:- from ..mobject.types.opengl_vectorized_mobject import OpenGLVGroup+ from manim.mobject.opengl.opengl_vectorized_mobject import OpenGLVGroup+from ..mobject.types.vectorized_mobject import VGroup__all__ = ["AnimationGroup", "Succession", "LaggedStart", "LaggedStartMap"]diff --git a/manim/animation/creation.py b/manim/animation/creation.pyindex 24a9938b9..7b413c97a 100644--- a/manim/animation/creation.py+++ b/manim/animation/creation.py@@ -1,5 +1,3 @@-from __future__ import annotations-r"""Animate the display or removal of a mobject from a scene... manim:: CreationModule@@ -57,6 +55,7 @@ r"""Animate the display or removal of a mobject from a scene."""+from __future__ import annotations__all__ = ["Create",@@ -79,13 +78,14 @@ import numpy as npfrom colour import Colorif TYPE_CHECKING:- from manim.mobject.svg.text_mobject import Text+ from manim.mobject.text.text_mobject import Text++from manim.mobject.opengl.opengl_surface import OpenGLSurface+from manim.mobject.opengl.opengl_vectorized_mobject import OpenGLVMobjectfrom ..animation.animation import Animationfrom ..animation.composition import Successionfrom ..mobject.mobject import Group, Mobject-from ..mobject.types.opengl_surface import OpenGLSurface-from ..mobject.types.opengl_vectorized_mobject import OpenGLVMobjectfrom ..mobject.types.vectorized_mobject import VMobjectfrom ..utils.bezier import integer_interpolatefrom ..utils.rate_functions import double_smooth, linear, smoothdiff --git a/manim/animation/fading.py b/manim/animation/fading.pyindex 03519fd19..33f38a502 100644--- a/manim/animation/fading.py+++ b/manim/animation/fading.py@@ -20,10 +20,9 @@ __all__ = ["FadeIn",]-import numpy as np-from manim.mobject.opengl_mobject import OpenGLMobject+from manim.mobject.opengl.opengl_mobject import OpenGLMobjectfrom ..animation.transform import Transformfrom ..constants import ORIGINdiff --git a/manim/animation/growing.py b/manim/animation/growing.pyindex 4011eb02b..d9f526c13 100644--- a/manim/animation/growing.py+++ b/manim/animation/growing.py@@ -40,7 +40,8 @@ from ..constants import PIfrom ..utils.paths import spiral_pathif typing.TYPE_CHECKING:- from ..mobject.geometry import Arrow+ from manim.mobject.geometry.line import Arrow+from ..mobject.mobject import Mobjectdiff --git a/manim/animation/indication.py b/manim/animation/indication.pyindex 8618e2126..55bf6b409 100644--- a/manim/animation/indication.py+++ b/manim/animation/indication.py@@ -42,6 +42,11 @@ from typing import Callable, Iterable, Optional, Tuple, Type, Unionimport numpy as npfrom colour import Color+from manim.mobject.geometry.arc import Circle, Dot+from manim.mobject.geometry.line import Line+from manim.mobject.geometry.polygram import Rectangle+from manim.mobject.geometry.shape_matchers import SurroundingRectangle+from .. import configfrom ..animation.animation import Animationfrom ..animation.composition import AnimationGroup, Succession@@ -50,9 +55,7 @@ from ..animation.fading import FadeIn, FadeOutfrom ..animation.movement import Homotopyfrom ..animation.transform import Transformfrom ..constants import *-from ..mobject.geometry import Circle, Dot, Line, Rectanglefrom ..mobject.mobject import Mobject-from ..mobject.shape_matchers import SurroundingRectanglefrom ..mobject.types.vectorized_mobject import VGroup, VMobjectfrom ..utils.bezier import interpolate, inverse_interpolatefrom ..utils.color import GREY, YELLOWdiff --git a/manim/animation/movement.py b/manim/animation/movement.pyindex 09d18f6f2..0eb78c711 100644--- a/manim/animation/movement.py+++ b/manim/animation/movement.py@@ -18,7 +18,7 @@ from ..animation.animation import Animationfrom ..utils.rate_functions import linearif TYPE_CHECKING:- from ..mobject.mobject import Mobject+ from ..mobject.mobject import Mobject, VMobjectclass Homotopy(Animation):diff --git a/manim/animation/numbers.py b/manim/animation/numbers.pyindex 814319613..86bfe7154 100644--- a/manim/animation/numbers.py+++ b/manim/animation/numbers.py@@ -7,8 +7,9 @@ __all__ = ["ChangingDecimal", "ChangeDecimalToValue"]import typing+from manim.mobject.text.numbers import DecimalNumber+from ..animation.animation import Animation-from ..mobject.numbers import DecimalNumberfrom ..utils.bezier import interpolatediff --git a/manim/animation/rotation.py b/manim/animation/rotation.pyindex 198159404..faff411c2 100644--- a/manim/animation/rotation.py+++ b/manim/animation/rotation.py@@ -4,8 +4,7 @@ from __future__ import annotations__all__ = ["Rotating", "Rotate"]-import typing-from typing import Callable, Sequence+from typing import TYPE_CHECKING, Callable, Sequenceimport numpy as np@@ -14,7 +13,7 @@ from ..animation.transform import Transformfrom ..constants import OUT, PI, TAUfrom ..utils.rate_functions import linear-if typing.TYPE_CHECKING:+if TYPE_CHECKING:from ..mobject.mobject import Mobjectdiff --git a/manim/animation/transform.py b/manim/animation/transform.pyindex e0de1aaad..22d2a65d1 100644--- a/manim/animation/transform.py+++ b/manim/animation/transform.py@@ -32,11 +32,12 @@ from typing import TYPE_CHECKING, Any, Callable, Iterable, Sequenceimport numpy as np+from manim.mobject.opengl.opengl_mobject import OpenGLGroup, OpenGLMobject+from .. import configfrom ..animation.animation import Animationfrom ..constants import DEFAULT_POINTWISE_FUNCTION_RUN_TIME, DEGREES, ORIGIN, OUTfrom ..mobject.mobject import Group, Mobject-from ..mobject.opengl_mobject import OpenGLGroup, OpenGLMobjectfrom ..utils.paths import path_along_arc, path_along_circlesfrom ..utils.rate_functions import smooth, squish_rate_funcdiff --git a/manim/animation/transform_matching_parts.py b/manim/animation/transform_matching_parts.pyindex c289d28ef..51f48fc12 100644--- a/manim/animation/transform_matching_parts.py+++ b/manim/animation/transform_matching_parts.py@@ -8,10 +8,11 @@ from typing import TYPE_CHECKINGimport numpy as np+from manim.mobject.opengl.opengl_mobject import OpenGLGroup, OpenGLMobject+from manim.mobject.opengl.opengl_vectorized_mobject import OpenGLVGroup, OpenGLVMobject+from .._config import configfrom ..mobject.mobject import Group, Mobject-from ..mobject.opengl_mobject import OpenGLGroup, OpenGLMobject-from ..mobject.types.opengl_vectorized_mobject import OpenGLVGroup, OpenGLVMobjectfrom ..mobject.types.vectorized_mobject import VGroup, VMobjectfrom .composition import AnimationGroupfrom .fading import FadeIn, FadeOutdiff --git a/manim/animation/updaters/__init__.py b/manim/animation/updaters/__init__.pynew file mode 100644index 000000000..e40db9a22--- /dev/null+++ b/manim/animation/updaters/__init__.py@@ -0,0 +1,12 @@+"""Animations and utility mobjects related to update functions.++Modules+=======++.. autosummary::+ :toctree: ../reference++ ~mobject_update_utils+ ~update+ ~value_tracker+"""diff --git a/manim/mobject/mobject_update_utils.py b/manim/animation/updaters/mobject_update_utils.pysimilarity index 97%rename from manim/mobject/mobject_update_utils.pyrename to manim/animation/updaters/mobject_update_utils.pyindex 099a112f9..c039b04b8 100644--- a/manim/mobject/mobject_update_utils.py+++ b/manim/animation/updaters/mobject_update_utils.py@@ -18,8 +18,8 @@ import inspectimport numpy as np-from ..constants import DEGREES, RIGHT-from ..mobject.mobject import Mobject+from manim.constants import DEGREES, RIGHT+from manim.mobject.mobject import Mobjectdef assert_is_mobject_method(method):diff --git a/manim/animation/update.py b/manim/animation/updaters/update.pysimilarity index 94%rename from manim/animation/update.pyrename to manim/animation/updaters/update.pyindex 268d1fa05..ded160cff 100644--- a/manim/animation/update.py+++ b/manim/animation/updaters/update.py@@ -8,10 +8,10 @@ __all__ = ["UpdateFromFunc", "UpdateFromAlphaFunc", "MaintainPositionRelativeTo"import operator as opimport typing-from ..animation.animation import Animation+from manim.animation.animation import Animationif typing.TYPE_CHECKING:- from ..mobject.mobject import Mobject+ from manim.mobject.mobject import Mobjectclass UpdateFromFunc(Animation):diff --git a/manim/mobject/value_tracker.py b/manim/animation/updaters/value_tracker.pysimilarity index 97%rename from manim/mobject/value_tracker.pyrename to manim/animation/updaters/value_tracker.pyindex 56a65c5d0..41e646d5b 100644--- a/manim/mobject/value_tracker.py+++ b/manim/animation/updaters/value_tracker.py@@ -7,9 +7,9 @@ __all__ = ["ValueTracker", "ComplexValueTracker"]import numpy as np-from ..mobject.mobject import Mobject-from ..utils.paths import straight_path-from .opengl_compatibility import ConvertToOpenGL+from manim.mobject.mobject import Mobject+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from manim.utils.paths import straight_pathclass ValueTracker(Mobject, metaclass=ConvertToOpenGL):diff --git a/manim/camera/three_d_camera.py b/manim/camera/three_d_camera.pyindex d54320207..bed85d80c 100644--- a/manim/camera/three_d_camera.py+++ b/manim/camera/three_d_camera.py@@ -7,17 +7,18 @@ __all__ = ["ThreeDCamera"]import numpy as np-from .. import config-from ..camera.camera import Camera-from ..constants import *-from ..mobject.three_d_utils import (+from manim.animation.updaters.value_tracker import ValueTracker+from manim.mobject.three_d.three_d_utils import (get_3d_vmob_end_corner,get_3d_vmob_end_corner_unit_normal,get_3d_vmob_start_corner,get_3d_vmob_start_corner_unit_normal,)++from .. import config+from ..camera.camera import Camera+from ..constants import *from ..mobject.types.point_cloud_mobject import Point-from ..mobject.value_tracker import ValueTrackerfrom ..utils.color import get_shaded_rgbfrom ..utils.family import extract_mobject_family_membersfrom ..utils.space_ops import rotation_about_z, rotation_matrixdiff --git a/manim/cli/render/global_options.py b/manim/cli/render/global_options.pyindex 422a57c11..b17e4671c 100644--- a/manim/cli/render/global_options.py+++ b/manim/cli/render/global_options.py@@ -1,12 +1,16 @@from __future__ import annotationsimport re+from typing import TYPE_CHECKINGimport clickfrom cloup import option, option_groupfrom ... import logger+if TYPE_CHECKING:+ from cloup._option_groups import OptionGroupDecorator+def validate_gui_location(ctx, param, value):if value:@@ -18,7 +22,7 @@ def validate_gui_location(ctx, param, value):exit()-global_options = option_group(+global_options: OptionGroupDecorator = option_group("Global options",option("-c",diff --git a/manim/grpc/impl/frame_server_impl.py b/manim/grpc/impl/frame_server_impl.pyindex 7acef3571..555c86e96 100644--- a/manim/grpc/impl/frame_server_impl.py+++ b/manim/grpc/impl/frame_server_impl.py@@ -8,11 +8,12 @@ from concurrent import futuresimport grpc+from manim.animation.updaters.value_tracker import ValueTracker+from ... import config, loggerfrom ...constants import WEBGL_RENDERER_INFOfrom ...mobject.types.image_mobject import ImageMobjectfrom ...mobject.types.vectorized_mobject import VMobject-from ...mobject.value_tracker import ValueTrackerfrom ...renderer.webgl_renderer import WebGLRendererfrom ...utils.family import extract_mobject_family_membersfrom ...utils.module_ops import scene_classes_from_filediff --git a/manim/mobject/frame.py b/manim/mobject/frame.pyindex 5b3e18e1a..b85464391 100644--- a/manim/mobject/frame.py+++ b/manim/mobject/frame.py@@ -8,8 +8,9 @@ __all__ = []+from manim.mobject.geometry.polygram import Rectangle+from .. import config-from ..mobject.geometry import Rectangleclass ScreenRectangle(Rectangle):diff --git a/manim/mobject/geometry.py b/manim/mobject/geometry.pydeleted file mode 100644index bc5d9b0cd..000000000--- a/manim/mobject/geometry.py+++ /dev/null@@ -1,3154 +0,0 @@-from __future__ import annotations--r"""Mobjects that are simple geometric shapes.--Examples-----------.. manim:: UsefulAnnotations- :save_last_frame:-- class UsefulAnnotations(Scene):- def construct(self):- m0 = Dot()- m1 = AnnotationDot()- m2 = LabeledDot("ii")- m3 = LabeledDot(MathTex(r"\alpha").set_color(ORANGE))- m4 = CurvedArrow(2*LEFT, 2*RIGHT, radius= -5)- m5 = CurvedArrow(2*LEFT, 2*RIGHT, radius= 8)- m6 = CurvedDoubleArrow(ORIGIN, 2*RIGHT)-- self.add(m0, m1, m2, m3, m4, m5, m6)- for i, mobj in enumerate(self.mobjects):- mobj.shift(DOWN * (i-3))--"""--__all__ = [- "TipableVMobject",- "Arc",- "ArcBetweenPoints",- "CurvedArrow",- "CurvedDoubleArrow",- "Circle",- "Dot",- "AnnotationDot",- "LabeledDot",- "Ellipse",- "AnnularSector",- "Sector",- "Annulus",- "Line",- "DashedLine",- "TangentLine",- "Elbow",- "Arrow",- "Vector",- "DoubleArrow",- "CubicBezier",- "Polygram",- "Polygon",- "RegularPolygram",- "RegularPolygon",- "Star",- "ArcPolygon",- "ArcPolygonFromArcs",- "Triangle",- "ArrowTip",- "Rectangle",- "Square",- "RoundedRectangle",- "Cutout",- "Angle",- "RightAngle",- "ArrowCircleFilledTip",- "ArrowCircleTip",- "ArrowSquareTip",- "ArrowSquareFilledTip",-]--import itertools-import math-import warnings-from typing import Iterable, Sequence--import numpy as np-from colour import Color--from manim.mobject.opengl_mobject import OpenGLMobject--from .. import config-from ..constants import *-from ..mobject.mobject import Mobject-from ..mobject.types.vectorized_mobject import DashedVMobject, VGroup, VMobject-from ..utils.color import *-from ..utils.iterables import adjacent_n_tuples, adjacent_pairs-from ..utils.space_ops import (- angle_between_vectors,- angle_of_vector,- cartesian_to_spherical,- line_intersection,- normalize,- perpendicular_bisector,- regular_vertices,- rotate_vector,-)-from .opengl_compatibility import ConvertToOpenGL---class TipableVMobject(VMobject, metaclass=ConvertToOpenGL):- """- Meant for shared functionality between Arc and Line.- Functionality can be classified broadly into these groups:-- * Adding, Creating, Modifying tips- - add_tip calls create_tip, before pushing the new tip- into the TipableVMobject's list of submobjects- - stylistic and positional configuration-- * Checking for tips- - Boolean checks for whether the TipableVMobject has a tip- and a starting tip-- * Getters- - Straightforward accessors, returning information pertaining- to the TipableVMobject instance's tip(s), its length etc-- """-- def __init__(- self,- tip_length=DEFAULT_ARROW_TIP_LENGTH,- normal_vector=OUT,- tip_style={},- **kwargs,- ):- self.tip_length = tip_length- self.normal_vector = normal_vector- self.tip_style = tip_style- super().__init__(**kwargs)-- # Adding, Creating, Modifying tips-- def add_tip(self, tip=None, tip_shape=None, tip_length=None, at_start=False):- """- Adds a tip to the TipableVMobject instance, recognising- that the endpoints might need to be switched if it's- a 'starting tip' or not.- """- if tip is None:- tip = self.create_tip(tip_shape, tip_length, at_start)- else:- self.position_tip(tip, at_start)- self.reset_endpoints_based_on_tip(tip, at_start)- self.asign_tip_attr(tip, at_start)- self.add(tip)- return self-- def create_tip(self, tip_shape=None, tip_length=None, at_start=False):- """- Stylises the tip, positions it spatially, and returns- the newly instantiated tip to the caller.- """- tip = self.get_unpositioned_tip(tip_shape, tip_length)- self.position_tip(tip, at_start)- return tip-- def get_unpositioned_tip(self, tip_shape=None, tip_length=None):- """- Returns a tip that has been stylistically configured,- but has not yet been given a position in space.- """- if tip_shape is None:- tip_shape = ArrowTriangleFilledTip- if tip_length is None:- tip_length = self.get_default_tip_length()- color = self.get_color()- style = {"fill_color": color, "stroke_color": color}- style.update(self.tip_style)- tip = tip_shape(length=tip_length, **style)- return tip-- def position_tip(self, tip, at_start=False):- # Last two control points, defining both- # the end, and the tangency direction- if at_start:- anchor = self.get_start()- handle = self.get_first_handle()- else:- handle = self.get_last_handle()- anchor = self.get_end()- angles = cartesian_to_spherical(handle - anchor)- tip.rotate(- angles[1] - PI - tip.tip_angle,- ) # Rotates the tip along the azimuthal- if not hasattr(self, "_init_positioning_axis"):- axis = [- np.sin(angles[1]),- -np.cos(angles[1]),- 0,- ] # Obtains the perpendicular of the tip- tip.rotate(- -angles[2] + PI / 2,- axis=axis,- ) # Rotates the tip along the vertical wrt the axis- self._init_positioning_axis = axis- tip.shift(anchor - tip.tip_point)- return tip-- def reset_endpoints_based_on_tip(self, tip, at_start):- if self.get_length() == 0:- # Zero length, put_start_and_end_on wouldn't work- return self-- if at_start:- self.put_start_and_end_on(tip.base, self.get_end())- else:- self.put_start_and_end_on(self.get_start(), tip.base)- return self-- def asign_tip_attr(self, tip, at_start):- if at_start:- self.start_tip = tip- else:- self.tip = tip- return self-- # Checking for tips-- def has_tip(self):- return hasattr(self, "tip") and self.tip in self-- def has_start_tip(self):- return hasattr(self, "start_tip") and self.start_tip in self-- # Getters-- def pop_tips(self):- start, end = self.get_start_and_end()- result = self.get_group_class()()- if self.has_tip():- result.add(self.tip)- self.remove(self.tip)- if self.has_start_tip():- result.add(self.start_tip)- self.remove(self.start_tip)- self.put_start_and_end_on(start, end)- return result-- def get_tips(self):- """- Returns a VGroup (collection of VMobjects) containing- the TipableVMObject instance's tips.- """- result = self.get_group_class()()- if hasattr(self, "tip"):- result.add(self.tip)- if hasattr(self, "start_tip"):- result.add(self.start_tip)- return result-- def get_tip(self):- """Returns the TipableVMobject instance's (first) tip,- otherwise throws an exception."""- tips = self.get_tips()- if len(tips) == 0:- raise Exception("tip not found")- else:- return tips[0]-- def get_default_tip_length(self):- return self.tip_length-- def get_first_handle(self):- return self.points[1]-- def get_last_handle(self):- return self.points[-2]-- def get_end(self):- if self.has_tip():- return self.tip.get_start()- else:- return super().get_end()-- def get_start(self):- if self.has_start_tip():- return self.start_tip.get_start()- else:- return super().get_start()-- def get_length(self):- start, end = self.get_start_and_end()- return np.linalg.norm(start - end)---class Arc(TipableVMobject):- """A circular arc.-- Examples- --------- A simple arc of angle Pi.-- .. manim:: ArcExample- :save_last_frame:-- class ArcExample(Scene):- def construct(self):- self.add(Arc(angle=PI))- """-- def __init__(- self,- radius: float = 1.0,- start_angle=0,- angle=TAU / 4,- num_components=9,- arc_center=ORIGIN,- **kwargs,- ):- if radius is None: # apparently None is passed by ArcBetweenPoints- radius = 1.0- self.radius = radius- self.num_components = num_components- self.arc_center = arc_center- self.start_angle = start_angle- self.angle = angle- self._failed_to_get_center = False- super().__init__(**kwargs)-- def generate_points(self):- self._set_pre_positioned_points()- self.scale(self.radius, about_point=ORIGIN)- self.shift(self.arc_center)-- # Points are set a bit differently when rendering via OpenGL.- # TODO: refactor Arc so that only one strategy for setting points- # has to be used.- def init_points(self):- self.set_points(- Arc._create_quadratic_bezier_points(- angle=self.angle,- start_angle=self.start_angle,- n_components=self.num_components,- ),- )- self.scale(self.radius, about_point=ORIGIN)- self.shift(self.arc_center)-- @staticmethod- def _create_quadratic_bezier_points(angle, start_angle=0, n_components=8):- samples = np.array(- [- [np.cos(a), np.sin(a), 0]- for a in np.linspace(- start_angle,- start_angle + angle,- 2 * n_components + 1,- )- ],- )- theta = angle / n_components- samples[1::2] /= np.cos(theta / 2)-- points = np.zeros((3 * n_components, 3))- points[0::3] = samples[0:-1:2]- points[1::3] = samples[1::2]- points[2::3] = samples[2::2]- return points-- def _set_pre_positioned_points(self):- anchors = np.array(- [- np.cos(a) * RIGHT + np.sin(a) * UP- for a in np.linspace(- self.start_angle,- self.start_angle + self.angle,- self.num_components,- )- ],- )- # Figure out which control points will give the- # Appropriate tangent lines to the circle- d_theta = self.angle / (self.num_components - 1.0)- tangent_vectors = np.zeros(anchors.shape)- # Rotate all 90 degrees, via (x, y) -> (-y, x)- tangent_vectors[:, 1] = anchors[:, 0]- tangent_vectors[:, 0] = -anchors[:, 1]- # Use tangent vectors to deduce anchors- handles1 = anchors[:-1] + (d_theta / 3) * tangent_vectors[:-1]- handles2 = anchors[1:] - (d_theta / 3) * tangent_vectors[1:]- self.set_anchors_and_handles(anchors[:-1], handles1, handles2, anchors[1:])-- def get_arc_center(self, warning=True):- """- Looks at the normals to the first two- anchors, and finds their intersection points- """- # First two anchors and handles- a1, h1, h2, a2 = self.points[:4]-- if np.all(a1 == a2):- # For a1 and a2 to lie at the same point arc radius- # must be zero. Thus arc_center will also lie at- # that point.- return a1- # Tangent vectors- t1 = h1 - a1- t2 = h2 - a2- # Normals- n1 = rotate_vector(t1, TAU / 4)- n2 = rotate_vector(t2, TAU / 4)- try:- return line_intersection(line1=(a1, a1 + n1), line2=(a2, a2 + n2))- except Exception:- if warning:- warnings.warn("Can't find Arc center, using ORIGIN instead")- self._failed_to_get_center = True- return np.array(ORIGIN)-- def move_arc_center_to(self, point):- self.shift(point - self.get_arc_center())- return self-- def stop_angle(self):- return angle_of_vector(self.points[-1] - self.get_arc_center()) % TAU---class ArcBetweenPoints(Arc):- """- Inherits from Arc and additionally takes 2 points between which the arc is spanned.-- Example- --------------------- .. manim:: ArcBetweenPointsExample-- class ArcBetweenPointsExample(Scene):- def construct(self):- circle = Circle(radius=2, stroke_color=GREY)- dot_1 = Dot(color=GREEN).move_to([2, 0, 0]).scale(0.5)- dot_1_text = Tex("(2,0)").scale(0.5).next_to(dot_1, RIGHT).set_color(BLUE)- dot_2 = Dot(color=GREEN).move_to([0, 2, 0]).scale(0.5)- dot_2_text = Tex("(0,2)").scale(0.5).next_to(dot_2, UP).set_color(BLUE)- arc= ArcBetweenPoints(start=2 * RIGHT, end=2 * UP, stroke_color=YELLOW)- self.add(circle, dot_1, dot_2, dot_1_text, dot_2_text)- self.play(Create(arc))- """-- def __init__(self, start, end, angle=TAU / 4, radius=None, **kwargs):- if radius is not None:- self.radius = radius- if radius < 0:- sign = -2- radius *= -1- else:- sign = 2- halfdist = np.linalg.norm(np.array(start) - np.array(end)) / 2- if radius < halfdist:- raise ValueError(- """ArcBetweenPoints called with a radius that is- smaller than half the distance between the points.""",- )- arc_height = radius - math.sqrt(radius**2 - halfdist**2)- angle = math.acos((radius - arc_height) / radius) * sign-- super().__init__(radius=radius, angle=angle, **kwargs)- if angle == 0:- self.set_points_as_corners([LEFT, RIGHT])- self.put_start_and_end_on(start, end)-- if radius is None:- center = self.get_arc_center(warning=False)- if not self._failed_to_get_center:- self.radius = np.linalg.norm(np.array(start) - np.array(center))- else:- self.radius = math.inf---class CurvedArrow(ArcBetweenPoints):- def __init__(self, start_point, end_point, **kwargs):- tip_shape = kwargs.pop("tip_shape", ArrowTriangleFilledTip)- super().__init__(start_point, end_point, **kwargs)- self.add_tip(tip_shape=tip_shape)---class CurvedDoubleArrow(CurvedArrow):- def __init__(self, start_point, end_point, **kwargs):- if "tip_shape_end" in kwargs:- kwargs["tip_shape"] = kwargs.pop("tip_shape_end")- tip_shape_start = kwargs.pop("tip_shape_start", ArrowTriangleFilledTip)- super().__init__(start_point, end_point, **kwargs)- self.add_tip(at_start=True, tip_shape=tip_shape_start)---class Circle(Arc):- """A circle.-- Parameters- ----------- color : :class:`~.Colors`, optional- The color of the shape.- kwargs : Any- Additional arguments to be passed to :class:`Arc`-- Examples- ---------- .. manim:: CircleExample- :save_last_frame:-- class CircleExample(Scene):- def construct(self):- circle_1 = Circle(radius=1.0)- circle_2 = Circle(radius=1.5, color=GREEN)- circle_3 = Circle(radius=1.0, color=BLUE_B, fill_opacity=1)-- circle_group = Group(circle_1, circle_2, circle_3).arrange(buff=1)- self.add(circle_group)- """-- def __init__(- self,- radius: float = None,- color=RED,- **kwargs,- ):- super().__init__(- radius=radius,- start_angle=0,- angle=TAU,- color=color,- **kwargs,- )-- def surround(self, mobject, dim_to_match=0, stretch=False, buffer_factor=1.2):- """Modifies a circle so that it surrounds a given mobject.-- Parameters- ----------- mobject : :class:`~.Mobject`- The mobject that the circle will be surrounding.- dim_to_match : :class:`int`, optional- buffer_factor : :class:`float`, optional- Scales the circle with respect to the mobject. A `buffer_factor` < 1 makes the circle smaller than the mobject.- stretch : :class:`bool`, optional- Stretches the circle to fit more tightly around the mobject. Note: Does not work with :class:`Line`-- Examples- ---------- .. manim:: CircleSurround- :save_last_frame:-- class CircleSurround(Scene):- def construct(self):- triangle1 = Triangle()- circle1 = Circle().surround(triangle1)- group1 = Group(triangle1,circle1) # treat the two mobjects as one-- line2 = Line()- circle2 = Circle().surround(line2, buffer_factor=2.0)- group2 = Group(line2,circle2)-- # buffer_factor < 1, so the circle is smaller than the square- square3 = Square()- circle3 = Circle().surround(square3, buffer_factor=0.5)- group3 = Group(square3, circle3)-- group = Group(group1, group2, group3).arrange(buff=1)- self.add(group)- """-- # Ignores dim_to_match and stretch; result will always be a circle- # TODO: Perhaps create an ellipse class to handle single-dimension stretching-- # Something goes wrong here when surrounding lines?- # TODO: Figure out and fix- self.replace(mobject, dim_to_match, stretch)-- self.width = np.sqrt(mobject.width**2 + mobject.height**2)- return self.scale(buffer_factor)-- def point_at_angle(self, angle):- """Returns the position of a point on the circle.-- Parameters- ----------- angle : class: `float`- The angle of the point along the circle in radians.-- Examples- ---------- .. manim:: PointAtAngleExample- :save_last_frame:-- class PointAtAngleExample(Scene):- def construct(self):- circle = Circle(radius=2.0)- p1 = circle.point_at_angle(PI/2)- p2 = circle.point_at_angle(270*DEGREES)-- s1 = Square(side_length=0.25).move_to(p1)- s2 = Square(side_length=0.25).move_to(p2)- self.add(circle, s1, s2)-- Returns- -------- :class:`numpy.ndarray`- The location of the point along the circle's circumference.- """-- start_angle = angle_of_vector(self.points[0] - self.get_center())- return self.point_from_proportion((angle - start_angle) / TAU)-- @staticmethod- def from_three_points(- p1: Sequence[float], p2: Sequence[float], p3: Sequence[float], **kwargs- ):- """Returns a circle passing through the specified- three points.-- Example- --------- .. manim:: CircleFromPointsExample- :save_last_frame:-- class CircleFromPointsExample(Scene):- def construct(self):- circle = Circle.from_three_points(LEFT, LEFT + UP, UP * 2, color=RED)- dots = VGroup(- Dot(LEFT),- Dot(LEFT + UP),- Dot(UP * 2),- )- self.add(NumberPlane(), circle, dots)- """- center = line_intersection(- perpendicular_bisector([p1, p2]),- perpendicular_bisector([p2, p3]),- )- radius = np.linalg.norm(p1 - center)- return Circle(radius=radius, **kwargs).shift(center)---class Dot(Circle):- """A circle with a very small radius.-- Parameters- ----------- point : Union[:class:`list`, :class:`numpy.ndarray`], optional- The location of the dot.- radius : Optional[:class:`float`]- The radius of the dot.- stroke_width : :class:`float`, optional- The thickness of the outline of the dot.- fill_opacity : :class:`float`, optional- The opacity of the dot's fill_colour- color : :class:`~.Colors`, optional- The color of the dot.- kwargs : Any- Additional arguments to be passed to :class:`Circle`-- Examples- ---------- .. manim:: DotExample- :save_last_frame:-- class DotExample(Scene):- def construct(self):- dot1 = Dot(point=LEFT, radius=0.08)- dot2 = Dot(point=ORIGIN)- dot3 = Dot(point=RIGHT)- self.add(dot1,dot2,dot3)- """-- def __init__(- self,- point=ORIGIN,- radius: float = DEFAULT_DOT_RADIUS,- stroke_width=0,- fill_opacity=1.0,- color=WHITE,- **kwargs,- ):- super().__init__(- arc_center=point,- radius=radius,- stroke_width=stroke_width,- fill_opacity=fill_opacity,- color=color,- **kwargs,- )---class AnnotationDot(Dot):- """- A dot with bigger radius and bold stroke to annotate scenes.- """-- def __init__(- self,- radius: float = DEFAULT_DOT_RADIUS * 1.3,- stroke_width=5,- stroke_color=WHITE,- fill_color=BLUE,- **kwargs,- ):- super().__init__(- radius=radius,- stroke_width=stroke_width,- stroke_color=stroke_color,- fill_color=fill_color,- **kwargs,- )---class LabeledDot(Dot):- """A :class:`Dot` containing a label in its center.-- Parameters- ----------- label : Union[:class:`str`, :class:`~.SingleStringMathTex`, :class:`~.Text`, :class:`~.Tex`]- The label of the :class:`Dot`. This is rendered as :class:`~.MathTex`- by default (i.e., when passing a :class:`str`), but other classes- representing rendered strings like :class:`~.Text` or :class:`~.Tex`- can be passed as well.-- radius : :class:`float`- The radius of the :class:`Dot`. If ``None`` (the default), the radius- is calculated based on the size of the ``label``.-- Examples- ---------- .. manim:: SeveralLabeledDots- :save_last_frame:-- class SeveralLabeledDots(Scene):- def construct(self):- sq = Square(fill_color=RED, fill_opacity=1)- self.add(sq)- dot1 = LabeledDot(Tex("42", color=RED))- dot2 = LabeledDot(MathTex("a", color=GREEN))- dot3 = LabeledDot(Text("ii", color=BLUE))- dot4 = LabeledDot("3")- dot1.next_to(sq, UL)- dot2.next_to(sq, UR)- dot3.next_to(sq, DL)- dot4.next_to(sq, DR)- self.add(dot1, dot2, dot3, dot4)- """-- def __init__(self, label, radius=None, **kwargs) -> None:- if isinstance(label, str):- from manim import MathTex-- rendered_label = MathTex(label, color=BLACK)- else:- rendered_label = label-- if radius is None:- radius = 0.1 + max(rendered_label.width, rendered_label.height) / 2- super().__init__(radius=radius, **kwargs)- rendered_label.move_to(self.get_center())- self.add(rendered_label)---class Ellipse(Circle):- """A circular shape; oval, circle.-- Parameters- ----------- width : :class:`float`, optional- The horizontal width of the ellipse.- height : :class:`float`, optional- The vertical height of the ellipse.- kwargs : Any- Additional arguments to be passed to :class:`Circle`-- Examples- ---------- .. manim:: EllipseExample- :save_last_frame:-- class EllipseExample(Scene):- def construct(self):- ellipse_1 = Ellipse(width=2.0, height=4.0, color=BLUE_B)- ellipse_2 = Ellipse(width=4.0, height=1.0, color=BLUE_D)- ellipse_group = Group(ellipse_1,ellipse_2).arrange(buff=1)- self.add(ellipse_group)- """-- def __init__(self, width=2, height=1, **kwargs):- super().__init__(**kwargs)- self.stretch_to_fit_width(width)- self.stretch_to_fit_height(height)---class AnnularSector(Arc):- """-- Parameters- ----------- inner_radius- The inside radius of the Annular Sector.- outer_radius- The outside radius of the Annular Sector.- angle- The clockwise angle of the Annular Sector.- start_angle- The starting clockwise angle of the Annular Sector.- fill_opacity- The opacity of the color filled in the Annular Sector.- stroke_width- The stroke width of the Annular Sector.- color- The color filled into the Annular Sector.-- Examples- --------- .. manim:: AnnularSectorExample- :save_last_frame:-- class AnnularSectorExample(Scene):- def construct(self):- # Changes background color to clearly visualize changes in fill_opacity.- self.camera.background_color = WHITE-- # The default parameter start_angle is 0, so the AnnularSector starts from the +x-axis.- s1 = AnnularSector(color=YELLOW).move_to(2 * UL)-- # Different inner_radius and outer_radius than the default.- s2 = AnnularSector(inner_radius=1.5, outer_radius=2, angle=45 * DEGREES, color=RED).move_to(2 * UR)-- # fill_opacity is typically a number > 0 and <= 1. If fill_opacity=0, the AnnularSector is transparent.- s3 = AnnularSector(inner_radius=1, outer_radius=1.5, angle=PI, fill_opacity=0.25, color=BLUE).move_to(2 * DL)-- # With a negative value for the angle, the AnnularSector is drawn clockwise from the start value.- s4 = AnnularSector(inner_radius=1, outer_radius=1.5, angle=-3 * PI / 2, color=GREEN).move_to(2 * DR)-- self.add(s1, s2, s3, s4)--- """-- def __init__(- self,- inner_radius=1,- outer_radius=2,- angle=TAU / 4,- start_angle=0,- fill_opacity=1,- stroke_width=0,- color=WHITE,- **kwargs,- ):- self.inner_radius = inner_radius- self.outer_radius = outer_radius- super().__init__(- start_angle=start_angle,- angle=angle,- fill_opacity=fill_opacity,- stroke_width=stroke_width,- color=color,- **kwargs,- )-- def generate_points(self):- inner_arc, outer_arc = (- Arc(- start_angle=self.start_angle,- angle=self.angle,- radius=radius,- arc_center=self.arc_center,- )- for radius in (self.inner_radius, self.outer_radius)- )- outer_arc.reverse_points()- self.append_points(inner_arc.points)- self.add_line_to(outer_arc.points[0])- self.append_points(outer_arc.points)- self.add_line_to(inner_arc.points[0])-- init_points = generate_points---class Sector(AnnularSector):- """-- Examples- ---------- .. manim:: ExampleSector- :save_last_frame:-- class ExampleSector(Scene):- def construct(self):- sector = Sector(outer_radius=2, inner_radius=1)- sector2 = Sector(outer_radius=2.5, inner_radius=0.8).move_to([-3, 0, 0])- sector.set_color(RED)- sector2.set_color(PINK)- self.add(sector, sector2)- """-- def __init__(self, outer_radius=1, inner_radius=0, **kwargs):- super().__init__(inner_radius=inner_radius, outer_radius=outer_radius, **kwargs)---class Annulus(Circle):- """Region between two concentric :class:`Circles <.Circle>`.-- Parameters- ----------- inner_radius- The radius of the inner :class:`Circle`.- outer_radius- The radius of the outer :class:`Circle`.- kwargs : Any- Additional arguments to be passed to :class:`Annulus`-- Examples- ---------- .. manim:: AnnulusExample- :save_last_frame:-- class AnnulusExample(Scene):- def construct(self):- annulus_1 = Annulus(inner_radius=0.5, outer_radius=1).shift(UP)- annulus_2 = Annulus(inner_radius=0.3, outer_radius=0.6, color=RED).next_to(annulus_1, DOWN)- self.add(annulus_1, annulus_2)- """-- def __init__(- self,- inner_radius: float | None = 1,- outer_radius: float | None = 2,- fill_opacity=1,- stroke_width=0,- color=WHITE,- mark_paths_closed=False,- **kwargs,- ):- self.mark_paths_closed = mark_paths_closed # is this even used?- self.inner_radius = inner_radius- self.outer_radius = outer_radius- super().__init__(- fill_opacity=fill_opacity, stroke_width=stroke_width, color=color, **kwargs- )-- def generate_points(self):- self.radius = self.outer_radius- outer_circle = Circle(radius=self.outer_radius)- inner_circle = Circle(radius=self.inner_radius)- inner_circle.reverse_points()- self.append_points(outer_circle.points)- self.append_points(inner_circle.points)- self.shift(self.arc_center)-- init_points = generate_points---class Line(TipableVMobject):- def __init__(self, start=LEFT, end=RIGHT, buff=0, path_arc=None, **kwargs):- self.dim = 3- self.buff = buff- self.path_arc = path_arc- self._set_start_and_end_attrs(start, end)- super().__init__(**kwargs)-- def generate_points(self):- self.set_points_by_ends(- start=self.start,- end=self.end,- buff=self.buff,- path_arc=self.path_arc,- )-- def set_points_by_ends(self, start, end, buff=0, path_arc=0):- if path_arc:- arc = ArcBetweenPoints(self.start, self.end, angle=self.path_arc)- self.set_points(arc.points)- else:- self.set_points_as_corners([start, end])-- self._account_for_buff(buff)-- init_points = generate_points-- def _account_for_buff(self, buff):- if buff == 0:- return- #- if self.path_arc == 0:- length = self.get_length()- else:- length = self.get_arc_length()- #- if length < 2 * buff:- return- buff_proportion = buff / length- self.pointwise_become_partial(self, buff_proportion, 1 - buff_proportion)- return self-- def _set_start_and_end_attrs(self, start, end):- # If either start or end are Mobjects, this- # gives their centers- rough_start = self._pointify(start)- rough_end = self._pointify(end)- vect = normalize(rough_end - rough_start)- # Now that we know the direction between them,- # we can find the appropriate boundary point from- # start and end, if they're mobjects- self.start = self._pointify(start, vect)- self.end = self._pointify(end, -vect)-- def _pointify(- self,- mob_or_point: Mobject | Sequence[float],- direction: Sequence[float] | None = None,- ) -> np.ndarray:- """Transforms a mobject into its corresponding point. Does nothing if a point is passed.-- ``direction`` determines the location of the point along its bounding box in that direction.-- Parameters- ----------- mob_or_point- The mobject or point.- direction- The direction.- """- if isinstance(mob_or_point, (Mobject, OpenGLMobject)):- mob = mob_or_point- if direction is None:- return mob.get_center()- else:- return mob.get_boundary_point(direction)- return np.array(mob_or_point)-- def set_path_arc(self, new_value):- self.path_arc = new_value- self.init_points()-- def put_start_and_end_on(self, start: Sequence[float], end: Sequence[float]):- """Sets starts and end coordinates of a line.- Examples- --------- .. manim:: LineExample-- class LineExample(Scene):- def construct(self):- d = VGroup()- for i in range(0,10):- d.add(Dot())- d.arrange_in_grid(buff=1)- self.add(d)- l= Line(d[0], d[1])- self.add(l)- self.wait()- l.put_start_and_end_on(d[1].get_center(), d[2].get_center())- self.wait()- l.put_start_and_end_on(d[4].get_center(), d[7].get_center())- self.wait()- """- curr_start, curr_end = self.get_start_and_end()- if np.all(curr_start == curr_end):- # TODO, any problems with resetting- # these attrs?- self.start = start- self.end = end- self.generate_points()- return super().put_start_and_end_on(start, end)-- def get_vector(self):- return self.get_end() - self.get_start()-- def get_unit_vector(self):- return normalize(self.get_vector())-- def get_angle(self):- return angle_of_vector(self.get_vector())-- def get_projection(self, point: Sequence[float]) -> Sequence[float]:- """Returns the projection of a point onto a line.-- Parameters- ----------- point- The point to which the line is projected.-- """-- start = self.get_start()- end = self.get_end()- unit_vect = normalize(end - start)- return start + np.dot(point - start, unit_vect) * unit_vect-- def get_slope(self):- return np.tan(self.get_angle())-- def set_angle(self, angle, about_point=None):- if about_point is None:- about_point = self.get_start()-- self.rotate(- angle - self.get_angle(),- about_point=about_point,- )-- return self-- def set_length(self, length):- return self.scale(length / self.get_length())---class DashedLine(Line):- """A dashed :class:`Line`.-- Parameters- ----------- args : Any- Arguments to be passed to :class:`Line`- dash_length : :class:`float`, optional- The length of each individual dash of the line.- dashed_ratio : :class:`float`, optional- The ratio of dash space to empty space. Range of 0-1.- kwargs : Any- Additional arguments to be passed to :class:`Line`-- Examples- --------- .. manim:: DashedLineExample- :save_last_frame:-- class DashedLineExample(Scene):- def construct(self):- # dash_length increased- dashed_1 = DashedLine(config.left_side, config.right_side, dash_length=2.0).shift(UP*2)- # normal- dashed_2 = DashedLine(config.left_side, config.right_side)- # dashed_ratio decreased- dashed_3 = DashedLine(config.left_side, config.right_side, dashed_ratio=0.1).shift(DOWN*2)- self.add(dashed_1, dashed_2, dashed_3)-- See Also- --------- :class:`~.DashedVMobject`- """-- def __init__(- self,- *args,- dash_length=DEFAULT_DASH_LENGTH,- dashed_ratio=0.5,- **kwargs,- ):- self.dash_length = dash_length- self.dashed_ratio = dashed_ratio- super().__init__(*args, **kwargs)- dashes = DashedVMobject(- self,- num_dashes=self._calculate_num_dashes(),- dashed_ratio=dashed_ratio,- )- self.clear_points()- self.add(*dashes)-- def _calculate_num_dashes(self) -> int:- """Returns the number of dashes in the dashed line.-- Examples- --------- ::-- >>> DashedLine()._calculate_num_dashes()- 20- """-- # Minimum number of dashes has to be 2- return max(- 2,- int(np.ceil((self.get_length() / self.dash_length) * self.dashed_ratio)),- )-- def get_start(self) -> np.ndarray:- """Returns the start point of the line.-- Examples- --------- ::-- >>> DashedLine().get_start()- array([-1., 0., 0.])- """-- if len(self.submobjects) > 0:- return self.submobjects[0].get_start()- else:- return super().get_start()-- def get_end(self) -> np.ndarray:- """Returns the end point of the line.-- Examples- --------- ::-- >>> DashedLine().get_end()- array([1., 0., 0.])- """-- if len(self.submobjects) > 0:- return self.submobjects[-1].get_end()- else:- return super().get_end()-- def get_first_handle(self) -> np.ndarray:- """Returns the point of the first handle.-- Examples- --------- ::-- >>> DashedLine().get_first_handle()- array([-0.98333333, 0. , 0. ])- """-- return self.submobjects[0].points[1]-- def get_last_handle(self) -> np.ndarray:- """Returns the point of the last handle.-- Examples- --------- ::-- >>> DashedLine().get_last_handle()- array([0.98333333, 0. , 0. ])- """-- return self.submobjects[-1].points[-2]---class TangentLine(Line):- """Constructs a line tangent to a :class:`~.VMobject` at a specific point.-- Parameters- ----------- vmob : :class:`~.VMobject`- The VMobject on which the tangent line is drawn.- alpha : :class:`float`- How far along the shape that the line will be constructed. range: 0-1.- length : :class:`float`, optional- Length of the tangent line.- d_alpha: :class:`float`, optional- The ``dx`` value- kwargs : Any- Additional arguments to be passed to :class:`Line`-- Examples- ---------- .. manim:: TangentLineExample- :save_last_frame:-- class TangentLineExample(Scene):- def construct(self):- circle = Circle(radius=2)- line_1 = TangentLine(circle, alpha=0.0, length=4, color=BLUE_D) # right- line_2 = TangentLine(circle, alpha=0.4, length=4, color=GREEN) # top left- self.add(circle, line_1, line_2)-- See Also- --------- :meth:`~.VMobject.point_from_proportion`- """-- def __init__(self, vmob, alpha, length=1, d_alpha=1e-6, **kwargs):- self.length = length- self.d_alpha = d_alpha- da = self.d_alpha- a1 = np.clip(alpha - da, 0, 1)- a2 = np.clip(alpha + da, 0, 1)- super().__init__(- vmob.point_from_proportion(a1), vmob.point_from_proportion(a2), **kwargs- )- self.scale(self.length / self.get_length())---class Elbow(VMobject, metaclass=ConvertToOpenGL):- """Two lines that create a right angle about each other: L-shape.-- Parameters- ----------- width : :class:`float`, optional- The length of the elbow's sides.- angle : :class:`float`, optional- The rotation of the elbow.- kwargs : Any- Additional arguments to be passed to :class:`~.VMobject`-- Examples- ---------- .. manim:: ElbowExample- :save_last_frame:-- class ElbowExample(Scene):- def construct(self):- elbow_1 = Elbow()- elbow_2 = Elbow(width=2.0)- elbow_3 = Elbow(width=2.0, angle=5*PI/4)-- elbow_group = Group(elbow_1, elbow_2, elbow_3).arrange(buff=1)- self.add(elbow_group)-- See Also- --------- :class:`RightAngle`- """-- def __init__(self, width=0.2, angle=0, **kwargs):- self.angle = angle- super().__init__(**kwargs)- self.set_points_as_corners([UP, UP + RIGHT, RIGHT])- self.scale_to_fit_width(width, about_point=ORIGIN)- self.rotate(self.angle, about_point=ORIGIN)---class Arrow(Line):- """An arrow.-- Parameters- ----------- args : Any- Arguments to be passed to :class:`Line`.- stroke_width : :class:`float`, optional- The thickness of the arrow. Influenced by :attr:`max_stroke_width_to_length_ratio`.- buff : :class:`float`, optional- The distance of the arrow from its start and end points.- max_tip_length_to_length_ratio : :class:`float`, optional- :attr:`tip_length` scales with the length of the arrow. Increasing this ratio raises the max value of :attr:`tip_length`.- max_stroke_width_to_length_ratio : :class:`float`, optional- :attr:`stroke_width` scales with the length of the arrow. Increasing this ratio ratios the max value of :attr:`stroke_width`.- kwargs : Any- Additional arguments to be passed to :class:`Line`.-- Examples- ---------- .. manim:: ArrowExample- :save_last_frame:-- from manim.mobject.geometry import ArrowSquareTip- class ArrowExample(Scene):- def construct(self):- arrow_1 = Arrow(start=RIGHT, end=LEFT, color=GOLD)- arrow_2 = Arrow(start=RIGHT, end=LEFT, color=GOLD, tip_shape=ArrowSquareTip).shift(DOWN)- g1 = Group(arrow_1, arrow_2)-- # the effect of buff- square = Square(color=MAROON_A)- arrow_3 = Arrow(start=LEFT, end=RIGHT)- arrow_4 = Arrow(start=LEFT, end=RIGHT, buff=0).next_to(arrow_1, UP)- g2 = Group(arrow_3, arrow_4, square)-- # a shorter arrow has a shorter tip and smaller stroke width- arrow_5 = Arrow(start=ORIGIN, end=config.top).shift(LEFT * 4)- arrow_6 = Arrow(start=config.top + DOWN, end=config.top).shift(LEFT * 3)- g3 = Group(arrow_5, arrow_6)-- self.add(Group(g1, g2, g3).arrange(buff=2))--- .. manim:: ArrowExample- :save_last_frame:-- class ArrowExample(Scene):- def construct(self):- left_group = VGroup()- # As buff increases, the size of the arrow decreases.- for buff in np.arange(0, 2.2, 0.45):- left_group += Arrow(buff=buff, start=2 * LEFT, end=2 * RIGHT)- # Required to arrange arrows.- left_group.arrange(DOWN)- left_group.move_to(4 * LEFT)-- middle_group = VGroup()- # As max_stroke_width_to_length_ratio gets bigger,- # the width of stroke increases.- for i in np.arange(0, 5, 0.5):- middle_group += Arrow(max_stroke_width_to_length_ratio=i)- middle_group.arrange(DOWN)-- UR_group = VGroup()- # As max_tip_length_to_length_ratio increases,- # the length of the tip increases.- for i in np.arange(0, 0.3, 0.1):- UR_group += Arrow(max_tip_length_to_length_ratio=i)- UR_group.arrange(DOWN)- UR_group.move_to(4 * RIGHT + 2 * UP)-- DR_group = VGroup()- DR_group += Arrow(start=LEFT, end=RIGHT, color=BLUE, tip_shape=ArrowSquareTip)- DR_group += Arrow(start=LEFT, end=RIGHT, color=BLUE, tip_shape=ArrowSquareFilledTip)- DR_group += Arrow(start=LEFT, end=RIGHT, color=YELLOW, tip_shape=ArrowCircleTip)- DR_group += Arrow(start=LEFT, end=RIGHT, color=YELLOW, tip_shape=ArrowCircleFilledTip)- DR_group.arrange(DOWN)- DR_group.move_to(4 * RIGHT + 2 * DOWN)-- self.add(left_group, middle_group, UR_group, DR_group)--- See Also- --------- :class:`ArrowTip`- :class:`CurvedArrow`- """-- def __init__(- self,- *args,- stroke_width=6,- buff=MED_SMALL_BUFF,- max_tip_length_to_length_ratio=0.25,- max_stroke_width_to_length_ratio=5,- **kwargs,- ):- self.max_tip_length_to_length_ratio = max_tip_length_to_length_ratio- self.max_stroke_width_to_length_ratio = max_stroke_width_to_length_ratio- tip_shape = kwargs.pop("tip_shape", ArrowTriangleFilledTip)- super().__init__(*args, buff=buff, stroke_width=stroke_width, **kwargs)- # TODO, should this be affected when- # Arrow.set_stroke is called?- self.initial_stroke_width = self.stroke_width- self.add_tip(tip_shape=tip_shape)- self._set_stroke_width_from_length()-- def scale(self, factor, scale_tips=False, **kwargs):- r"""Scale an arrow, but keep stroke width and arrow tip size fixed.-- See Also- --------- :meth:`~.Mobject.scale`-- Examples- --------- ::-- >>> arrow = Arrow(np.array([-1, -1, 0]), np.array([1, 1, 0]), buff=0)- >>> scaled_arrow = arrow.scale(2)- >>> np.round(scaled_arrow.get_start_and_end(), 8) + 0- array([[-2., -2., 0.],- [ 2., 2., 0.]])- >>> arrow.tip.length == scaled_arrow.tip.length- True-- Manually scaling the object using the default method- :meth:`~.Mobject.scale` does not have the same properties::-- >>> new_arrow = Arrow(np.array([-1, -1, 0]), np.array([1, 1, 0]), buff=0)- >>> another_scaled_arrow = VMobject.scale(new_arrow, 2)- >>> another_scaled_arrow.tip.length == arrow.tip.length- False-- """- if self.get_length() == 0:- return self-- if scale_tips:- super().scale(factor, **kwargs)- self._set_stroke_width_from_length()- return self-- has_tip = self.has_tip()- has_start_tip = self.has_start_tip()- if has_tip or has_start_tip:- old_tips = self.pop_tips()-- super().scale(factor, **kwargs)- self._set_stroke_width_from_length()-- if has_tip:- self.add_tip(tip=old_tips[0])- if has_start_tip:- self.add_tip(tip=old_tips[1], at_start=True)- return self-- def get_normal_vector(self) -> np.ndarray:- """Returns the normal of a vector.-- Examples- --------- ::-- >>> np.round(Arrow().get_normal_vector()) + 0. # add 0. to avoid negative 0 in output- array([ 0., 0., -1.])- """-- p0, p1, p2 = self.tip.get_start_anchors()[:3]- return normalize(np.cross(p2 - p1, p1 - p0))-- def reset_normal_vector(self):- """Resets the normal of a vector"""- self.normal_vector = self.get_normal_vector()- return self-- def get_default_tip_length(self) -> float:- """Returns the default tip_length of the arrow.-- Examples- ---------- ::-- >>> Arrow().get_default_tip_length()- 0.35- """-- max_ratio = self.max_tip_length_to_length_ratio- return min(self.tip_length, max_ratio * self.get_length())-- def _set_stroke_width_from_length(self):- """Sets stroke width based on length."""- max_ratio = self.max_stroke_width_to_length_ratio- if config.renderer == "opengl":- self.set_stroke(- width=min(self.initial_stroke_width, max_ratio * self.get_length()),- recurse=False,- )- else:- self.set_stroke(- width=min(self.initial_stroke_width, max_ratio * self.get_length()),- family=False,- )- return self---class Vector(Arrow):- """A vector specialized for use in graphs.-- Parameters- ----------- direction : Union[:class:`list`, :class:`numpy.ndarray`]- The direction of the arrow.- buff : :class:`float`- The distance of the vector from its endpoints.- kwargs : Any- Additional arguments to be passed to :class:`Arrow`-- Examples- ---------- .. manim:: VectorExample- :save_last_frame:-- class VectorExample(Scene):- def construct(self):- plane = NumberPlane()- vector_1 = Vector([1,2])- vector_2 = Vector([-5,-2])- self.add(plane, vector_1, vector_2)- """-- def __init__(self, direction=RIGHT, buff=0, **kwargs):- self.buff = buff- if len(direction) == 2:- direction = np.hstack([direction, 0])-- super().__init__(ORIGIN, direction, buff=buff, **kwargs)-- def coordinate_label(- self,- integer_labels: bool = True,- n_dim: int = 2,- color: Color | None = None,- **kwargs,- ):- """Creates a label based on the coordinates of the vector.-- Parameters- ----------- integer_labels- Whether or not to round the coordinates to integers.- n_dim- The number of dimensions of the vector.- color- Sets the color of label, optional.- kwargs- Additional arguments to be passed to :class:`~.Matrix`.-- Examples- ---------- .. manim:: VectorCoordinateLabel- :save_last_frame:-- class VectorCoordinateLabel(Scene):- def construct(self):- plane = NumberPlane()-- vec_1 = Vector([1, 2])- vec_2 = Vector([-3, -2])- label_1 = vec_1.coordinate_label()- label_2 = vec_2.coordinate_label(color=YELLOW)-- self.add(plane, vec_1, vec_2, label_1, label_2)-- Returns- -------- :class:`~.Matrix`- The label.- """-- # avoiding circular imports- from .matrix import Matrix-- vect = np.array(self.get_end())- if integer_labels:- vect = np.round(vect).astype(int)- vect = vect[:n_dim]- vect = vect.reshape((n_dim, 1))- label = Matrix(vect, **kwargs)- label.scale(LARGE_BUFF - 0.2)-- shift_dir = np.array(self.get_end())- if shift_dir[0] >= 0: # Pointing right- shift_dir -= label.get_left() + DEFAULT_MOBJECT_TO_MOBJECT_BUFFER * LEFT- else: # Pointing left- shift_dir -= label.get_right() + DEFAULT_MOBJECT_TO_MOBJECT_BUFFER * RIGHT- label.shift(shift_dir)- if color is not None:- label.set_color(color)- return label---class DoubleArrow(Arrow):- """An arrow with tips on both ends.-- Parameters- ----------- args : Any- Arguments to be passed to :class:`Arrow`- kwargs : Any- Additional arguments to be passed to :class:`Arrow`-- Examples- ---------- .. manim:: DoubleArrowExample- :save_last_frame:-- from manim.mobject.geometry import ArrowCircleFilledTip- class DoubleArrowExample(Scene):- def construct(self):- circle = Circle(radius=2.0)- d_arrow = DoubleArrow(start=circle.get_left(), end=circle.get_right())- d_arrow_2 = DoubleArrow(tip_shape_end=ArrowCircleFilledTip, tip_shape_start=ArrowCircleFilledTip)- group = Group(Group(circle, d_arrow), d_arrow_2).arrange(UP, buff=1)- self.add(group)--- .. manim:: DoubleArrowExample2- :save_last_frame:-- class DoubleArrowExample2(Scene):- def construct(self):- box = Square()- p1 = box.get_left()- p2 = box.get_right()- d1 = DoubleArrow(p1, p2, buff=0)- d2 = DoubleArrow(p1, p2, buff=0, tip_length=0.2, color=YELLOW)- d3 = DoubleArrow(p1, p2, buff=0, tip_length=0.4, color=BLUE)- Group(d1, d2, d3).arrange(DOWN)- self.add(box, d1, d2, d3)-- See Also- --------- :class:`ArrowTip`- :class:`CurvedDoubleArrow`- """-- def __init__(self, *args, **kwargs):- if "tip_shape_end" in kwargs:- kwargs["tip_shape"] = kwargs.pop("tip_shape_end")- tip_shape_start = kwargs.pop("tip_shape_start", ArrowTriangleFilledTip)- super().__init__(*args, **kwargs)- self.add_tip(at_start=True, tip_shape=tip_shape_start)---class CubicBezier(VMobject, metaclass=ConvertToOpenGL):- """- Example- --------- .. manim:: BezierSplineExample- :save_last_frame:-- class BezierSplineExample(Scene):- def construct(self):- p1 = np.array([-3, 1, 0])- p1b = p1 + [1, 0, 0]- d1 = Dot(point=p1).set_color(BLUE)- l1 = Line(p1, p1b)- p2 = np.array([3, -1, 0])- p2b = p2 - [1, 0, 0]- d2 = Dot(point=p2).set_color(RED)- l2 = Line(p2, p2b)- bezier = CubicBezier(p1b, p1b + 3 * RIGHT, p2b - 3 * RIGHT, p2b)- self.add(l1, d1, l2, d2, bezier)-- """-- def __init__(self, start_anchor, start_handle, end_handle, end_anchor, **kwargs):- super().__init__(**kwargs)- self.add_cubic_bezier_curve(start_anchor, start_handle, end_handle, end_anchor)---class Polygram(VMobject, metaclass=ConvertToOpenGL):- """A generalized :class:`Polygon`, allowing for disconnected sets of edges.-- Parameters- ----------- vertex_groups- The groups of vertices making up the :class:`Polygram`.-- The first vertex in each group is repeated to close the shape.- Each point must be 3-dimensional: ``[x,y,z]``- color- The color of the :class:`Polygram`.- kwargs- Forwarded to the parent constructor.-- Examples- --------- .. manim:: PolygramExample-- import numpy as np-- class PolygramExample(Scene):- def construct(self):- hexagram = Polygram(- [[0, 2, 0], [-np.sqrt(3), -1, 0], [np.sqrt(3), -1, 0]],- [[-np.sqrt(3), 1, 0], [0, -2, 0], [np.sqrt(3), 1, 0]],- )- self.add(hexagram)-- dot = Dot()- self.play(MoveAlongPath(dot, hexagram), run_time=5, rate_func=linear)- self.remove(dot)- self.wait()--- """-- def __init__(self, *vertex_groups: Iterable[Sequence[float]], color=BLUE, **kwargs):- super().__init__(color=color, **kwargs)-- for vertices in vertex_groups:- first_vertex, *vertices = vertices- first_vertex = np.array(first_vertex)-- self.start_new_path(first_vertex)- self.add_points_as_corners(- [*(np.array(vertex) for vertex in vertices), first_vertex],- )-- def get_vertices(self) -> np.ndarray:- """Gets the vertices of the :class:`Polygram`.-- Returns- -------- :class:`numpy.ndarray`- The vertices of the :class:`Polygram`.-- Examples- --------- ::-- >>> sq = Square()- >>> sq.get_vertices()- array([[ 1., 1., 0.],- [-1., 1., 0.],- [-1., -1., 0.],- [ 1., -1., 0.]])- """-- return self.get_start_anchors()-- def get_vertex_groups(self) -> np.ndarray:- """Gets the vertex groups of the :class:`Polygram`.-- Returns- -------- :class:`numpy.ndarray`- The vertex groups of the :class:`Polygram`.-- Examples- --------- ::-- >>> poly = Polygram([ORIGIN, RIGHT, UP], [LEFT, LEFT + UP, 2 * LEFT])- >>> poly.get_vertex_groups()- array([[[ 0., 0., 0.],- [ 1., 0., 0.],- [ 0., 1., 0.]],- <BLANKLINE>- [[-1., 0., 0.],- [-1., 1., 0.],- [-2., 0., 0.]]])- """-- vertex_groups = []-- group = []- for start, end in zip(self.get_start_anchors(), self.get_end_anchors()):- group.append(start)-- if self.consider_points_equals(end, group[0]):- vertex_groups.append(group)- group = []-- return np.array(vertex_groups)-- def round_corners(self, radius: float = 0.5):- """Rounds off the corners of the :class:`Polygram`.-- Parameters- ----------- radius- The curvature of the corners of the :class:`Polygram`.-- Examples- ---------- .. manim:: PolygramRoundCorners- :save_last_frame:-- class PolygramRoundCorners(Scene):- def construct(self):- star = Star(outer_radius=2)-- shapes = VGroup(star)- shapes.add(star.copy().round_corners(radius=0.1))- shapes.add(star.copy().round_corners(radius=0.25))-- shapes.arrange(RIGHT)- self.add(shapes)-- See Also- --------- :class:`RoundedRectangle`- """-- if radius == 0:- return self-- new_points = []-- for vertices in self.get_vertex_groups():- arcs = []- for v1, v2, v3 in adjacent_n_tuples(vertices, 3):- vect1 = v2 - v1- vect2 = v3 - v2- unit_vect1 = normalize(vect1)- unit_vect2 = normalize(vect2)-- angle = angle_between_vectors(vect1, vect2)- # Negative radius gives concave curves- angle *= np.sign(radius)-- # Distance between vertex and start of the arc- cut_off_length = radius * np.tan(angle / 2)-- # Determines counterclockwise vs. clockwise- sign = np.sign(np.cross(vect1, vect2)[2])-- arc = ArcBetweenPoints(- v2 - unit_vect1 * cut_off_length,- v2 + unit_vect2 * cut_off_length,- angle=sign * angle,- )- arcs.append(arc)-- # To ensure that we loop through starting with last- arcs = [arcs[-1], *arcs[:-1]]- for arc1, arc2 in adjacent_pairs(arcs):- new_points.extend(arc1.points)-- line = Line(arc1.get_end(), arc2.get_start())-- # Make sure anchors are evenly distributed- len_ratio = line.get_length() / arc1.get_arc_length()-- line.insert_n_curves(int(arc1.get_num_curves() * len_ratio))-- new_points.extend(line.points)-- self.set_points(new_points)-- return self---class Polygon(Polygram):- """A shape consisting of one closed loop of vertices.-- Parameters- ----------- vertices- The vertices of the :class:`Polygon`.- kwargs- Forwarded to the parent constructor.-- Examples- ---------- .. manim:: PolygonExample- :save_last_frame:-- class PolygonExample(Scene):- def construct(self):- isosceles = Polygon([-5, 1.5, 0], [-2, 1.5, 0], [-3.5, -2, 0])- position_list = [- [4, 1, 0], # middle right- [4, -2.5, 0], # bottom right- [0, -2.5, 0], # bottom left- [0, 3, 0], # top left- [2, 1, 0], # middle- [4, 3, 0], # top right- ]- square_and_triangles = Polygon(*position_list, color=PURPLE_B)- self.add(isosceles, square_and_triangles)- """-- def __init__(self, *vertices: Sequence[float], **kwargs):- super().__init__(vertices, **kwargs)---class RegularPolygram(Polygram):- """A :class:`Polygram` with regularly spaced vertices.-- Parameters- ----------- num_vertices- The number of vertices.- density- The density of the :class:`RegularPolygram`.-- Can be thought of as how many vertices to hop- to draw a line between them. Every ``density``-th- vertex is connected.- radius- The radius of the circle that the vertices are placed on.- start_angle- The angle the vertices start at; the rotation of- the :class:`RegularPolygram`.- kwargs- Forwarded to the parent constructor.-- Examples- --------- .. manim:: RegularPolygramExample- :save_last_frame:-- class RegularPolygramExample(Scene):- def construct(self):- pentagram = RegularPolygram(5, radius=2)- self.add(pentagram)- """-- def __init__(- self,- num_vertices: int,- *,- density: int = 2,- radius: float = 1,- start_angle: float | None = None,- **kwargs,- ):- # Regular polygrams can be expressed by the number of their vertices- # and their density. This relation can be expressed as its Schläfli- # symbol: {num_vertices/density}.- #- # For instance, a pentagon can be expressed as {5/1} or just {5}.- # A pentagram, however, can be expressed as {5/2}.- # A hexagram *would* be expressed as {6/2}, except that 6 and 2- # are not coprime, and it can be simplified to 2{3}, which corresponds- # to the fact that a hexagram is actually made up of 2 triangles.- #- # See https://en.wikipedia.org/wiki/Polygram_(geometry)#Generalized_regular_polygons- # for more information.-- num_gons = np.gcd(num_vertices, density)- num_vertices //= num_gons- density //= num_gons-- # Utility function for generating the individual- # polygon vertices.- def gen_polygon_vertices(start_angle):- reg_vertices, start_angle = regular_vertices(- num_vertices,- radius=radius,- start_angle=start_angle,- )-- vertices = []- i = 0- while True:- vertices.append(reg_vertices[i])-- i += density- i %= num_vertices- if i == 0:- break-- return vertices, start_angle-- first_group, self.start_angle = gen_polygon_vertices(start_angle)- vertex_groups = [first_group]-- for i in range(1, num_gons):- start_angle = self.start_angle + (i / num_gons) * TAU / num_vertices- group, _ = gen_polygon_vertices(start_angle)-- vertex_groups.append(group)-- super().__init__(*vertex_groups, **kwargs)---class RegularPolygon(RegularPolygram):- """An n-sided regular :class:`Polygon`.-- Parameters- ----------- n- The number of sides of the :class:`RegularPolygon`.- kwargs- Forwarded to the parent constructor.-- Examples- ---------- .. manim:: RegularPolygonExample- :save_last_frame:-- class RegularPolygonExample(Scene):- def construct(self):- poly_1 = RegularPolygon(n=6)- poly_2 = RegularPolygon(n=6, start_angle=30*DEGREES, color=GREEN)- poly_3 = RegularPolygon(n=10, color=RED)-- poly_group = Group(poly_1, poly_2, poly_3).scale(1.5).arrange(buff=1)- self.add(poly_group)- """-- def __init__(self, n: int = 6, **kwargs):- super().__init__(n, density=1, **kwargs)---class Star(Polygon):- """A regular polygram without the intersecting lines.-- Parameters- ----------- n- How many points on the :class:`Star`.- outer_radius- The radius of the circle that the outer vertices are placed on.- inner_radius- The radius of the circle that the inner vertices are placed on.-- If unspecified, the inner radius will be- calculated such that the edges of the :class:`Star`- perfectly follow the edges of its :class:`RegularPolygram`- counterpart.- density- The density of the :class:`Star`. Only used if- ``inner_radius`` is unspecified.-- See :class:`RegularPolygram` for more information.- start_angle- The angle the vertices start at; the rotation of- the :class:`Star`.- kwargs- Forwardeds to the parent constructor.-- Raises- ------- :exc:`ValueError`- If ``inner_radius`` is unspecified and ``density``- is not in the range ``[1, n/2)``.-- Examples- --------- .. manim:: StarExample- :save_as_gif:-- class StarExample(Scene):- def construct(self):- pentagram = RegularPolygram(5, radius=2)- star = Star(outer_radius=2, color=RED)-- self.add(pentagram)- self.play(Create(star), run_time=3)- self.play(FadeOut(star), run_time=2)-- .. manim:: DifferentDensitiesExample- :save_last_frame:-- class DifferentDensitiesExample(Scene):- def construct(self):- density_2 = Star(7, outer_radius=2, density=2, color=RED)- density_3 = Star(7, outer_radius=2, density=3, color=PURPLE)-- self.add(VGroup(density_2, density_3).arrange(RIGHT))-- """-- def __init__(- self,- n: int = 5,- *,- outer_radius: float = 1,- inner_radius: float | None = None,- density: int = 2,- start_angle: float | None = TAU / 4,- **kwargs,- ):- inner_angle = TAU / (2 * n)-- if inner_radius is None:- # See https://math.stackexchange.com/a/2136292 for an- # overview of how to calculate the inner radius of a- # perfect star.-- if density <= 0 or density >= n / 2:- raise ValueError(- f"Incompatible density {density} for number of points {n}",- )-- outer_angle = TAU * density / n- inverse_x = 1 - np.tan(inner_angle) * (- (np.cos(outer_angle) - 1) / np.sin(outer_angle)- )-- inner_radius = outer_radius / (np.cos(inner_angle) * inverse_x)-- outer_vertices, self.start_angle = regular_vertices(- n,- radius=outer_radius,- start_angle=start_angle,- )- inner_vertices, _ = regular_vertices(- n,- radius=inner_radius,- start_angle=self.start_angle + inner_angle,- )-- vertices = []- for pair in zip(outer_vertices, inner_vertices):- vertices.extend(pair)-- super().__init__(*vertices, **kwargs)---class ArcPolygon(VMobject, metaclass=ConvertToOpenGL):- """A generalized polygon allowing for points to be connected with arcs.-- This version tries to stick close to the way :class:`Polygon` is used. Points- can be passed to it directly which are used to generate the according arcs- (using :class:`ArcBetweenPoints`). An angle or radius can be passed to it to- use across all arcs, but to configure arcs individually an ``arc_config`` list- has to be passed with the syntax explained below.-- .. tip::-- Two instances of :class:`ArcPolygon` can be transformed properly into one- another as well. Be advised that any arc initialized with ``angle=0``- will actually be a straight line, so if a straight section should seamlessly- transform into an arced section or vice versa, initialize the straight section- with a negligible angle instead (such as ``angle=0.0001``).-- There is an alternative version (:class:`ArcPolygonFromArcs`) that is instantiated- with pre-defined arcs.-- See Also- --------- :class:`ArcPolygonFromArcs`-- Parameters- ----------- vertices : Union[:class:`list`, :class:`np.array`]- A list of vertices, start and end points for the arc segments.- angle : :class:`float`- The angle used for constructing the arcs. If no other parameters- are set, this angle is used to construct all arcs.- radius : Optional[:class:`float`]- The circle radius used to construct the arcs. If specified,- overrides the specified ``angle``.- arc_config : Optional[Union[List[:class:`dict`]], :class:`dict`]- When passing a ``dict``, its content will be passed as keyword- arguments to :class:`~.ArcBetweenPoints`. Otherwise, a list- of dictionaries containing values that are passed as keyword- arguments for every individual arc can be passed.- kwargs- Further keyword arguments that are passed to the constructor of- :class:`~.VMobject`.-- Attributes- ----------- arcs : :class:`list`- The arcs created from the input parameters::-- >>> from manim import ArcPolygon- >>> ap = ArcPolygon([0, 0, 0], [2, 0, 0], [0, 2, 0])- >>> ap.arcs- [ArcBetweenPoints, ArcBetweenPoints, ArcBetweenPoints]-- Examples- ---------- .. manim:: SeveralArcPolygons-- class SeveralArcPolygons(Scene):- def construct(self):- a = [0, 0, 0]- b = [2, 0, 0]- c = [0, 2, 0]- ap1 = ArcPolygon(a, b, c, radius=2)- ap2 = ArcPolygon(a, b, c, angle=45*DEGREES)- ap3 = ArcPolygon(a, b, c, arc_config={'radius': 1.7, 'color': RED})- ap4 = ArcPolygon(a, b, c, color=RED, fill_opacity=1,- arc_config=[{'radius': 1.7, 'color': RED},- {'angle': 20*DEGREES, 'color': BLUE},- {'radius': 1}])- ap_group = VGroup(ap1, ap2, ap3, ap4).arrange()- self.play(*[Create(ap) for ap in [ap1, ap2, ap3, ap4]])- self.wait()-- For further examples see :class:`ArcPolygonFromArcs`.- """-- def __init__(self, *vertices, angle=PI / 4, radius=None, arc_config=None, **kwargs):- n = len(vertices)- point_pairs = [(vertices[k], vertices[(k + 1) % n]) for k in range(n)]-- if not arc_config:- if radius:- all_arc_configs = itertools.repeat({"radius": radius}, len(point_pairs))- else:- all_arc_configs = itertools.repeat({"angle": angle}, len(point_pairs))- elif isinstance(arc_config, dict):- all_arc_configs = itertools.repeat(arc_config, len(point_pairs))- else:- assert len(arc_config) == n- all_arc_configs = arc_config-- arcs = [- ArcBetweenPoints(*pair, **conf)- for (pair, conf) in zip(point_pairs, all_arc_configs)- ]-- super().__init__(**kwargs)- # Adding the arcs like this makes ArcPolygon double as a VGroup.- # Also makes changes to the ArcPolygon, such as scaling, affect- # the arcs, so that their new values are usable.- self.add(*arcs)- for arc in arcs:- self.append_points(arc.points)-- # This enables the use of ArcPolygon.arcs as a convenience- # because ArcPolygon[0] returns itself, not the first Arc.- self.arcs = arcs---class ArcPolygonFromArcs(VMobject, metaclass=ConvertToOpenGL):- """A generalized polygon allowing for points to be connected with arcs.-- This version takes in pre-defined arcs to generate the arcpolygon and introduces- little new syntax. However unlike :class:`Polygon` it can't be created with points- directly.-- For proper appearance the passed arcs should connect seamlessly:- ``[a,b][b,c][c,a]``-- If there are any gaps between the arcs, those will be filled in- with straight lines, which can be used deliberately for any straight- sections. Arcs can also be passed as straight lines such as an arc- initialized with ``angle=0``.-- .. tip::-- Two instances of :class:`ArcPolygon` can be transformed properly into- one another as well. Be advised that any arc initialized with ``angle=0``- will actually be a straight line, so if a straight section should seamlessly- transform into an arced section or vice versa, initialize the straight- section with a negligible angle instead (such as ``angle=0.0001``).-- There is an alternative version (:class:`ArcPolygon`) that can be instantiated- with points.-- See Also- --------- :class:`ArcPolygon`-- Parameters- ----------- arcs : Union[:class:`Arc`, :class:`ArcBetweenPoints`]- These are the arcs from which the arcpolygon is assembled.- kwargs- Keyword arguments that are passed to the constructor of- :class:`~.VMobject`. Affects how the ArcPolygon itself is drawn,- but doesn't affect passed arcs.-- Attributes- ----------- arcs : :class:`list`- The arcs used to initialize the ArcPolygonFromArcs::-- >>> from manim import ArcPolygonFromArcs, Arc, ArcBetweenPoints- >>> ap = ArcPolygonFromArcs(Arc(), ArcBetweenPoints([1,0,0], [0,1,0]), Arc())- >>> ap.arcs- [Arc, ArcBetweenPoints, Arc]-- Examples- --------- One example of an arcpolygon is the Reuleaux triangle.- Instead of 3 straight lines connecting the outer points,- a Reuleaux triangle has 3 arcs connecting those points,- making a shape with constant width.-- Passed arcs are stored as submobjects in the arcpolygon.- This means that the arcs are changed along with the arcpolygon,- for example when it's shifted, and these arcs can be manipulated- after the arcpolygon has been initialized.-- Also both the arcs contained in an :class:`~.ArcPolygonFromArcs`, as well as the- arcpolygon itself are drawn, which affects draw time in :class:`~.Create`- for example. In most cases the arcs themselves don't- need to be drawn, in which case they can be passed as invisible.-- .. manim:: ArcPolygonExample-- class ArcPolygonExample(Scene):- def construct(self):- arc_conf = {"stroke_width": 0}- poly_conf = {"stroke_width": 10, "stroke_color": BLUE,- "fill_opacity": 1, "color": PURPLE}- a = [-1, 0, 0]- b = [1, 0, 0]- c = [0, np.sqrt(3), 0]- arc0 = ArcBetweenPoints(a, b, radius=2, **arc_conf)- arc1 = ArcBetweenPoints(b, c, radius=2, **arc_conf)- arc2 = ArcBetweenPoints(c, a, radius=2, **arc_conf)- reuleaux_tri = ArcPolygonFromArcs(arc0, arc1, arc2, **poly_conf)- self.play(FadeIn(reuleaux_tri))- self.wait(2)-- The arcpolygon itself can also be hidden so that instead only the contained- arcs are drawn. This can be used to easily debug arcs or to highlight them.-- .. manim:: ArcPolygonExample2-- class ArcPolygonExample2(Scene):- def construct(self):- arc_conf = {"stroke_width": 3, "stroke_color": BLUE,- "fill_opacity": 0.5, "color": GREEN}- poly_conf = {"color": None}- a = [-1, 0, 0]- b = [1, 0, 0]- c = [0, np.sqrt(3), 0]- arc0 = ArcBetweenPoints(a, b, radius=2, **arc_conf)- arc1 = ArcBetweenPoints(b, c, radius=2, **arc_conf)- arc2 = ArcBetweenPoints(c, a, radius=2, stroke_color=RED)- reuleaux_tri = ArcPolygonFromArcs(arc0, arc1, arc2, **poly_conf)- self.play(FadeIn(reuleaux_tri))- self.wait(2)-- """-- def __init__(self, *arcs, **kwargs):- if not all(isinstance(m, (Arc, ArcBetweenPoints)) for m in arcs):- raise ValueError(- "All ArcPolygon submobjects must be of type Arc/ArcBetweenPoints",- )- super().__init__(**kwargs)- # Adding the arcs like this makes ArcPolygonFromArcs double as a VGroup.- # Also makes changes to the ArcPolygonFromArcs, such as scaling, affect- # the arcs, so that their new values are usable.- self.add(*arcs)- # This enables the use of ArcPolygonFromArcs.arcs as a convenience- # because ArcPolygonFromArcs[0] returns itself, not the first Arc.- self.arcs = [*arcs]- for arc1, arc2 in adjacent_pairs(arcs):- self.append_points(arc1.points)- line = Line(arc1.get_end(), arc2.get_start())- len_ratio = line.get_length() / arc1.get_arc_length()- if math.isnan(len_ratio) or math.isinf(len_ratio):- continue- line.insert_n_curves(int(arc1.get_num_curves() * len_ratio))- self.append_points(line.points)---class Triangle(RegularPolygon):- """An equilateral triangle.-- Parameters- ----------- kwargs : Any- Additional arguments to be passed to :class:`RegularPolygon`-- Examples- ---------- .. manim:: TriangleExample- :save_last_frame:-- class TriangleExample(Scene):- def construct(self):- triangle_1 = Triangle()- triangle_2 = Triangle().scale(2).rotate(60*DEGREES)- tri_group = Group(triangle_1, triangle_2).arrange(buff=1)- self.add(tri_group)- """-- def __init__(self, **kwargs):- super().__init__(n=3, **kwargs)---class Rectangle(Polygon):- """A quadrilateral with two sets of parallel sides.-- Parameters- ----------- color : :class:`~.Colors`, optional- The color of the rectangle.- height : :class:`float`, optional- The vertical height of the rectangle.- width : :class:`float`, optional- The horizontal width of the rectangle.- grid_xstep : :class:`float`, optional- Space between vertical grid lines.- grid_ystep : :class:`float`, optional- Space between horizontal grid lines.- mark_paths_closed : :class:`bool`, optional- No purpose.- close_new_points : :class:`bool`, optional- No purpose.- kwargs : Any- Additional arguments to be passed to :class:`Polygon`-- Examples- ------------ .. manim:: RectangleExample- :save_last_frame:-- class RectangleExample(Scene):- def construct(self):- rect1 = Rectangle(width=4.0, height=2.0, grid_xstep=1.0, grid_ystep=0.5)- rect2 = Rectangle(width=1.0, height=4.0)-- rects = Group(rect1,rect2).arrange(buff=1)- self.add(rects)- """-- def __init__(- self,- color: Color = WHITE,- height: float = 2.0,- width: float = 4.0,- grid_xstep: float | None = None,- grid_ystep: float | None = None,- mark_paths_closed=True,- close_new_points=True,- **kwargs,- ):- super().__init__(UR, UL, DL, DR, color=color, **kwargs)- self.stretch_to_fit_width(width)- self.stretch_to_fit_height(height)- v = self.get_vertices()- if grid_xstep is not None:- grid_xstep = abs(grid_xstep)- count = int(width / grid_xstep)- grid = VGroup(- *(- Line(- v[1] + i * grid_xstep * RIGHT,- v[1] + i * grid_xstep * RIGHT + height * DOWN,- color=color,- )- for i in range(1, count)- )- )- self.add(grid)- if grid_ystep is not None:- grid_ystep = abs(grid_ystep)- count = int(height / grid_ystep)- grid = VGroup(- *(- Line(- v[1] + i * grid_ystep * DOWN,- v[1] + i * grid_ystep * DOWN + width * RIGHT,- color=color,- )- for i in range(1, count)- )- )- self.add(grid)---class Square(Rectangle):- """A rectangle with equal side lengths.-- Parameters- ----------- side_length : :class:`float`, optional- The length of the sides of the square.- kwargs : Any- Additional arguments to be passed to :class:`Rectangle`.-- Examples- ---------- .. manim:: SquareExample- :save_last_frame:-- class SquareExample(Scene):- def construct(self):- square_1 = Square(side_length=2.0).shift(DOWN)- square_2 = Square(side_length=1.0).next_to(square_1, direction=UP)- square_3 = Square(side_length=0.5).next_to(square_2, direction=UP)- self.add(square_1, square_2, square_3)- """-- def __init__(self, side_length=2.0, **kwargs):- self.side_length = side_length- super().__init__(height=side_length, width=side_length, **kwargs)---class RoundedRectangle(Rectangle):- """A rectangle with rounded corners.-- Parameters- ----------- corner_radius : :class:`float`, optional- The curvature of the corners of the rectangle.- kwargs : Any- Additional arguments to be passed to :class:`Rectangle`-- Examples- ---------- .. manim:: RoundedRectangleExample- :save_last_frame:-- class RoundedRectangleExample(Scene):- def construct(self):- rect_1 = RoundedRectangle(corner_radius=0.5)- rect_2 = RoundedRectangle(corner_radius=1.5, height=4.0, width=4.0)-- rect_group = Group(rect_1, rect_2).arrange(buff=1)- self.add(rect_group)- """-- def __init__(self, corner_radius=0.5, **kwargs):- super().__init__(**kwargs)- self.corner_radius = corner_radius- self.round_corners(self.corner_radius)---class ArrowTip(VMobject, metaclass=ConvertToOpenGL):- r"""Base class for arrow tips.-- See Also- --------- :class:`ArrowTriangleTip`- :class:`ArrowTriangleFilledTip`- :class:`ArrowCircleTip`- :class:`ArrowCircleFilledTip`- :class:`ArrowSquareTip`- :class:`ArrowSquareFilledTip`-- Examples- --------- Cannot be used directly, only intended for inheritance::-- >>> tip = ArrowTip()- Traceback (most recent call last):- ...- NotImplementedError: Has to be implemented in inheriting subclasses.-- Instead, use one of the pre-defined ones, or make- a custom one like this:-- .. manim:: CustomTipExample-- >>> class MyCustomArrowTip(ArrowTip, RegularPolygon):- ... def __init__(self, length=0.35, **kwargs):- ... RegularPolygon.__init__(self, n=5, **kwargs)- ... self.width = length- ... self.stretch_to_fit_height(length)- >>> arr = Arrow(np.array([-2, -2, 0]), np.array([2, 2, 0]),- ... tip_shape=MyCustomArrowTip)- >>> isinstance(arr.tip, RegularPolygon)- True- >>> from manim import Scene- >>> class CustomTipExample(Scene):- ... def construct(self):- ... self.play(Create(arr))-- Using a class inherited from :class:`ArrowTip` to get a non-filled- tip is a shorthand to manually specifying the arrow tip style as follows::-- >>> arrow = Arrow(np.array([0, 0, 0]), np.array([1, 1, 0]),- ... tip_style={'fill_opacity': 0, 'stroke_width': 3})-- The following example illustrates the usage of all of the predefined- arrow tips.-- .. manim:: ArrowTipsShowcase- :save_last_frame:-- from manim.mobject.geometry import ArrowTriangleTip, ArrowSquareTip, ArrowSquareFilledTip,\- ArrowCircleTip, ArrowCircleFilledTip- class ArrowTipsShowcase(Scene):- def construct(self):- a00 = Arrow(start=[-2, 3, 0], end=[2, 3, 0], color=YELLOW)- a11 = Arrow(start=[-2, 2, 0], end=[2, 2, 0], tip_shape=ArrowTriangleTip)- a12 = Arrow(start=[-2, 1, 0], end=[2, 1, 0])- a21 = Arrow(start=[-2, 0, 0], end=[2, 0, 0], tip_shape=ArrowSquareTip)- a22 = Arrow([-2, -1, 0], [2, -1, 0], tip_shape=ArrowSquareFilledTip)- a31 = Arrow([-2, -2, 0], [2, -2, 0], tip_shape=ArrowCircleTip)- a32 = Arrow([-2, -3, 0], [2, -3, 0], tip_shape=ArrowCircleFilledTip)- b11 = a11.copy().scale(0.5, scale_tips=True).next_to(a11, RIGHT)- b12 = a12.copy().scale(0.5, scale_tips=True).next_to(a12, RIGHT)- b21 = a21.copy().scale(0.5, scale_tips=True).next_to(a21, RIGHT)- self.add(a00, a11, a12, a21, a22, a31, a32, b11, b12, b21)-- """-- def __init__(self, *args, **kwargs):- raise NotImplementedError("Has to be implemented in inheriting subclasses.")-- @property- def base(self):- r"""The base point of the arrow tip.-- This is the point connecting to the arrow line.-- Examples- --------- ::-- >>> arrow = Arrow(np.array([0, 0, 0]), np.array([2, 0, 0]), buff=0)- >>> arrow.tip.base.round(2) + 0. # add 0. to avoid negative 0 in output- array([1.65, 0. , 0. ])-- """- return self.point_from_proportion(0.5)-- @property- def tip_point(self):- r"""The tip point of the arrow tip.-- Examples- --------- ::-- >>> arrow = Arrow(np.array([0, 0, 0]), np.array([2, 0, 0]), buff=0)- >>> arrow.tip.tip_point.round(2) + 0.- array([2., 0., 0.])-- """- return self.points[0]-- @property- def vector(self):- r"""The vector pointing from the base point to the tip point.-- Examples- --------- ::-- >>> arrow = Arrow(np.array([0, 0, 0]), np.array([2, 2, 0]), buff=0)- >>> arrow.tip.vector.round(2) + 0.- array([0.25, 0.25, 0. ])-- """- return self.tip_point - self.base-- @property- def tip_angle(self):- r"""The angle of the arrow tip.-- Examples- --------- ::-- >>> arrow = Arrow(np.array([0, 0, 0]), np.array([1, 1, 0]), buff=0)- >>> round(arrow.tip.tip_angle, 5) == round(PI/4, 5)- True-- """- return angle_of_vector(self.vector)-- @property- def length(self):- r"""The length of the arrow tip.-- Examples- --------- ::-- >>> arrow = Arrow(np.array([0, 0, 0]), np.array([1, 2, 0]))- >>> round(arrow.tip.length, 3)- 0.35-- """- return np.linalg.norm(self.vector)---class ArrowTriangleTip(ArrowTip, Triangle):- r"""Triangular arrow tip."""-- def __init__(- self,- fill_opacity=0,- stroke_width=3,- length=DEFAULT_ARROW_TIP_LENGTH,- start_angle=PI,- **kwargs,- ):- Triangle.__init__(- self,- fill_opacity=fill_opacity,- stroke_width=stroke_width,- start_angle=start_angle,- **kwargs,- )- self.width = length- self.stretch_to_fit_height(length)---class ArrowTriangleFilledTip(ArrowTriangleTip):- r"""Triangular arrow tip with filled tip.-- This is the default arrow tip shape.- """-- def __init__(self, fill_opacity=1, stroke_width=0, **kwargs):- super().__init__(fill_opacity=fill_opacity, stroke_width=stroke_width, **kwargs)---class ArrowCircleTip(ArrowTip, Circle):- r"""Circular arrow tip."""-- def __init__(- self,- fill_opacity=0,- stroke_width=3,- length=DEFAULT_ARROW_TIP_LENGTH,- start_angle=PI,- **kwargs,- ):- self.start_angle = start_angle- Circle.__init__(- self, fill_opacity=fill_opacity, stroke_width=stroke_width, **kwargs- )- self.width = length- self.stretch_to_fit_height(length)---class ArrowCircleFilledTip(ArrowCircleTip):- r"""Circular arrow tip with filled tip."""-- def __init__(self, fill_opacity=1, stroke_width=0, **kwargs):- super().__init__(fill_opacity=fill_opacity, stroke_width=stroke_width, **kwargs)---class ArrowSquareTip(ArrowTip, Square):- r"""Square arrow tip."""-- def __init__(- self,- fill_opacity=0,- stroke_width=3,- length=DEFAULT_ARROW_TIP_LENGTH,- start_angle=PI,- **kwargs,- ):- self.start_angle = start_angle- Square.__init__(- self,- fill_opacity=fill_opacity,- stroke_width=stroke_width,- side_length=length,- **kwargs,- )- self.width = length- self.stretch_to_fit_height(length)---class ArrowSquareFilledTip(ArrowSquareTip):- r"""Square arrow tip with filled tip."""-- def __init__(self, fill_opacity=1, stroke_width=0, **kwargs):- super().__init__(fill_opacity=fill_opacity, stroke_width=stroke_width, **kwargs)---class Cutout(VMobject, metaclass=ConvertToOpenGL):- """A shape with smaller cutouts.-- .. warning::-- Technically, this class behaves similar to a symmetric difference: if- parts of the ``mobjects`` are not located within the ``main_shape``,- these parts will be added to the resulting :class:`~.VMobject`.-- Parameters- ----------- main_shape : :class:`~.VMobject`- The primary shape from which cutouts are made.- mobjects : :class:`~.VMobject`- The smaller shapes which are to be cut out of the ``main_shape``.- kwargs- Further keyword arguments that are passed to the constructor of- :class:`~.VMobject`.-- Examples- --------- .. manim:: CutoutExample-- class CutoutExample(Scene):- def construct(self):- s1 = Square().scale(2.5)- s2 = Triangle().shift(DOWN + RIGHT).scale(0.5)- s3 = Square().shift(UP + RIGHT).scale(0.5)- s4 = RegularPolygon(5).shift(DOWN + LEFT).scale(0.5)- s5 = RegularPolygon(6).shift(UP + LEFT).scale(0.5)- c = Cutout(s1, s2, s3, s4, s5, fill_opacity=1, color=BLUE, stroke_color=RED)- self.play(Write(c), run_time=4)- self.wait()- """-- def __init__(self, main_shape, *mobjects, **kwargs):- super().__init__(**kwargs)- self.append_points(main_shape.points)- if main_shape.get_direction() == "CW":- sub_direction = "CCW"- else:- sub_direction = "CW"- for mobject in mobjects:- self.append_points(mobject.force_direction(sub_direction).points)---class Angle(VMobject, metaclass=ConvertToOpenGL):- """A circular arc or elbow-type mobject representing an angle of two lines.-- Parameters- ----------- line1 :- The first line.- line2 :- The second line.- radius :- The radius of the :class:`Arc`.- quadrant : Sequence[:class:`int`]- A sequence of two :class:`int` numbers determining which of the 4 quadrants should be used.- The first value indicates whether to anchor the arc on the first line closer to the end point (1)- or start point (-1), and the second value functions similarly for the- end (1) or start (-1) of the second line.- Possibilities: (1,1), (-1,1), (1,-1), (-1,-1).- other_angle :- Toggles between the two possible angles defined by two points and an arc center. If set to- False (default), the arc will always go counterclockwise from the point on line1 until- the point on line2 is reached. If set to True, the angle will go clockwise from line1 to line2.- dot : :class:`bool`- Allows for a :class:`Dot` in the arc. Mainly used as an convention to indicate a right angle.- The dot can be customized in the next three parameters.- dot_radius : :class:`float`- The radius of the :class:`Dot`. If not specified otherwise, this radius will be 1/10 of the arc radius.- dot_distance : :class:`float`- Relative distance from the center to the arc: 0 puts the dot in the center and 1 on the arc itself.- dot_color : :class:`~.Colors`- The color of the :class:`Dot`.- elbow : :class:`bool`- Produces an elbow-type mobject indicating a right angle, see :class:`RightAngle` for more information- and a shorthand.- **kwargs- Further keyword arguments that are passed to the constructor of :class:`Arc` or :class:`Elbow`.-- Examples- --------- The first example shows some right angles with a dot in the middle while the second example shows- all 8 possible angles defined by two lines.-- .. manim:: RightArcAngleExample- :save_last_frame:-- class RightArcAngleExample(Scene):- def construct(self):- line1 = Line( LEFT, RIGHT )- line2 = Line( DOWN, UP )- rightarcangles = [- Angle(line1, line2, dot=True),- Angle(line1, line2, radius=0.4, quadrant=(1,-1), dot=True, other_angle=True),- Angle(line1, line2, radius=0.5, quadrant=(-1,1), stroke_width=8, dot=True, dot_color=YELLOW, dot_radius=0.04, other_angle=True),- Angle(line1, line2, radius=0.7, quadrant=(-1,-1), color=RED, dot=True, dot_color=GREEN, dot_radius=0.08),- ]- plots = VGroup()- for angle in rightarcangles:- plot=VGroup(line1.copy(),line2.copy(), angle)- plots.add(plot)- plots.arrange(buff=1.5)- self.add(plots)-- .. manim:: AngleExample- :save_last_frame:-- class AngleExample(Scene):- def construct(self):- line1 = Line( LEFT + (1/3) * UP, RIGHT + (1/3) * DOWN )- line2 = Line( DOWN + (1/3) * RIGHT, UP + (1/3) * LEFT )- angles = [- Angle(line1, line2),- Angle(line1, line2, radius=0.4, quadrant=(1,-1), other_angle=True),- Angle(line1, line2, radius=0.5, quadrant=(-1,1), stroke_width=8, other_angle=True),- Angle(line1, line2, radius=0.7, quadrant=(-1,-1), color=RED),- Angle(line1, line2, other_angle=True),- Angle(line1, line2, radius=0.4, quadrant=(1,-1)),- Angle(line1, line2, radius=0.5, quadrant=(-1,1), stroke_width=8),- Angle(line1, line2, radius=0.7, quadrant=(-1,-1), color=RED, other_angle=True),- ]- plots = VGroup()- for angle in angles:- plot=VGroup(line1.copy(),line2.copy(), angle)- plots.add(VGroup(plot,SurroundingRectangle(plot, buff=0.3)))- plots.arrange_in_grid(rows=2,buff=1)- self.add(plots)-- .. manim:: FilledAngle- :save_last_frame:-- class FilledAngle(Scene):- def construct(self):- l1 = Line(ORIGIN, 2 * UP + RIGHT).set_color(GREEN)- l2 = (- Line(ORIGIN, 2 * UP + RIGHT)- .set_color(GREEN)- .rotate(-20 * DEGREES, about_point=ORIGIN)- )- norm = l1.get_length()- a1 = Angle(l1, l2, other_angle=True, radius=norm - 0.5).set_color(GREEN)- a2 = Angle(l1, l2, other_angle=True, radius=norm).set_color(GREEN)- q1 = a1.points # save all coordinates of points of angle a1- q2 = a2.reverse_direction().points # save all coordinates of points of angle a1 (in reversed direction)- pnts = np.concatenate([q1, q2, q1[0].reshape(1, 3)]) # adds points and ensures that path starts and ends at same point- mfill = VMobject().set_color(ORANGE)- mfill.set_points_as_corners(pnts).set_fill(GREEN, opacity=1)- self.add(l1, l2)- self.add(mfill)-- """-- def __init__(- self,- line1: Line,- line2: Line,- radius: float = None,- quadrant=(1, 1),- other_angle: bool = False,- dot=False,- dot_radius=None,- dot_distance=0.55,- dot_color=WHITE,- elbow=False,- **kwargs,- ):- super().__init__(**kwargs)- self.lines = (line1, line2)- self.quadrant = quadrant- self.dot_distance = dot_distance- self.elbow = elbow- inter = line_intersection(- [line1.get_start(), line1.get_end()],- [line2.get_start(), line2.get_end()],- )-- if radius is None:- if quadrant[0] == 1:- dist_1 = np.linalg.norm(line1.get_end() - inter)- else:- dist_1 = np.linalg.norm(line1.get_start() - inter)- if quadrant[1] == 1:- dist_2 = np.linalg.norm(line2.get_end() - inter)- else:- dist_2 = np.linalg.norm(line2.get_start() - inter)- if np.minimum(dist_1, dist_2) < 0.6:- radius = (2 / 3) * np.minimum(dist_1, dist_2)- else:- radius = 0.4- else:- self.radius = radius-- anchor_angle_1 = inter + quadrant[0] * radius * line1.get_unit_vector()- anchor_angle_2 = inter + quadrant[1] * radius * line2.get_unit_vector()-- if elbow:- anchor_middle = (- inter- + quadrant[0] * radius * line1.get_unit_vector()- + quadrant[1] * radius * line2.get_unit_vector()- )- angle_mobject = Elbow(**kwargs)- angle_mobject.set_points_as_corners(- [anchor_angle_1, anchor_middle, anchor_angle_2],- )- else:- angle_1 = angle_of_vector(anchor_angle_1 - inter)- angle_2 = angle_of_vector(anchor_angle_2 - inter)-- if not other_angle:- start_angle = angle_1- if angle_2 > angle_1:- angle_fin = angle_2 - angle_1- else:- angle_fin = 2 * np.pi - (angle_1 - angle_2)- else:- start_angle = angle_1- if angle_2 < angle_1:- angle_fin = -angle_1 + angle_2- else:- angle_fin = -2 * np.pi + (angle_2 - angle_1)-- self.angle_value = angle_fin-- angle_mobject = Arc(- radius=radius,- angle=self.angle_value,- start_angle=start_angle,- arc_center=inter,- **kwargs,- )-- if dot:- if dot_radius is None:- dot_radius = radius / 10- else:- self.dot_radius = dot_radius- right_dot = Dot(ORIGIN, radius=dot_radius, color=dot_color)- dot_anchor = (- inter- + (angle_mobject.get_center() - inter)- / np.linalg.norm(angle_mobject.get_center() - inter)- * radius- * dot_distance- )- right_dot.move_to(dot_anchor)- self.add(right_dot)-- self.set_points(angle_mobject.points)-- def get_lines(self) -> VGroup:- """Get the lines forming an angle of the :class:`Angle` class.-- Returns- -------- :class:`~.VGroup`- A :class:`~.VGroup` containing the lines that form the angle of the :class:`Angle` class.-- Examples- --------- ::-- >>> line_1, line_2 = Line(ORIGIN, RIGHT), Line(ORIGIN, UR)- >>> angle = Angle(line_1, line_2)- >>> angle.get_lines()- VGroup(Line, Line)- """-- return VGroup(*self.lines)-- def get_value(self, degrees: bool = False) -> float:- """Get the value of an angle of the :class:`Angle` class.-- Parameters- ----------- degrees- A boolean to decide the unit (deg/rad) in which the value of the angle is returned.-- Returns- -------- :class:`float`- The value in degrees/radians of an angle of the :class:`Angle` class.-- Examples- ---------- .. manim:: GetValueExample- :save_last_frame:-- class GetValueExample(Scene):- def construct(self):- line1 = Line(LEFT+(1/3)*UP, RIGHT+(1/3)*DOWN)- line2 = Line(DOWN+(1/3)*RIGHT, UP+(1/3)*LEFT)-- angle = Angle(line1, line2, radius=0.4)-- value = DecimalNumber(angle.get_value(degrees=True), unit="^{\\circ}")- value.next_to(angle, UR)-- self.add(line1, line2, angle, value)- """-- if degrees:- return self.angle_value / DEGREES- return self.angle_value---class RightAngle(Angle):- """An elbow-type mobject representing a right angle between two lines.-- Parameters- ----------- line1 : :class:`Line`- The first line.- line2 : :class:`Line`- The second line.- length : :class:`float`- The length of the arms.- **kwargs- Further keyword arguments that are passed to the constructor of :class:`Angle`.-- Examples- ---------- .. manim:: RightAngleExample- :save_last_frame:-- class RightAngleExample(Scene):- def construct(self):- line1 = Line( LEFT, RIGHT )- line2 = Line( DOWN, UP )- rightangles = [- RightAngle(line1, line2),- RightAngle(line1, line2, length=0.4, quadrant=(1,-1)),- RightAngle(line1, line2, length=0.5, quadrant=(-1,1), stroke_width=8),- RightAngle(line1, line2, length=0.7, quadrant=(-1,-1), color=RED),- ]- plots = VGroup()- for rightangle in rightangles:- plot=VGroup(line1.copy(),line2.copy(), rightangle)- plots.add(plot)- plots.arrange(buff=1.5)- self.add(plots)- """-- def __init__(self, line1, line2, length=None, **kwargs):- super().__init__(line1, line2, radius=length, elbow=True, **kwargs)diff --git a/manim/mobject/geometry/__init__.py b/manim/mobject/geometry/__init__.pynew file mode 100644index 000000000..abae9c0da--- /dev/null+++ b/manim/mobject/geometry/__init__.py@@ -0,0 +1,15 @@+"""Various geometric Mobjects.++Modules+=======++.. autosummary::+ :toctree: ../reference++ ~arc+ ~boolean_ops+ ~line+ ~polygram+ ~shape_matchers+ ~tips+"""diff --git a/manim/mobject/geometry/arc.py b/manim/mobject/geometry/arc.pynew file mode 100644index 000000000..c639d2d9b--- /dev/null+++ b/manim/mobject/geometry/arc.py@@ -0,0 +1,1195 @@+r"""Mobjects that are curved.++Examples+--------++.. manim:: UsefulAnnotations+ :save_last_frame:++ class UsefulAnnotations(Scene):+ def construct(self):+ m0 = Dot()+ m1 = AnnotationDot()+ m2 = LabeledDot("ii")+ m3 = LabeledDot(MathTex(r"\alpha").set_color(ORANGE))+ m4 = CurvedArrow(2*LEFT, 2*RIGHT, radius= -5)+ m5 = CurvedArrow(2*LEFT, 2*RIGHT, radius= 8)+ m6 = CurvedDoubleArrow(ORIGIN, 2*RIGHT)++ self.add(m0, m1, m2, m3, m4, m5, m6)+ for i, mobj in enumerate(self.mobjects):+ mobj.shift(DOWN * (i-3))++"""++from __future__ import annotations++__all__ = [+ "TipableVMobject",+ "Arc",+ "ArcBetweenPoints",+ "CurvedArrow",+ "CurvedDoubleArrow",+ "Circle",+ "Dot",+ "AnnotationDot",+ "LabeledDot",+ "Ellipse",+ "AnnularSector",+ "Sector",+ "Annulus",+ "CubicBezier",+ "ArcPolygon",+ "ArcPolygonFromArcs",+]++import itertools+import math+import warnings+from typing import Sequence++import numpy as np++from manim.constants import *+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from manim.mobject.types.vectorized_mobject import VMobject+from manim.utils.color import *+from manim.utils.iterables import adjacent_pairs+from manim.utils.space_ops import (+ angle_of_vector,+ cartesian_to_spherical,+ line_intersection,+ perpendicular_bisector,+ rotate_vector,+)+++class TipableVMobject(VMobject, metaclass=ConvertToOpenGL):+ """+ Meant for shared functionality between Arc and Line.+ Functionality can be classified broadly into these groups:++ * Adding, Creating, Modifying tips+ - add_tip calls create_tip, before pushing the new tip+ into the TipableVMobject's list of submobjects+ - stylistic and positional configuration++ * Checking for tips+ - Boolean checks for whether the TipableVMobject has a tip+ and a starting tip++ * Getters+ - Straightforward accessors, returning information pertaining+ to the TipableVMobject instance's tip(s), its length etc++ """++ def __init__(+ self,+ tip_length=DEFAULT_ARROW_TIP_LENGTH,+ normal_vector=OUT,+ tip_style={},+ **kwargs,+ ):+ self.tip_length = tip_length+ self.normal_vector = normal_vector+ self.tip_style = tip_style+ super().__init__(**kwargs)++ # Adding, Creating, Modifying tips++ def add_tip(self, tip=None, tip_shape=None, tip_length=None, at_start=False):+ """+ Adds a tip to the TipableVMobject instance, recognising+ that the endpoints might need to be switched if it's+ a 'starting tip' or not.+ """+ if tip is None:+ tip = self.create_tip(tip_shape, tip_length, at_start)+ else:+ self.position_tip(tip, at_start)+ self.reset_endpoints_based_on_tip(tip, at_start)+ self.asign_tip_attr(tip, at_start)+ self.add(tip)+ return self++ def create_tip(self, tip_shape=None, tip_length=None, at_start=False):+ """+ Stylises the tip, positions it spatially, and returns+ the newly instantiated tip to the caller.+ """+ tip = self.get_unpositioned_tip(tip_shape, tip_length)+ self.position_tip(tip, at_start)+ return tip++ def get_unpositioned_tip(self, tip_shape=None, tip_length=None):+ """+ Returns a tip that has been stylistically configured,+ but has not yet been given a position in space.+ """+ from manim.mobject.geometry.tips import ArrowTriangleFilledTip++ if tip_shape is None:+ tip_shape = ArrowTriangleFilledTip+ if tip_length is None:+ tip_length = self.get_default_tip_length()+ color = self.get_color()+ style = {"fill_color": color, "stroke_color": color}+ style.update(self.tip_style)+ tip = tip_shape(length=tip_length, **style)+ return tip++ def position_tip(self, tip, at_start=False):+ # Last two control points, defining both+ # the end, and the tangency direction+ if at_start:+ anchor = self.get_start()+ handle = self.get_first_handle()+ else:+ handle = self.get_last_handle()+ anchor = self.get_end()+ angles = cartesian_to_spherical(handle - anchor)+ tip.rotate(+ angles[1] - PI - tip.tip_angle,+ ) # Rotates the tip along the azimuthal+ if not hasattr(self, "_init_positioning_axis"):+ axis = [+ np.sin(angles[1]),+ -np.cos(angles[1]),+ 0,+ ] # Obtains the perpendicular of the tip+ tip.rotate(+ -angles[2] + PI / 2,+ axis=axis,+ ) # Rotates the tip along the vertical wrt the axis+ self._init_positioning_axis = axis+ tip.shift(anchor - tip.tip_point)+ return tip++ def reset_endpoints_based_on_tip(self, tip, at_start):+ if self.get_length() == 0:+ # Zero length, put_start_and_end_on wouldn't work+ return self++ if at_start:+ self.put_start_and_end_on(tip.base, self.get_end())+ else:+ self.put_start_and_end_on(self.get_start(), tip.base)+ return self++ def asign_tip_attr(self, tip, at_start):+ if at_start:+ self.start_tip = tip+ else:+ self.tip = tip+ return self++ # Checking for tips++ def has_tip(self):+ return hasattr(self, "tip") and self.tip in self++ def has_start_tip(self):+ return hasattr(self, "start_tip") and self.start_tip in self++ # Getters++ def pop_tips(self):+ start, end = self.get_start_and_end()+ result = self.get_group_class()()+ if self.has_tip():+ result.add(self.tip)+ self.remove(self.tip)+ if self.has_start_tip():+ result.add(self.start_tip)+ self.remove(self.start_tip)+ self.put_start_and_end_on(start, end)+ return result++ def get_tips(self):+ """+ Returns a VGroup (collection of VMobjects) containing+ the TipableVMObject instance's tips.+ """+ result = self.get_group_class()()+ if hasattr(self, "tip"):+ result.add(self.tip)+ if hasattr(self, "start_tip"):+ result.add(self.start_tip)+ return result++ def get_tip(self):+ """Returns the TipableVMobject instance's (first) tip,+ otherwise throws an exception."""+ tips = self.get_tips()+ if len(tips) == 0:+ raise Exception("tip not found")+ else:+ return tips[0]++ def get_default_tip_length(self):+ return self.tip_length++ def get_first_handle(self):+ return self.points[1]++ def get_last_handle(self):+ return self.points[-2]++ def get_end(self):+ if self.has_tip():+ return self.tip.get_start()+ else:+ return super().get_end()++ def get_start(self):+ if self.has_start_tip():+ return self.start_tip.get_start()+ else:+ return super().get_start()++ def get_length(self):+ start, end = self.get_start_and_end()+ return np.linalg.norm(start - end)+++class Arc(TipableVMobject):+ """A circular arc.++ Examples+ --------+ A simple arc of angle Pi.++ .. manim:: ArcExample+ :save_last_frame:++ class ArcExample(Scene):+ def construct(self):+ self.add(Arc(angle=PI))+ """++ def __init__(+ self,+ radius: float = 1.0,+ start_angle=0,+ angle=TAU / 4,+ num_components=9,+ arc_center=ORIGIN,+ **kwargs,+ ):+ if radius is None: # apparently None is passed by ArcBetweenPoints+ radius = 1.0+ self.radius = radius+ self.num_components = num_components+ self.arc_center = arc_center+ self.start_angle = start_angle+ self.angle = angle+ self._failed_to_get_center = False+ super().__init__(**kwargs)++ def generate_points(self):+ self._set_pre_positioned_points()+ self.scale(self.radius, about_point=ORIGIN)+ self.shift(self.arc_center)++ # Points are set a bit differently when rendering via OpenGL.+ # TODO: refactor Arc so that only one strategy for setting points+ # has to be used.+ def init_points(self):+ self.set_points(+ Arc._create_quadratic_bezier_points(+ angle=self.angle,+ start_angle=self.start_angle,+ n_components=self.num_components,+ ),+ )+ self.scale(self.radius, about_point=ORIGIN)+ self.shift(self.arc_center)++ @staticmethod+ def _create_quadratic_bezier_points(angle, start_angle=0, n_components=8):+ samples = np.array(+ [+ [np.cos(a), np.sin(a), 0]+ for a in np.linspace(+ start_angle,+ start_angle + angle,+ 2 * n_components + 1,+ )+ ],+ )+ theta = angle / n_components+ samples[1::2] /= np.cos(theta / 2)++ points = np.zeros((3 * n_components, 3))+ points[0::3] = samples[0:-1:2]+ points[1::3] = samples[1::2]+ points[2::3] = samples[2::2]+ return points++ def _set_pre_positioned_points(self):+ anchors = np.array(+ [+ np.cos(a) * RIGHT + np.sin(a) * UP+ for a in np.linspace(+ self.start_angle,+ self.start_angle + self.angle,+ self.num_components,+ )+ ],+ )+ # Figure out which control points will give the+ # Appropriate tangent lines to the circle+ d_theta = self.angle / (self.num_components - 1.0)+ tangent_vectors = np.zeros(anchors.shape)+ # Rotate all 90 degrees, via (x, y) -> (-y, x)+ tangent_vectors[:, 1] = anchors[:, 0]+ tangent_vectors[:, 0] = -anchors[:, 1]+ # Use tangent vectors to deduce anchors+ handles1 = anchors[:-1] + (d_theta / 3) * tangent_vectors[:-1]+ handles2 = anchors[1:] - (d_theta / 3) * tangent_vectors[1:]+ self.set_anchors_and_handles(anchors[:-1], handles1, handles2, anchors[1:])++ def get_arc_center(self, warning=True):+ """+ Looks at the normals to the first two+ anchors, and finds their intersection points+ """+ # First two anchors and handles+ a1, h1, h2, a2 = self.points[:4]++ if np.all(a1 == a2):+ # For a1 and a2 to lie at the same point arc radius+ # must be zero. Thus arc_center will also lie at+ # that point.+ return a1+ # Tangent vectors+ t1 = h1 - a1+ t2 = h2 - a2+ # Normals+ n1 = rotate_vector(t1, TAU / 4)+ n2 = rotate_vector(t2, TAU / 4)+ try:+ return line_intersection(line1=(a1, a1 + n1), line2=(a2, a2 + n2))+ except Exception:+ if warning:+ warnings.warn("Can't find Arc center, using ORIGIN instead")+ self._failed_to_get_center = True+ return np.array(ORIGIN)++ def move_arc_center_to(self, point):+ self.shift(point - self.get_arc_center())+ return self++ def stop_angle(self):+ return angle_of_vector(self.points[-1] - self.get_arc_center()) % TAU+++class ArcBetweenPoints(Arc):+ """+ Inherits from Arc and additionally takes 2 points between which the arc is spanned.++ Example+ --------------------+ .. manim:: ArcBetweenPointsExample++ class ArcBetweenPointsExample(Scene):+ def construct(self):+ circle = Circle(radius=2, stroke_color=GREY)+ dot_1 = Dot(color=GREEN).move_to([2, 0, 0]).scale(0.5)+ dot_1_text = Tex("(2,0)").scale(0.5).next_to(dot_1, RIGHT).set_color(BLUE)+ dot_2 = Dot(color=GREEN).move_to([0, 2, 0]).scale(0.5)+ dot_2_text = Tex("(0,2)").scale(0.5).next_to(dot_2, UP).set_color(BLUE)+ arc= ArcBetweenPoints(start=2 * RIGHT, end=2 * UP, stroke_color=YELLOW)+ self.add(circle, dot_1, dot_2, dot_1_text, dot_2_text)+ self.play(Create(arc))+ """++ def __init__(self, start, end, angle=TAU / 4, radius=None, **kwargs):+ if radius is not None:+ self.radius = radius+ if radius < 0:+ sign = -2+ radius *= -1+ else:+ sign = 2+ halfdist = np.linalg.norm(np.array(start) - np.array(end)) / 2+ if radius < halfdist:+ raise ValueError(+ """ArcBetweenPoints called with a radius that is+ smaller than half the distance between the points.""",+ )+ arc_height = radius - math.sqrt(radius**2 - halfdist**2)+ angle = math.acos((radius - arc_height) / radius) * sign++ super().__init__(radius=radius, angle=angle, **kwargs)+ if angle == 0:+ self.set_points_as_corners([LEFT, RIGHT])+ self.put_start_and_end_on(start, end)++ if radius is None:+ center = self.get_arc_center(warning=False)+ if not self._failed_to_get_center:+ self.radius = np.linalg.norm(np.array(start) - np.array(center))+ else:+ self.radius = math.inf+++class CurvedArrow(ArcBetweenPoints):+ def __init__(self, start_point, end_point, **kwargs):+ from manim.mobject.geometry.tips import ArrowTriangleFilledTip++ tip_shape = kwargs.pop("tip_shape", ArrowTriangleFilledTip)+ super().__init__(start_point, end_point, **kwargs)+ self.add_tip(tip_shape=tip_shape)+++class CurvedDoubleArrow(CurvedArrow):+ def __init__(self, start_point, end_point, **kwargs):+ if "tip_shape_end" in kwargs:+ kwargs["tip_shape"] = kwargs.pop("tip_shape_end")+ from manim.mobject.geometry.tips import ArrowTriangleFilledTip++ tip_shape_start = kwargs.pop("tip_shape_start", ArrowTriangleFilledTip)+ super().__init__(start_point, end_point, **kwargs)+ self.add_tip(at_start=True, tip_shape=tip_shape_start)+++class Circle(Arc):+ """A circle.++ Parameters+ ----------+ color : :class:`~.Colors`, optional+ The color of the shape.+ kwargs : Any+ Additional arguments to be passed to :class:`Arc`++ Examples+ --------++ .. manim:: CircleExample+ :save_last_frame:++ class CircleExample(Scene):+ def construct(self):+ circle_1 = Circle(radius=1.0)+ circle_2 = Circle(radius=1.5, color=GREEN)+ circle_3 = Circle(radius=1.0, color=BLUE_B, fill_opacity=1)++ circle_group = Group(circle_1, circle_2, circle_3).arrange(buff=1)+ self.add(circle_group)+ """++ def __init__(+ self,+ radius: float = None,+ color=RED,+ **kwargs,+ ):+ super().__init__(+ radius=radius,+ start_angle=0,+ angle=TAU,+ color=color,+ **kwargs,+ )++ def surround(self, mobject, dim_to_match=0, stretch=False, buffer_factor=1.2):+ """Modifies a circle so that it surrounds a given mobject.++ Parameters+ ----------+ mobject : :class:`~.Mobject`+ The mobject that the circle will be surrounding.+ dim_to_match : :class:`int`, optional+ buffer_factor : :class:`float`, optional+ Scales the circle with respect to the mobject. A `buffer_factor` < 1 makes the circle smaller than the mobject.+ stretch : :class:`bool`, optional+ Stretches the circle to fit more tightly around the mobject. Note: Does not work with :class:`Line`++ Examples+ --------++ .. manim:: CircleSurround+ :save_last_frame:++ class CircleSurround(Scene):+ def construct(self):+ triangle1 = Triangle()+ circle1 = Circle().surround(triangle1)+ group1 = Group(triangle1,circle1) # treat the two mobjects as one++ line2 = Line()+ circle2 = Circle().surround(line2, buffer_factor=2.0)+ group2 = Group(line2,circle2)++ # buffer_factor < 1, so the circle is smaller than the square+ square3 = Square()+ circle3 = Circle().surround(square3, buffer_factor=0.5)+ group3 = Group(square3, circle3)++ group = Group(group1, group2, group3).arrange(buff=1)+ self.add(group)+ """++ # Ignores dim_to_match and stretch; result will always be a circle+ # TODO: Perhaps create an ellipse class to handle single-dimension stretching++ # Something goes wrong here when surrounding lines?+ # TODO: Figure out and fix+ self.replace(mobject, dim_to_match, stretch)++ self.width = np.sqrt(mobject.width**2 + mobject.height**2)+ return self.scale(buffer_factor)++ def point_at_angle(self, angle):+ """Returns the position of a point on the circle.++ Parameters+ ----------+ angle : class: `float`+ The angle of the point along the circle in radians.++ Examples+ --------++ .. manim:: PointAtAngleExample+ :save_last_frame:++ class PointAtAngleExample(Scene):+ def construct(self):+ circle = Circle(radius=2.0)+ p1 = circle.point_at_angle(PI/2)+ p2 = circle.point_at_angle(270*DEGREES)++ s1 = Square(side_length=0.25).move_to(p1)+ s2 = Square(side_length=0.25).move_to(p2)+ self.add(circle, s1, s2)++ Returns+ -------+ :class:`numpy.ndarray`+ The location of the point along the circle's circumference.+ """++ start_angle = angle_of_vector(self.points[0] - self.get_center())+ return self.point_from_proportion((angle - start_angle) / TAU)++ @staticmethod+ def from_three_points(+ p1: Sequence[float], p2: Sequence[float], p3: Sequence[float], **kwargs+ ):+ """Returns a circle passing through the specified+ three points.++ Example+ -------++ .. manim:: CircleFromPointsExample+ :save_last_frame:++ class CircleFromPointsExample(Scene):+ def construct(self):+ circle = Circle.from_three_points(LEFT, LEFT + UP, UP * 2, color=RED)+ dots = VGroup(+ Dot(LEFT),+ Dot(LEFT + UP),+ Dot(UP * 2),+ )+ self.add(NumberPlane(), circle, dots)+ """+ center = line_intersection(+ perpendicular_bisector([p1, p2]),+ perpendicular_bisector([p2, p3]),+ )+ radius = np.linalg.norm(p1 - center)+ return Circle(radius=radius, **kwargs).shift(center)+++class Dot(Circle):+ """A circle with a very small radius.++ Parameters+ ----------+ point : Union[:class:`list`, :class:`numpy.ndarray`], optional+ The location of the dot.+ radius : Optional[:class:`float`]+ The radius of the dot.+ stroke_width : :class:`float`, optional+ The thickness of the outline of the dot.+ fill_opacity : :class:`float`, optional+ The opacity of the dot's fill_colour+ color : :class:`~.Colors`, optional+ The color of the dot.+ kwargs : Any+ Additional arguments to be passed to :class:`Circle`++ Examples+ --------++ .. manim:: DotExample+ :save_last_frame:++ class DotExample(Scene):+ def construct(self):+ dot1 = Dot(point=LEFT, radius=0.08)+ dot2 = Dot(point=ORIGIN)+ dot3 = Dot(point=RIGHT)+ self.add(dot1,dot2,dot3)+ """++ def __init__(+ self,+ point=ORIGIN,+ radius: float = DEFAULT_DOT_RADIUS,+ stroke_width=0,+ fill_opacity=1.0,+ color=WHITE,+ **kwargs,+ ):+ super().__init__(+ arc_center=point,+ radius=radius,+ stroke_width=stroke_width,+ fill_opacity=fill_opacity,+ color=color,+ **kwargs,+ )+++class AnnotationDot(Dot):+ """+ A dot with bigger radius and bold stroke to annotate scenes.+ """++ def __init__(+ self,+ radius: float = DEFAULT_DOT_RADIUS * 1.3,+ stroke_width=5,+ stroke_color=WHITE,+ fill_color=BLUE,+ **kwargs,+ ):+ super().__init__(+ radius=radius,+ stroke_width=stroke_width,+ stroke_color=stroke_color,+ fill_color=fill_color,+ **kwargs,+ )+++class LabeledDot(Dot):+ """A :class:`Dot` containing a label in its center.++ Parameters+ ----------+ label : Union[:class:`str`, :class:`~.SingleStringMathTex`, :class:`~.Text`, :class:`~.Tex`]+ The label of the :class:`Dot`. This is rendered as :class:`~.MathTex`+ by default (i.e., when passing a :class:`str`), but other classes+ representing rendered strings like :class:`~.Text` or :class:`~.Tex`+ can be passed as well.++ radius : :class:`float`+ The radius of the :class:`Dot`. If ``None`` (the default), the radius+ is calculated based on the size of the ``label``.++ Examples+ --------++ .. manim:: SeveralLabeledDots+ :save_last_frame:++ class SeveralLabeledDots(Scene):+ def construct(self):+ sq = Square(fill_color=RED, fill_opacity=1)+ self.add(sq)+ dot1 = LabeledDot(Tex("42", color=RED))+ dot2 = LabeledDot(MathTex("a", color=GREEN))+ dot3 = LabeledDot(Text("ii", color=BLUE))+ dot4 = LabeledDot("3")+ dot1.next_to(sq, UL)+ dot2.next_to(sq, UR)+ dot3.next_to(sq, DL)+ dot4.next_to(sq, DR)+ self.add(dot1, dot2, dot3, dot4)+ """++ def __init__(self, label, radius=None, **kwargs) -> None:+ if isinstance(label, str):+ from manim import MathTex++ rendered_label = MathTex(label, color=BLACK)+ else:+ rendered_label = label++ if radius is None:+ radius = 0.1 + max(rendered_label.width, rendered_label.height) / 2+ super().__init__(radius=radius, **kwargs)+ rendered_label.move_to(self.get_center())+ self.add(rendered_label)+++class Ellipse(Circle):+ """A circular shape; oval, circle.++ Parameters+ ----------+ width : :class:`float`, optional+ The horizontal width of the ellipse.+ height : :class:`float`, optional+ The vertical height of the ellipse.+ kwargs : Any+ Additional arguments to be passed to :class:`Circle`++ Examples+ --------++ .. manim:: EllipseExample+ :save_last_frame:++ class EllipseExample(Scene):+ def construct(self):+ ellipse_1 = Ellipse(width=2.0, height=4.0, color=BLUE_B)+ ellipse_2 = Ellipse(width=4.0, height=1.0, color=BLUE_D)+ ellipse_group = Group(ellipse_1,ellipse_2).arrange(buff=1)+ self.add(ellipse_group)+ """++ def __init__(self, width=2, height=1, **kwargs):+ super().__init__(**kwargs)+ self.stretch_to_fit_width(width)+ self.stretch_to_fit_height(height)+++class AnnularSector(Arc):+ """++ Parameters+ ----------+ inner_radius+ The inside radius of the Annular Sector.+ outer_radius+ The outside radius of the Annular Sector.+ angle+ The clockwise angle of the Annular Sector.+ start_angle+ The starting clockwise angle of the Annular Sector.+ fill_opacity+ The opacity of the color filled in the Annular Sector.+ stroke_width+ The stroke width of the Annular Sector.+ color+ The color filled into the Annular Sector.++ Examples+ --------+ .. manim:: AnnularSectorExample+ :save_last_frame:++ class AnnularSectorExample(Scene):+ def construct(self):+ # Changes background color to clearly visualize changes in fill_opacity.+ self.camera.background_color = WHITE++ # The default parameter start_angle is 0, so the AnnularSector starts from the +x-axis.+ s1 = AnnularSector(color=YELLOW).move_to(2 * UL)++ # Different inner_radius and outer_radius than the default.+ s2 = AnnularSector(inner_radius=1.5, outer_radius=2, angle=45 * DEGREES, color=RED).move_to(2 * UR)++ # fill_opacity is typically a number > 0 and <= 1. If fill_opacity=0, the AnnularSector is transparent.+ s3 = AnnularSector(inner_radius=1, outer_radius=1.5, angle=PI, fill_opacity=0.25, color=BLUE).move_to(2 * DL)++ # With a negative value for the angle, the AnnularSector is drawn clockwise from the start value.+ s4 = AnnularSector(inner_radius=1, outer_radius=1.5, angle=-3 * PI / 2, color=GREEN).move_to(2 * DR)++ self.add(s1, s2, s3, s4)+++ """++ def __init__(+ self,+ inner_radius=1,+ outer_radius=2,+ angle=TAU / 4,+ start_angle=0,+ fill_opacity=1,+ stroke_width=0,+ color=WHITE,+ **kwargs,+ ):+ self.inner_radius = inner_radius+ self.outer_radius = outer_radius+ super().__init__(+ start_angle=start_angle,+ angle=angle,+ fill_opacity=fill_opacity,+ stroke_width=stroke_width,+ color=color,+ **kwargs,+ )++ def generate_points(self):+ inner_arc, outer_arc = (+ Arc(+ start_angle=self.start_angle,+ angle=self.angle,+ radius=radius,+ arc_center=self.arc_center,+ )+ for radius in (self.inner_radius, self.outer_radius)+ )+ outer_arc.reverse_points()+ self.append_points(inner_arc.points)+ self.add_line_to(outer_arc.points[0])+ self.append_points(outer_arc.points)+ self.add_line_to(inner_arc.points[0])++ init_points = generate_points+++class Sector(AnnularSector):+ """++ Examples+ --------++ .. manim:: ExampleSector+ :save_last_frame:++ class ExampleSector(Scene):+ def construct(self):+ sector = Sector(outer_radius=2, inner_radius=1)+ sector2 = Sector(outer_radius=2.5, inner_radius=0.8).move_to([-3, 0, 0])+ sector.set_color(RED)+ sector2.set_color(PINK)+ self.add(sector, sector2)+ """++ def __init__(self, outer_radius=1, inner_radius=0, **kwargs):+ super().__init__(inner_radius=inner_radius, outer_radius=outer_radius, **kwargs)+++class Annulus(Circle):+ """Region between two concentric :class:`Circles <.Circle>`.++ Parameters+ ----------+ inner_radius+ The radius of the inner :class:`Circle`.+ outer_radius+ The radius of the outer :class:`Circle`.+ kwargs : Any+ Additional arguments to be passed to :class:`Annulus`++ Examples+ --------++ .. manim:: AnnulusExample+ :save_last_frame:++ class AnnulusExample(Scene):+ def construct(self):+ annulus_1 = Annulus(inner_radius=0.5, outer_radius=1).shift(UP)+ annulus_2 = Annulus(inner_radius=0.3, outer_radius=0.6, color=RED).next_to(annulus_1, DOWN)+ self.add(annulus_1, annulus_2)+ """++ def __init__(+ self,+ inner_radius: float | None = 1,+ outer_radius: float | None = 2,+ fill_opacity=1,+ stroke_width=0,+ color=WHITE,+ mark_paths_closed=False,+ **kwargs,+ ):+ self.mark_paths_closed = mark_paths_closed # is this even used?+ self.inner_radius = inner_radius+ self.outer_radius = outer_radius+ super().__init__(+ fill_opacity=fill_opacity, stroke_width=stroke_width, color=color, **kwargs+ )++ def generate_points(self):+ self.radius = self.outer_radius+ outer_circle = Circle(radius=self.outer_radius)+ inner_circle = Circle(radius=self.inner_radius)+ inner_circle.reverse_points()+ self.append_points(outer_circle.points)+ self.append_points(inner_circle.points)+ self.shift(self.arc_center)++ init_points = generate_points+++class CubicBezier(VMobject, metaclass=ConvertToOpenGL):+ """+ Example+ -------++ .. manim:: BezierSplineExample+ :save_last_frame:++ class BezierSplineExample(Scene):+ def construct(self):+ p1 = np.array([-3, 1, 0])+ p1b = p1 + [1, 0, 0]+ d1 = Dot(point=p1).set_color(BLUE)+ l1 = Line(p1, p1b)+ p2 = np.array([3, -1, 0])+ p2b = p2 - [1, 0, 0]+ d2 = Dot(point=p2).set_color(RED)+ l2 = Line(p2, p2b)+ bezier = CubicBezier(p1b, p1b + 3 * RIGHT, p2b - 3 * RIGHT, p2b)+ self.add(l1, d1, l2, d2, bezier)++ """++ def __init__(self, start_anchor, start_handle, end_handle, end_anchor, **kwargs):+ super().__init__(**kwargs)+ self.add_cubic_bezier_curve(start_anchor, start_handle, end_handle, end_anchor)+++class ArcPolygon(VMobject, metaclass=ConvertToOpenGL):+ """A generalized polygon allowing for points to be connected with arcs.++ This version tries to stick close to the way :class:`Polygon` is used. Points+ can be passed to it directly which are used to generate the according arcs+ (using :class:`ArcBetweenPoints`). An angle or radius can be passed to it to+ use across all arcs, but to configure arcs individually an ``arc_config`` list+ has to be passed with the syntax explained below.++ .. tip::++ Two instances of :class:`ArcPolygon` can be transformed properly into one+ another as well. Be advised that any arc initialized with ``angle=0``+ will actually be a straight line, so if a straight section should seamlessly+ transform into an arced section or vice versa, initialize the straight section+ with a negligible angle instead (such as ``angle=0.0001``).++ There is an alternative version (:class:`ArcPolygonFromArcs`) that is instantiated+ with pre-defined arcs.++ See Also+ --------+ :class:`ArcPolygonFromArcs`++ Parameters+ ----------+ vertices : Union[:class:`list`, :class:`np.array`]+ A list of vertices, start and end points for the arc segments.+ angle : :class:`float`+ The angle used for constructing the arcs. If no other parameters+ are set, this angle is used to construct all arcs.+ radius : Optional[:class:`float`]+ The circle radius used to construct the arcs. If specified,+ overrides the specified ``angle``.+ arc_config : Optional[Union[List[:class:`dict`]], :class:`dict`]+ When passing a ``dict``, its content will be passed as keyword+ arguments to :class:`~.ArcBetweenPoints`. Otherwise, a list+ of dictionaries containing values that are passed as keyword+ arguments for every individual arc can be passed.+ kwargs+ Further keyword arguments that are passed to the constructor of+ :class:`~.VMobject`.++ Attributes+ ----------+ arcs : :class:`list`+ The arcs created from the input parameters::++ >>> from manim import ArcPolygon+ >>> ap = ArcPolygon([0, 0, 0], [2, 0, 0], [0, 2, 0])+ >>> ap.arcs+ [ArcBetweenPoints, ArcBetweenPoints, ArcBetweenPoints]++ Examples+ --------++ .. manim:: SeveralArcPolygons++ class SeveralArcPolygons(Scene):+ def construct(self):+ a = [0, 0, 0]+ b = [2, 0, 0]+ c = [0, 2, 0]+ ap1 = ArcPolygon(a, b, c, radius=2)+ ap2 = ArcPolygon(a, b, c, angle=45*DEGREES)+ ap3 = ArcPolygon(a, b, c, arc_config={'radius': 1.7, 'color': RED})+ ap4 = ArcPolygon(a, b, c, color=RED, fill_opacity=1,+ arc_config=[{'radius': 1.7, 'color': RED},+ {'angle': 20*DEGREES, 'color': BLUE},+ {'radius': 1}])+ ap_group = VGroup(ap1, ap2, ap3, ap4).arrange()+ self.play(*[Create(ap) for ap in [ap1, ap2, ap3, ap4]])+ self.wait()++ For further examples see :class:`ArcPolygonFromArcs`.+ """++ def __init__(self, *vertices, angle=PI / 4, radius=None, arc_config=None, **kwargs):+ n = len(vertices)+ point_pairs = [(vertices[k], vertices[(k + 1) % n]) for k in range(n)]++ if not arc_config:+ if radius:+ all_arc_configs = itertools.repeat({"radius": radius}, len(point_pairs))+ else:+ all_arc_configs = itertools.repeat({"angle": angle}, len(point_pairs))+ elif isinstance(arc_config, dict):+ all_arc_configs = itertools.repeat(arc_config, len(point_pairs))+ else:+ assert len(arc_config) == n+ all_arc_configs = arc_config++ arcs = [+ ArcBetweenPoints(*pair, **conf)+ for (pair, conf) in zip(point_pairs, all_arc_configs)+ ]++ super().__init__(**kwargs)+ # Adding the arcs like this makes ArcPolygon double as a VGroup.+ # Also makes changes to the ArcPolygon, such as scaling, affect+ # the arcs, so that their new values are usable.+ self.add(*arcs)+ for arc in arcs:+ self.append_points(arc.points)++ # This enables the use of ArcPolygon.arcs as a convenience+ # because ArcPolygon[0] returns itself, not the first Arc.+ self.arcs = arcs+++class ArcPolygonFromArcs(VMobject, metaclass=ConvertToOpenGL):+ """A generalized polygon allowing for points to be connected with arcs.++ This version takes in pre-defined arcs to generate the arcpolygon and introduces+ little new syntax. However unlike :class:`Polygon` it can't be created with points+ directly.++ For proper appearance the passed arcs should connect seamlessly:+ ``[a,b][b,c][c,a]``++ If there are any gaps between the arcs, those will be filled in+ with straight lines, which can be used deliberately for any straight+ sections. Arcs can also be passed as straight lines such as an arc+ initialized with ``angle=0``.++ .. tip::++ Two instances of :class:`ArcPolygon` can be transformed properly into+ one another as well. Be advised that any arc initialized with ``angle=0``+ will actually be a straight line, so if a straight section should seamlessly+ transform into an arced section or vice versa, initialize the straight+ section with a negligible angle instead (such as ``angle=0.0001``).++ There is an alternative version (:class:`ArcPolygon`) that can be instantiated+ with points.++ See Also+ --------+ :class:`ArcPolygon`++ Parameters+ ----------+ arcs : Union[:class:`Arc`, :class:`ArcBetweenPoints`]+ These are the arcs from which the arcpolygon is assembled.+ kwargs+ Keyword arguments that are passed to the constructor of+ :class:`~.VMobject`. Affects how the ArcPolygon itself is drawn,+ but doesn't affect passed arcs.++ Attributes+ ----------+ arcs : :class:`list`+ The arcs used to initialize the ArcPolygonFromArcs::++ >>> from manim import ArcPolygonFromArcs, Arc, ArcBetweenPoints+ >>> ap = ArcPolygonFromArcs(Arc(), ArcBetweenPoints([1,0,0], [0,1,0]), Arc())+ >>> ap.arcs+ [Arc, ArcBetweenPoints, Arc]++ Examples+ --------+ One example of an arcpolygon is the Reuleaux triangle.+ Instead of 3 straight lines connecting the outer points,+ a Reuleaux triangle has 3 arcs connecting those points,+ making a shape with constant width.++ Passed arcs are stored as submobjects in the arcpolygon.+ This means that the arcs are changed along with the arcpolygon,+ for example when it's shifted, and these arcs can be manipulated+ after the arcpolygon has been initialized.++ Also both the arcs contained in an :class:`~.ArcPolygonFromArcs`, as well as the+ arcpolygon itself are drawn, which affects draw time in :class:`~.Create`+ for example. In most cases the arcs themselves don't+ need to be drawn, in which case they can be passed as invisible.++ .. manim:: ArcPolygonExample++ class ArcPolygonExample(Scene):+ def construct(self):+ arc_conf = {"stroke_width": 0}+ poly_conf = {"stroke_width": 10, "stroke_color": BLUE,+ "fill_opacity": 1, "color": PURPLE}+ a = [-1, 0, 0]+ b = [1, 0, 0]+ c = [0, np.sqrt(3), 0]+ arc0 = ArcBetweenPoints(a, b, radius=2, **arc_conf)+ arc1 = ArcBetweenPoints(b, c, radius=2, **arc_conf)+ arc2 = ArcBetweenPoints(c, a, radius=2, **arc_conf)+ reuleaux_tri = ArcPolygonFromArcs(arc0, arc1, arc2, **poly_conf)+ self.play(FadeIn(reuleaux_tri))+ self.wait(2)++ The arcpolygon itself can also be hidden so that instead only the contained+ arcs are drawn. This can be used to easily debug arcs or to highlight them.++ .. manim:: ArcPolygonExample2++ class ArcPolygonExample2(Scene):+ def construct(self):+ arc_conf = {"stroke_width": 3, "stroke_color": BLUE,+ "fill_opacity": 0.5, "color": GREEN}+ poly_conf = {"color": None}+ a = [-1, 0, 0]+ b = [1, 0, 0]+ c = [0, np.sqrt(3), 0]+ arc0 = ArcBetweenPoints(a, b, radius=2, **arc_conf)+ arc1 = ArcBetweenPoints(b, c, radius=2, **arc_conf)+ arc2 = ArcBetweenPoints(c, a, radius=2, stroke_color=RED)+ reuleaux_tri = ArcPolygonFromArcs(arc0, arc1, arc2, **poly_conf)+ self.play(FadeIn(reuleaux_tri))+ self.wait(2)++ """++ def __init__(self, *arcs, **kwargs):+ if not all(isinstance(m, (Arc, ArcBetweenPoints)) for m in arcs):+ raise ValueError(+ "All ArcPolygon submobjects must be of type Arc/ArcBetweenPoints",+ )+ super().__init__(**kwargs)+ # Adding the arcs like this makes ArcPolygonFromArcs double as a VGroup.+ # Also makes changes to the ArcPolygonFromArcs, such as scaling, affect+ # the arcs, so that their new values are usable.+ self.add(*arcs)+ # This enables the use of ArcPolygonFromArcs.arcs as a convenience+ # because ArcPolygonFromArcs[0] returns itself, not the first Arc.+ self.arcs = [*arcs]+ from .line import Line++ for arc1, arc2 in adjacent_pairs(arcs):+ self.append_points(arc1.points)+ line = Line(arc1.get_end(), arc2.get_start())+ len_ratio = line.get_length() / arc1.get_arc_length()+ if math.isnan(len_ratio) or math.isinf(len_ratio):+ continue+ line.insert_n_curves(int(arc1.get_num_curves() * len_ratio))+ self.append_points(line.points)diff --git a/manim/mobject/boolean_ops.py b/manim/mobject/geometry/boolean_ops.pysimilarity index 97%rename from manim/mobject/boolean_ops.pyrename to manim/mobject/geometry/boolean_ops.pyindex 56b669016..32dfbfcf6 100644--- a/manim/mobject/boolean_ops.py+++ b/manim/mobject/geometry/boolean_ops.py@@ -1,3 +1,5 @@+"""Boolean operations for two-dimensional mobjects."""+from __future__ import annotationsimport typing@@ -6,9 +8,9 @@ import numpy as npfrom pathops import Path as SkiaPathfrom pathops import PathVerb, difference, intersection, union, xor-from .. import config-from .opengl_compatibility import ConvertToOpenGL-from .types.vectorized_mobject import VMobject+from manim import config+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from manim.mobject.types.vectorized_mobject import VMobject__all__ = ["Union", "Intersection", "Difference", "Exclusion"]diff --git a/manim/mobject/geometry/line.py b/manim/mobject/geometry/line.pynew file mode 100644index 000000000..77f6eab09--- /dev/null+++ b/manim/mobject/geometry/line.py@@ -0,0 +1,1066 @@+r"""Mobjects that are lines or variations of them."""++from __future__ import annotations++__all__ = [+ "Line",+ "DashedLine",+ "TangentLine",+ "Elbow",+ "Arrow",+ "Vector",+ "DoubleArrow",+ "Angle",+ "RightAngle",+]++from typing import Sequence, Union++import numpy as np+from colour import Color++from manim import config+from manim.constants import *+from manim.mobject.geometry.arc import Arc, ArcBetweenPoints, Dot, TipableVMobject+from manim.mobject.geometry.tips import ArrowTriangleFilledTip+from manim.mobject.mobject import Mobject+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from manim.mobject.opengl.opengl_mobject import OpenGLMobject+from manim.mobject.types.vectorized_mobject import DashedVMobject, VGroup, VMobject+from manim.utils.color import *+from manim.utils.space_ops import angle_of_vector, line_intersection, normalize+++class Line(TipableVMobject):+ def __init__(self, start=LEFT, end=RIGHT, buff=0, path_arc=None, **kwargs):+ self.dim = 3+ self.buff = buff+ self.path_arc = path_arc+ self._set_start_and_end_attrs(start, end)+ super().__init__(**kwargs)++ def generate_points(self):+ self.set_points_by_ends(+ start=self.start,+ end=self.end,+ buff=self.buff,+ path_arc=self.path_arc,+ )++ def set_points_by_ends(self, start, end, buff=0, path_arc=0):+ if path_arc:+ arc = ArcBetweenPoints(self.start, self.end, angle=self.path_arc)+ self.set_points(arc.points)+ else:+ self.set_points_as_corners([start, end])++ self._account_for_buff(buff)++ init_points = generate_points++ def _account_for_buff(self, buff):+ if buff == 0:+ return+ #+ if self.path_arc == 0:+ length = self.get_length()+ else:+ length = self.get_arc_length()+ #+ if length < 2 * buff:+ return+ buff_proportion = buff / length+ self.pointwise_become_partial(self, buff_proportion, 1 - buff_proportion)+ return self++ def _set_start_and_end_attrs(self, start, end):+ # If either start or end are Mobjects, this+ # gives their centers+ rough_start = self._pointify(start)+ rough_end = self._pointify(end)+ vect = normalize(rough_end - rough_start)+ # Now that we know the direction between them,+ # we can find the appropriate boundary point from+ # start and end, if they're mobjects+ self.start = self._pointify(start, vect)+ self.end = self._pointify(end, -vect)++ def _pointify(+ self,+ mob_or_point: Mobject | Sequence[float],+ direction: Sequence[float] | None = None,+ ) -> np.ndarray:+ """Transforms a mobject into its corresponding point. Does nothing if a point is passed.++ ``direction`` determines the location of the point along its bounding box in that direction.++ Parameters+ ----------+ mob_or_point+ The mobject or point.+ direction+ The direction.+ """+ if isinstance(mob_or_point, (Mobject, OpenGLMobject)):+ mob = mob_or_point+ if direction is None:+ return mob.get_center()+ else:+ return mob.get_boundary_point(direction)+ return np.array(mob_or_point)++ def set_path_arc(self, new_value):+ self.path_arc = new_value+ self.init_points()++ def put_start_and_end_on(self, start: Sequence[float], end: Sequence[float]):+ """Sets starts and end coordinates of a line.+ Examples+ --------+ .. manim:: LineExample++ class LineExample(Scene):+ def construct(self):+ d = VGroup()+ for i in range(0,10):+ d.add(Dot())+ d.arrange_in_grid(buff=1)+ self.add(d)+ l= Line(d[0], d[1])+ self.add(l)+ self.wait()+ l.put_start_and_end_on(d[1].get_center(), d[2].get_center())+ self.wait()+ l.put_start_and_end_on(d[4].get_center(), d[7].get_center())+ self.wait()+ """+ curr_start, curr_end = self.get_start_and_end()+ if np.all(curr_start == curr_end):+ # TODO, any problems with resetting+ # these attrs?+ self.start = start+ self.end = end+ self.generate_points()+ return super().put_start_and_end_on(start, end)++ def get_vector(self):+ return self.get_end() - self.get_start()++ def get_unit_vector(self):+ return normalize(self.get_vector())++ def get_angle(self):+ return angle_of_vector(self.get_vector())++ def get_projection(self, point: Sequence[float]) -> Sequence[float]:+ """Returns the projection of a point onto a line.++ Parameters+ ----------+ point+ The point to which the line is projected.++ """++ start = self.get_start()+ end = self.get_end()+ unit_vect = normalize(end - start)+ return start + np.dot(point - start, unit_vect) * unit_vect++ def get_slope(self):+ return np.tan(self.get_angle())++ def set_angle(self, angle, about_point=None):+ if about_point is None:+ about_point = self.get_start()++ self.rotate(+ angle - self.get_angle(),+ about_point=about_point,+ )++ return self++ def set_length(self, length):+ return self.scale(length / self.get_length())+++class DashedLine(Line):+ """A dashed :class:`Line`.++ Parameters+ ----------+ args : Any+ Arguments to be passed to :class:`Line`+ dash_length : :class:`float`, optional+ The length of each individual dash of the line.+ dashed_ratio : :class:`float`, optional+ The ratio of dash space to empty space. Range of 0-1.+ kwargs : Any+ Additional arguments to be passed to :class:`Line`++ Examples+ --------+ .. manim:: DashedLineExample+ :save_last_frame:++ class DashedLineExample(Scene):+ def construct(self):+ # dash_length increased+ dashed_1 = DashedLine(config.left_side, config.right_side, dash_length=2.0).shift(UP*2)+ # normal+ dashed_2 = DashedLine(config.left_side, config.right_side)+ # dashed_ratio decreased+ dashed_3 = DashedLine(config.left_side, config.right_side, dashed_ratio=0.1).shift(DOWN*2)+ self.add(dashed_1, dashed_2, dashed_3)++ See Also+ --------+ :class:`~.DashedVMobject`+ """++ def __init__(+ self,+ *args,+ dash_length=DEFAULT_DASH_LENGTH,+ dashed_ratio=0.5,+ **kwargs,+ ):+ self.dash_length = dash_length+ self.dashed_ratio = dashed_ratio+ super().__init__(*args, **kwargs)+ dashes = DashedVMobject(+ self,+ num_dashes=self._calculate_num_dashes(),+ dashed_ratio=dashed_ratio,+ )+ self.clear_points()+ self.add(*dashes)++ def _calculate_num_dashes(self) -> int:+ """Returns the number of dashes in the dashed line.++ Examples+ --------+ ::++ >>> DashedLine()._calculate_num_dashes()+ 20+ """++ # Minimum number of dashes has to be 2+ return max(+ 2,+ int(np.ceil((self.get_length() / self.dash_length) * self.dashed_ratio)),+ )++ def get_start(self) -> np.ndarray:+ """Returns the start point of the line.++ Examples+ --------+ ::++ >>> DashedLine().get_start()+ array([-1., 0., 0.])+ """++ if len(self.submobjects) > 0:+ return self.submobjects[0].get_start()+ else:+ return super().get_start()++ def get_end(self) -> np.ndarray:+ """Returns the end point of the line.++ Examples+ --------+ ::++ >>> DashedLine().get_end()+ array([1., 0., 0.])+ """++ if len(self.submobjects) > 0:+ return self.submobjects[-1].get_end()+ else:+ return super().get_end()++ def get_first_handle(self) -> np.ndarray:+ """Returns the point of the first handle.++ Examples+ --------+ ::++ >>> DashedLine().get_first_handle()+ array([-0.98333333, 0. , 0. ])+ """++ return self.submobjects[0].points[1]++ def get_last_handle(self) -> np.ndarray:+ """Returns the point of the last handle.++ Examples+ --------+ ::++ >>> DashedLine().get_last_handle()+ array([0.98333333, 0. , 0. ])+ """++ return self.submobjects[-1].points[-2]+++class TangentLine(Line):+ """Constructs a line tangent to a :class:`~.VMobject` at a specific point.++ Parameters+ ----------+ vmob : :class:`~.VMobject`+ The VMobject on which the tangent line is drawn.+ alpha : :class:`float`+ How far along the shape that the line will be constructed. range: 0-1.+ length : :class:`float`, optional+ Length of the tangent line.+ d_alpha: :class:`float`, optional+ The ``dx`` value+ kwargs : Any+ Additional arguments to be passed to :class:`Line`++ Examples+ --------++ .. manim:: TangentLineExample+ :save_last_frame:++ class TangentLineExample(Scene):+ def construct(self):+ circle = Circle(radius=2)+ line_1 = TangentLine(circle, alpha=0.0, length=4, color=BLUE_D) # right+ line_2 = TangentLine(circle, alpha=0.4, length=4, color=GREEN) # top left+ self.add(circle, line_1, line_2)++ See Also+ --------+ :meth:`~.VMobject.point_from_proportion`+ """++ def __init__(self, vmob, alpha, length=1, d_alpha=1e-6, **kwargs):+ self.length = length+ self.d_alpha = d_alpha+ da = self.d_alpha+ a1 = np.clip(alpha - da, 0, 1)+ a2 = np.clip(alpha + da, 0, 1)+ super().__init__(+ vmob.point_from_proportion(a1), vmob.point_from_proportion(a2), **kwargs+ )+ self.scale(self.length / self.get_length())+++class Elbow(VMobject, metaclass=ConvertToOpenGL):+ """Two lines that create a right angle about each other: L-shape.++ Parameters+ ----------+ width : :class:`float`, optional+ The length of the elbow's sides.+ angle : :class:`float`, optional+ The rotation of the elbow.+ kwargs : Any+ Additional arguments to be passed to :class:`~.VMobject`++ Examples+ --------++ .. manim:: ElbowExample+ :save_last_frame:++ class ElbowExample(Scene):+ def construct(self):+ elbow_1 = Elbow()+ elbow_2 = Elbow(width=2.0)+ elbow_3 = Elbow(width=2.0, angle=5*PI/4)++ elbow_group = Group(elbow_1, elbow_2, elbow_3).arrange(buff=1)+ self.add(elbow_group)++ See Also+ --------+ :class:`RightAngle`+ """++ def __init__(self, width=0.2, angle=0, **kwargs):+ self.angle = angle+ super().__init__(**kwargs)+ self.set_points_as_corners([UP, UP + RIGHT, RIGHT])+ self.scale_to_fit_width(width, about_point=ORIGIN)+ self.rotate(self.angle, about_point=ORIGIN)+++class Arrow(Line):+ """An arrow.++ Parameters+ ----------+ args : Any+ Arguments to be passed to :class:`Line`.+ stroke_width : :class:`float`, optional+ The thickness of the arrow. Influenced by :attr:`max_stroke_width_to_length_ratio`.+ buff : :class:`float`, optional+ The distance of the arrow from its start and end points.+ max_tip_length_to_length_ratio : :class:`float`, optional+ :attr:`tip_length` scales with the length of the arrow. Increasing this ratio raises the max value of :attr:`tip_length`.+ max_stroke_width_to_length_ratio : :class:`float`, optional+ :attr:`stroke_width` scales with the length of the arrow. Increasing this ratio ratios the max value of :attr:`stroke_width`.+ kwargs : Any+ Additional arguments to be passed to :class:`Line`.++ Examples+ --------++ .. manim:: ArrowExample+ :save_last_frame:++ from manim.mobject.geometry.tips import ArrowSquareTip+ class ArrowExample(Scene):+ def construct(self):+ arrow_1 = Arrow(start=RIGHT, end=LEFT, color=GOLD)+ arrow_2 = Arrow(start=RIGHT, end=LEFT, color=GOLD, tip_shape=ArrowSquareTip).shift(DOWN)+ g1 = Group(arrow_1, arrow_2)++ # the effect of buff+ square = Square(color=MAROON_A)+ arrow_3 = Arrow(start=LEFT, end=RIGHT)+ arrow_4 = Arrow(start=LEFT, end=RIGHT, buff=0).next_to(arrow_1, UP)+ g2 = Group(arrow_3, arrow_4, square)++ # a shorter arrow has a shorter tip and smaller stroke width+ arrow_5 = Arrow(start=ORIGIN, end=config.top).shift(LEFT * 4)+ arrow_6 = Arrow(start=config.top + DOWN, end=config.top).shift(LEFT * 3)+ g3 = Group(arrow_5, arrow_6)++ self.add(Group(g1, g2, g3).arrange(buff=2))+++ .. manim:: ArrowExample+ :save_last_frame:++ class ArrowExample(Scene):+ def construct(self):+ left_group = VGroup()+ # As buff increases, the size of the arrow decreases.+ for buff in np.arange(0, 2.2, 0.45):+ left_group += Arrow(buff=buff, start=2 * LEFT, end=2 * RIGHT)+ # Required to arrange arrows.+ left_group.arrange(DOWN)+ left_group.move_to(4 * LEFT)++ middle_group = VGroup()+ # As max_stroke_width_to_length_ratio gets bigger,+ # the width of stroke increases.+ for i in np.arange(0, 5, 0.5):+ middle_group += Arrow(max_stroke_width_to_length_ratio=i)+ middle_group.arrange(DOWN)++ UR_group = VGroup()+ # As max_tip_length_to_length_ratio increases,+ # the length of the tip increases.+ for i in np.arange(0, 0.3, 0.1):+ UR_group += Arrow(max_tip_length_to_length_ratio=i)+ UR_group.arrange(DOWN)+ UR_group.move_to(4 * RIGHT + 2 * UP)++ DR_group = VGroup()+ DR_group += Arrow(start=LEFT, end=RIGHT, color=BLUE, tip_shape=ArrowSquareTip)+ DR_group += Arrow(start=LEFT, end=RIGHT, color=BLUE, tip_shape=ArrowSquareFilledTip)+ DR_group += Arrow(start=LEFT, end=RIGHT, color=YELLOW, tip_shape=ArrowCircleTip)+ DR_group += Arrow(start=LEFT, end=RIGHT, color=YELLOW, tip_shape=ArrowCircleFilledTip)+ DR_group.arrange(DOWN)+ DR_group.move_to(4 * RIGHT + 2 * DOWN)++ self.add(left_group, middle_group, UR_group, DR_group)+++ See Also+ --------+ :class:`ArrowTip`+ :class:`CurvedArrow`+ """++ def __init__(+ self,+ *args,+ stroke_width=6,+ buff=MED_SMALL_BUFF,+ max_tip_length_to_length_ratio=0.25,+ max_stroke_width_to_length_ratio=5,+ **kwargs,+ ):+ self.max_tip_length_to_length_ratio = max_tip_length_to_length_ratio+ self.max_stroke_width_to_length_ratio = max_stroke_width_to_length_ratio+ tip_shape = kwargs.pop("tip_shape", ArrowTriangleFilledTip)+ super().__init__(*args, buff=buff, stroke_width=stroke_width, **kwargs)+ # TODO, should this be affected when+ # Arrow.set_stroke is called?+ self.initial_stroke_width = self.stroke_width+ self.add_tip(tip_shape=tip_shape)+ self._set_stroke_width_from_length()++ def scale(self, factor, scale_tips=False, **kwargs):+ r"""Scale an arrow, but keep stroke width and arrow tip size fixed.++ See Also+ --------+ :meth:`~.Mobject.scale`++ Examples+ --------+ ::++ >>> arrow = Arrow(np.array([-1, -1, 0]), np.array([1, 1, 0]), buff=0)+ >>> scaled_arrow = arrow.scale(2)+ >>> np.round(scaled_arrow.get_start_and_end(), 8) + 0+ array([[-2., -2., 0.],+ [ 2., 2., 0.]])+ >>> arrow.tip.length == scaled_arrow.tip.length+ True++ Manually scaling the object using the default method+ :meth:`~.Mobject.scale` does not have the same properties::++ >>> new_arrow = Arrow(np.array([-1, -1, 0]), np.array([1, 1, 0]), buff=0)+ >>> another_scaled_arrow = VMobject.scale(new_arrow, 2)+ >>> another_scaled_arrow.tip.length == arrow.tip.length+ False++ """+ if self.get_length() == 0:+ return self++ if scale_tips:+ super().scale(factor, **kwargs)+ self._set_stroke_width_from_length()+ return self++ has_tip = self.has_tip()+ has_start_tip = self.has_start_tip()+ if has_tip or has_start_tip:+ old_tips = self.pop_tips()++ super().scale(factor, **kwargs)+ self._set_stroke_width_from_length()++ if has_tip:+ self.add_tip(tip=old_tips[0])+ if has_start_tip:+ self.add_tip(tip=old_tips[1], at_start=True)+ return self++ def get_normal_vector(self) -> np.ndarray:+ """Returns the normal of a vector.++ Examples+ --------+ ::++ >>> np.round(Arrow().get_normal_vector()) + 0. # add 0. to avoid negative 0 in output+ array([ 0., 0., -1.])+ """++ p0, p1, p2 = self.tip.get_start_anchors()[:3]+ return normalize(np.cross(p2 - p1, p1 - p0))++ def reset_normal_vector(self):+ """Resets the normal of a vector"""+ self.normal_vector = self.get_normal_vector()+ return self++ def get_default_tip_length(self) -> float:+ """Returns the default tip_length of the arrow.++ Examples+ --------++ ::++ >>> Arrow().get_default_tip_length()+ 0.35+ """++ max_ratio = self.max_tip_length_to_length_ratio+ return min(self.tip_length, max_ratio * self.get_length())++ def _set_stroke_width_from_length(self):+ """Sets stroke width based on length."""+ max_ratio = self.max_stroke_width_to_length_ratio+ if config.renderer == "opengl":+ self.set_stroke(+ width=min(self.initial_stroke_width, max_ratio * self.get_length()),+ recurse=False,+ )+ else:+ self.set_stroke(+ width=min(self.initial_stroke_width, max_ratio * self.get_length()),+ family=False,+ )+ return self+++class Vector(Arrow):+ """A vector specialized for use in graphs.++ Parameters+ ----------+ direction : Union[:class:`list`, :class:`numpy.ndarray`]+ The direction of the arrow.+ buff : :class:`float`+ The distance of the vector from its endpoints.+ kwargs : Any+ Additional arguments to be passed to :class:`Arrow`++ Examples+ --------++ .. manim:: VectorExample+ :save_last_frame:++ class VectorExample(Scene):+ def construct(self):+ plane = NumberPlane()+ vector_1 = Vector([1,2])+ vector_2 = Vector([-5,-2])+ self.add(plane, vector_1, vector_2)+ """++ def __init__(self, direction=RIGHT, buff=0, **kwargs):+ self.buff = buff+ if len(direction) == 2:+ direction = np.hstack([direction, 0])++ super().__init__(ORIGIN, direction, buff=buff, **kwargs)++ def coordinate_label(+ self,+ integer_labels: bool = True,+ n_dim: int = 2,+ color: Color | None = None,+ **kwargs,+ ):+ """Creates a label based on the coordinates of the vector.++ Parameters+ ----------+ integer_labels+ Whether or not to round the coordinates to integers.+ n_dim+ The number of dimensions of the vector.+ color+ Sets the color of label, optional.+ kwargs+ Additional arguments to be passed to :class:`~.Matrix`.++ Examples+ --------++ .. manim:: VectorCoordinateLabel+ :save_last_frame:++ class VectorCoordinateLabel(Scene):+ def construct(self):+ plane = NumberPlane()++ vec_1 = Vector([1, 2])+ vec_2 = Vector([-3, -2])+ label_1 = vec_1.coordinate_label()+ label_2 = vec_2.coordinate_label(color=YELLOW)++ self.add(plane, vec_1, vec_2, label_1, label_2)++ Returns+ -------+ :class:`~.Matrix`+ The label.+ """++ # avoiding circular imports+ from ..matrix import Matrix++ vect = np.array(self.get_end())+ if integer_labels:+ vect = np.round(vect).astype(int)+ vect = vect[:n_dim]+ vect = vect.reshape((n_dim, 1))+ label = Matrix(vect, **kwargs)+ label.scale(LARGE_BUFF - 0.2)++ shift_dir = np.array(self.get_end())+ if shift_dir[0] >= 0: # Pointing right+ shift_dir -= label.get_left() + DEFAULT_MOBJECT_TO_MOBJECT_BUFFER * LEFT+ else: # Pointing left+ shift_dir -= label.get_right() + DEFAULT_MOBJECT_TO_MOBJECT_BUFFER * RIGHT+ label.shift(shift_dir)+ if color is not None:+ label.set_color(color)+ return label+++class DoubleArrow(Arrow):+ """An arrow with tips on both ends.++ Parameters+ ----------+ args : Any+ Arguments to be passed to :class:`Arrow`+ kwargs : Any+ Additional arguments to be passed to :class:`Arrow`++ Examples+ --------++ .. manim:: DoubleArrowExample+ :save_last_frame:++ from manim.mobject.geometry.tips import ArrowCircleFilledTip+ class DoubleArrowExample(Scene):+ def construct(self):+ circle = Circle(radius=2.0)+ d_arrow = DoubleArrow(start=circle.get_left(), end=circle.get_right())+ d_arrow_2 = DoubleArrow(tip_shape_end=ArrowCircleFilledTip, tip_shape_start=ArrowCircleFilledTip)+ group = Group(Group(circle, d_arrow), d_arrow_2).arrange(UP, buff=1)+ self.add(group)+++ .. manim:: DoubleArrowExample2+ :save_last_frame:++ class DoubleArrowExample2(Scene):+ def construct(self):+ box = Square()+ p1 = box.get_left()+ p2 = box.get_right()+ d1 = DoubleArrow(p1, p2, buff=0)+ d2 = DoubleArrow(p1, p2, buff=0, tip_length=0.2, color=YELLOW)+ d3 = DoubleArrow(p1, p2, buff=0, tip_length=0.4, color=BLUE)+ Group(d1, d2, d3).arrange(DOWN)+ self.add(box, d1, d2, d3)++ See Also+ --------+ :class:`ArrowTip`+ :class:`CurvedDoubleArrow`+ """++ def __init__(self, *args, **kwargs):+ if "tip_shape_end" in kwargs:+ kwargs["tip_shape"] = kwargs.pop("tip_shape_end")+ tip_shape_start = kwargs.pop("tip_shape_start", ArrowTriangleFilledTip)+ super().__init__(*args, **kwargs)+ self.add_tip(at_start=True, tip_shape=tip_shape_start)+++class Angle(VMobject, metaclass=ConvertToOpenGL):+ """A circular arc or elbow-type mobject representing an angle of two lines.++ Parameters+ ----------+ line1 :+ The first line.+ line2 :+ The second line.+ radius :+ The radius of the :class:`Arc`.+ quadrant : Sequence[:class:`int`]+ A sequence of two :class:`int` numbers determining which of the 4 quadrants should be used.+ The first value indicates whether to anchor the arc on the first line closer to the end point (1)+ or start point (-1), and the second value functions similarly for the+ end (1) or start (-1) of the second line.+ Possibilities: (1,1), (-1,1), (1,-1), (-1,-1).+ other_angle :+ Toggles between the two possible angles defined by two points and an arc center. If set to+ False (default), the arc will always go counterclockwise from the point on line1 until+ the point on line2 is reached. If set to True, the angle will go clockwise from line1 to line2.+ dot : :class:`bool`+ Allows for a :class:`Dot` in the arc. Mainly used as an convention to indicate a right angle.+ The dot can be customized in the next three parameters.+ dot_radius : :class:`float`+ The radius of the :class:`Dot`. If not specified otherwise, this radius will be 1/10 of the arc radius.+ dot_distance : :class:`float`+ Relative distance from the center to the arc: 0 puts the dot in the center and 1 on the arc itself.+ dot_color : :class:`~.Colors`+ The color of the :class:`Dot`.+ elbow : :class:`bool`+ Produces an elbow-type mobject indicating a right angle, see :class:`RightAngle` for more information+ and a shorthand.+ **kwargs+ Further keyword arguments that are passed to the constructor of :class:`Arc` or :class:`Elbow`.++ Examples+ --------+ The first example shows some right angles with a dot in the middle while the second example shows+ all 8 possible angles defined by two lines.++ .. manim:: RightArcAngleExample+ :save_last_frame:++ class RightArcAngleExample(Scene):+ def construct(self):+ line1 = Line( LEFT, RIGHT )+ line2 = Line( DOWN, UP )+ rightarcangles = [+ Angle(line1, line2, dot=True),+ Angle(line1, line2, radius=0.4, quadrant=(1,-1), dot=True, other_angle=True),+ Angle(line1, line2, radius=0.5, quadrant=(-1,1), stroke_width=8, dot=True, dot_color=YELLOW, dot_radius=0.04, other_angle=True),+ Angle(line1, line2, radius=0.7, quadrant=(-1,-1), color=RED, dot=True, dot_color=GREEN, dot_radius=0.08),+ ]+ plots = VGroup()+ for angle in rightarcangles:+ plot=VGroup(line1.copy(),line2.copy(), angle)+ plots.add(plot)+ plots.arrange(buff=1.5)+ self.add(plots)++ .. manim:: AngleExample+ :save_last_frame:++ class AngleExample(Scene):+ def construct(self):+ line1 = Line( LEFT + (1/3) * UP, RIGHT + (1/3) * DOWN )+ line2 = Line( DOWN + (1/3) * RIGHT, UP + (1/3) * LEFT )+ angles = [+ Angle(line1, line2),+ Angle(line1, line2, radius=0.4, quadrant=(1,-1), other_angle=True),+ Angle(line1, line2, radius=0.5, quadrant=(-1,1), stroke_width=8, other_angle=True),+ Angle(line1, line2, radius=0.7, quadrant=(-1,-1), color=RED),+ Angle(line1, line2, other_angle=True),+ Angle(line1, line2, radius=0.4, quadrant=(1,-1)),+ Angle(line1, line2, radius=0.5, quadrant=(-1,1), stroke_width=8),+ Angle(line1, line2, radius=0.7, quadrant=(-1,-1), color=RED, other_angle=True),+ ]+ plots = VGroup()+ for angle in angles:+ plot=VGroup(line1.copy(),line2.copy(), angle)+ plots.add(VGroup(plot,SurroundingRectangle(plot, buff=0.3)))+ plots.arrange_in_grid(rows=2,buff=1)+ self.add(plots)++ .. manim:: FilledAngle+ :save_last_frame:++ class FilledAngle(Scene):+ def construct(self):+ l1 = Line(ORIGIN, 2 * UP + RIGHT).set_color(GREEN)+ l2 = (+ Line(ORIGIN, 2 * UP + RIGHT)+ .set_color(GREEN)+ .rotate(-20 * DEGREES, about_point=ORIGIN)+ )+ norm = l1.get_length()+ a1 = Angle(l1, l2, other_angle=True, radius=norm - 0.5).set_color(GREEN)+ a2 = Angle(l1, l2, other_angle=True, radius=norm).set_color(GREEN)+ q1 = a1.points # save all coordinates of points of angle a1+ q2 = a2.reverse_direction().points # save all coordinates of points of angle a1 (in reversed direction)+ pnts = np.concatenate([q1, q2, q1[0].reshape(1, 3)]) # adds points and ensures that path starts and ends at same point+ mfill = VMobject().set_color(ORANGE)+ mfill.set_points_as_corners(pnts).set_fill(GREEN, opacity=1)+ self.add(l1, l2)+ self.add(mfill)++ """++ def __init__(+ self,+ line1: Line,+ line2: Line,+ radius: float = None,+ quadrant=(1, 1),+ other_angle: bool = False,+ dot=False,+ dot_radius=None,+ dot_distance=0.55,+ dot_color=WHITE,+ elbow=False,+ **kwargs,+ ):+ super().__init__(**kwargs)+ self.lines = (line1, line2)+ self.quadrant = quadrant+ self.dot_distance = dot_distance+ self.elbow = elbow+ inter = line_intersection(+ [line1.get_start(), line1.get_end()],+ [line2.get_start(), line2.get_end()],+ )++ if radius is None:+ if quadrant[0] == 1:+ dist_1 = np.linalg.norm(line1.get_end() - inter)+ else:+ dist_1 = np.linalg.norm(line1.get_start() - inter)+ if quadrant[1] == 1:+ dist_2 = np.linalg.norm(line2.get_end() - inter)+ else:+ dist_2 = np.linalg.norm(line2.get_start() - inter)+ if np.minimum(dist_1, dist_2) < 0.6:+ radius = (2 / 3) * np.minimum(dist_1, dist_2)+ else:+ radius = 0.4+ else:+ self.radius = radius++ anchor_angle_1 = inter + quadrant[0] * radius * line1.get_unit_vector()+ anchor_angle_2 = inter + quadrant[1] * radius * line2.get_unit_vector()++ if elbow:+ anchor_middle = (+ inter+ + quadrant[0] * radius * line1.get_unit_vector()+ + quadrant[1] * radius * line2.get_unit_vector()+ )+ angle_mobject = Elbow(**kwargs)+ angle_mobject.set_points_as_corners(+ [anchor_angle_1, anchor_middle, anchor_angle_2],+ )+ else:+ angle_1 = angle_of_vector(anchor_angle_1 - inter)+ angle_2 = angle_of_vector(anchor_angle_2 - inter)++ if not other_angle:+ start_angle = angle_1+ if angle_2 > angle_1:+ angle_fin = angle_2 - angle_1+ else:+ angle_fin = 2 * np.pi - (angle_1 - angle_2)+ else:+ start_angle = angle_1+ if angle_2 < angle_1:+ angle_fin = -angle_1 + angle_2+ else:+ angle_fin = -2 * np.pi + (angle_2 - angle_1)++ self.angle_value = angle_fin++ angle_mobject = Arc(+ radius=radius,+ angle=self.angle_value,+ start_angle=start_angle,+ arc_center=inter,+ **kwargs,+ )++ if dot:+ if dot_radius is None:+ dot_radius = radius / 10+ else:+ self.dot_radius = dot_radius+ right_dot = Dot(ORIGIN, radius=dot_radius, color=dot_color)+ dot_anchor = (+ inter+ + (angle_mobject.get_center() - inter)+ / np.linalg.norm(angle_mobject.get_center() - inter)+ * radius+ * dot_distance+ )+ right_dot.move_to(dot_anchor)+ self.add(right_dot)++ self.set_points(angle_mobject.points)++ def get_lines(self) -> VGroup:+ """Get the lines forming an angle of the :class:`Angle` class.++ Returns+ -------+ :class:`~.VGroup`+ A :class:`~.VGroup` containing the lines that form the angle of the :class:`Angle` class.++ Examples+ --------+ ::++ >>> line_1, line_2 = Line(ORIGIN, RIGHT), Line(ORIGIN, UR)+ >>> angle = Angle(line_1, line_2)+ >>> angle.get_lines()+ VGroup(Line, Line)+ """++ return VGroup(*self.lines)++ def get_value(self, degrees: bool = False) -> float:+ """Get the value of an angle of the :class:`Angle` class.++ Parameters+ ----------+ degrees+ A boolean to decide the unit (deg/rad) in which the value of the angle is returned.++ Returns+ -------+ :class:`float`+ The value in degrees/radians of an angle of the :class:`Angle` class.++ Examples+ --------++ .. manim:: GetValueExample+ :save_last_frame:++ class GetValueExample(Scene):+ def construct(self):+ line1 = Line(LEFT+(1/3)*UP, RIGHT+(1/3)*DOWN)+ line2 = Line(DOWN+(1/3)*RIGHT, UP+(1/3)*LEFT)++ angle = Angle(line1, line2, radius=0.4)++ value = DecimalNumber(angle.get_value(degrees=True), unit="^{\\circ}")+ value.next_to(angle, UR)++ self.add(line1, line2, angle, value)+ """++ if degrees:+ return self.angle_value / DEGREES+ return self.angle_value+++class RightAngle(Angle):+ """An elbow-type mobject representing a right angle between two lines.++ Parameters+ ----------+ line1 : :class:`Line`+ The first line.+ line2 : :class:`Line`+ The second line.+ length : :class:`float`+ The length of the arms.+ **kwargs+ Further keyword arguments that are passed to the constructor of :class:`Angle`.++ Examples+ --------++ .. manim:: RightAngleExample+ :save_last_frame:++ class RightAngleExample(Scene):+ def construct(self):+ line1 = Line( LEFT, RIGHT )+ line2 = Line( DOWN, UP )+ rightangles = [+ RightAngle(line1, line2),+ RightAngle(line1, line2, length=0.4, quadrant=(1,-1)),+ RightAngle(line1, line2, length=0.5, quadrant=(-1,1), stroke_width=8),+ RightAngle(line1, line2, length=0.7, quadrant=(-1,-1), color=RED),+ ]+ plots = VGroup()+ for rightangle in rightangles:+ plot=VGroup(line1.copy(),line2.copy(), rightangle)+ plots.add(plot)+ plots.arrange(buff=1.5)+ self.add(plots)+ """++ def __init__(self, line1, line2, length=None, **kwargs):+ super().__init__(line1, line2, radius=length, elbow=True, **kwargs)diff --git a/manim/mobject/geometry/polygram.py b/manim/mobject/geometry/polygram.pynew file mode 100644index 000000000..68b5788d0--- /dev/null+++ b/manim/mobject/geometry/polygram.py@@ -0,0 +1,694 @@+r"""Mobjects that are simple geometric shapes."""++from __future__ import annotations++__all__ = [+ "Polygram",+ "Polygon",+ "RegularPolygram",+ "RegularPolygon",+ "Star",+ "Triangle",+ "Rectangle",+ "Square",+ "RoundedRectangle",+ "Cutout",+]++from typing import Iterable, Sequence++import numpy as np+from colour import Color++from manim.constants import *+from manim.mobject.geometry.arc import ArcBetweenPoints+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from manim.mobject.types.vectorized_mobject import VGroup, VMobject+from manim.utils.color import *+from manim.utils.iterables import adjacent_n_tuples, adjacent_pairs+from manim.utils.space_ops import angle_between_vectors, normalize, regular_vertices+++class Polygram(VMobject, metaclass=ConvertToOpenGL):+ """A generalized :class:`Polygon`, allowing for disconnected sets of edges.++ Parameters+ ----------+ vertex_groups+ The groups of vertices making up the :class:`Polygram`.++ The first vertex in each group is repeated to close the shape.+ Each point must be 3-dimensional: ``[x,y,z]``+ color+ The color of the :class:`Polygram`.+ kwargs+ Forwarded to the parent constructor.++ Examples+ --------+ .. manim:: PolygramExample++ import numpy as np++ class PolygramExample(Scene):+ def construct(self):+ hexagram = Polygram(+ [[0, 2, 0], [-np.sqrt(3), -1, 0], [np.sqrt(3), -1, 0]],+ [[-np.sqrt(3), 1, 0], [0, -2, 0], [np.sqrt(3), 1, 0]],+ )+ self.add(hexagram)++ dot = Dot()+ self.play(MoveAlongPath(dot, hexagram), run_time=5, rate_func=linear)+ self.remove(dot)+ self.wait()+++ """++ def __init__(self, *vertex_groups: Iterable[Sequence[float]], color=BLUE, **kwargs):+ super().__init__(color=color, **kwargs)++ for vertices in vertex_groups:+ first_vertex, *vertices = vertices+ first_vertex = np.array(first_vertex)++ self.start_new_path(first_vertex)+ self.add_points_as_corners(+ [*(np.array(vertex) for vertex in vertices), first_vertex],+ )++ def get_vertices(self) -> np.ndarray:+ """Gets the vertices of the :class:`Polygram`.++ Returns+ -------+ :class:`numpy.ndarray`+ The vertices of the :class:`Polygram`.++ Examples+ --------+ ::++ >>> sq = Square()+ >>> sq.get_vertices()+ array([[ 1., 1., 0.],+ [-1., 1., 0.],+ [-1., -1., 0.],+ [ 1., -1., 0.]])+ """++ return self.get_start_anchors()++ def get_vertex_groups(self) -> np.ndarray:+ """Gets the vertex groups of the :class:`Polygram`.++ Returns+ -------+ :class:`numpy.ndarray`+ The vertex groups of the :class:`Polygram`.++ Examples+ --------+ ::++ >>> poly = Polygram([ORIGIN, RIGHT, UP], [LEFT, LEFT + UP, 2 * LEFT])+ >>> poly.get_vertex_groups()+ array([[[ 0., 0., 0.],+ [ 1., 0., 0.],+ [ 0., 1., 0.]],+ <BLANKLINE>+ [[-1., 0., 0.],+ [-1., 1., 0.],+ [-2., 0., 0.]]])+ """++ vertex_groups = []++ group = []+ for start, end in zip(self.get_start_anchors(), self.get_end_anchors()):+ group.append(start)++ if self.consider_points_equals(end, group[0]):+ vertex_groups.append(group)+ group = []++ return np.array(vertex_groups)++ def round_corners(self, radius: float = 0.5):+ """Rounds off the corners of the :class:`Polygram`.++ Parameters+ ----------+ radius+ The curvature of the corners of the :class:`Polygram`.++ Examples+ --------++ .. manim:: PolygramRoundCorners+ :save_last_frame:++ class PolygramRoundCorners(Scene):+ def construct(self):+ star = Star(outer_radius=2)++ shapes = VGroup(star)+ shapes.add(star.copy().round_corners(radius=0.1))+ shapes.add(star.copy().round_corners(radius=0.25))++ shapes.arrange(RIGHT)+ self.add(shapes)++ See Also+ --------+ :class:`RoundedRectangle`+ """++ if radius == 0:+ return self++ new_points = []++ for vertices in self.get_vertex_groups():+ arcs = []+ for v1, v2, v3 in adjacent_n_tuples(vertices, 3):+ vect1 = v2 - v1+ vect2 = v3 - v2+ unit_vect1 = normalize(vect1)+ unit_vect2 = normalize(vect2)++ angle = angle_between_vectors(vect1, vect2)+ # Negative radius gives concave curves+ angle *= np.sign(radius)++ # Distance between vertex and start of the arc+ cut_off_length = radius * np.tan(angle / 2)++ # Determines counterclockwise vs. clockwise+ sign = np.sign(np.cross(vect1, vect2)[2])++ arc = ArcBetweenPoints(+ v2 - unit_vect1 * cut_off_length,+ v2 + unit_vect2 * cut_off_length,+ angle=sign * angle,+ )+ arcs.append(arc)++ # To ensure that we loop through starting with last+ arcs = [arcs[-1], *arcs[:-1]]+ from manim.mobject.geometry.line import Line++ for arc1, arc2 in adjacent_pairs(arcs):+ new_points.extend(arc1.points)++ line = Line(arc1.get_end(), arc2.get_start())++ # Make sure anchors are evenly distributed+ len_ratio = line.get_length() / arc1.get_arc_length()++ line.insert_n_curves(int(arc1.get_num_curves() * len_ratio))++ new_points.extend(line.points)++ self.set_points(new_points)++ return self+++class Polygon(Polygram):+ """A shape consisting of one closed loop of vertices.++ Parameters+ ----------+ vertices+ The vertices of the :class:`Polygon`.+ kwargs+ Forwarded to the parent constructor.++ Examples+ --------++ .. manim:: PolygonExample+ :save_last_frame:++ class PolygonExample(Scene):+ def construct(self):+ isosceles = Polygon([-5, 1.5, 0], [-2, 1.5, 0], [-3.5, -2, 0])+ position_list = [+ [4, 1, 0], # middle right+ [4, -2.5, 0], # bottom right+ [0, -2.5, 0], # bottom left+ [0, 3, 0], # top left+ [2, 1, 0], # middle+ [4, 3, 0], # top right+ ]+ square_and_triangles = Polygon(*position_list, color=PURPLE_B)+ self.add(isosceles, square_and_triangles)+ """++ def __init__(self, *vertices: Sequence[float], **kwargs):+ super().__init__(vertices, **kwargs)+++class RegularPolygram(Polygram):+ """A :class:`Polygram` with regularly spaced vertices.++ Parameters+ ----------+ num_vertices+ The number of vertices.+ density+ The density of the :class:`RegularPolygram`.++ Can be thought of as how many vertices to hop+ to draw a line between them. Every ``density``-th+ vertex is connected.+ radius+ The radius of the circle that the vertices are placed on.+ start_angle+ The angle the vertices start at; the rotation of+ the :class:`RegularPolygram`.+ kwargs+ Forwarded to the parent constructor.++ Examples+ --------+ .. manim:: RegularPolygramExample+ :save_last_frame:++ class RegularPolygramExample(Scene):+ def construct(self):+ pentagram = RegularPolygram(5, radius=2)+ self.add(pentagram)+ """++ def __init__(+ self,+ num_vertices: int,+ *,+ density: int = 2,+ radius: float = 1,+ start_angle: float | None = None,+ **kwargs,+ ):+ # Regular polygrams can be expressed by the number of their vertices+ # and their density. This relation can be expressed as its Schläfli+ # symbol: {num_vertices/density}.+ #+ # For instance, a pentagon can be expressed as {5/1} or just {5}.+ # A pentagram, however, can be expressed as {5/2}.+ # A hexagram *would* be expressed as {6/2}, except that 6 and 2+ # are not coprime, and it can be simplified to 2{3}, which corresponds+ # to the fact that a hexagram is actually made up of 2 triangles.+ #+ # See https://en.wikipedia.org/wiki/Polygram_(geometry)#Generalized_regular_polygons+ # for more information.++ num_gons = np.gcd(num_vertices, density)+ num_vertices //= num_gons+ density //= num_gons++ # Utility function for generating the individual+ # polygon vertices.+ def gen_polygon_vertices(start_angle):+ reg_vertices, start_angle = regular_vertices(+ num_vertices,+ radius=radius,+ start_angle=start_angle,+ )++ vertices = []+ i = 0+ while True:+ vertices.append(reg_vertices[i])++ i += density+ i %= num_vertices+ if i == 0:+ break++ return vertices, start_angle++ first_group, self.start_angle = gen_polygon_vertices(start_angle)+ vertex_groups = [first_group]++ for i in range(1, num_gons):+ start_angle = self.start_angle + (i / num_gons) * TAU / num_vertices+ group, _ = gen_polygon_vertices(start_angle)++ vertex_groups.append(group)++ super().__init__(*vertex_groups, **kwargs)+++class RegularPolygon(RegularPolygram):+ """An n-sided regular :class:`Polygon`.++ Parameters+ ----------+ n+ The number of sides of the :class:`RegularPolygon`.+ kwargs+ Forwarded to the parent constructor.++ Examples+ --------++ .. manim:: RegularPolygonExample+ :save_last_frame:++ class RegularPolygonExample(Scene):+ def construct(self):+ poly_1 = RegularPolygon(n=6)+ poly_2 = RegularPolygon(n=6, start_angle=30*DEGREES, color=GREEN)+ poly_3 = RegularPolygon(n=10, color=RED)++ poly_group = Group(poly_1, poly_2, poly_3).scale(1.5).arrange(buff=1)+ self.add(poly_group)+ """++ def __init__(self, n: int = 6, **kwargs):+ super().__init__(n, density=1, **kwargs)+++class Star(Polygon):+ """A regular polygram without the intersecting lines.++ Parameters+ ----------+ n+ How many points on the :class:`Star`.+ outer_radius+ The radius of the circle that the outer vertices are placed on.+ inner_radius+ The radius of the circle that the inner vertices are placed on.++ If unspecified, the inner radius will be+ calculated such that the edges of the :class:`Star`+ perfectly follow the edges of its :class:`RegularPolygram`+ counterpart.+ density+ The density of the :class:`Star`. Only used if+ ``inner_radius`` is unspecified.++ See :class:`RegularPolygram` for more information.+ start_angle+ The angle the vertices start at; the rotation of+ the :class:`Star`.+ kwargs+ Forwardeds to the parent constructor.++ Raises+ ------+ :exc:`ValueError`+ If ``inner_radius`` is unspecified and ``density``+ is not in the range ``[1, n/2)``.++ Examples+ --------+ .. manim:: StarExample+ :save_as_gif:++ class StarExample(Scene):+ def construct(self):+ pentagram = RegularPolygram(5, radius=2)+ star = Star(outer_radius=2, color=RED)++ self.add(pentagram)+ self.play(Create(star), run_time=3)+ self.play(FadeOut(star), run_time=2)++ .. manim:: DifferentDensitiesExample+ :save_last_frame:++ class DifferentDensitiesExample(Scene):+ def construct(self):+ density_2 = Star(7, outer_radius=2, density=2, color=RED)+ density_3 = Star(7, outer_radius=2, density=3, color=PURPLE)++ self.add(VGroup(density_2, density_3).arrange(RIGHT))++ """++ def __init__(+ self,+ n: int = 5,+ *,+ outer_radius: float = 1,+ inner_radius: float | None = None,+ density: int = 2,+ start_angle: float | None = TAU / 4,+ **kwargs,+ ):+ inner_angle = TAU / (2 * n)++ if inner_radius is None:+ # See https://math.stackexchange.com/a/2136292 for an+ # overview of how to calculate the inner radius of a+ # perfect star.++ if density <= 0 or density >= n / 2:+ raise ValueError(+ f"Incompatible density {density} for number of points {n}",+ )++ outer_angle = TAU * density / n+ inverse_x = 1 - np.tan(inner_angle) * (+ (np.cos(outer_angle) - 1) / np.sin(outer_angle)+ )++ inner_radius = outer_radius / (np.cos(inner_angle) * inverse_x)++ outer_vertices, self.start_angle = regular_vertices(+ n,+ radius=outer_radius,+ start_angle=start_angle,+ )+ inner_vertices, _ = regular_vertices(+ n,+ radius=inner_radius,+ start_angle=self.start_angle + inner_angle,+ )++ vertices = []+ for pair in zip(outer_vertices, inner_vertices):+ vertices.extend(pair)++ super().__init__(*vertices, **kwargs)+++class Triangle(RegularPolygon):+ """An equilateral triangle.++ Parameters+ ----------+ kwargs : Any+ Additional arguments to be passed to :class:`RegularPolygon`++ Examples+ --------++ .. manim:: TriangleExample+ :save_last_frame:++ class TriangleExample(Scene):+ def construct(self):+ triangle_1 = Triangle()+ triangle_2 = Triangle().scale(2).rotate(60*DEGREES)+ tri_group = Group(triangle_1, triangle_2).arrange(buff=1)+ self.add(tri_group)+ """++ def __init__(self, **kwargs):+ super().__init__(n=3, **kwargs)+++class Rectangle(Polygon):+ """A quadrilateral with two sets of parallel sides.++ Parameters+ ----------+ color : :class:`~.Colors`, optional+ The color of the rectangle.+ height : :class:`float`, optional+ The vertical height of the rectangle.+ width : :class:`float`, optional+ The horizontal width of the rectangle.+ grid_xstep : :class:`float`, optional+ Space between vertical grid lines.+ grid_ystep : :class:`float`, optional+ Space between horizontal grid lines.+ mark_paths_closed : :class:`bool`, optional+ No purpose.+ close_new_points : :class:`bool`, optional+ No purpose.+ kwargs : Any+ Additional arguments to be passed to :class:`Polygon`++ Examples+ ----------++ .. manim:: RectangleExample+ :save_last_frame:++ class RectangleExample(Scene):+ def construct(self):+ rect1 = Rectangle(width=4.0, height=2.0, grid_xstep=1.0, grid_ystep=0.5)+ rect2 = Rectangle(width=1.0, height=4.0)++ rects = Group(rect1,rect2).arrange(buff=1)+ self.add(rects)+ """++ def __init__(+ self,+ color: Color = WHITE,+ height: float = 2.0,+ width: float = 4.0,+ grid_xstep: float | None = None,+ grid_ystep: float | None = None,+ mark_paths_closed=True,+ close_new_points=True,+ **kwargs,+ ):+ super().__init__(UR, UL, DL, DR, color=color, **kwargs)+ self.stretch_to_fit_width(width)+ self.stretch_to_fit_height(height)+ v = self.get_vertices()+ if grid_xstep is not None:+ from manim.mobject.geometry.line import Line++ grid_xstep = abs(grid_xstep)+ count = int(width / grid_xstep)+ grid = VGroup(+ *(+ Line(+ v[1] + i * grid_xstep * RIGHT,+ v[1] + i * grid_xstep * RIGHT + height * DOWN,+ color=color,+ )+ for i in range(1, count)+ )+ )+ self.add(grid)+ if grid_ystep is not None:+ grid_ystep = abs(grid_ystep)+ count = int(height / grid_ystep)+ grid = VGroup(+ *(+ Line(+ v[1] + i * grid_ystep * DOWN,+ v[1] + i * grid_ystep * DOWN + width * RIGHT,+ color=color,+ )+ for i in range(1, count)+ )+ )+ self.add(grid)+++class Square(Rectangle):+ """A rectangle with equal side lengths.++ Parameters+ ----------+ side_length : :class:`float`, optional+ The length of the sides of the square.+ kwargs : Any+ Additional arguments to be passed to :class:`Rectangle`.++ Examples+ --------++ .. manim:: SquareExample+ :save_last_frame:++ class SquareExample(Scene):+ def construct(self):+ square_1 = Square(side_length=2.0).shift(DOWN)+ square_2 = Square(side_length=1.0).next_to(square_1, direction=UP)+ square_3 = Square(side_length=0.5).next_to(square_2, direction=UP)+ self.add(square_1, square_2, square_3)+ """++ def __init__(self, side_length=2.0, **kwargs):+ self.side_length = side_length+ super().__init__(height=side_length, width=side_length, **kwargs)+++class RoundedRectangle(Rectangle):+ """A rectangle with rounded corners.++ Parameters+ ----------+ corner_radius : :class:`float`, optional+ The curvature of the corners of the rectangle.+ kwargs : Any+ Additional arguments to be passed to :class:`Rectangle`++ Examples+ --------++ .. manim:: RoundedRectangleExample+ :save_last_frame:++ class RoundedRectangleExample(Scene):+ def construct(self):+ rect_1 = RoundedRectangle(corner_radius=0.5)+ rect_2 = RoundedRectangle(corner_radius=1.5, height=4.0, width=4.0)++ rect_group = Group(rect_1, rect_2).arrange(buff=1)+ self.add(rect_group)+ """++ def __init__(self, corner_radius=0.5, **kwargs):+ super().__init__(**kwargs)+ self.corner_radius = corner_radius+ self.round_corners(self.corner_radius)+++class Cutout(VMobject, metaclass=ConvertToOpenGL):+ """A shape with smaller cutouts.++ .. warning::++ Technically, this class behaves similar to a symmetric difference: if+ parts of the ``mobjects`` are not located within the ``main_shape``,+ these parts will be added to the resulting :class:`~.VMobject`.++ Parameters+ ----------+ main_shape : :class:`~.VMobject`+ The primary shape from which cutouts are made.+ mobjects : :class:`~.VMobject`+ The smaller shapes which are to be cut out of the ``main_shape``.+ kwargs+ Further keyword arguments that are passed to the constructor of+ :class:`~.VMobject`.++ Examples+ --------+ .. manim:: CutoutExample++ class CutoutExample(Scene):+ def construct(self):+ s1 = Square().scale(2.5)+ s2 = Triangle().shift(DOWN + RIGHT).scale(0.5)+ s3 = Square().shift(UP + RIGHT).scale(0.5)+ s4 = RegularPolygon(5).shift(DOWN + LEFT).scale(0.5)+ s5 = RegularPolygon(6).shift(UP + LEFT).scale(0.5)+ c = Cutout(s1, s2, s3, s4, s5, fill_opacity=1, color=BLUE, stroke_color=RED)+ self.play(Write(c), run_time=4)+ self.wait()+ """++ def __init__(self, main_shape, *mobjects, **kwargs):+ super().__init__(**kwargs)+ self.append_points(main_shape.points)+ if main_shape.get_direction() == "CW":+ sub_direction = "CCW"+ else:+ sub_direction = "CW"+ for mobject in mobjects:+ self.append_points(mobject.force_direction(sub_direction).points)diff --git a/manim/mobject/shape_matchers.py b/manim/mobject/geometry/shape_matchers.pysimilarity index 94%rename from manim/mobject/shape_matchers.pyrename to manim/mobject/geometry/shape_matchers.pyindex cf5b398e1..bb8768360 100644--- a/manim/mobject/shape_matchers.py+++ b/manim/mobject/geometry/shape_matchers.py@@ -4,15 +4,13 @@ from __future__ import annotations__all__ = ["SurroundingRectangle", "BackgroundRectangle", "Cross", "Underline"]--from manim.utils.color import Color--from .. import config-from ..constants import *-from ..mobject.geometry import Line, RoundedRectangle-from ..mobject.mobject import Mobject-from ..mobject.types.vectorized_mobject import VGroup-from ..utils.color import BLACK, RED, YELLOW, Colors+from manim import config+from manim.constants import *+from manim.mobject.geometry.line import Line+from manim.mobject.geometry.polygram import RoundedRectangle+from manim.mobject.mobject import Mobject+from manim.mobject.types.vectorized_mobject import VGroup+from manim.utils.color import BLACK, RED, YELLOW, Color, Colorsclass SurroundingRectangle(RoundedRectangle):diff --git a/manim/mobject/geometry/tips.py b/manim/mobject/geometry/tips.pynew file mode 100644index 000000000..ebb4abbad--- /dev/null+++ b/manim/mobject/geometry/tips.py@@ -0,0 +1,266 @@+r"""A collection of tip mobjects for use with :class:`~.TipableVMobject`."""++from __future__ import annotations++__all__ = [+ "ArrowTip",+ "ArrowCircleFilledTip",+ "ArrowCircleTip",+ "ArrowSquareTip",+ "ArrowSquareFilledTip",+]++import numpy as np++from manim.constants import *+from manim.mobject.geometry.arc import Circle+from manim.mobject.geometry.polygram import Square, Triangle+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from manim.mobject.types.vectorized_mobject import VMobject+from manim.utils.space_ops import angle_of_vector+++class ArrowTip(VMobject, metaclass=ConvertToOpenGL):+ r"""Base class for arrow tips.++ See Also+ --------+ :class:`ArrowTriangleTip`+ :class:`ArrowTriangleFilledTip`+ :class:`ArrowCircleTip`+ :class:`ArrowCircleFilledTip`+ :class:`ArrowSquareTip`+ :class:`ArrowSquareFilledTip`++ Examples+ --------+ Cannot be used directly, only intended for inheritance::++ >>> tip = ArrowTip()+ Traceback (most recent call last):+ ...+ NotImplementedError: Has to be implemented in inheriting subclasses.++ Instead, use one of the pre-defined ones, or make+ a custom one like this:++ .. manim:: CustomTipExample++ >>> from manim import RegularPolygon, Arrow+ >>> class MyCustomArrowTip(ArrowTip, RegularPolygon):+ ... def __init__(self, length=0.35, **kwargs):+ ... RegularPolygon.__init__(self, n=5, **kwargs)+ ... self.width = length+ ... self.stretch_to_fit_height(length)+ >>> arr = Arrow(np.array([-2, -2, 0]), np.array([2, 2, 0]),+ ... tip_shape=MyCustomArrowTip)+ >>> isinstance(arr.tip, RegularPolygon)+ True+ >>> from manim import Scene, Create+ >>> class CustomTipExample(Scene):+ ... def construct(self):+ ... self.play(Create(arr))++ Using a class inherited from :class:`ArrowTip` to get a non-filled+ tip is a shorthand to manually specifying the arrow tip style as follows::++ >>> arrow = Arrow(np.array([0, 0, 0]), np.array([1, 1, 0]),+ ... tip_style={'fill_opacity': 0, 'stroke_width': 3})++ The following example illustrates the usage of all of the predefined+ arrow tips.++ .. manim:: ArrowTipsShowcase+ :save_last_frame:++ from manim.mobject.geometry.tips import ArrowTriangleTip,\+ ArrowSquareTip, ArrowSquareFilledTip,\+ ArrowCircleTip, ArrowCircleFilledTip+ class ArrowTipsShowcase(Scene):+ def construct(self):+ a00 = Arrow(start=[-2, 3, 0], end=[2, 3, 0], color=YELLOW)+ a11 = Arrow(start=[-2, 2, 0], end=[2, 2, 0], tip_shape=ArrowTriangleTip)+ a12 = Arrow(start=[-2, 1, 0], end=[2, 1, 0])+ a21 = Arrow(start=[-2, 0, 0], end=[2, 0, 0], tip_shape=ArrowSquareTip)+ a22 = Arrow([-2, -1, 0], [2, -1, 0], tip_shape=ArrowSquareFilledTip)+ a31 = Arrow([-2, -2, 0], [2, -2, 0], tip_shape=ArrowCircleTip)+ a32 = Arrow([-2, -3, 0], [2, -3, 0], tip_shape=ArrowCircleFilledTip)+ b11 = a11.copy().scale(0.5, scale_tips=True).next_to(a11, RIGHT)+ b12 = a12.copy().scale(0.5, scale_tips=True).next_to(a12, RIGHT)+ b21 = a21.copy().scale(0.5, scale_tips=True).next_to(a21, RIGHT)+ self.add(a00, a11, a12, a21, a22, a31, a32, b11, b12, b21)++ """++ def __init__(self, *args, **kwargs):+ raise NotImplementedError("Has to be implemented in inheriting subclasses.")++ @property+ def base(self):+ r"""The base point of the arrow tip.++ This is the point connecting to the arrow line.++ Examples+ --------+ ::++ >>> from manim import Arrow+ >>> arrow = Arrow(np.array([0, 0, 0]), np.array([2, 0, 0]), buff=0)+ >>> arrow.tip.base.round(2) + 0. # add 0. to avoid negative 0 in output+ array([1.65, 0. , 0. ])++ """+ return self.point_from_proportion(0.5)++ @property+ def tip_point(self):+ r"""The tip point of the arrow tip.++ Examples+ --------+ ::++ >>> from manim import Arrow+ >>> arrow = Arrow(np.array([0, 0, 0]), np.array([2, 0, 0]), buff=0)+ >>> arrow.tip.tip_point.round(2) + 0.+ array([2., 0., 0.])++ """+ return self.points[0]++ @property+ def vector(self):+ r"""The vector pointing from the base point to the tip point.++ Examples+ --------+ ::++ >>> from manim import Arrow+ >>> arrow = Arrow(np.array([0, 0, 0]), np.array([2, 2, 0]), buff=0)+ >>> arrow.tip.vector.round(2) + 0.+ array([0.25, 0.25, 0. ])++ """+ return self.tip_point - self.base++ @property+ def tip_angle(self):+ r"""The angle of the arrow tip.++ Examples+ --------+ ::++ >>> from manim import Arrow+ >>> arrow = Arrow(np.array([0, 0, 0]), np.array([1, 1, 0]), buff=0)+ >>> round(arrow.tip.tip_angle, 5) == round(PI/4, 5)+ True++ """+ return angle_of_vector(self.vector)++ @property+ def length(self):+ r"""The length of the arrow tip.++ Examples+ --------+ ::++ >>> from manim import Arrow+ >>> arrow = Arrow(np.array([0, 0, 0]), np.array([1, 2, 0]))+ >>> round(arrow.tip.length, 3)+ 0.35++ """+ return np.linalg.norm(self.vector)+++class ArrowTriangleTip(ArrowTip, Triangle):+ r"""Triangular arrow tip."""++ def __init__(+ self,+ fill_opacity=0,+ stroke_width=3,+ length=DEFAULT_ARROW_TIP_LENGTH,+ start_angle=PI,+ **kwargs,+ ):+ Triangle.__init__(+ self,+ fill_opacity=fill_opacity,+ stroke_width=stroke_width,+ start_angle=start_angle,+ **kwargs,+ )+ self.width = length+ self.stretch_to_fit_height(length)+++class ArrowTriangleFilledTip(ArrowTriangleTip):+ r"""Triangular arrow tip with filled tip.++ This is the default arrow tip shape.+ """++ def __init__(self, fill_opacity=1, stroke_width=0, **kwargs):+ super().__init__(fill_opacity=fill_opacity, stroke_width=stroke_width, **kwargs)+++class ArrowCircleTip(ArrowTip, Circle):+ r"""Circular arrow tip."""++ def __init__(+ self,+ fill_opacity=0,+ stroke_width=3,+ length=DEFAULT_ARROW_TIP_LENGTH,+ start_angle=PI,+ **kwargs,+ ):+ self.start_angle = start_angle+ Circle.__init__(+ self, fill_opacity=fill_opacity, stroke_width=stroke_width, **kwargs+ )+ self.width = length+ self.stretch_to_fit_height(length)+++class ArrowCircleFilledTip(ArrowCircleTip):+ r"""Circular arrow tip with filled tip."""++ def __init__(self, fill_opacity=1, stroke_width=0, **kwargs):+ super().__init__(fill_opacity=fill_opacity, stroke_width=stroke_width, **kwargs)+++class ArrowSquareTip(ArrowTip, Square):+ r"""Square arrow tip."""++ def __init__(+ self,+ fill_opacity=0,+ stroke_width=3,+ length=DEFAULT_ARROW_TIP_LENGTH,+ start_angle=PI,+ **kwargs,+ ):+ self.start_angle = start_angle+ Square.__init__(+ self,+ fill_opacity=fill_opacity,+ stroke_width=stroke_width,+ side_length=length,+ **kwargs,+ )+ self.width = length+ self.stretch_to_fit_height(length)+++class ArrowSquareFilledTip(ArrowSquareTip):+ r"""Square arrow tip with filled tip."""++ def __init__(self, fill_opacity=1, stroke_width=0, **kwargs):+ super().__init__(fill_opacity=fill_opacity, stroke_width=stroke_width, **kwargs)diff --git a/manim/mobject/graph.py b/manim/mobject/graph.pyindex c58f974cb..3bc11c7a3 100644--- a/manim/mobject/graph.py+++ b/manim/mobject/graph.py@@ -13,15 +13,16 @@ from typing import Hashable, Iterableimport networkx as nximport numpy as np-from manim.mobject.opengl_mobject import OpenGLMobject+from manim.mobject.geometry.arc import Dot, LabeledDot+from manim.mobject.geometry.line import Line+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from manim.mobject.opengl.opengl_mobject import OpenGLMobject+from manim.mobject.text.tex_mobject import MathTexfrom ..animation.composition import AnimationGroupfrom ..animation.creation import Create, Uncreatefrom ..utils.color import BLACK-from .geometry import Dot, LabeledDot, Linefrom .mobject import Mobject, override_animate-from .opengl_compatibility import ConvertToOpenGL-from .svg.tex_mobject import MathTexfrom .types.vectorized_mobject import VMobjectdiff --git a/manim/mobject/graphing/__init__.py b/manim/mobject/graphing/__init__.pynew file mode 100644index 000000000..c73818cea--- /dev/null+++ b/manim/mobject/graphing/__init__.py@@ -0,0 +1,14 @@+"""Coordinate systems and function graphing related mobjects.++Modules+=======++.. autosummary::+ :toctree: ../reference++ ~coordinate_systems+ ~functions+ ~number_line+ ~probability+ ~scale+"""diff --git a/manim/mobject/coordinate_systems.py b/manim/mobject/graphing/coordinate_systems.pysimilarity index 99%rename from manim/mobject/coordinate_systems.pyrename to manim/mobject/graphing/coordinate_systems.pyindex 4ecae94da..06f0e36a9 100644--- a/manim/mobject/coordinate_systems.py+++ b/manim/mobject/graphing/coordinate_systems.py@@ -14,37 +14,28 @@ __all__ = [import fractions as frimport numbers-from typing import Any, Callable, Iterable, Sequence+from typing import TYPE_CHECKING, Any, Callable, Iterable, Sequenceimport numpy as npfrom colour import Color-from manim.mobject.opengl_compatibility import ConvertToOpenGL-from manim.utils.scale import LinearBase--from .. import config-from ..constants import *-from ..mobject.functions import ImplicitFunction, ParametricFunction-from ..mobject.geometry import (- Arrow,- Circle,- DashedLine,- Dot,- Line,- Polygon,- Rectangle,- RegularPolygon,-)-from ..mobject.number_line import NumberLine-from ..mobject.svg.tex_mobject import MathTex-from ..mobject.types.vectorized_mobject import (- Mobject,+from manim import config+from manim.constants import *+from manim.mobject.geometry.arc import Circle, Dot+from manim.mobject.geometry.line import Arrow, DashedLine, Line+from manim.mobject.geometry.polygram import Polygon, Rectangle, RegularPolygon+from manim.mobject.graphing.functions import ImplicitFunction, ParametricFunction+from manim.mobject.graphing.number_line import NumberLine+from manim.mobject.graphing.scale import LinearBase+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from manim.mobject.text.tex_mobject import MathTex+from manim.mobject.types.vectorized_mobject import (VDict,VectorizedPoint,VGroup,VMobject,)-from ..utils.color import (+from manim.utils.color import (BLACK,BLUE,BLUE_D,@@ -54,9 +45,12 @@ from ..utils.color import (color_gradient,invert_color,)-from ..utils.config_ops import merge_dicts_recursively, update_dict_recursively-from ..utils.simple_functions import binary_search-from ..utils.space_ops import angle_of_vector+from manim.utils.config_ops import merge_dicts_recursively, update_dict_recursively+from manim.utils.simple_functions import binary_search+from manim.utils.space_ops import angle_of_vector++if TYPE_CHECKING:+ from manim.mobject.mobject import Mobjectclass CoordinateSystem:diff --git a/manim/mobject/functions.py b/manim/mobject/graphing/functions.pysimilarity index 97%rename from manim/mobject/functions.pyrename to manim/mobject/graphing/functions.pyindex 60c450703..f59918dde 100644--- a/manim/mobject/functions.py+++ b/manim/mobject/graphing/functions.py@@ -10,11 +10,11 @@ from typing import Callable, Iterable, Sequenceimport numpy as npfrom isosurfaces import plot_isoline-from .. import config-from ..mobject.types.vectorized_mobject import VMobject-from ..utils.color import YELLOW-from ..utils.scale import LinearBase, _ScaleBase-from .opengl_compatibility import ConvertToOpenGL+from manim import config+from manim.mobject.graphing.scale import LinearBase, _ScaleBase+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from manim.mobject.types.vectorized_mobject import VMobject+from manim.utils.color import YELLOWclass ParametricFunction(VMobject, metaclass=ConvertToOpenGL):diff --git a/manim/mobject/number_line.py b/manim/mobject/graphing/number_line.pysimilarity index 97%rename from manim/mobject/number_line.pyrename to manim/mobject/graphing/number_line.pyindex e8ad84af9..c54aebc8a 100644--- a/manim/mobject/number_line.py+++ b/manim/mobject/graphing/number_line.py@@ -8,17 +8,16 @@ from typing import Iterable, Sequenceimport numpy as np-from manim.mobject.svg.tex_mobject import MathTex, Tex-from manim.utils.scale import LinearBase, _ScaleBase--from .. import config-from ..constants import *-from ..mobject.geometry import Line-from ..mobject.numbers import DecimalNumber-from ..mobject.types.vectorized_mobject import VGroup, VMobject-from ..utils.bezier import interpolate-from ..utils.config_ops import merge_dicts_recursively-from ..utils.space_ops import normalize+from manim import config+from manim.constants import *+from manim.mobject.geometry.line import Line+from manim.mobject.graphing.scale import LinearBase, _ScaleBase+from manim.mobject.text.numbers import DecimalNumber+from manim.mobject.text.tex_mobject import MathTex, Tex+from manim.mobject.types.vectorized_mobject import VGroup, VMobject+from manim.utils.bezier import interpolate+from manim.utils.config_ops import merge_dicts_recursively+from manim.utils.space_ops import normalizeclass NumberLine(Line):diff --git a/manim/mobject/probability.py b/manim/mobject/graphing/probability.pysimilarity index 96%rename from manim/mobject/probability.pyrename to manim/mobject/graphing/probability.pyindex 9b0b10260..80d8df6cb 100644--- a/manim/mobject/probability.py+++ b/manim/mobject/graphing/probability.py@@ -10,16 +10,16 @@ from typing import Iterable, Sequenceimport numpy as npfrom colour import Color-from .. import config-from ..constants import *-from ..mobject.coordinate_systems import Axes-from ..mobject.geometry import Rectangle-from ..mobject.mobject import Mobject-from ..mobject.opengl_mobject import OpenGLMobject-from ..mobject.svg.brace import Brace-from ..mobject.svg.tex_mobject import MathTex, Tex-from ..mobject.types.vectorized_mobject import VGroup, VMobject-from ..utils.color import (+from manim import config+from manim.constants import *+from manim.mobject.geometry.polygram import Rectangle+from manim.mobject.graphing.coordinate_systems import Axes+from manim.mobject.mobject import Mobject+from manim.mobject.opengl.opengl_mobject import OpenGLMobject+from manim.mobject.svg.brace import Brace+from manim.mobject.text.tex_mobject import MathTex, Tex+from manim.mobject.types.vectorized_mobject import VGroup, VMobject+from manim.utils.color import (BLUE_E,DARK_GREY,GREEN_E,@@ -28,7 +28,7 @@ from ..utils.color import (YELLOW,color_gradient,)-from ..utils.iterables import tuplify+from manim.utils.iterables import tuplifyEPSILON = 0.0001diff --git a/manim/utils/scale.py b/manim/mobject/graphing/scale.pysimilarity index 98%rename from manim/utils/scale.pyrename to manim/mobject/graphing/scale.pyindex 1b9ac384c..362599f36 100644--- a/manim/utils/scale.py+++ b/manim/mobject/graphing/scale.py@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING, Any, Iterable__all__ = ["LogBase", "LinearBase"]-from ..mobject.numbers import Integer+from manim.mobject.text.numbers import Integerif TYPE_CHECKING:from manim.mobject.mobject import Mobject@@ -162,7 +162,7 @@ class LogBase(_ScaleBase):val_rangeThe iterable of values used to create the labels. Determines the exponent.- units_decimal_places+ unit_decimal_placesThe number of decimal places to include in the exponentbase_configAdditional arguments to be passed to :class:`~.Integer`.diff --git a/manim/mobject/logo.py b/manim/mobject/logo.pyindex a76627bd1..3441e89c1 100644--- a/manim/mobject/logo.py+++ b/manim/mobject/logo.py@@ -4,14 +4,16 @@ from __future__ import annotations__all__ = ["ManimBanner"]+from manim.animation.updaters.update import UpdateFromAlphaFunc+from manim.mobject.geometry.arc import Circle+from manim.mobject.geometry.polygram import Square, Triangle+from manim.mobject.text.tex_mobject import MathTex, Tex+from ..animation.animation import override_animationfrom ..animation.composition import AnimationGroup, Successionfrom ..animation.creation import Createfrom ..animation.fading import FadeIn-from ..animation.update import UpdateFromAlphaFuncfrom ..constants import DOWN, LEFT, ORIGIN, RIGHT, TAU, UP-from ..mobject.geometry import Circle, Square, Triangle-from ..mobject.svg.tex_mobject import MathTex, Texfrom ..mobject.types.vectorized_mobject import VGroupfrom ..utils.rate_functions import ease_in_out_cubic, ease_out_sine, smoothfrom ..utils.tex_templates import TexFontTemplatesdiff --git a/manim/mobject/matrix.py b/manim/mobject/matrix.pyindex 7e660dc98..d19014666 100644--- a/manim/mobject/matrix.py+++ b/manim/mobject/matrix.py@@ -1,5 +1,3 @@-from __future__ import annotations-r"""Mobjects representing matrices.Examples@@ -28,6 +26,8 @@ Examplesself.add(g)"""+from __future__ import annotations+__all__ = ["Matrix","DecimalMatrix",@@ -44,11 +44,12 @@ from typing import Iterable, Sequenceimport numpy as np+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from manim.mobject.text.numbers import DecimalNumber, Integer+from manim.mobject.text.tex_mobject import MathTex, Tex+from ..constants import *-from ..mobject.numbers import DecimalNumber, Integer-from ..mobject.svg.tex_mobject import MathTex, Texfrom ..mobject.types.vectorized_mobject import VGroup, VMobject-from .opengl_compatibility import ConvertToOpenGL# TO DO : The following two functions are not used in this file.# Not sure if we should keep it or not.diff --git a/manim/mobject/mobject.py b/manim/mobject/mobject.pyindex 5c42cdd34..b2ababb99 100644--- a/manim/mobject/mobject.py+++ b/manim/mobject/mobject.py@@ -31,6 +31,8 @@ from typing import (import numpy as npfrom colour import Color+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from .. import configfrom ..constants import *from ..utils.color import (@@ -46,7 +48,6 @@ from ..utils.iterables import list_update, remove_list_redundanciesfrom ..utils.paths import straight_pathfrom ..utils.simple_functions import get_parametersfrom ..utils.space_ops import angle_between_vectors, normalize, rotation_matrix-from .opengl_compatibility import ConvertToOpenGL# TODO: Explain array_attrs@@ -1677,7 +1678,7 @@ class Mobject:# TODO, this does not behave well when the mobject has points,# since it gets displayed on top- from ..mobject.shape_matchers import BackgroundRectangle+ from manim.mobject.geometry.shape_matchers import BackgroundRectangleself.background_rectangle = BackgroundRectangle(self, color=color, fill_opacity=opacity, **kwargs@@ -2238,7 +2239,7 @@ class Mobject:"""- from .geometry import Line+ from manim.mobject.geometry.line import Linemobs = self.submobjects.copy()start_pos = self.get_center()diff --git a/manim/mobject/opengl/__init__.py b/manim/mobject/opengl/__init__.pynew file mode 100644index 000000000..e69de29bbdiff --git a/manim/mobject/types/dot_cloud.py b/manim/mobject/opengl/dot_cloud.pysimilarity index 89%rename from manim/mobject/types/dot_cloud.pyrename to manim/mobject/opengl/dot_cloud.pyindex 85298db19..4cb0ed8bc 100644--- a/manim/mobject/types/dot_cloud.py+++ b/manim/mobject/opengl/dot_cloud.py@@ -4,9 +4,9 @@ __all__ = ["TrueDot", "DotCloud"]import numpy as np-from ...constants import ORIGIN, RIGHT, UP-from ...utils.color import YELLOW-from .opengl_point_cloud_mobject import OpenGLPMobject+from manim.constants import ORIGIN, RIGHT, UP+from manim.mobject.opengl.opengl_point_cloud_mobject import OpenGLPMobject+from manim.utils.color import YELLOWclass DotCloud(OpenGLPMobject):diff --git a/manim/mobject/opengl_compatibility.py b/manim/mobject/opengl/opengl_compatibility.pysimilarity index 81%rename from manim/mobject/opengl_compatibility.pyrename to manim/mobject/opengl/opengl_compatibility.pyindex 23bb6f719..611bbea19 100644--- a/manim/mobject/opengl_compatibility.py+++ b/manim/mobject/opengl/opengl_compatibility.py@@ -2,11 +2,11 @@ from __future__ import annotationsfrom abc import ABCMeta-from .. import config-from .opengl_mobject import OpenGLMobject-from .opengl_three_dimensions import OpenGLSurface-from .types.opengl_point_cloud_mobject import OpenGLPMobject-from .types.opengl_vectorized_mobject import OpenGLVMobject+from manim import config+from manim.mobject.opengl.opengl_mobject import OpenGLMobject+from manim.mobject.opengl.opengl_point_cloud_mobject import OpenGLPMobject+from manim.mobject.opengl.opengl_three_dimensions import OpenGLSurface+from manim.mobject.opengl.opengl_vectorized_mobject import OpenGLVMobjectclass ConvertToOpenGL(ABCMeta):diff --git a/manim/mobject/opengl_geometry.py b/manim/mobject/opengl/opengl_geometry.pysimilarity index 98%rename from manim/mobject/opengl_geometry.pyrename to manim/mobject/opengl/opengl_geometry.pyindex ffbc045e0..3f9379b14 100644--- a/manim/mobject/opengl_geometry.py+++ b/manim/mobject/opengl/opengl_geometry.py@@ -2,17 +2,17 @@ from __future__ import annotationsimport numpy as np-from ..constants import *-from ..mobject.mobject import Mobject-from ..mobject.types.opengl_vectorized_mobject import (+from manim.constants import *+from manim.mobject.mobject import Mobject+from manim.mobject.opengl.opengl_vectorized_mobject import (OpenGLDashedVMobject,OpenGLVGroup,OpenGLVMobject,)-from ..utils.color import *-from ..utils.iterables import adjacent_n_tuples, adjacent_pairs-from ..utils.simple_functions import clip-from ..utils.space_ops import (+from manim.utils.color import *+from manim.utils.iterables import adjacent_n_tuples, adjacent_pairs+from manim.utils.simple_functions import clip+from manim.utils.space_ops import (angle_between_vectors,angle_of_vector,compass_directions,diff --git a/manim/mobject/opengl_mobject.py b/manim/mobject/opengl/opengl_mobject.pysimilarity index 99%rename from manim/mobject/opengl_mobject.pyrename to manim/mobject/opengl/opengl_mobject.pyindex 6a7048f91..9aae1a576 100644--- a/manim/mobject/opengl_mobject.py+++ b/manim/mobject/opengl/opengl_mobject.py@@ -12,15 +12,15 @@ import modernglimport numpy as npfrom colour import Color-from .. import config-from ..constants import *-from ..utils.bezier import integer_interpolate, interpolate-from ..utils.color import *-from ..utils.color import Colors-from ..utils.config_ops import _Data, _Uniforms+from manim import config+from manim.constants import *+from manim.utils.bezier import integer_interpolate, interpolate+from manim.utils.color import *+from manim.utils.color import Colors+from manim.utils.config_ops import _Data, _Uniforms# from ..utils.iterables import batch_by_property-from ..utils.iterables import (+from manim.utils.iterables import (batch_by_property,list_update,listify,@@ -30,9 +30,9 @@ from ..utils.iterables import (resize_with_interpolation,uniq_chain,)-from ..utils.paths import straight_path-from ..utils.simple_functions import get_parameters-from ..utils.space_ops import (+from manim.utils.paths import straight_path+from manim.utils.simple_functions import get_parameters+from manim.utils.space_ops import (angle_between_vectors,normalize,rotation_matrix_transpose,@@ -983,7 +983,7 @@ class OpenGLMobject:"""- from .geometry import Line+ from manim.mobject.geometry.line import Linemobs = self.submobjects.copy()start_pos = self.get_center()@@ -2014,7 +2014,7 @@ class OpenGLMobject::class:`~.BackgroundRectangle`"""- from ..mobject.shape_matchers import BackgroundRectangle+ from manim.mobject.geometry.shape_matchers import BackgroundRectangleself.background_rectangle = BackgroundRectangle(self, color=color, fill_opacity=opacity, **kwargs@@ -2581,7 +2581,7 @@ class OpenGLMobject:# return selfdef get_shader_wrapper(self):- from ..renderer.shader_wrapper import ShaderWrapper+ from manim.renderer.shader_wrapper import ShaderWrapperself.shader_wrapper = ShaderWrapper(vert_data=self.get_shader_data(),@@ -2756,7 +2756,7 @@ class _AnimationBuilder:return update_targetdef build(self):- from ..animation.transform import _MethodAnimation+ from manim.animation.transform import _MethodAnimationif self.overridden_animation:anim = self.overridden_animationdiff --git a/manim/mobject/types/opengl_point_cloud_mobject.py b/manim/mobject/opengl/opengl_point_cloud_mobject.pysimilarity index 94%rename from manim/mobject/types/opengl_point_cloud_mobject.pyrename to manim/mobject/opengl/opengl_point_cloud_mobject.pyindex c9894a21b..1732b23dc 100644--- a/manim/mobject/types/opengl_point_cloud_mobject.py+++ b/manim/mobject/opengl/opengl_point_cloud_mobject.py@@ -5,12 +5,12 @@ __all__ = ["OpenGLPMobject", "OpenGLPGroup", "OpenGLPMPoint"]import modernglimport numpy as np-from ...constants import *-from ...mobject.opengl_mobject import OpenGLMobject-from ...utils.bezier import interpolate-from ...utils.color import BLACK, WHITE, YELLOW, color_gradient, color_to_rgba-from ...utils.config_ops import _Uniforms-from ...utils.iterables import resize_with_interpolation+from manim.constants import *+from manim.mobject.opengl.opengl_mobject import OpenGLMobject+from manim.utils.bezier import interpolate+from manim.utils.color import BLACK, WHITE, YELLOW, color_gradient, color_to_rgba+from manim.utils.config_ops import _Uniforms+from manim.utils.iterables import resize_with_interpolationclass OpenGLPMobject(OpenGLMobject):diff --git a/manim/mobject/types/opengl_surface.py b/manim/mobject/opengl/opengl_surface.pysimilarity index 97%rename from manim/mobject/types/opengl_surface.pyrename to manim/mobject/opengl/opengl_surface.pyindex 7834bbcdf..1d72d56a8 100644--- a/manim/mobject/types/opengl_surface.py+++ b/manim/mobject/opengl/opengl_surface.py@@ -3,14 +3,14 @@ from __future__ import annotationsimport modernglimport numpy as np-from ...constants import *-from ...mobject.opengl_mobject import OpenGLMobject-from ...utils.bezier import integer_interpolate, interpolate-from ...utils.color import *-from ...utils.config_ops import _Data, _Uniforms-from ...utils.images import get_full_raster_image_path-from ...utils.iterables import listify-from ...utils.space_ops import normalize_along_axis+from manim.constants import *+from manim.mobject.opengl.opengl_mobject import OpenGLMobject+from manim.utils.bezier import integer_interpolate, interpolate+from manim.utils.color import *+from manim.utils.config_ops import _Data, _Uniforms+from manim.utils.images import get_full_raster_image_path+from manim.utils.iterables import listify+from manim.utils.space_ops import normalize_along_axisclass OpenGLSurface(OpenGLMobject):diff --git a/manim/mobject/opengl_three_dimensions.py b/manim/mobject/opengl/opengl_three_dimensions.pysimilarity index 91%rename from manim/mobject/opengl_three_dimensions.pyrename to manim/mobject/opengl/opengl_three_dimensions.pyindex b7c081a12..097d5739b 100644--- a/manim/mobject/opengl_three_dimensions.py+++ b/manim/mobject/opengl/opengl_three_dimensions.py@@ -2,8 +2,8 @@ from __future__ import annotationsimport numpy as np-from ..mobject.types.opengl_surface import OpenGLSurface-from ..mobject.types.opengl_vectorized_mobject import OpenGLVGroup, OpenGLVMobject+from manim.mobject.opengl.opengl_surface import OpenGLSurface+from manim.mobject.opengl.opengl_vectorized_mobject import OpenGLVGroup, OpenGLVMobjectclass OpenGLSurfaceMesh(OpenGLVGroup):diff --git a/manim/mobject/types/opengl_vectorized_mobject.py b/manim/mobject/opengl/opengl_vectorized_mobject.pysimilarity index 99%rename from manim/mobject/types/opengl_vectorized_mobject.pyrename to manim/mobject/opengl/opengl_vectorized_mobject.pyindex 5265a2d89..47ea18b82 100644--- a/manim/mobject/types/opengl_vectorized_mobject.py+++ b/manim/mobject/opengl/opengl_vectorized_mobject.py@@ -9,10 +9,10 @@ import modernglimport numpy as npfrom colour import Color-from ... import config-from ...constants import *-from ...mobject.opengl_mobject import OpenGLMobject, OpenGLPoint-from ...utils.bezier import (+from manim import config+from manim.constants import *+from manim.mobject.opengl.opengl_mobject import OpenGLMobject, OpenGLPoint+from manim.utils.bezier import (bezier,get_quadratic_approximation_of_cubic,get_smooth_cubic_bezier_handle_points,@@ -21,10 +21,10 @@ from ...utils.bezier import (partial_quadratic_bezier_points,proportions_along_bezier_curve_for_point,)-from ...utils.color import *-from ...utils.config_ops import _Data-from ...utils.iterables import listify, make_even, resize_with_interpolation-from ...utils.space_ops import (+from manim.utils.color import *+from manim.utils.config_ops import _Data+from manim.utils.iterables import listify, make_even, resize_with_interpolation+from manim.utils.space_ops import (angle_between_vectors,cross2d,earclip_triangulation,@@ -1534,7 +1534,6 @@ class OpenGLVMobject(OpenGLMobject):)def get_shader_wrapper_list(self):- from ...renderer.shader_wrapper import ShaderWrapper# Build up data listsfill_shader_wrappers = []diff --git a/manim/mobject/svg/__init__.py b/manim/mobject/svg/__init__.pyindex e69de29bb..7aa13c29c 100644--- a/manim/mobject/svg/__init__.py+++ b/manim/mobject/svg/__init__.py@@ -0,0 +1,13 @@+"""Mobjects related to SVG images.++Modules+=======++.. autosummary::+ :toctree: ../reference++ ~brace+ ~style_utils+ ~svg_mobject+ ~svg_path+"""diff --git a/manim/mobject/svg/brace.py b/manim/mobject/svg/brace.pyindex 8c2ba4f41..580df9788 100644--- a/manim/mobject/svg/brace.py+++ b/manim/mobject/svg/brace.py@@ -9,15 +9,16 @@ from typing import Sequenceimport numpy as npfrom manim._config import config-from manim.mobject.opengl_compatibility import ConvertToOpenGL+from manim.mobject.geometry.arc import Arc+from manim.mobject.geometry.line import Line+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from manim.mobject.text.tex_mobject import MathTex, Texfrom ...animation.composition import AnimationGroupfrom ...animation.fading import FadeInfrom ...animation.growing import GrowFromCenterfrom ...constants import *-from ...mobject.geometry import Arc, Linefrom ...mobject.svg.svg_path import SVGPathMobject-from ...mobject.svg.tex_mobject import MathTex, Texfrom ...mobject.types.vectorized_mobject import VMobjectfrom ...utils.color import BLACKdiff --git a/manim/mobject/svg/svg_mobject.py b/manim/mobject/svg/svg_mobject.pyindex f577589e9..b5ebd856d 100644--- a/manim/mobject/svg/svg_mobject.py+++ b/manim/mobject/svg/svg_mobject.py@@ -15,11 +15,14 @@ from xml.dom.minidom import parse as minidom_parseimport numpy as npfrom colour import Color+from manim.mobject.geometry.arc import Circle+from manim.mobject.geometry.line import Line+from manim.mobject.geometry.polygram import Rectangle, RoundedRectangle+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from ... import config, loggerfrom ...constants import *-from ...mobject.geometry import Circle, Line, Rectangle, RoundedRectanglefrom ...mobject.types.vectorized_mobject import VMobject-from ..opengl_compatibility import ConvertToOpenGLfrom .style_utils import cascade_element_style, parse_stylefrom .svg_path import SVGPathMobjectdiff --git a/manim/mobject/svg/svg_path.py b/manim/mobject/svg/svg_path.pyindex 1e7906530..9d23bb7ca 100644--- a/manim/mobject/svg/svg_path.py+++ b/manim/mobject/svg/svg_path.py@@ -11,9 +11,10 @@ from math import *import numpy as np+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from ... import configfrom ...constants import *-from ..opengl_compatibility import ConvertToOpenGLfrom ..types.vectorized_mobject import VMobjectdiff --git a/manim/mobject/table.py b/manim/mobject/table.pyindex 40a761777..35690b078 100644--- a/manim/mobject/table.py+++ b/manim/mobject/table.py@@ -1,5 +1,3 @@-from __future__ import annotations-r"""Mobjects representing tables.Examples@@ -55,6 +53,8 @@ Examplesself.add(g1, g2)"""+from __future__ import annotations+__all__ = ["Table","MathTable",@@ -69,17 +69,18 @@ from typing import Callable, Iterable, Sequencefrom colour import Color+from manim.mobject.geometry.line import Line+from manim.mobject.geometry.polygram import Polygon+from manim.mobject.geometry.shape_matchers import BackgroundRectangle+from manim.mobject.text.numbers import DecimalNumber, Integer+from manim.mobject.text.tex_mobject import MathTex+from manim.mobject.text.text_mobject import Paragraph+from .. import configfrom ..animation.animation import Animationfrom ..animation.composition import AnimationGroupfrom ..animation.creation import Create, Writefrom ..animation.fading import FadeIn-from ..constants import *-from ..mobject.geometry import Line, Polygon-from ..mobject.numbers import DecimalNumber, Integer-from ..mobject.shape_matchers import BackgroundRectangle-from ..mobject.svg.tex_mobject import MathTex-from ..mobject.svg.text_mobject import Paragraphfrom ..mobject.types.vectorized_mobject import VGroup, VMobjectfrom ..utils.color import BLACK, YELLOWdiff --git a/manim/mobject/text/__init__.py b/manim/mobject/text/__init__.pynew file mode 100644index 000000000..d4122e838--- /dev/null+++ b/manim/mobject/text/__init__.py@@ -0,0 +1,13 @@+"""Mobjects used to display Text using Pango or LaTeX.++Modules+=======++.. autosummary::+ :toctree: ../reference++ ~code_mobject+ ~numbers+ ~tex_mobject+ ~text_mobject+"""diff --git a/manim/mobject/svg/code_mobject.py b/manim/mobject/text/code_mobject.pysimilarity index 98%rename from manim/mobject/svg/code_mobject.pyrename to manim/mobject/text/code_mobject.pyindex 54d32b054..0d5e7cb23 100644--- a/manim/mobject/svg/code_mobject.py+++ b/manim/mobject/text/code_mobject.py@@ -16,12 +16,13 @@ from pygments.formatters.html import HtmlFormatterfrom pygments.lexers import get_lexer_by_name, guess_lexer_for_filenamefrom pygments.styles import get_all_styles-from ...constants import *-from ...mobject.geometry import Dot, RoundedRectangle-from ...mobject.shape_matchers import SurroundingRectangle-from ...mobject.svg.text_mobject import Paragraph-from ...mobject.types.vectorized_mobject import VGroup-from ...utils.color import WHITE+from manim.constants import *+from manim.mobject.geometry.arc import Dot+from manim.mobject.geometry.polygram import RoundedRectangle+from manim.mobject.geometry.shape_matchers import SurroundingRectangle+from manim.mobject.text.text_mobject import Paragraph+from manim.mobject.types.vectorized_mobject import VGroup+from manim.utils.color import WHITEclass Code(VGroup):diff --git a/manim/mobject/numbers.py b/manim/mobject/text/numbers.pysimilarity index 97%rename from manim/mobject/numbers.pyrename to manim/mobject/text/numbers.pyindex 183b25152..c5286035c 100644--- a/manim/mobject/numbers.py+++ b/manim/mobject/text/numbers.py@@ -8,12 +8,12 @@ from typing import Sequenceimport numpy as np-from .. import config-from ..constants import *-from ..mobject.svg.tex_mobject import MathTex, SingleStringMathTex-from ..mobject.types.vectorized_mobject import VMobject-from ..mobject.value_tracker import ValueTracker-from .opengl_compatibility import ConvertToOpenGL+from manim import config+from manim.animation.updaters.value_tracker import ValueTracker+from manim.constants import *+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from manim.mobject.text.tex_mobject import MathTex, SingleStringMathTex+from manim.mobject.types.vectorized_mobject import VMobjectstring_to_mob_map = {}diff --git a/manim/mobject/svg/tex_mobject.py b/manim/mobject/text/tex_mobject.pysimilarity index 97%rename from manim/mobject/svg/tex_mobject.pyrename to manim/mobject/text/tex_mobject.pyindex 381515a32..f918a3bd7 100644--- a/manim/mobject/svg/tex_mobject.py+++ b/manim/mobject/text/tex_mobject.py@@ -1,5 +1,3 @@-from __future__ import annotations-r"""Mobjects representing text rendered using LaTeX... important::@@ -12,6 +10,8 @@ r"""Mobjects representing text rendered using LaTeX."""+from __future__ import annotations+__all__ = ["TexSymbol","SingleStringMathTex",@@ -31,16 +31,15 @@ from typing import Dict, Iterable, Optionalfrom colour import Color+from manim import config, logger+from manim.constants import *+from manim.mobject.geometry.line import Line+from manim.mobject.svg.style_utils import parse_style+from manim.mobject.svg.svg_mobject import SVGMobject+from manim.mobject.svg.svg_path import SVGPathMobject+from manim.mobject.types.vectorized_mobject import VectorizedPoint, VGroup, VMobjectfrom manim.utils.tex import TexTemplate--from ... import config, logger-from ...constants import *-from ...mobject.geometry import Line-from ...mobject.svg.svg_mobject import SVGMobject-from ...mobject.svg.svg_path import SVGPathMobject-from ...mobject.types.vectorized_mobject import VectorizedPoint, VGroup, VMobject-from ...utils.tex_file_writing import tex_to_svg_file-from .style_utils import parse_style+from manim.utils.tex_file_writing import tex_to_svg_fileSCALE_FACTOR_PER_FONT_POINT = 1 / 960diff --git a/manim/mobject/svg/text_mobject.py b/manim/mobject/text/text_mobject.pysimilarity index 99%rename from manim/mobject/svg/text_mobject.pyrename to manim/mobject/text/text_mobject.pyindex cda23f6c6..a6ff4bdd1 100644--- a/manim/mobject/svg/text_mobject.py+++ b/manim/mobject/text/text_mobject.py@@ -66,13 +66,13 @@ import numpy as npfrom colour import Colorfrom manimpango import MarkupUtils, PangoUtils, TextSetting-from ... import config, logger-from ...constants import *-from ...mobject.geometry import Dot-from ...mobject.svg.svg_mobject import SVGMobject-from ...mobject.types.vectorized_mobject import VGroup, VMobject-from ...utils.color import Colors, color_gradient-from ...utils.deprecation import deprecated+from manim import config, logger+from manim.constants import *+from manim.mobject.geometry.arc import Dot+from manim.mobject.svg.svg_mobject import SVGMobject+from manim.mobject.types.vectorized_mobject import VGroup, VMobject+from manim.utils.color import Colors, color_gradient+from manim.utils.deprecation import deprecatedTEXT_MOB_SCALE_FACTOR = 0.05DEFAULT_LINE_SPACING_SCALE = 0.3diff --git a/manim/mobject/three_d/__init__.py b/manim/mobject/three_d/__init__.pynew file mode 100644index 000000000..98d295a24--- /dev/null+++ b/manim/mobject/three_d/__init__.py@@ -0,0 +1,12 @@+"""Three-dimensional mobjects.++Modules+=======++.. autosummary::+ :toctree: ../reference++ ~polyhedra+ ~three_d_utils+ ~three_dimensions+"""diff --git a/manim/mobject/polyhedra.py b/manim/mobject/three_d/polyhedra.pysimilarity index 97%rename from manim/mobject/polyhedra.pyrename to manim/mobject/three_d/polyhedra.pyindex 678318165..300cf660a 100644--- a/manim/mobject/polyhedra.py+++ b/manim/mobject/three_d/polyhedra.py@@ -6,13 +6,13 @@ from typing import TYPE_CHECKINGimport numpy as np-from .geometry import Polygon-from .graph import Graph-from .three_dimensions import Dot3D-from .types.vectorized_mobject import VGroup+from manim.mobject.geometry.polygram import Polygon+from manim.mobject.graph import Graph+from manim.mobject.three_d.three_dimensions import Dot3D+from manim.mobject.types.vectorized_mobject import VGroupif TYPE_CHECKING:- from .mobject import Mobject+ from manim.mobject.mobject import Mobject__all__ = ["Polyhedron", "Tetrahedron", "Octahedron", "Icosahedron", "Dodecahedron"]diff --git a/manim/mobject/three_d_utils.py b/manim/mobject/three_d/three_d_utils.pysimilarity index 95%rename from manim/mobject/three_d_utils.pyrename to manim/mobject/three_d/three_d_utils.pyindex 19fdcef04..397e304af 100644--- a/manim/mobject/three_d_utils.py+++ b/manim/mobject/three_d/three_d_utils.py@@ -16,8 +16,8 @@ __all__ = [import numpy as np-from ..constants import ORIGIN, UP-from ..utils.space_ops import get_unit_normal+from manim.constants import ORIGIN, UP+from manim.utils.space_ops import get_unit_normaldef get_3d_vmob_gradient_start_and_end_points(vmob):diff --git a/manim/mobject/three_dimensions.py b/manim/mobject/three_d/three_dimensions.pysimilarity index 98%rename from manim/mobject/three_dimensions.pyrename to manim/mobject/three_d/three_dimensions.pyindex 4b05e4370..80aa10078 100644--- a/manim/mobject/three_dimensions.py+++ b/manim/mobject/three_d/three_dimensions.py@@ -22,17 +22,17 @@ from typing import *import numpy as npfrom colour import Color-from manim.mobject.opengl_compatibility import ConvertToOpenGL--from .. import config-from ..constants import *-from ..mobject.geometry import Circle, Square-from ..mobject.mobject import *-from ..mobject.opengl_mobject import OpenGLMobject-from ..mobject.types.vectorized_mobject import VGroup, VMobject-from ..utils.color import *-from ..utils.iterables import tuplify-from ..utils.space_ops import normalize, perpendicular_bisector, z_to_vector+from manim import config+from manim.constants import *+from manim.mobject.geometry.arc import Circle+from manim.mobject.geometry.polygram import Square+from manim.mobject.mobject import *+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from manim.mobject.opengl.opengl_mobject import OpenGLMobject+from manim.mobject.types.vectorized_mobject import VGroup, VMobject+from manim.utils.color import *+from manim.utils.iterables import tuplify+from manim.utils.space_ops import normalize, perpendicular_bisector, z_to_vectorclass ThreeDVMobject(VMobject, metaclass=ConvertToOpenGL):diff --git a/manim/mobject/types/__init__.py b/manim/mobject/types/__init__.pyindex e69de29bb..7c73aaa28 100644--- a/manim/mobject/types/__init__.py+++ b/manim/mobject/types/__init__.py@@ -0,0 +1,12 @@+"""Specialized mobject base classes.++Modules+=======++.. autosummary::+ :toctree: ../reference++ ~image_mobject+ ~point_cloud_mobject+ ~vectorized_mobject+"""diff --git a/manim/mobject/types/image_mobject.py b/manim/mobject/types/image_mobject.pyindex 1cbaddb3f..10b61a27a 100644--- a/manim/mobject/types/image_mobject.py+++ b/manim/mobject/types/image_mobject.py@@ -10,12 +10,11 @@ import colourimport numpy as npfrom PIL import Image-from manim.constants import DEFAULT_QUALITY, QUALITIES+from manim.mobject.geometry.shape_matchers import SurroundingRectanglefrom ... import configfrom ...constants import *from ...mobject.mobject import Mobject-from ...mobject.shape_matchers import SurroundingRectanglefrom ...utils.bezier import interpolatefrom ...utils.color import WHITE, color_to_int_rgbfrom ...utils.images import get_full_raster_image_pathdiff --git a/manim/mobject/types/point_cloud_mobject.py b/manim/mobject/types/point_cloud_mobject.pyindex bd418e8a5..acc981cc6 100644--- a/manim/mobject/types/point_cloud_mobject.py+++ b/manim/mobject/types/point_cloud_mobject.py@@ -7,6 +7,9 @@ __all__ = ["PMobject", "Mobject1D", "Mobject2D", "PGroup", "PointCloudDot", "Poiimport numpy as npfrom colour import Color+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from manim.mobject.opengl.opengl_point_cloud_mobject import OpenGLPMobject+from ...constants import *from ...mobject.mobject import Mobjectfrom ...utils.bezier import interpolate@@ -19,8 +22,6 @@ from ...utils.color import (rgba_to_color,)from ...utils.iterables import stretch_array_to_length-from ..opengl_compatibility import ConvertToOpenGL-from ..types.opengl_point_cloud_mobject import OpenGLPMobjectclass PMobject(Mobject, metaclass=ConvertToOpenGL):diff --git a/manim/mobject/types/vectorized_mobject.py b/manim/mobject/types/vectorized_mobject.pyindex 4f052fbe2..7fac178f3 100644--- a/manim/mobject/types/vectorized_mobject.py+++ b/manim/mobject/types/vectorized_mobject.py@@ -20,10 +20,15 @@ import colourimport numpy as npfrom PIL.Image import Image+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from manim.mobject.opengl.opengl_vectorized_mobject import OpenGLVMobject+from manim.mobject.three_d.three_d_utils import (+ get_3d_vmob_gradient_start_and_end_points,+)+from ... import configfrom ...constants import *from ...mobject.mobject import Mobject-from ...mobject.three_d_utils import get_3d_vmob_gradient_start_and_end_pointsfrom ...utils.bezier import (bezier,get_smooth_handle_points,@@ -36,8 +41,6 @@ from ...utils.color import BLACK, WHITE, color_to_rgbafrom ...utils.deprecation import deprecatedfrom ...utils.iterables import make_even, stretch_array_to_length, tuplifyfrom ...utils.space_ops import rotate_vector, shoelace_direction-from ..opengl_compatibility import ConvertToOpenGL-from .opengl_vectorized_mobject import OpenGLVMobject# TODO# - Change cubic curve groups to have 4 points instead of 3@@ -2201,7 +2204,7 @@ class VDict(VMobject, metaclass=ConvertToOpenGL):mob = valueif self.show_keys:# This import is here and not at the top to avoid circular import- from ...mobject.svg.tex_mobject import Tex+ from manim.mobject.text.tex_mobject import Texkey_text = Tex(str(key)).next_to(value, LEFT)mob.add(key_text)diff --git a/manim/mobject/vector_field.py b/manim/mobject/vector_field.pyindex 726594a20..2c09edcb3 100644--- a/manim/mobject/vector_field.py+++ b/manim/mobject/vector_field.py@@ -17,20 +17,21 @@ import numpy as npfrom colour import Colorfrom PIL import Image+from manim.animation.updaters.update import UpdateFromAlphaFunc+from manim.mobject.geometry.line import Vector+from manim.mobject.opengl.opengl_vectorized_mobject import OpenGLVMobject+from .. import configfrom ..animation.composition import AnimationGroup, Successionfrom ..animation.creation import Createfrom ..animation.indication import ShowPassingFlash-from ..animation.update import UpdateFromAlphaFuncfrom ..constants import OUT, RIGHT, UP-from ..mobject.geometry import Vectorfrom ..mobject.mobject import Mobjectfrom ..mobject.types.vectorized_mobject import VGroup, VMobjectfrom ..utils.bezier import interpolate, inverse_interpolatefrom ..utils.color import BLUE_E, GREEN, RED, YELLOW, color_to_rgb, rgb_to_colorfrom ..utils.rate_functions import ease_out_sine, linearfrom ..utils.simple_functions import sigmoid-from .types.opengl_vectorized_mobject import OpenGLVMobjectDEFAULT_SCALAR_FIELD_COLORS: list = [BLUE_E, GREEN, YELLOW, RED]diff --git a/manim/opengl/__init__.py b/manim/opengl/__init__.pyindex 1f40fda9a..85d583086 100644--- a/manim/opengl/__init__.py+++ b/manim/opengl/__init__.py@@ -5,9 +5,13 @@ try:except ImportError:pass-from ..mobject.opengl_mobject import *-from ..mobject.opengl_three_dimensions import *-from ..mobject.types.opengl_surface import *-from ..mobject.types.opengl_vectorized_mobject import *++from manim.mobject.opengl.dot_cloud import *+from manim.mobject.opengl.opengl_mobject import *+from manim.mobject.opengl.opengl_point_cloud_mobject import *+from manim.mobject.opengl.opengl_surface import *+from manim.mobject.opengl.opengl_three_dimensions import *+from manim.mobject.opengl.opengl_vectorized_mobject import *+from ..renderer.shader import *from ..utils.opengl import *diff --git a/manim/renderer/opengl_renderer.py b/manim/renderer/opengl_renderer.pyindex cce012b76..3490ac2c0 100644--- a/manim/renderer/opengl_renderer.py+++ b/manim/renderer/opengl_renderer.py@@ -15,13 +15,13 @@ import numpy as npfrom PIL import Imagefrom manim import config, logger+from manim.mobject.opengl.opengl_mobject import OpenGLMobject, OpenGLPoint+from manim.mobject.opengl.opengl_vectorized_mobject import OpenGLVMobjectfrom manim.utils.caching import handle_caching_playfrom manim.utils.color import color_to_rgbafrom manim.utils.exceptions import EndSceneEarlyExceptionfrom ..constants import *-from ..mobject.opengl_mobject import OpenGLMobject, OpenGLPoint-from ..mobject.types.opengl_vectorized_mobject import OpenGLVMobjectfrom ..scene.scene_file_writer import SceneFileWriterfrom ..utils import openglfrom ..utils.config_ops import _Datadiff --git a/manim/scene/scene.py b/manim/scene/scene.pyindex 85a2f1f20..f751a8b2e 100644--- a/manim/scene/scene.py+++ b/manim/scene/scene.py@@ -30,12 +30,13 @@ from tqdm import tqdmfrom watchdog.events import FileSystemEventHandlerfrom watchdog.observers import Observer+from manim.mobject.opengl.opengl_mobject import OpenGLPoint+from .. import config, loggerfrom ..animation.animation import Animation, Wait, prepare_animationfrom ..camera.camera import Camerafrom ..constants import *from ..gui.gui import configure_pygui-from ..mobject.opengl_mobject import OpenGLPointfrom ..renderer.cairo_renderer import CairoRendererfrom ..renderer.opengl_renderer import OpenGLRendererfrom ..renderer.shader import Object3D@@ -1167,7 +1168,6 @@ class Scene:self.interactive_mode = Truedef ipython(shell, namespace):- import manimimport manim.opengldef load_module_into_namespace(module, namespace):diff --git a/manim/scene/three_d_scene.py b/manim/scene/three_d_scene.pyindex e7c26e3f2..de5593f2d 100644--- a/manim/scene/three_d_scene.py+++ b/manim/scene/three_d_scene.py@@ -10,18 +10,19 @@ from typing import Iterable, Sequenceimport numpy as np+from manim.animation.updaters.value_tracker import ValueTracker+from manim.mobject.geometry.line import Line+from manim.mobject.graphing.coordinate_systems import ThreeDAxes+from manim.mobject.opengl.opengl_mobject import OpenGLMobject+from manim.mobject.three_d.three_dimensions import Sphere+from .. import configfrom ..animation.animation import Animationfrom ..animation.transform import Transformfrom ..camera.three_d_camera import ThreeDCamerafrom ..constants import DEGREES-from ..mobject.coordinate_systems import ThreeDAxes-from ..mobject.geometry import Linefrom ..mobject.mobject import Mobject-from ..mobject.opengl_mobject import OpenGLMobject-from ..mobject.three_dimensions import Spherefrom ..mobject.types.vectorized_mobject import VectorizedPoint, VGroup-from ..mobject.value_tracker import ValueTrackerfrom ..renderer.opengl_renderer import OpenGLCamerafrom ..scene.scene import Scenefrom ..utils.config_ops import merge_dicts_recursivelydiff --git a/manim/scene/vector_space_scene.py b/manim/scene/vector_space_scene.pyindex 789e56ef1..aa4df4997 100644--- a/manim/scene/vector_space_scene.py+++ b/manim/scene/vector_space_scene.py@@ -4,10 +4,15 @@ from __future__ import annotations__all__ = ["VectorScene", "LinearTransformationScene"]-import numpy as npfrom colour import Color+from manim.mobject.geometry.arc import Dot+from manim.mobject.geometry.line import Arrow, Line, Vector+from manim.mobject.geometry.polygram import Rectangle+from manim.mobject.graphing.coordinate_systems import Axes, NumberPlane+from manim.mobject.opengl.opengl_mobject import OpenGLMobject+from manim.mobject.text.tex_mobject import MathTex, Texfrom manim.utils.config_ops import update_dict_recursivelyfrom .. import config@@ -17,12 +22,8 @@ from ..animation.fading import FadeOutfrom ..animation.growing import GrowArrowfrom ..animation.transform import ApplyFunction, ApplyPointwiseFunction, Transformfrom ..constants import *-from ..mobject.coordinate_systems import Axes, NumberPlane-from ..mobject.geometry import Arrow, Dot, Line, Rectangle, Vectorfrom ..mobject.matrix import Matrixfrom ..mobject.mobject import Mobject-from ..mobject.opengl_mobject import OpenGLMobject-from ..mobject.svg.tex_mobject import MathTex, Texfrom ..mobject.types.vectorized_mobject import VGroup, VMobjectfrom ..scene.scene import Scenefrom ..utils.color import BLUE_D, GREEN_C, GREY, RED_C, WHITE, YELLOWdiff --git a/manim/utils/debug.py b/manim/utils/debug.pyindex 9a193dfb8..3e066837e 100644--- a/manim/utils/debug.py+++ b/manim/utils/debug.py@@ -6,11 +6,9 @@ from __future__ import annotations__all__ = ["print_family", "index_labels"]-from colour import Color-from manim.mobject.mobject import Mobject+from manim.mobject.text.numbers import Integer-from ..mobject.numbers import Integerfrom ..mobject.types.vectorized_mobject import VGroupfrom .color import BLACKdiff --git a/manim/utils/docbuild/manim_directive.py b/manim/utils/docbuild/manim_directive.pyindex 3e121a9ab..155e475c5 100644--- a/manim/utils/docbuild/manim_directive.py+++ b/manim/utils/docbuild/manim_directive.py@@ -342,8 +342,6 @@ def _delete_rendering_times(*args):def setup(app):- import manim-app.add_node(skip_manim_node, html=(visit, depart))setup.app = appdiff --git a/manim/utils/images.py b/manim/utils/images.pyindex ee3060f77..544533f89 100644--- a/manim/utils/images.py+++ b/manim/utils/images.py@@ -4,7 +4,6 @@ from __future__ import annotations__all__ = ["get_full_raster_image_path", "drag_pixels", "invert_image"]-import numpy as npfrom PIL import Imagediff --git a/tests/opengl/test_animate_opengl.py b/tests/opengl/test_animate_opengl.pyindex 2312f41fc..1243fcb21 100644--- a/tests/opengl/test_animate_opengl.py+++ b/tests/opengl/test_animate_opengl.py@@ -4,7 +4,9 @@ import numpy as npimport pytestfrom manim.animation.creation import Uncreate-from manim.mobject.geometry import Dot, Line, Square+from manim.mobject.geometry.arc import Dot+from manim.mobject.geometry.line import Line+from manim.mobject.geometry.polygram import Squarefrom manim.mobject.mobject import override_animatefrom manim.mobject.types.vectorized_mobject import VGroupdiff --git a/tests/opengl/test_axes_shift_opengl.py b/tests/opengl/test_axes_shift_opengl.pyindex 4b320b1fb..731db633f 100644--- a/tests/opengl/test_axes_shift_opengl.py+++ b/tests/opengl/test_axes_shift_opengl.py@@ -2,7 +2,7 @@ from __future__ import annotationsimport numpy as np-from manim.mobject.coordinate_systems import Axes+from manim.mobject.graphing.coordinate_systems import Axesdef test_axes_origin_shift(using_opengl_renderer):diff --git a/tests/opengl/test_color_opengl.py b/tests/opengl/test_color_opengl.pyindex 4212fe691..e3f6940ac 100644--- a/tests/opengl/test_color_opengl.py+++ b/tests/opengl/test_color_opengl.py@@ -4,8 +4,8 @@ import numpy as npfrom colour import Colorfrom manim import BLACK, BLUE, GREEN, PURE_BLUE, PURE_GREEN, PURE_RED, Scene-from manim.mobject.opengl_mobject import OpenGLMobject-from manim.mobject.types.opengl_vectorized_mobject import OpenGLVMobject+from manim.mobject.opengl.opengl_mobject import OpenGLMobject+from manim.mobject.opengl.opengl_vectorized_mobject import OpenGLVMobjectdef test_import_color(using_opengl_renderer):diff --git a/tests/opengl/test_composition_opengl.py b/tests/opengl/test_composition_opengl.pyindex 9cb293ed4..0f4de3cb1 100644--- a/tests/opengl/test_composition_opengl.py+++ b/tests/opengl/test_composition_opengl.py@@ -6,7 +6,9 @@ from manim.animation.animation import Animation, Waitfrom manim.animation.composition import AnimationGroup, Successionfrom manim.animation.fading import FadeIn, FadeOutfrom manim.constants import DOWN, UP-from manim.mobject.geometry import Circle, Line, Square+from manim.mobject.geometry.arc import Circle+from manim.mobject.geometry.line import Line+from manim.mobject.geometry.polygram import Squaredef test_succession_timing(using_opengl_renderer):diff --git a/tests/opengl/test_copy_opengl.py b/tests/opengl/test_copy_opengl.pyindex 31c49011d..db2e06dba 100644--- a/tests/opengl/test_copy_opengl.py+++ b/tests/opengl/test_copy_opengl.py@@ -3,7 +3,7 @@ from __future__ import annotationsfrom pathlib import Pathfrom manim import BraceLabel, config-from manim.mobject.opengl_mobject import OpenGLMobject+from manim.mobject.opengl.opengl_mobject import OpenGLMobjectdef test_opengl_mobject_copy(using_opengl_renderer):diff --git a/tests/opengl/test_family_opengl.py b/tests/opengl/test_family_opengl.pyindex f1939c158..a7dd35e93 100644--- a/tests/opengl/test_family_opengl.py+++ b/tests/opengl/test_family_opengl.py@@ -3,7 +3,7 @@ from __future__ import annotationsimport numpy as npfrom manim import RIGHT, Circle-from manim.mobject.opengl_mobject import OpenGLMobject+from manim.mobject.opengl.opengl_mobject import OpenGLMobjectdef test_family(using_opengl_renderer):diff --git a/tests/opengl/test_number_line_opengl.py b/tests/opengl/test_number_line_opengl.pyindex acebdda42..4092e4bfd 100644--- a/tests/opengl/test_number_line_opengl.py+++ b/tests/opengl/test_number_line_opengl.py@@ -3,7 +3,7 @@ from __future__ import annotationsimport numpy as npfrom manim import NumberLine-from manim.mobject.numbers import Integer+from manim.mobject.text.numbers import Integerdef test_unit_vector():diff --git a/tests/opengl/test_numbers_opengl.py b/tests/opengl/test_numbers_opengl.pyindex a697687ae..9bc2ddd13 100644--- a/tests/opengl/test_numbers_opengl.py+++ b/tests/opengl/test_numbers_opengl.py@@ -1,6 +1,6 @@from __future__ import annotations-from manim.mobject.numbers import DecimalNumber+from manim.mobject.text.numbers import DecimalNumberdef test_font_size():diff --git a/tests/opengl/test_opengl_mobject.py b/tests/opengl/test_opengl_mobject.pyindex f366c15df..f1a58fa6a 100644--- a/tests/opengl/test_opengl_mobject.py+++ b/tests/opengl/test_opengl_mobject.py@@ -2,7 +2,7 @@ from __future__ import annotationsimport pytest-from manim.mobject.opengl_mobject import OpenGLMobject+from manim.mobject.opengl.opengl_mobject import OpenGLMobjectdef test_opengl_mobject_add(using_opengl_renderer):diff --git a/tests/opengl/test_opengl_vectorized_mobject.py b/tests/opengl/test_opengl_vectorized_mobject.pyindex 196b2fc0e..64b53641c 100644--- a/tests/opengl/test_opengl_vectorized_mobject.py+++ b/tests/opengl/test_opengl_vectorized_mobject.py@@ -4,8 +4,8 @@ import numpy as npimport pytestfrom manim import Circle, Line, Square, VDict, VGroup-from manim.mobject.opengl_mobject import OpenGLMobject-from manim.mobject.types.opengl_vectorized_mobject import OpenGLVMobject+from manim.mobject.opengl.opengl_mobject import OpenGLMobject+from manim.mobject.opengl.opengl_vectorized_mobject import OpenGLVMobjectdef test_opengl_vmobject_point_from_propotion(using_opengl_renderer):diff --git a/tests/opengl/test_override_animation_opengl.py b/tests/opengl/test_override_animation_opengl.pyindex 38d714d2f..cb150201c 100644--- a/tests/opengl/test_override_animation_opengl.py+++ b/tests/opengl/test_override_animation_opengl.py@@ -3,7 +3,7 @@ from __future__ import annotationsimport pytestfrom manim import Animation, override_animation-from manim.mobject.opengl_mobject import OpenGLMobject+from manim.mobject.opengl.opengl_mobject import OpenGLMobjectfrom manim.utils.exceptions import MultiAnimationOverrideExceptiondiff --git a/tests/opengl/test_scene_opengl.py b/tests/opengl/test_scene_opengl.pyindex 596b097cb..e202fa9a7 100644--- a/tests/opengl/test_scene_opengl.py+++ b/tests/opengl/test_scene_opengl.py@@ -1,7 +1,7 @@from __future__ import annotationsfrom manim import Scene, tempconfig-from manim.mobject.opengl_mobject import OpenGLMobject+from manim.mobject.opengl.opengl_mobject import OpenGLMobjectdef test_scene_add_remove(using_opengl_renderer):diff --git a/tests/opengl/test_stroke_opengl.py b/tests/opengl/test_stroke_opengl.pyindex 74e373eea..7a18d5de2 100644--- a/tests/opengl/test_stroke_opengl.py+++ b/tests/opengl/test_stroke_opengl.py@@ -3,7 +3,7 @@ from __future__ import annotationsfrom colour import Colorimport manim.utils.color as C-from manim.mobject.types.opengl_vectorized_mobject import OpenGLVMobject+from manim.mobject.opengl.opengl_vectorized_mobject import OpenGLVMobjectdef test_stroke_props_in_ctor(using_opengl_renderer):diff --git a/tests/opengl/test_text_mobject_opengl.py b/tests/opengl/test_text_mobject_opengl.pyindex 29984399a..9fa941531 100644--- a/tests/opengl/test_text_mobject_opengl.py+++ b/tests/opengl/test_text_mobject_opengl.py@@ -1,6 +1,6 @@from __future__ import annotations-from manim.mobject.svg.text_mobject import MarkupText, Text+from manim.mobject.text.text_mobject import MarkupText, Textdef test_font_size(using_opengl_renderer):diff --git a/tests/opengl/test_value_tracker_opengl.py b/tests/opengl/test_value_tracker_opengl.pyindex ad8ac3acf..f3816424e 100644--- a/tests/opengl/test_value_tracker_opengl.py+++ b/tests/opengl/test_value_tracker_opengl.py@@ -1,6 +1,6 @@from __future__ import annotations-from manim.mobject.value_tracker import ComplexValueTracker, ValueTracker+from manim.animation.updaters.value_tracker import ComplexValueTracker, ValueTrackerdef test_value_tracker_set_value(using_opengl_renderer):diff --git a/tests/test_animate.py b/tests/test_animate.pyindex 3163796a7..4f39d8548 100644--- a/tests/test_animate.py+++ b/tests/test_animate.py@@ -4,7 +4,9 @@ import numpy as npimport pytestfrom manim.animation.creation import Uncreate-from manim.mobject.geometry import Dot, Line, Square+from manim.mobject.geometry.arc import Dot+from manim.mobject.geometry.line import Line+from manim.mobject.geometry.polygram import Squarefrom manim.mobject.mobject import override_animatefrom manim.mobject.types.vectorized_mobject import VGroupdiff --git a/tests/test_axes_shift.py b/tests/test_axes_shift.pyindex 1d826c7c0..6697f5d83 100644--- a/tests/test_axes_shift.py+++ b/tests/test_axes_shift.py@@ -2,8 +2,8 @@ from __future__ import annotationsimport numpy as np-from manim.mobject.coordinate_systems import Axes, ThreeDAxes-from manim.utils.scale import LogBase+from manim.mobject.graphing.coordinate_systems import Axes, ThreeDAxes+from manim.mobject.graphing.scale import LogBasedef test_axes_origin_shift():diff --git a/tests/test_boolean_ops.py b/tests/test_boolean_ops.pyindex 8ff5f78ef..30ea22906 100644--- a/tests/test_boolean_ops.py+++ b/tests/test_boolean_ops.py@@ -4,7 +4,7 @@ import numpy as npimport pytestfrom manim import Circle, Square-from manim.mobject.boolean_ops import _BooleanOps+from manim.mobject.geometry.boolean_ops import _BooleanOps@pytest.mark.parametrize(diff --git a/tests/test_composition.py b/tests/test_composition.pyindex a1a5f22f1..5660d7717 100644--- a/tests/test_composition.py+++ b/tests/test_composition.py@@ -9,7 +9,9 @@ from manim.animation.composition import AnimationGroup, Successionfrom manim.animation.creation import Create, Writefrom manim.animation.fading import FadeIn, FadeOutfrom manim.constants import DOWN, UP-from manim.mobject.geometry import Circle, Line, RegularPolygon, Square+from manim.mobject.geometry.arc import Circle+from manim.mobject.geometry.line import Line+from manim.mobject.geometry.polygram import RegularPolygon, Squarefrom manim.scene.scene import Scenediff --git a/tests/test_graphical_units/test_coordinate_systems.py b/tests/test_graphical_units/test_coordinate_systems.pyindex c61a9a53b..3a62b3107 100644--- a/tests/test_graphical_units/test_coordinate_systems.py+++ b/tests/test_graphical_units/test_coordinate_systems.py@@ -53,7 +53,6 @@ def test_plot_log_x_axis(scene):)graph = ax.plot(lambda x: 2 if x < 10 else 1, x_range=[-1, 4])-scene.add(ax, graph)diff --git a/tests/test_graphical_units/test_probability.py b/tests/test_graphical_units/test_probability.pyindex c09acdf99..f5e31c95c 100644--- a/tests/test_graphical_units/test_probability.py+++ b/tests/test_graphical_units/test_probability.py@@ -1,6 +1,6 @@from manim.constants import LEFT-from manim.mobject.probability import BarChart-from manim.mobject.svg.tex_mobject import MathTex+from manim.mobject.graphing.probability import BarChart+from manim.mobject.text.tex_mobject import MathTexfrom manim.utils.color import BLUE, GREEN, RED, WHITE, YELLOWfrom manim.utils.testing.frames_comparison import frames_comparisondiff --git a/tests/test_number_line.py b/tests/test_number_line.pyindex acebdda42..4092e4bfd 100644--- a/tests/test_number_line.py+++ b/tests/test_number_line.py@@ -3,7 +3,7 @@ from __future__ import annotationsimport numpy as npfrom manim import NumberLine-from manim.mobject.numbers import Integer+from manim.mobject.text.numbers import Integerdef test_unit_vector():diff --git a/tests/test_opengl_metaclass.py b/tests/test_opengl_metaclass.pyindex bfc40a68d..bc172bfa3 100644--- a/tests/test_opengl_metaclass.py+++ b/tests/test_opengl_metaclass.py@@ -1,8 +1,8 @@from __future__ import annotationsfrom manim import Mobject, config, tempconfig-from manim.mobject.opengl_compatibility import ConvertToOpenGL-from manim.mobject.opengl_mobject import OpenGLMobject+from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL+from manim.mobject.opengl.opengl_mobject import OpenGLMobjectdef test_metaclass_registry():diff --git a/tests/test_set_attr.py b/tests/test_set_attr.pyindex 1c3425cee..e04a2286f 100644--- a/tests/test_set_attr.py+++ b/tests/test_set_attr.py@@ -4,7 +4,7 @@ import numpy as npfrom manim import configfrom manim.constants import RIGHT-from manim.mobject.geometry import Square+from manim.mobject.geometry.polygram import Squaredef test_Data():diff --git a/tests/test_text_mobject.py b/tests/test_text_mobject.pyindex 21a964d4d..79542163d 100644--- a/tests/test_text_mobject.py+++ b/tests/test_text_mobject.py@@ -1,11 +1,8 @@from __future__ import annotations-import pytestfrom colour import Color-from manim.mobject.svg.text_mobject import MarkupText, Text-from manim.mobject.types.vectorized_mobject import VMobject-from manim.utils.color import RED+from manim.mobject.text.text_mobject import MarkupText, Textdef test_font_size():diff --git a/tests/test_value_tracker.py b/tests/test_value_tracker.pyindex 824902a9b..0689ebd1c 100644--- a/tests/test_value_tracker.py+++ b/tests/test_value_tracker.py@@ -1,6 +1,6 @@from __future__ import annotations-from manim.mobject.value_tracker import ComplexValueTracker, ValueTracker+from manim.animation.updaters.value_tracker import ComplexValueTracker, ValueTrackerdef test_value_tracker_set_value():