Skip to content
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

OrbitControls/TrackballControls: Replace event.keyCode with event.code. #21409

Merged
merged 24 commits into from
Mar 30, 2021
Merged

OrbitControls/TrackballControls: Replace event.keyCode with event.code. #21409

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
c8a9d07
OrbitControls: replace event.keyCode with event.code
puxiao Mar 4, 2021
59fc302
Update OrbitControls.js
puxiao Mar 4, 2021
8c51bc8
Update TrackballControls.js
puxiao Mar 4, 2021
7af2fbb
Update TrackballControls.js
puxiao Mar 4, 2021
b48126a
Update webgl_shading_physical.html
puxiao Mar 4, 2021
4a9910e
Update misc_controls_trackball.html
puxiao Mar 4, 2021
5b905c9
Update OrbitControls.html
puxiao Mar 4, 2021
b88ffda
Update TrackballControls.html
puxiao Mar 4, 2021
2b237f8
Update TrackballControls.html
puxiao Mar 4, 2021
b775895
Update OrbitControls.html
puxiao Mar 4, 2021
72036c4
Update OrbitControls.html
puxiao Mar 4, 2021
e87c661
Update OrbitControls.html
puxiao Mar 4, 2021
7235660
Update OrbitControls.html
puxiao Mar 4, 2021
ece3477
Update OrbitControls.html
puxiao Mar 4, 2021
1570696
Update OrbitControls.html
puxiao Mar 4, 2021
8311ba5
Update OrbitControls.html
puxiao Mar 4, 2021
1c465d1
Update OrbitControls.html
puxiao Mar 4, 2021
3abc833
Update TrackballControls.html
puxiao Mar 4, 2021
cc517ab
Update OrbitControls.html
puxiao Mar 4, 2021
c951659
Update OrbitControls.html
puxiao Mar 4, 2021
fd035b1
Update OrbitControls.html
puxiao Mar 4, 2021
b394b6c
Docs: Modify the default keys value
puxiao Mar 4, 2021
0316eb1
Docs: Modify the default keys value
puxiao Mar 4, 2021
5457c45
Docs: Modify the default keys value
puxiao Mar 4, 2021
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
11 changes: 5 additions & 6 deletions docs/examples/en/controls/OrbitControls.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,12 @@ <h3>[property:Object keys]</h3>
This object contains references to the keycodes for controlling camera panning. Default is the 4 arrow keys.
<code>
controls.keys = {
LEFT: 37, //left arrow
UP: 38, // up arrow
RIGHT: 39, // right arrow
BOTTOM: 40 // down arrow
LEFT: 'ArrowLeft', //left arrow
UP: 'ArrowUp', // up arrow
RIGHT: 'ArrowRight', // right arrow
BOTTOM: 'ArrowDown' // down arrow
}
</code> See [link:https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/keyCode this page] for a full
list of keycodes.
</code> See [link:https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/code KeyboardEvent.code] for a full list of keycodes.
</p>

<h3>[property:Float maxAzimuthAngle]</h3>
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/en/controls/TrackballControls.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ <h3>[property:Array keys]</h3>
<li>When the second defined key is pressed, all mouse interactions (left, middle, right) performs zooming.</li>
<li>When the third defined key is pressed, all mouse interactions (left, middle, right) performs panning.</li>
</ul>
Default is *65, 83, 68* which represents A, S, D.
Default is *'KeyA', 'KeyS', 'KeyD'* which represents A, S, D.
Mugen87 marked this conversation as resolved.
Show resolved Hide resolved
</p>

