Merge remote-tracking branch 'origin/master' into moderngl-interaction

Author: eulertour

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,15 @@
 <!--
-Thank you for contributing to manim!
-
-Please ensure that your pull request works with the latest
-version of manim from this repository.
+Thanks for your contribution to ManimCommunity!
+
+Before filling in the details, ensure:
+- Your local changes are up-to-date with ManimCommunity/manim
+  
+- The title of your PR gives a descriptive summary to end-users. Some examples:
+  - Fixed last animations not running to completion
+  - Added gradient support and documentation for SVG files
+  Examples of what *NOT* to do:
+  - "fixed that styling issue" - not descriptive enough
+  - "fixed issue #XYZ" - end-user needs to do further research
 -->
 
 ## Motivation
@@ -16,14 +23,6 @@ For PRs introducing new features, please provide code snippets
 using the newly introduced functionality and ideally even the
 expected rendered output. -->
 
-## Oneline Summary of Changes
-<!-- Please update the lines below with a oneline summary
-for your changes. It will be included in the list of upcoming changes at
-https://github.com/ManimCommunity/manim/wiki/Changelog-for-next-release -->
-```
-- Added new feature ... / Fixed bug ... / ... (:pr:`PR NUMBER HERE`)
-```
-
 ## Testing Status
 <!-- Optional (but recommended): your computer specs and
 what tests you ran with their results, if any. This section
