diff --git a/manim/__main__.py b/manim/__main__.py index c11ca88450..f05f4c2971 100644 --- a/manim/__main__.py +++ b/manim/__main__.py @@ -1,7 +1,5 @@ from __future__ import annotations -import sys - import click import cloup diff --git a/manim/mobject/mobject.py b/manim/mobject/mobject.py index 1b5eed0d58..9b79f67111 100644 --- a/manim/mobject/mobject.py +++ b/manim/mobject/mobject.py @@ -2700,13 +2700,13 @@ def push_self_into_submobjects(self) -> Self: def add_n_more_submobjects(self, n: int) -> Self | None: if n == 0: - return + return None curr = len(self.submobjects) if curr == 0: # If empty, simply add n point mobjects self.submobjects = [self.get_point_mobject() for k in range(n)] - return + return None target = curr + n # TODO, factor this out to utils so as to reuse diff --git a/manim/mobject/opengl/opengl_geometry.py b/manim/mobject/opengl/opengl_geometry.py index 3e81f6f6f3..2ec0bbe4dd 100644 --- a/manim/mobject/opengl/opengl_geometry.py +++ b/manim/mobject/opengl/opengl_geometry.py @@ -23,7 +23,6 @@ ) DEFAULT_DOT_RADIUS = 0.08 -DEFAULT_SMALL_DOT_RADIUS = 0.04 DEFAULT_DASH_LENGTH = 0.05 DEFAULT_ARROW_TIP_LENGTH = 0.35 DEFAULT_ARROW_TIP_WIDTH = 0.35 diff --git a/manim/mobject/table.py b/manim/mobject/table.py index ff0c0f0bd9..1a1beffad1 100644 --- a/manim/mobject/table.py +++ b/manim/mobject/table.py @@ -74,7 +74,6 @@ def construct(self): from manim.mobject.text.tex_mobject import MathTex from manim.mobject.text.text_mobject import Paragraph -from .. import config from ..animation.animation import Animation from ..animation.composition import AnimationGroup from ..animation.creation import Create, Write diff --git a/manim/mobject/text/tex_mobject.py b/manim/mobject/text/tex_mobject.py index 47cbe6cd96..029b5ce009 100644 --- a/manim/mobject/text/tex_mobject.py +++ b/manim/mobject/text/tex_mobject.py @@ -34,7 +34,7 @@ from manim.constants import * from manim.mobject.geometry.line import Line from manim.mobject.svg.svg_mobject import SVGMobject -from manim.mobject.types.vectorized_mobject import VectorizedPoint, VGroup, VMobject +from manim.mobject.types.vectorized_mobject import VGroup, VMobject from manim.utils.tex import TexTemplate from manim.utils.tex_file_writing import tex_to_svg_file diff --git a/manim/mobject/types/vectorized_mobject.py b/manim/mobject/types/vectorized_mobject.py index 8312b74459..ec15646c31 100644 --- a/manim/mobject/types/vectorized_mobject.py +++ b/manim/mobject/types/vectorized_mobject.py @@ -26,20 +26,17 @@ ) import numpy as np -import numpy.typing as npt from PIL.Image import Image -from typing_extensions import Self +from manim import config +from manim.constants import * +from manim.mobject.mobject import Mobject 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 config -from ...constants import * -from ...mobject.mobject import Mobject -from ...utils.bezier import ( +from manim.utils.bezier import ( bezier, get_smooth_handle_points, integer_interpolate, @@ -47,11 +44,19 @@ partial_bezier_points, proportions_along_bezier_curve_for_point, ) -from ...utils.color import BLACK, WHITE, ManimColor, ParsableManimColor -from ...utils.iterables import make_even, resize_array, stretch_array_to_length, tuplify -from ...utils.space_ops import rotate_vector, shoelace_direction +from manim.utils.color import BLACK, WHITE, ManimColor, ParsableManimColor +from manim.utils.iterables import ( + make_even, + resize_array, + stretch_array_to_length, + tuplify, +) +from manim.utils.space_ops import rotate_vector, shoelace_direction if TYPE_CHECKING: + import numpy.typing as npt + from typing_extensions import Self + from manim.typing import ( BezierPoints, CubicBezierPoints, @@ -1406,6 +1411,9 @@ def point_from_proportion(self, alpha: float) -> Point3D: return curve(residue) current_length += length + raise Exception( + "Not sure how you reached here, please file a bug report at https://github.com/ManimCommunity/manim/issues/new/choose" + ) def proportion_from_point( self, diff --git a/manim/renderer/opengl_renderer.py b/manim/renderer/opengl_renderer.py index 79390be97c..d457682267 100644 --- a/manim/renderer/opengl_renderer.py +++ b/manim/renderer/opengl_renderer.py @@ -219,9 +219,6 @@ def interpolate(self, *args, **kwargs): self.refresh_rotation_matrix() -points_per_curve = 3 - - class OpenGLRenderer: def __init__(self, file_writer_class=SceneFileWriter, skip_animations=False): # Measured in pixel widths, used for vector graphics