Skip to content
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.

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

Improve numerical stability of 3D projection #6998

Merged
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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 draftlogs/6998_fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Fix numerical instability in 3D plots [[6998](https://github.com/plotly/plotly.js/pull/6998)]
34 changes: 17 additions & 17 deletions stackgl_modules/index.js

Large diffs are not rendered by default.

116 changes: 63 additions & 53 deletions stackgl_modules/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 9 additions & 8 deletions stackgl_modules/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,22 @@
"box-intersect": "plotly/box-intersect#v1.1.0",
"convex-hull": "^1.0.3",
"delaunay-triangulate": "^1.1.6",
"gl-axes3d": "^1.7.0",
"gl-cone3d": "^1.6.0",
"gl-error3d": "^1.0.16",
"gl-axes3d": "github:hborchardt/gl-axes3d#83caafc058b2d60b6006e26432967c411c125fe1",
"gl-cone3d": "github:hborchardt/gl-cone3d#e9728cd068e0dfe11b92c5785974cd463f78c01c",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please open pull requests on all gl-vis/* dependencies and paste the links for every line change in package.json file. Thank you!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"gl-error3d": "github:hborchardt/gl-error3d#ee55620d17f3cc7dfb104823c904f5070aba79ed",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"gl-heatmap2d": "^1.1.1",
"gl-line3d": "1.2.1",
"gl-mesh3d": "^2.3.1",
"gl-line3d": "github:hborchardt/gl-line3d#27123949f65e2d8deab6a6e131030073ed9cdf02",
Copy link
Contributor Author

@hborchardt hborchardt May 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"gl-mesh3d": "github:hborchardt/gl-mesh3d#be2c7fcb68e70e001bbfb8021380d0d7ac75b1c9",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"gl-plot2d": "^1.5.0",
"gl-plot3d": "^2.4.7",
"gl-pointcloud2d": "^1.0.3",
"gl-scatter3d": "^1.4.0",
"gl-scatter3d": "github:hborchardt/gl-scatter3d#086177000f405bc72f171350f9c1efa6eb523e29",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"gl-select-box": "^1.0.4",
"gl-shader": "4.3.1",
"gl-spikes2d": "^1.0.2",
"gl-streamtube3d": "^1.4.1",
"gl-surface3d": "^1.6.0",
"gl-spikes3d": "github:hborchardt/gl-spikes3d#9ad06b2dd48fa19d2faa54e5645c2e4bf5e6157c",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"gl-streamtube3d": "github:hborchardt/gl-streamtube3d#29c914cc0d88fc5dffce62dcd8169f38115d078b",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"gl-surface3d": "github:hborchardt/gl-surface3d#0728e33c0296c602b147e8f1ea8f1bfe7040c61e",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please install the patch.

"glslify": "^7.1.1",
"incremental-convex-hull": "plotly/incremental-convex-hull#v1.1.0",
"is-mobile": "^4.0.0",
Expand Down
Binary file modified test/image/baselines/gl3d_annotations.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_annotations_orthographic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_bunny.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_bunny_cell-area.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_chrisp-nan-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_coloraxes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_cone-newplot_reversed_ranges.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_cone-rossler.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_cone-with-streamtube.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_contour-lines.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_contour-lines2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_convex-hull.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_cufflinks.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_directions-isosurface2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_directions-streamtube1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_directions-streamtube2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_error_bars_log_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_ibm-plot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_isosurface_math.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_isosurface_multiple-traces.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_isosurface_out_of_iso_range_case.png
Binary file modified test/image/baselines/gl3d_isosurface_thin_slices_transparent.png
Binary file modified test/image/baselines/gl3d_isosurface_transparent.png
Binary file modified test/image/baselines/gl3d_isosurface_xycaps_volume_slices.png
Binary file modified test/image/baselines/gl3d_mesh3d-missing-colors.png
Binary file modified test/image/baselines/gl3d_mesh3d_surface_lighting.png
Binary file modified test/image/baselines/gl3d_mirror-ticks.png
Binary file modified test/image/baselines/gl3d_opacity-scaling-spikes.png
Binary file modified test/image/baselines/gl3d_opacity-surface.png
Binary file modified test/image/baselines/gl3d_parametric_surface_data_precision.png
Binary file modified test/image/baselines/gl3d_perspective_tick_distances.png
Binary file modified test/image/baselines/gl3d_projection-traces.png
Binary file modified test/image/baselines/gl3d_reversescale.png
Binary file modified test/image/baselines/gl3d_ribbons.png
Binary file modified test/image/baselines/gl3d_scatter-color-array.png
Binary file modified test/image/baselines/gl3d_scatter-color-line-gradient.png
Binary file modified test/image/baselines/gl3d_scatter-colorscale-marker.png
Binary file modified test/image/baselines/gl3d_scatter3d-align-texts.png
Binary file modified test/image/baselines/gl3d_scatter3d-colorscale-with-line.png
Binary file modified test/image/baselines/gl3d_scatter3d_errorbars_inherit_color.png
Binary file modified test/image/baselines/gl3d_set-ranges.png
Binary file modified test/image/baselines/gl3d_snowden.png
Binary file modified test/image/baselines/gl3d_snowden_altered.png
Binary file modified test/image/baselines/gl3d_streamtube-thin.png
Binary file modified test/image/baselines/gl3d_streamtube_reversed_ranges.png
Binary file modified test/image/baselines/gl3d_surface-circular-colorscale.png
Binary file modified test/image/baselines/gl3d_surface-circular-opacityscale.png
Binary file modified test/image/baselines/gl3d_surface-lighting.png
Binary file modified test/image/baselines/gl3d_surface_connectgaps.png
Binary file modified test/image/baselines/gl3d_surface_contour_precision.png
Binary file modified test/image/baselines/gl3d_surface_contour_start-end-size.png
Binary file modified test/image/baselines/gl3d_surface_intensity.png
Binary file modified test/image/baselines/gl3d_surface_opacity-and-opacityscale.png
Binary file modified test/image/baselines/gl3d_surface_opacityscale_contour.png
Binary file modified test/image/baselines/gl3d_surface_transparent-with-contours.png
Binary file modified test/image/baselines/gl3d_text-weirdness.png
Binary file modified test/image/baselines/gl3d_traces-with-legend.png
Binary file modified test/image/baselines/gl3d_traces-with-opacity.png
Binary file modified test/image/baselines/gl3d_transparent_same-depth.png
Binary file modified test/image/baselines/gl3d_volume_airflow.png
Binary file modified test/image/baselines/gl3d_volume_multiple-traces.png
Binary file modified test/image/baselines/gl3d_volume_multiple-traces_one-cube.png
Binary file modified test/image/baselines/gl3d_volume_opacityscale-iso.png
Binary file modified test/image/baselines/gl3d_world-cals.png
Binary file modified test/image/baselines/plot_types.png
Binary file modified test/image/baselines/trace_metatext.png
3 changes: 2 additions & 1 deletion test/image/compare_pixels_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@ for(var i = 0; i < allMockList.length; i++) {
'gl3d_opacity-scaling-spikes',
'gl3d_cone-wind',
'gl3d_isosurface_math',
'gl3d_scatter3d-blank-text'
'gl3d_scatter3d-blank-text',
'gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges'
].indexOf(mockName) !== -1) threshold = 0.7;
}

Expand Down