Skip to content

Detect and increase pixelRatio in 3D plots when anti-alias is not enabled by hardware #3571

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

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all 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
43 changes: 18 additions & 25 deletions package-lock.json

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

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,21 +72,21 @@
"es6-promise": "^3.0.2",
"fast-isnumeric": "^1.1.2",
"font-atlas-sdf": "^1.3.3",
"gl-cone3d": "^1.2.2",
"gl-cone3d": "git://github.com/gl-vis/gl-cone3d.git#ec71aa87233d04b543ae53854c9a1182d40fc8ac",
"gl-contour2d": "^1.1.5",
"gl-error3d": "^1.0.13",
"gl-error3d": "git://github.com/gl-vis/gl-error3d.git#75ec29dd1dde51a697f718cdacf76e36a7bfd38c",
"gl-heatmap2d": "^1.0.5",
"gl-line3d": "^1.1.10",
"gl-mat4": "^1.2.0",
"gl-mesh3d": "^2.0.7",
"gl-mesh3d": "git://github.com/gl-vis/gl-mesh3d.git#31d34ba3cec063697cc3891e141532cd80d95ba3",
"gl-plot2d": "^1.4.2",
"gl-plot3d": "^2.0.0",
"gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#036b593bc62b2db79a44936785a96cace7c3cf89",
"gl-pointcloud2d": "^1.0.2",
"gl-scatter3d": "^1.1.6",
"gl-scatter3d": "git://github.com/gl-vis/gl-scatter3d.git#3aff92340ceef1fdb7bdea5f78d8cd44866a846f",
"gl-select-box": "^1.0.3",
"gl-spikes2d": "^1.0.2",
"gl-streamtube3d": "^1.1.2",
"gl-surface3d": "^1.4.1",
"gl-streamtube3d": "git://github.com/gl-vis/gl-streamtube3d.git#ecdaa1dbbcd315ba06133aeccf870c98b993a8ae",
"gl-surface3d": "git://github.com/gl-vis/gl-surface3d.git#96e61eebac18e9b525f7f3e6b714291b5d1b4bad",
"gl-text": "^1.1.6",
"glslify": "^7.0.0",
"has-hover": "^1.0.1",
Expand Down
8 changes: 4 additions & 4 deletions src/traces/scatter3d/convert.js
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ proto.update = function(data) {
this.dataPoints = options.position;

lineOptions = {
gl: gl,
gl: this.scene.glplot.gl,
position: options.position,
color: options.lineColor,
lineWidth: options.lineWidth || 1,
Expand Down Expand Up @@ -371,7 +371,7 @@ proto.update = function(data) {
if(data.marker && data.marker.opacity) scatterOpacity *= data.marker.opacity;

scatterOptions = {
gl: gl,
gl: this.scene.glplot.gl,
position: options.position,
color: options.scatterColor,
size: options.scatterSize,
Expand Down Expand Up @@ -400,7 +400,7 @@ proto.update = function(data) {
}

textOptions = {
gl: gl,
gl: this.scene.glplot.gl,
position: options.position,
glyph: options.text,
color: options.textColor,
Expand Down Expand Up @@ -431,7 +431,7 @@ proto.update = function(data) {
}

errorOptions = {
gl: gl,
gl: this.scene.glplot.gl,
position: options.position,
color: options.errorColor,
error: options.errorBounds,
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_autocolorscale.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_autorange-zero.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_axes-visible-false.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-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_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_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_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_cube.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_delaunay.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.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_errorbars_sqrt.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_errorbars_xy.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_errorbars_zx.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_errorbars_zy.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_formatted-text-on-multiple-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_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.
Binary file modified test/image/baselines/gl3d_isosurface_math.png
Binary file modified test/image/baselines/gl3d_isosurface_multiple-traces.png
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_with_surface-pattern.png
Binary file modified test/image/baselines/gl3d_isosurface_xycaps_volume_slices.png
Binary file modified test/image/baselines/gl3d_line-colorscale-with-markers.png
Binary file modified test/image/baselines/gl3d_line_rectangle_render.png
Binary file modified test/image/baselines/gl3d_log-axis-big.png
Binary file modified test/image/baselines/gl3d_log-axis.png
Binary file modified test/image/baselines/gl3d_marker-arrays.png
Binary file modified test/image/baselines/gl3d_marker-color.png
Binary file modified test/image/baselines/gl3d_marker_symbols.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_multi-scene.png
Binary file modified test/image/baselines/gl3d_multiple-scatter3d-traces.png
Binary file modified test/image/baselines/gl3d_nan-holes.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-color-mono-and-palette.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-blank-text.png
Binary file modified test/image/baselines/gl3d_scatter3d-colorscale-with-line.png
Binary file modified test/image/baselines/gl3d_scatter3d-colorscale.png
Binary file modified test/image/baselines/gl3d_scatter3d-connectgaps.png
Binary file modified test/image/baselines/gl3d_scatter3d-different-align-texts.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-first.png
Binary file modified test/image/baselines/gl3d_streamtube-simple.png
Binary file modified test/image/baselines/gl3d_streamtube-thin.png
Binary file modified test/image/baselines/gl3d_streamtube-wind.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-lighting.png
Binary file modified test/image/baselines/gl3d_surface_after_heatmap.png
Binary file modified test/image/baselines/gl3d_surface_contour_precision.png
Binary file modified test/image/baselines/gl3d_surface_intensity.png
Binary file modified test/image/baselines/gl3d_tetrahedra.png
Binary file modified test/image/baselines/gl3d_text-weirdness.png
Binary file modified test/image/baselines/gl3d_triangle.png
Binary file modified test/image/baselines/gl3d_wire-surface.png
Binary file modified test/image/baselines/gl3d_world-cals.png
Binary file modified test/image/baselines/gl3d_xy-defined-ticks.png
Binary file modified test/image/baselines/gl3d_z-range.png
Binary file modified test/image/baselines/grid_subplot_types.png
Binary file modified test/image/baselines/layout_metatext.png
Binary file modified test/image/baselines/plot_types.png
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
],
"layout": {
"title":"Now texts could be displayed in 3D on multiple lines.",
"width": 1200,
"width": 900,
"height": 900,
"scene":{
"xaxis":{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
],
"layout": {
"height": 758,
"width": 1310,
"width": 1000,
"title": "X-axis using autorange:'reversed',Y-axis using range:[30,-5] & Z-axis using range:'reversed' & type:log",
"scene": {
"xaxis": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
],
"layout": {
"height": 758,
"width": 1310,
"width": 1000,
"title": "X-axis using autorange:'reversed',Y-axis using range:[30,-5] & Z-axis using range:'reversed' & type:log",
"scene": {
"xaxis": {
Expand Down
2 changes: 1 addition & 1 deletion test/image/mocks/gl3d_surface-circular-colorscale.json
Original file line number Diff line number Diff line change
Expand Up @@ -1013,7 +1013,7 @@
}
}
},
"width": 1745,
"width": 878,
"height": 878
}
}