Skip to content

move orthographic scroll zoom from the gl-plot3d scene to plotly scene #24

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 2 commits into from
Oct 23, 2019
Merged

move orthographic scroll zoom from the gl-plot3d scene to plotly scene #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d41ca2
move scene wheelListener to plotly scene.js
archmoj Oct 21, 2019
83e9c94
add getter and setter functions for scene aspectratio values
archmoj Oct 22, 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
32 changes: 15 additions & 17 deletions scene.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ var createSelect = require('gl-select-static')
var createFBO = require('gl-fbo')
var drawTriangle = require('a-big-triangle')
var mouseChange = require('mouse-change')
var mouseWheel = require('mouse-wheel')
var perspective = require('gl-mat4/perspective')
var ortho = require('gl-mat4/ortho')
var createShader = require('./lib/shader')
Expand Down Expand Up @@ -187,7 +186,21 @@ function createScene(options) {
cameraParams: cameraParams,
oncontextloss: null,
mouseListener: null,
_stopped: false
_stopped: false,

getAspectratio: function() {
return {
x: this.aspect[0],
y: this.aspect[1],
z: this.aspect[2]
}
},

setAspectratio: function(aspectratio) {
this.aspect[0] = aspectratio.x
this.aspect[1] = aspectratio.y
this.aspect[2] = aspectratio.z
}
}

var pickShape = [ (gl.drawingBufferWidth/scene.pixelRatio)|0, (gl.drawingBufferHeight/scene.pixelRatio)|0 ]
Expand Down Expand Up @@ -339,21 +352,6 @@ function createScene(options) {
objects = []
}

scene.wheelListener = mouseWheel(canvas, function(dx, dy) {
// TODO remove now that we can disable scroll via scrollZoom?
if(camera.keyBindingMode === false) return
if(!camera.enableWheel) return

if(camera._ortho) {
var s = (dx > dy) ? 1.1 : 1.0 / 1.1

scene.aspect[0] *= s
scene.aspect[1] *= s
scene.aspect[2] *= s
scene.redraw()
}
}, true)

//Update mouse position
scene._mouseRotating = false
scene._prevButtons = 0
Expand Down