@@ -35,7 +34,7 @@ that might be useful for reviewers.. -->
 
 ## Acknowledgements
 - [ ] I have read the [Contributing Guidelines](https://docs.manim.community/en/latest/contributing.html)
-
+- [ ] I have chosen a descriptive PR title (see top of PR template for examples)
 <!-- Once again, thanks for helping out by contributing to manim! -->
 
 
@@ -44,4 +43,4 @@ that might be useful for reviewers.. -->
 - [ ] Newly added functions/classes are either private or have a docstring
 - [ ] Newly added functions/classes have [tests](https://github.com/ManimCommunity/manim/wiki/Testing) added and (optional) examples in the docs
 - [ ] Newly added documentation builds, looks correctly formatted, and adds no additional build warnings
-- [ ] The oneline summary has been included [in the wiki](https://github.com/ManimCommunity/manim/wiki/Changelog-for-next-release)
+- [ ] The PR title is descriptive enough

.github/workflows/ci.yml

@@ -50,7 +50,7 @@ jobs:
         run: |
           sudo apt update
           sudo apt install -y ffmpeg
-          sudo apt-get -y install texlive texlive-latex-extra texlive-fonts-extra texlive-latex-recommended texlive-science texlive-fonts-extra tipa freeglut3-dev python-opengl
+          sudo apt-get -y install texlive texlive-latex-extra texlive-fonts-extra texlive-latex-recommended texlive-science texlive-fonts-extra tipa python-opengl libpango1.0-dev
           echo "$HOME/.poetry/bin" >> $GITHUB_PATH
 
       - name: Install system dependencies (MacOS)

docs/source/changelog.rst

@@ -14,8 +14,6 @@ Upcoming release
 
 :Date: TBD
 
-Changes for the upcoming release are tracked `in our GitHub wiki <https://github.com/ManimCommunity/manim/wiki/Changelog-for-next-release>`_.
-
 
 ******
 v0.4.0

docs/source/reference.rst

@@ -37,6 +37,8 @@ Mobjects
    ~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

manim/__init__.py

@@ -50,10 +50,12 @@
 from .mobject.probability import *
 from .mobject.shape_matchers import *
 from .mobject.svg.brace import *
+from .mobject.svg.code_mobject import *
+from .mobject.svg.style_utils import *
 from .mobject.svg.svg_mobject import *
+from .mobject.svg.svg_path import *
 from .mobject.svg.tex_mobject import *
 from .mobject.svg.text_mobject import *
-from .mobject.svg.code_mobject import *
 from .mobject.three_d_utils import *
 from .mobject.three_dimensions import *
 from .mobject.types.image_mobject import *

manim/_config/main_utils.py

@@ -111,7 +111,6 @@ def parse_args(args: list) -> argparse.Namespace:
     elif subcmd == "plugins":
         return _parse_args_plugins(args)
     elif args[1] == "--version":
-        print(f"Manim Community v{ __version__ }")
         sys.exit()
     # elif subcmd == some_other_future_subcmd:
     #     return _parse_args_some_other_subcmd(args)

manim/mobject/coordinate_systems.py

@@ -14,7 +14,7 @@
 from ..mobject.number_line import NumberLine
 from ..mobject.svg.tex_mobject import MathTex
 from ..mobject.types.vectorized_mobject import VGroup
-from ..utils.config_ops import merge_dicts_recursively
+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 ..utils.color import LIGHT_GREY, WHITE, BLUE_D, BLUE
@@ -28,16 +28,12 @@ class CoordinateSystem:
     Abstract class for Axes and NumberPlane
     """
 
-    def __init__(self, dim=2):
+    def __init__(self, x_min=None, x_max=None, y_min=None, y_max=None, dim=2):
         self.dimension = dim
-        if not hasattr(self, "x_min"):
-            self.x_min = -config["frame_x_radius"]
-        if not hasattr(self, "x_max"):
-            self.x_max = config["frame_x_radius"]
-        if not hasattr(self, "y_min"):
-            self.y_min = -config["frame_y_radius"]
-        if not hasattr(self, "y_max"):
-            self.y_max = config["frame_y_radius"]
+        self.x_min = -config["frame_x_radius"] if x_min is None else x_min
+        self.x_max = config["frame_x_radius"] if x_max is None else x_max
+        self.y_min = -config["frame_y_radius"] if y_min is None else y_min
+        self.y_max = config["frame_y_radius"] if y_max is None else y_max
 
     def coords_to_point(self, *coords):
         raise NotImplementedError()
@@ -132,43 +128,56 @@ def input_to_graph_point(self, x, graph):
 class Axes(VGroup, CoordinateSystem):
     def __init__(
         self,
+        x_min=None,
+        x_max=None,
+        y_min=None,
+        y_max=None,
         axis_config=None,
         x_axis_config=None,
-        y_axis_config={"label_direction": LEFT},
+        y_axis_config=None,
         center_point=ORIGIN,
         **kwargs
     ):
-        if axis_config is None:
-            axis_config = {
-                "color": LIGHT_GREY,
-                "include_tip": True,
-                "exclude_zero_from_default_numbers": True,
-            }
-        self.axis_config = axis_config
-        if x_axis_config is None:
-            x_axis_config = {}
-        self.x_axis_config = x_axis_config
-        self.y_axis_config = y_axis_config
-        self.center_point = center_point
-        CoordinateSystem.__init__(self)
+        CoordinateSystem.__init__(
+            self, x_min=x_min, x_max=x_max, y_min=y_min, y_max=y_max
+        )
         VGroup.__init__(self, **kwargs)
-        self.x_axis = self.create_axis(self.x_min, self.x_max, self.x_axis_config)
-        self.y_axis = self.create_axis(self.y_min, self.y_max, self.y_axis_config)
-        self.y_axis.rotate(90 * DEGREES, about_point=ORIGIN)
+
+        self.axis_config = {
+            "color": LIGHT_GREY,
+            "include_tip": True,
+            "exclude_zero_from_default_numbers": True,
+        }
+        self.x_axis_config = {"x_min": self.x_min, "x_max": self.x_max}
+        self.y_axis_config = {
+            "x_min": self.y_min,
+            "x_max": self.y_max,
+            "label_direction": LEFT,
+            "rotation": 90 * DEGREES,
+        }
+
+        self.update_default_configs(
+            (self.axis_config, self.x_axis_config, self.y_axis_config),
+            (axis_config, x_axis_config, y_axis_config),
+        )
+        self.center_point = center_point
+        self.x_axis = self.create_axis(self.x_axis_config)
+        self.y_axis = self.create_axis(self.y_axis_config)
         # Add as a separate group in case various other
         # mobjects are added to self, as for example in
         # NumberPlane below
         self.axes = VGroup(self.x_axis, self.y_axis, dim=self.dim)
         self.add(*self.axes)
         self.shift(self.center_point)
 
-    def create_axis(self, min_val, max_val, axis_config):
-        new_config = merge_dicts_recursively(
-            self.axis_config,
-            {"x_min": min_val, "x_max": max_val},
-            axis_config,
-        )
-        return NumberLine(**new_config)
+    @staticmethod
+    def update_default_configs(default_configs, passed_configs):
+        for default_config, passed_config in zip(default_configs, passed_configs):
+            if passed_config is not None:
+                update_dict_recursively(default_config, passed_config)
+
+    def create_axis(self, axis_config):
+        return NumberLine(**merge_dicts_recursively(self.axis_config, axis_config))
 
     def coords_to_point(self, *coords):
         origin = self.x_axis.number_to_point(0)
@@ -208,37 +217,33 @@ def add_coordinates(self, x_vals=None, y_vals=None):
 class ThreeDAxes(Axes):
     def __init__(
         self,
-        z_axis_config=None,
-        z_min=-3.5,
-        z_max=3.5,
         x_min=-5.5,
         x_max=5.5,
         y_min=-5.5,
         y_max=5.5,
+        z_min=-3.5,
+        z_max=3.5,
+        z_axis_config=None,
         z_normal=DOWN,
         num_axis_pieces=20,
         light_source=9 * DOWN + 7 * LEFT + 10 * OUT,
         **kwargs
     ):
-        if z_axis_config is None:
-            z_axis_config = {}
-        self.z_axis_config = z_axis_config
+        Axes.__init__(
+            self, x_min=x_min, x_max=x_max, y_min=y_min, y_max=y_max, **kwargs
+        )
         self.z_min = z_min
         self.z_max = z_max
+        self.z_axis_config = {"x_min": self.z_min, "x_max": self.z_max}
+        self.update_default_configs((self.z_axis_config,), (z_axis_config,))
         self.z_normal = z_normal
         self.num_axis_pieces = num_axis_pieces
         self.light_source = light_source
-        self.x_min = x_min
-        self.x_max = x_max
-        self.y_min = y_min
-        self.y_max = y_max
-        Axes.__init__(self, **kwargs)
         self.dimension = 3
-        z_axis = self.z_axis = self.create_axis(
-            self.z_min, self.z_max, self.z_axis_config
-        )
-        z_axis.rotate(-np.pi / 2, UP, about_point=ORIGIN)
-        z_axis.rotate(angle_of_vector(self.z_normal), OUT, about_point=ORIGIN)
+        z_axis = self.z_axis = self.create_axis(self.z_axis_config)
+        z_axis.shift(self.center_point)
+        z_axis.rotate_about_zero(-np.pi / 2, UP)
+        z_axis.rotate_about_zero(angle_of_vector(self.z_normal))
         self.axes.add(z_axis)
         self.add(z_axis)
 
@@ -280,28 +285,26 @@ def __init__(
         make_smooth_after_applying_functions=True,
         **kwargs
     ):
-        if axis_config is None:
-            axis_config = {
-                "stroke_color": WHITE,
-                "stroke_width": 2,
-                "include_ticks": False,
-                "include_tip": False,
-                "line_to_number_buff": SMALL_BUFF,
-                "label_direction": DR,
-                "number_scale_val": 0.5,
-            }
-        self.axis_config = axis_config
-        if y_axis_config is None:
-            y_axis_config = {"label_direction": DR}
-        self.y_axis_config = y_axis_config
-
-        if background_line_style is None:
-            background_line_style = {
-                "stroke_color": BLUE_D,
-                "stroke_width": 2,
-                "stroke_opacity": 1,
-            }
-        self.background_line_style = background_line_style
+        self.axis_config = {
+            "stroke_color": WHITE,
+            "stroke_width": 2,
+            "include_ticks": False,
+            "include_tip": False,
+            "line_to_number_buff": SMALL_BUFF,
+            "label_direction": DR,
+            "number_scale_val": 0.5,
+        }
+        self.y_axis_config = {"label_direction": DR}
+        self.background_line_style = {
+            "stroke_color": BLUE_D,
+            "stroke_width": 2,
+            "stroke_opacity": 1,
+        }
+
+        self.update_default_configs(
+            (self.axis_config, self.y_axis_config, self.background_line_style),
+            (axis_config, y_axis_config, background_line_style),
+        )
 
         # Defaults to a faded version of line_config
         self.faded_line_style = faded_line_style

manim/mobject/geometry.py

@@ -76,6 +76,7 @@ def construct(self):
 from ..utils.space_ops import normalize
 from ..utils.space_ops import rotate_vector
 from ..utils.color import *
+from .. import logger
 
 DEFAULT_DOT_RADIUS = 0.08
 DEFAULT_SMALL_DOT_RADIUS = 0.04
@@ -443,11 +444,13 @@ def __init__(
 
 
 class SmallDot(Dot):
-    """
-    A dot with small radius
-    """
+    """Deprecated - A dot with small radius"""
 
     def __init__(self, radius=DEFAULT_SMALL_DOT_RADIUS, **kwargs):
+        logger.warning(
+            "SmallDot has been deprecated and will be removed in a future release. "
+            "Use Dot instead."
+        )
         Dot.__init__(self, radius=radius, **kwargs)
 
 

manim/mobject/number_line.py

@@ -24,6 +24,7 @@ def __init__(
         color=LIGHT_GREY,
         unit_size=1,
         width=None,
+        rotation=0,
         include_ticks=True,
         tick_size=0.1,
         tick_frequency=1,
@@ -53,6 +54,7 @@ def __init__(
         self.unit_size = unit_size
         self.include_ticks = include_ticks
         self.tick_size = tick_size
+        self.rotation = rotation
         self.tick_frequency = tick_frequency
         self.leftmost_tick = leftmost_tick
         self.numbers_with_elongated_ticks = numbers_with_elongated_ticks
@@ -92,9 +94,16 @@ def __init__(
             self.add_tip()
         if self.include_ticks:
             self.add_tick_marks()
+        self.rotate_about_zero(self.rotation)
         if self.include_numbers:
             self.add_numbers()
 
+    def rotate_about_zero(self, angle, axis=OUT, **kwargs):
+        return self.rotate_about_number(0, angle, axis, **kwargs)
+
+    def rotate_about_number(self, number, angle, axis=OUT, **kwargs):
+        return self.rotate(angle, axis, about_point=self.n2p(number), **kwargs)
+
     def init_leftmost_tick(self):
         if self.leftmost_tick is None:
             self.leftmost_tick = op.mul(
@@ -186,7 +195,12 @@ def default_numbers_to_display(self):
         return numbers
 
     def get_number_mobject(
-        self, number, number_config=None, scale_val=None, direction=None, buff=None
+        self,
+        number,
+        number_config=None,
+        scale_val=None,
+        direction=None,
+        buff=None,
     ):
         number_config = merge_dicts_recursively(
             self.decimal_number_config,