Merge branch 'master' into startistics

Author: irvanalhaq9

.github/workflows/publish.yml

@@ -14,10 +14,10 @@ jobs:
         python: ["py37", "py38", "py39", "py310"]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v6
       with:
         python-version: '3.8'
 

.gitignore

@@ -152,3 +152,4 @@ dmypy.json
 /videos
 /custom_config.yml
 test.py
+CLAUDE.md

README.md

@@ -69,6 +69,15 @@ manim-render example_scenes.py OpeningManimExample
     ```sh
     brew install ffmpeg mactex
     ```
+    <details>
+      <summary>💡 An alternative to heavyweight MacTeX bundle.</summary>
+
+      > To avoid installing the full MacTeX bundle, which is ~6GB, you can alternatively install the
+      > lightweight [BasicTeX](https://formulae.brew.sh/cask/basictex) and then gradually add
+      > only the LaTeX packages you actually need. A list of packages sufficient to run examples can 
+      > be found [here](https://github.com/3b1b/manim/issues/2133#issuecomment-2414547866).
+      > For an overview of the MacTeX installer bundles, see https://www.tug.org/mactex/.
+    </details>
 
 2. If you are using an ARM-based processor, install Cairo. 
     ```sh
@@ -86,7 +95,7 @@ manim-render example_scenes.py OpeningManimExample
 ## Anaconda Install
 
 1. Install LaTeX as above.
-2. Create a conda environment using `conda create -n manim python=3.8`.
+2. Create a conda environment using `conda create -n manim python=3.9`.
 3. Activate the environment using `conda activate manim`.
 4. Install manimgl using `pip install -e .`.
 

docs/source/getting_started/example_scenes.rst

@@ -426,7 +426,7 @@ CoordinateSystemExample
             # you can call call axes.coords_to_point, abbreviated to
             # axes.c2p, to associate a set of coordinates with a point,
             # like so:
-            dot = Dot(color=RED)
+            dot = Dot(fill_color=RED)
             dot.move_to(axes.c2p(0, 0))
             self.play(FadeIn(dot, scale=0.5))
             self.play(dot.animate.move_to(axes.c2p(3, 2)))
@@ -537,7 +537,7 @@ GraphExample
 
             # You can use axes.input_to_graph_point, abbreviated
             # to axes.i2gp, to find a particular point on a graph
-            dot = Dot(color=RED)
+            dot = Dot(fill_color=RED)
             dot.move_to(axes.i2gp(2, parabola))
             self.play(FadeIn(dot, scale=0.5))
 

example_scenes.py

@@ -381,7 +381,7 @@ def construct(self):
         # you can call call axes.coords_to_point, abbreviated to
         # axes.c2p, to associate a set of coordinates with a point,
         # like so:
-        dot = Dot(color=RED)
+        dot = Dot(fill_color=RED)
         dot.move_to(axes.c2p(0, 0))
         self.play(FadeIn(dot, scale=0.5))
         self.play(dot.animate.move_to(axes.c2p(3, 2)))
@@ -486,7 +486,7 @@ def construct(self):
 
         # You can use axes.input_to_graph_point, abbreviated
         # to axes.i2gp, to find a particular point on a graph
-        dot = Dot(color=RED)
+        dot = Dot(fill_color=RED)
         dot.move_to(axes.i2gp(2, parabola))
         self.play(FadeIn(dot, scale=0.5))
 

manimlib/__init__.py

@@ -1,6 +1,13 @@
-import pkg_resources
+try:
+    from importlib.metadata import version, PackageNotFoundError
+except ImportError:  # For Python <3.8 fallback
+    from importlib_metadata import version, PackageNotFoundError  # type: ignore
+
+try:
+    __version__ = version("manimgl")
+except PackageNotFoundError:
+    __version__ = "unknown"
 
-__version__ = pkg_resources.get_distribution("manimgl").version
 
 from typing import TYPE_CHECKING
 

manimlib/animation/creation.py

@@ -32,8 +32,8 @@ def __init__(self, mobject: Mobject, should_match_start: bool = False, **kwargs)
 
     def interpolate_submobject(
         self,
-        submob: VMobject,
-        start_submob: VMobject,
+        submob: Mobject,
+        start_submob: Mobject,
         alpha: float
     ) -> None:
         submob.pointwise_become_partial(

manimlib/animation/transform_matching_parts.py

@@ -88,7 +88,7 @@ def add_transform(
         if not source_is_new or not target_is_new:
             return
 
-        transform_type = self.mismatch_animation 
+        transform_type = self.mismatch_animation
         if source.has_same_shape_as(target):
             transform_type = self.match_animation
 
@@ -154,16 +154,16 @@ def matching_blocks(
         counts2 = list(map(target.substr_to_path_count, syms2))
 
         # Start with user specified matches
-        blocks = [(source[key], target[key]) for key in matched_keys]
-        blocks += [(source[key1], target[key2]) for key1, key2 in key_map.items()]
+        blocks = [(source[key1], target[key2]) for key1, key2 in key_map.items()]
+        blocks += [(source[key], target[key]) for key in matched_keys]
 
         # Nullify any intersections with those matches in the two symbol lists
         for sub_source, sub_target in blocks:
             for i in range(len(syms1)):
-                if source[i] in sub_source.family_members_with_points():
+                if i < len(source) and source[i] in sub_source.family_members_with_points():
                     syms1[i] = "Null1"
             for j in range(len(syms2)):
-                if target[j] in sub_target.family_members_with_points():
+                if j < len(target) and target[j] in sub_target.family_members_with_points():
                     syms2[j] = "Null2"
 
         # Group together longest matching substrings

manimlib/animation/update.py

@@ -46,7 +46,8 @@ def __init__(
         super().__init__(mobject, suspend_mobject_updating=suspend_mobject_updating, **kwargs)
 
     def interpolate_mobject(self, alpha: float) -> None:
-        self.update_function(self.mobject, alpha)
+        true_alpha = self.rate_func(self.time_spanned_alpha(alpha))
+        self.update_function(self.mobject, true_alpha)
 
 
 class MaintainPositionRelativeTo(Animation):

manimlib/config.py

@@ -386,8 +386,6 @@ def get_output_directory(args: Namespace, config: Dict) -> str:
     out_dir = args.video_dir or dir_config.output
     if dir_config.mirror_module_path and args.file:
         file_path = Path(args.file).absolute()
-        print(file_path)
-        print(dir_config.removed_mirror_prefix)
         if str(file_path).startswith(dir_config.removed_mirror_prefix):
             rel_path = file_path.relative_to(dir_config.removed_mirror_prefix)
             rel_path = Path(str(rel_path).lstrip("_"))