Skip to content

Optimize 3D display #6085

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

Closed
wants to merge 11 commits into from
Closed

Optimize 3D display #6085

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a4a8a86
Replace lists by numpy array in projection
AlexandreAbraham Feb 29, 2016
3d295af
Remove profiling code
AlexandreAbraham Feb 29, 2016
5239e1a
Vectorize output of proj_transform_vec
AlexandreAbraham Feb 29, 2016
7285fed
Reach vectorized projection functions directly
AlexandreAbraham Feb 29, 2016
328c2f4
Address comments
AlexandreAbraham Mar 2, 2016
a973da8
More fixes
AlexandreAbraham Mar 3, 2016
14853d0
Fix rotation of axes
AlexandreAbraham Mar 3, 2016
c4de047
Fix some failures
AlexandreAbraham Jun 8, 2016
6315961
Use a contiguous representation in memory and views for the segments
AlexandreAbraham Jun 8, 2016
bb948bb
Fix bug in PathPatch
AlexandreAbraham Sep 20, 2016
e6211bd
Fix vstack bug
AlexandreAbraham Sep 20, 2016
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
Prev Previous commit
Next Next commit
More fixes
  • Loading branch information
@AlexandreAbraham
AlexandreAbraham committed Jun 8, 2016
commit a973da8086e5f1607646087535da49b081669d8b
2 changes: 1 addition & 1 deletion lib/mpl_toolkits/mplot3d/art3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ def __init__(self, *args, **kwargs):
self.set_3d_properties(zs, zdir)

def set_3d_properties(self, verts, zs=0, zdir='z'):
verts = np.vstack([verts, np.ones(len(verts)) * zs])
verts = np.hstack([verts, np.ones((len(verts), 1)) * zs])
self._segment3d = juggle_axes_vec(verts, zdir)
self._facecolor3d = Patch.get_facecolor(self)

Expand Down
2 changes: 1 addition & 1 deletion lib/mpl_toolkits/mplot3d/axes3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2340,7 +2340,7 @@ def bar(self, left, height, zs=0, zdir='z', *args, **kwargs):
if 'alpha' in kwargs:
p.set_alpha(kwargs['alpha'])

verts = np.vstack(verts, verts_zs)
verts = np.hstack([verts, np.asarray(verts_zs)[:, np.newaxis]])

xs, ys, verts_zs = art3d.juggle_axes_vec(verts, zdir)
self.auto_scale_xyz(xs, ys, verts_zs, had_data)
Expand Down
3 changes: 1 addition & 2 deletions lib/mpl_toolkits/mplot3d/proj3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,7 @@ def proj_transform_vec(vec, M):
def proj_transform_vec_clip(vec, M):
vecw = np.dot(M, vec)
# Determine clipping before rescaling
tis = np.logical_and(vecw[0] >= 0, vecw[0] <= 1,
vecw[1] >= 0, vecw[1] <= 1)
tis = (vecw[0] >= 0) * (vecw[0] <= 1) * (vecw[1] >= 0) * (vecw[1] <= 1)
# clip here..
# Can anybody comment on this piece of code? I don't understand it...
if np.sometrue(tis):
Expand Down