Skip to content

Retarget PR#29175 to main #29285

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 5 commits into from
Dec 12, 2024
Merged

Retarget PR#29175 to main #29285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
595fde3
converted ps to array before slicing
vicliu2001 Nov 23, 2024
7527850
added test cases for the modification to art3d.py
vicliu2001 Nov 23, 2024
54b57b4
modified test for _generate_normals
vicliu2001 Dec 7, 2024
c73088a
changed plot.show to plot.draw
vicliu2001 Dec 7, 2024
e5f5765
linting
scottshambaugh Dec 11, 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
1 change: 1 addition & 0 deletions lib/mpl_toolkits/mplot3d/art3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1382,6 +1382,7 @@ def _generate_normals(polygons):
v2 = np.empty((len(polygons), 3))
for poly_i, ps in enumerate(polygons):
n = len(ps)
ps = np.asarray(ps)
i1, i2, i3 = 0, n//3, 2*n//3
v1[poly_i, :] = ps[i1, :] - ps[i2, :]
v2[poly_i, :] = ps[i2, :] - ps[i3, :]
Expand Down
17 changes: 16 additions & 1 deletion lib/mpl_toolkits/mplot3d/tests/test_art3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
import matplotlib.pyplot as plt

from matplotlib.backend_bases import MouseEvent
from mpl_toolkits.mplot3d.art3d import Line3DCollection, _all_points_on_plane
from mpl_toolkits.mplot3d.art3d import (
Line3DCollection,
Poly3DCollection,
_all_points_on_plane,
)


def test_scatter_3d_projection_conservation():
Expand Down Expand Up @@ -85,3 +89,14 @@ def test_all_points_on_plane():
# All points lie on a plane
points = np.array([[0, 0, 0], [0, 1, 0], [1, 0, 0], [1, 1, 0], [1, 2, 0]])
assert _all_points_on_plane(*points.T)


def test_generate_normals():
# Smoke test for https://github.com/matplotlib/matplotlib/issues/29156
vertices = ((0, 0, 0), (0, 5, 0), (5, 5, 0), (5, 0, 0))
shape = Poly3DCollection([vertices], edgecolors='r', shade=True)

fig = plt.figure()
ax = fig.add_subplot(projection='3d')
ax.add_collection3d(shape)
plt.draw()
Loading