Skip to content

Keep orthographic zoom scales in fullLayout #4292

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 8 commits into from
Oct 25, 2019
Merged

Keep orthographic zoom scales in fullLayout #4292

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4a649f0
record glplot aspect in fullLayout aspectratio
archmoj Oct 21, 2019
fe19e47
Store direct aspectratio edits and emit relayout
archmoj Oct 23, 2019
b92230a
Save camera and aspectratio only if they change before redraw the scene
archmoj Oct 23, 2019
d825c0e
improve relayout update object - now depends on changed parameter
archmoj Oct 24, 2019
d486dcd
correct initializeGLPlot argument
archmoj Oct 24, 2019
496059c
simplify gl3d pixelRatio pass
archmoj Oct 24, 2019
e4a30be
add new tests to cover both orthographic and perspective cases
archmoj Oct 24, 2019
3b28fae
add few more tests to lock down the orthographic relayout issue
archmoj Oct 24, 2019
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
simplify gl3d pixelRatio pass
  • Loading branch information
@archmoj
archmoj committed Oct 24, 2019
commit 496059ca3fe1c9baf4a6d690be7987c5cf5cb39a
14 changes: 6 additions & 8 deletions src/plots/gl3d/scene.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,10 @@ function tryCreatePlot(scene, cameraObject, pixelRatio, canvas, gl) {
return failed < 2;
}

function initializeGLPlot(scene, pixelRatio, canvas, gl) {
function initializeGLPlot(scene, canvas, gl) {
scene.initializeGLCamera();

var success = tryCreatePlot(scene, scene.camera, pixelRatio, canvas, gl);
var success = tryCreatePlot(scene, scene.camera, scene.pixelRatio, canvas, gl);
/*
* createPlot will throw when webgl is not enabled in the client.
* Lets return an instance of the module with all functions noop'd.
Expand Down Expand Up @@ -393,7 +393,7 @@ function Scene(options, fullLayout) {
this.convertAnnotations = Registry.getComponentMethod('annotations3d', 'convert');
this.drawAnnotations = Registry.getComponentMethod('annotations3d', 'draw');

initializeGLPlot(this, this.pixelRatio);
initializeGLPlot(this);
}

var proto = Scene.prototype;
Expand All @@ -417,15 +417,15 @@ proto.recoverContext = function() {
var scene = this;
var gl = this.glplot.gl;
var canvas = this.glplot.canvas;
var pixelRatio = this.glplot.pixelRatio;

this.glplot.dispose();

function tryRecover() {
if(gl.isContextLost()) {
requestAnimationFrame(tryRecover);
return;
}
if(!initializeGLPlot(scene, pixelRatio, canvas, gl)) {
if(!initializeGLPlot(scene, canvas, gl)) {
Lib.error('Catastrophic and unrecoverable WebGL error. Context lost.');
return;
}
Expand Down Expand Up @@ -825,8 +825,6 @@ proto.setViewport = function(sceneLayout) {
if(newOrtho !== oldOrtho) {
this.glplot.redraw();

var pixelRatio = this.glplot.pixelRatio;

var RGBA = this.glplot.clearColor;
this.glplot.gl.clearColor(
RGBA[0], RGBA[1], RGBA[2], RGBA[3]
Expand All @@ -838,7 +836,7 @@ proto.setViewport = function(sceneLayout) {

this.glplot.dispose();

initializeGLPlot(this, pixelRatio);
initializeGLPlot(this);
this.glplot.camera._ortho = newOrtho;
}
};
Expand Down