未验证 提交 398e4bde 编写于 作者: M Mr.doob 提交者: GitHub

Merge pull request #18836 from sciecode/dev-dolly

OrbitControls: Align dolly function names with behavior
......@@ -414,7 +414,7 @@ THREE.OrbitControls = function ( object, domElement ) {
}();
function dollyIn( dollyScale ) {
function dollyOut( dollyScale ) {
if ( scope.object.isPerspectiveCamera ) {
......@@ -435,7 +435,7 @@ THREE.OrbitControls = function ( object, domElement ) {
}
function dollyOut( dollyScale ) {
function dollyIn( dollyScale ) {
if ( scope.object.isPerspectiveCamera ) {
......@@ -504,11 +504,11 @@ THREE.OrbitControls = function ( object, domElement ) {
if ( dollyDelta.y > 0 ) {
dollyIn( getZoomScale() );
dollyOut( getZoomScale() );
} else if ( dollyDelta.y < 0 ) {
dollyOut( getZoomScale() );
dollyIn( getZoomScale() );
}
......@@ -542,11 +542,11 @@ THREE.OrbitControls = function ( object, domElement ) {
if ( event.deltaY < 0 ) {
dollyOut( getZoomScale() );
dollyIn( getZoomScale() );
} else if ( event.deltaY > 0 ) {
dollyIn( getZoomScale() );
dollyOut( getZoomScale() );
}
......@@ -716,7 +716,7 @@ THREE.OrbitControls = function ( object, domElement ) {
dollyDelta.set( 0, Math.pow( dollyEnd.y / dollyStart.y, scope.zoomSpeed ) );
dollyIn( dollyDelta.y );
dollyOut( dollyDelta.y );
dollyStart.copy( dollyEnd );
......
......@@ -424,7 +424,7 @@ var OrbitControls = function ( object, domElement ) {
}();
function dollyIn( dollyScale ) {
function dollyOut( dollyScale ) {
if ( scope.object.isPerspectiveCamera ) {
......@@ -445,7 +445,7 @@ var OrbitControls = function ( object, domElement ) {
}
function dollyOut( dollyScale ) {
function dollyIn( dollyScale ) {
if ( scope.object.isPerspectiveCamera ) {
......@@ -514,11 +514,11 @@ var OrbitControls = function ( object, domElement ) {
if ( dollyDelta.y > 0 ) {
dollyIn( getZoomScale() );
dollyOut( getZoomScale() );
} else if ( dollyDelta.y < 0 ) {
dollyOut( getZoomScale() );
dollyIn( getZoomScale() );
}
......@@ -552,11 +552,11 @@ var OrbitControls = function ( object, domElement ) {
if ( event.deltaY < 0 ) {
dollyOut( getZoomScale() );
dollyIn( getZoomScale() );
} else if ( event.deltaY > 0 ) {
dollyIn( getZoomScale() );
dollyOut( getZoomScale() );
}
......@@ -726,7 +726,7 @@ var OrbitControls = function ( object, domElement ) {
dollyDelta.set( 0, Math.pow( dollyEnd.y / dollyStart.y, scope.zoomSpeed ) );
dollyIn( dollyDelta.y );
dollyOut( dollyDelta.y );
dollyStart.copy( dollyEnd );
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册