Skip to content

T
three.js

Ablesons / three.js
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
T
three.js

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 398e4bde 编写于 作者: M Mr.doob 提交者： GitHub
浏览文件
操作

Merge pull request #18836 from sciecode/dev-dolly 

OrbitControls: Align dolly function names with behavior
上级 eca8e552 c4c4795a
隐藏空白更改
内联 并排
Showing with 14 addition and 14 deletion
examples/js/controls/OrbitControls.js
浏览文件 @ 398e4bde
...@@ -414,7 +414,7 @@ THREE.OrbitControls = function ( object, domElement ) { ...@@ -414,7 +414,7 @@ THREE.OrbitControls = function ( object, domElement ) {
}(); }();
function dollyIn( dollyScale ) { function dollyOut( dollyScale ) {
if ( scope.object.isPerspectiveCamera ) { if ( scope.object.isPerspectiveCamera ) {
...@@ -435,7 +435,7 @@ THREE.OrbitControls = function ( object, domElement ) { ...@@ -435,7 +435,7 @@ THREE.OrbitControls = function ( object, domElement ) {
} }
function dollyOut( dollyScale ) { function dollyIn( dollyScale ) {
if ( scope.object.isPerspectiveCamera ) { if ( scope.object.isPerspectiveCamera ) {
...@@ -504,11 +504,11 @@ THREE.OrbitControls = function ( object, domElement ) { ...@@ -504,11 +504,11 @@ THREE.OrbitControls = function ( object, domElement ) {
if ( dollyDelta.y > 0 ) { if ( dollyDelta.y > 0 ) {
dollyIn( getZoomScale() ); dollyOut( getZoomScale() );
} else if ( dollyDelta.y < 0 ) { } else if ( dollyDelta.y < 0 ) {
dollyOut( getZoomScale() ); dollyIn( getZoomScale() );
} }
...@@ -542,11 +542,11 @@ THREE.OrbitControls = function ( object, domElement ) { ...@@ -542,11 +542,11 @@ THREE.OrbitControls = function ( object, domElement ) {
if ( event.deltaY < 0 ) { if ( event.deltaY < 0 ) {
dollyOut( getZoomScale() ); dollyIn( getZoomScale() );
} else if ( event.deltaY > 0 ) { } else if ( event.deltaY > 0 ) {
dollyIn( getZoomScale() ); dollyOut( getZoomScale() );
} }
...@@ -716,7 +716,7 @@ THREE.OrbitControls = function ( object, domElement ) { ...@@ -716,7 +716,7 @@ THREE.OrbitControls = function ( object, domElement ) {
dollyDelta.set( 0, Math.pow( dollyEnd.y / dollyStart.y, scope.zoomSpeed ) ); dollyDelta.set( 0, Math.pow( dollyEnd.y / dollyStart.y, scope.zoomSpeed ) );
dollyIn( dollyDelta.y ); dollyOut( dollyDelta.y );
dollyStart.copy( dollyEnd ); dollyStart.copy( dollyEnd );
......
examples/jsm/controls/OrbitControls.js
浏览文件 @ 398e4bde
...@@ -424,7 +424,7 @@ var OrbitControls = function ( object, domElement ) { ...@@ -424,7 +424,7 @@ var OrbitControls = function ( object, domElement ) {
}(); }();
function dollyIn( dollyScale ) { function dollyOut( dollyScale ) {
if ( scope.object.isPerspectiveCamera ) { if ( scope.object.isPerspectiveCamera ) {
...@@ -445,7 +445,7 @@ var OrbitControls = function ( object, domElement ) { ...@@ -445,7 +445,7 @@ var OrbitControls = function ( object, domElement ) {
} }
function dollyOut( dollyScale ) { function dollyIn( dollyScale ) {
if ( scope.object.isPerspectiveCamera ) { if ( scope.object.isPerspectiveCamera ) {
...@@ -514,11 +514,11 @@ var OrbitControls = function ( object, domElement ) { ...@@ -514,11 +514,11 @@ var OrbitControls = function ( object, domElement ) {
if ( dollyDelta.y > 0 ) { if ( dollyDelta.y > 0 ) {
dollyIn( getZoomScale() ); dollyOut( getZoomScale() );
} else if ( dollyDelta.y < 0 ) { } else if ( dollyDelta.y < 0 ) {
dollyOut( getZoomScale() ); dollyIn( getZoomScale() );
} }
...@@ -552,11 +552,11 @@ var OrbitControls = function ( object, domElement ) { ...@@ -552,11 +552,11 @@ var OrbitControls = function ( object, domElement ) {
if ( event.deltaY < 0 ) { if ( event.deltaY < 0 ) {
dollyOut( getZoomScale() ); dollyIn( getZoomScale() );
} else if ( event.deltaY > 0 ) { } else if ( event.deltaY > 0 ) {
dollyIn( getZoomScale() ); dollyOut( getZoomScale() );
} }
...@@ -726,7 +726,7 @@ var OrbitControls = function ( object, domElement ) { ...@@ -726,7 +726,7 @@ var OrbitControls = function ( object, domElement ) {
dollyDelta.set( 0, Math.pow( dollyEnd.y / dollyStart.y, scope.zoomSpeed ) ); dollyDelta.set( 0, Math.pow( dollyEnd.y / dollyStart.y, scope.zoomSpeed ) );
dollyIn( dollyDelta.y ); dollyOut( dollyDelta.y );
dollyStart.copy( dollyEnd ); dollyStart.copy( dollyEnd );
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或