<h3>[property:Number maxDistance]</h3>
Expand Down
10 changes: 5 additions & 5 deletions docs/examples/ko/controls/OrbitControls.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,13 @@ <h3>[property:Object keys]</h3>
해당 객체는 카메라 패닝을 제어하기위한 키 코드에 대한 참조를 포함합니다. 기본값은 4 개의 화살표 키입니다.
<code>
controls.keys = {
LEFT: 37, // 왼쪽 화살표
UP: 38, // 위쪽 화살표
RIGHT: 39, // 오른쪽 화살표
BOTTOM: 40 // 아래쪽 화살표
LEFT: 'ArrowLeft', // 왼쪽 화살표
UP: 'ArrowUp', // 위쪽 화살표
RIGHT: 'ArrowRight', // 오른쪽 화살표
BOTTOM: 'ArrowDown' // 아래쪽 화살표
}
</code>
전체 키코드 목록은 [link:https://developer.mozilla.org/ko/docs/Web/API/KeyboardEvent/keyCode this page] 를 참조하세요.
전체 키코드 목록은 [link:https://developer.mozilla.org/ko/docs/Web/API/KeyboardEvent/code KeyboardEvent.code] 를 참조하세요.
</p>

<h3>[property:Float maxAzimuthAngle]</h3>
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/ko/controls/TrackballControls.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ <h3>[property:Array keys]</h3>
<li>두 번째로 정의 된 키를 누르면 모든 마우스 상호 작용 (왼쪽, 가운데, 오른쪽)이 확대 / 축소를 수행합니다.</li>
<li>세 번째로 정의 된 키를 누르면 모든 마우스 상호 작용 (왼쪽, 가운데, 오른쪽)이 패닝을 수행합니다.</li>
</ul>
기본값은 A, S, D를 나타내는 * 65, 83, 68 *입니다.
기본값은 A, S, D를 나타내는 * 'KeyA', 'KeyS', 'KeyD' *입니다.
</p>

<h3>[property:Number maxDistance]</h3>
Expand Down
10 changes: 5 additions & 5 deletions docs/examples/zh/controls/OrbitControls.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,12 @@ <h3>[property:Object keys]</h3>
这一对象包含了用于控制相机平移的按键代码的引用。默认值为4个箭头（方向）键。
<code>
controls.keys = {
LEFT: 37, //left arrow
UP: 38, // up arrow
RIGHT: 39, // right arrow
BOTTOM: 40 // down arrow
LEFT: 'ArrowLeft', //left arrow
UP: 'ArrowUp', // up arrow
RIGHT: 'ArrowRight', // right arrow
BOTTOM: 'ArrowDown' // down arrow
}
</code>请参阅[link:https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/keyCode this page]来查看所有按键的代码列表。
</code> 请参阅[link:https://developer.mozilla.org/zh-CN/docs/Web/API/KeyboardEvent/code KeyboardEvent.code]来查看所有按键的代码列表。
</p>

<h3>[property:Float maxAzimuthAngle]</h3>
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/zh/controls/TrackballControls.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ <h3>[property:Array keys]</h3>
<ul>
<li>当定义的第一个按键按下后，所有的鼠标交互（左/中/右键）表现为环绕。</li>
<li>当定义的第二个按键按下后，所有的鼠标交互（左/中/右键）表现为缩放。</li>
<li>当定义的第一个按键按下后，所有的鼠标交互（左/中/右键）表现为平移。</li>
<li>当定义的第三个按键按下后，所有的鼠标交互（左/中/右键）表现为平移。</li>
</ul>
默认为*65, 83, 68*，分别表示A, S, D。
默认为*'KeyA', 'KeyS', 'KeyD'*，分别表示A, S, D。
</p>

<h3>[property:Number maxDistance]</h3>
Expand Down
4 changes: 2 additions & 2 deletions examples/js/controls/OrbitControls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ THREE.OrbitControls = function ( object, domElement ) {
this.autoRotateSpeed = 2.0; // 30 seconds per orbit when fps is 60

// The four arrow keys
this.keys = { LEFT: 37, UP: 38, RIGHT: 39, BOTTOM: 40 };
this.keys = { LEFT: 'ArrowLeft', UP: 'ArrowUp', RIGHT: 'ArrowRight', BOTTOM: 'ArrowDown' };

// Mouse buttons
this.mouseButtons = { LEFT: THREE.MOUSE.ROTATE, MIDDLE: THREE.MOUSE.DOLLY, RIGHT: THREE.MOUSE.PAN };
Expand Down Expand Up @@ -586,7 +586,7 @@ THREE.OrbitControls = function ( object, domElement ) {

var needsUpdate = false;

switch ( event.keyCode ) {
switch ( event.code ) {

case scope.keys.UP:
pan( 0, scope.keyPanSpeed );
Expand Down
8 changes: 4 additions & 4 deletions examples/js/controls/TrackballControls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ THREE.TrackballControls = function ( object, domElement ) {
this.minDistance = 0;
this.maxDistance = Infinity;

this.keys = [ 65 /*A*/, 83 /*S*/, 68 /*D*/ ];
this.keys = [ 'KeyA' /*A*/, 'KeyS' /*S*/, 'KeyD' /*D*/ ];
Copy link
Owner

@mrdoob mrdoob Mar 4, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does this change affect french, ... keyboards?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see #21056 (comment)


this.mouseButtons = { LEFT: THREE.MOUSE.ROTATE, MIDDLE: THREE.MOUSE.DOLLY, RIGHT: THREE.MOUSE.PAN };

Expand Down Expand Up @@ -454,15 +454,15 @@ THREE.TrackballControls = function ( object, domElement ) {

return;

} else if ( event.keyCode === scope.keys[ STATE.ROTATE ] && ! scope.noRotate ) {
} else if ( event.code === scope.keys[ STATE.ROTATE ] && ! scope.noRotate ) {

_keyState = STATE.ROTATE;

} else if ( event.keyCode === scope.keys[ STATE.ZOOM ] && ! scope.noZoom ) {
} else if ( event.code === scope.keys[ STATE.ZOOM ] && ! scope.noZoom ) {

_keyState = STATE.ZOOM;

} else if ( event.keyCode === scope.keys[ STATE.PAN ] && ! scope.noPan ) {
} else if ( event.code === scope.keys[ STATE.PAN ] && ! scope.noPan ) {

_keyState = STATE.PAN;

Expand Down
4 changes: 2 additions & 2 deletions examples/jsm/controls/OrbitControls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ var OrbitControls = function ( object, domElement ) {
this.autoRotateSpeed = 2.0; // 30 seconds per orbit when fps is 60

// The four arrow keys
this.keys = { LEFT: 37, UP: 38, RIGHT: 39, BOTTOM: 40 };
this.keys = { LEFT: 'ArrowLeft', UP: 'ArrowUp', RIGHT: 'ArrowRight', BOTTOM: 'ArrowDown' };

// Mouse buttons
this.mouseButtons = { LEFT: MOUSE.ROTATE, MIDDLE: MOUSE.DOLLY, RIGHT: MOUSE.PAN };
Expand Down Expand Up @@ -596,7 +596,7 @@ var OrbitControls = function ( object, domElement ) {

var needsUpdate = false;

switch ( event.keyCode ) {
switch ( event.code ) {

case scope.keys.UP:
pan( 0, scope.keyPanSpeed );
Expand Down
8 changes: 4 additions & 4 deletions examples/jsm/controls/TrackballControls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ var TrackballControls = function ( object, domElement ) {
this.minDistance = 0;
this.maxDistance = Infinity;

this.keys = [ 65 /*A*/, 83 /*S*/, 68 /*D*/ ];
this.keys = [ 'KeyA' /*A*/, 'KeyS' /*S*/, 'KeyD' /*D*/ ];

this.mouseButtons = { LEFT: MOUSE.ROTATE, MIDDLE: MOUSE.DOLLY, RIGHT: MOUSE.PAN };

Expand Down Expand Up @@ -462,15 +462,15 @@ var TrackballControls = function ( object, domElement ) {

return;

} else if ( event.keyCode === scope.keys[ STATE.ROTATE ] && ! scope.noRotate ) {
} else if ( event.code === scope.keys[ STATE.ROTATE ] && ! scope.noRotate ) {

_keyState = STATE.ROTATE;

} else if ( event.keyCode === scope.keys[ STATE.ZOOM ] && ! scope.noZoom ) {
} else if ( event.code === scope.keys[ STATE.ZOOM ] && ! scope.noZoom ) {

_keyState = STATE.ZOOM;

} else if ( event.keyCode === scope.keys[ STATE.PAN ] && ! scope.noPan ) {
} else if ( event.code === scope.keys[ STATE.PAN ] && ! scope.noPan ) {

_keyState = STATE.PAN;

Expand Down
2 changes: 1 addition & 1 deletion examples/misc_controls_trackball.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
controls.zoomSpeed = 1.2;
controls.panSpeed = 0.8;

controls.keys = [ 65, 83, 68 ];
controls.keys = [ 'KeyA', 'KeyS', 'KeyD' ];

}

Expand Down
2 changes: 1 addition & 1 deletion examples/webgl_shading_physical.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@

controls.staticMoving = true;

controls.keys = [ 65, 83, 68 ];
controls.keys = [ 'KeyA', 'KeyS', 'KeyD' ];


// STATS
Expand Down