Skip to content

Commit

Permalink
Merge pull request #18734 from mrdoob/revert-18637-patch-1
Browse files Browse the repository at this point in the history
Revert "Do not require a camera for DeviceOrientationControls"
  • Loading branch information
mrdoob authored Feb 25, 2020
2 parents d77016c + ea42287 commit e9eda9b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions docs/examples/en/controls/DeviceOrientationControls.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<h1>[name]</h1>

<p class="desc">
Can be used to orient an object based on the mobile device's orientation.
Can be used to orient the camera based on the mobile device's orientation.
</p>

<h2>Example</h2>
Expand All @@ -21,10 +21,10 @@ <h2>Example</h2>

<h2>Constructor</h2>

<h3>[name]( [param:Object3D object] )</h3>
<h3>[name]( [param:Camera object] )</h3>
<p>
<p>
[page:Object3D object]: The object to be controlled.
[page:Camera object]: The camera to be controlled.
</p>
<p>
Creates a new instance of [name].
Expand All @@ -48,9 +48,9 @@ <h3>[property:Boolean enabled]</h3>
Whether or not the controls are enabled.
</p>

<h3>[property:Object3D object]</h3>
<h3>[property:Camera object]</h3>
<p>
The object to be controlled.
The camera to be controlled.
</p>

<h3>[property:Number screenOrientation]</h3>
Expand Down
6 changes: 3 additions & 3 deletions examples/jsm/controls/DeviceOrientationControls.d.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import {
Object3D
Camera
} from '../../../src/Three';

export class DeviceOrientationControls {

constructor( object: Object3D );
constructor( object: Camera );

object: Object3D;
object: Camera;

// API

Expand Down

0 comments on commit e9eda9b

Please sign in to comment.