Skip to content

Fixed get_anchors() Return Type Inconsistency #3214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 27, 2024
Merged

Fixed get_anchors() Return Type Inconsistency #3214

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ca0e471
changed return type of get_anchors()
JinchuLi2002 Apr 10, 2023
5e7d7d1
Ensured consistency with OpenGLVMobject
JinchuLi2002 Apr 11, 2023
d2d6110
Fixed CodeQl, updated docstring
JinchuLi2002 Apr 11, 2023
8cbc5c0
Update manim/mobject/types/vectorized_mobject.py
MrDiver Aug 5, 2023
7e0c533
Update manim/mobject/opengl/opengl_vectorized_mobject.py
MrDiver Aug 5, 2023
53bb724
Merge branch 'main' into fix-get-anchors
chopan050 Dec 4, 2023
b7d0b8b
fixed typo, t -> e
behackl Apr 24, 2024
07f2b80
Merge branch 'main' into fix-get-anchors
behackl Apr 24, 2024
57bf3e0
fixed doctest
behackl Apr 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions manim/mobject/opengl/opengl_vectorized_mobject.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import itertools as it
import operator as op
import typing
from functools import reduce, wraps
from typing import Callable, Iterable, Optional, Sequence

Expand Down Expand Up @@ -1013,7 +1014,7 @@ def proportion_from_point(

return alpha

def get_anchors_and_handles(self):
def get_anchors_and_handles(self) -> typing.Iterable[np.ndarray]:
"""
Returns anchors1, handles, anchors2,
where (anchors1[i], handles[i], anchors2[i])
Expand Down Expand Up @@ -1045,7 +1046,7 @@ def get_end_anchors(self) -> np.ndarray:
nppc = self.n_points_per_curve
return self.points[nppc - 1 :: nppc]

def get_anchors(self) -> np.ndarray:
def get_anchors(self) -> typing.Iterable[np.ndarray]:
"""Returns the anchors of the curves forming the OpenGLVMobject.

Returns
Expand All @@ -1056,16 +1057,10 @@ def get_anchors(self) -> np.ndarray:
points = self.points
if len(points) == 1:
return points
return np.array(
list(
it.chain(
*zip(
self.get_start_anchors(),
self.get_end_anchors(),
)
),
),
)

s = self.get_start_anchors()
e = self.get_end_anchors()
return [s[i // 2] if i % 2 == 0 else e[i // 2] for i in range(len(s) + len(e))]

def get_points_without_null_curves(self, atol=1e-9):
nppc = self.n_points_per_curve
Expand Down
9 changes: 5 additions & 4 deletions manim/mobject/types/vectorized_mobject.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1392,7 +1392,7 @@ def get_end_anchors(self) -> np.ndarray:
nppcc = self.n_points_per_cubic_curve
return self.points[nppcc - 1 :: nppcc]

def get_anchors(self) -> np.ndarray:
def get_anchors(self) -> typing.Iterable[np.ndarray]:
"""Returns the anchors of the curves forming the VMobject.

Returns
Expand All @@ -1402,9 +1402,10 @@ def get_anchors(self) -> np.ndarray:
"""
if self.points.shape[0] == 1:
return self.points
return np.array(
list(it.chain(*zip(self.get_start_anchors(), self.get_end_anchors()))),
)

s = self.get_start_anchors()
e = self.get_end_anchors()
return [s[i // 2] if i % 2 == 0 else e[i // 2] for i in range(len(s) + len(e))]

def get_points_defining_boundary(self):
# Probably returns all anchors, but this is weird regarding the name of the method.
Expand Down