Skip to content

Allow Decoupling of TouchEvents and Look-Contols #3012

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 4 commits into from
Sep 1, 2017
Merged

Allow Decoupling of TouchEvents and Look-Contols #3012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f38825a
Added property for touch enabled.
jsimonson2013 Aug 29, 2017
b9e47e3
Added hello world example with touch disabled.
jsimonson2013 Aug 29, 2017
6420e61
Did not need to check touch enabled before this.
jsimonson2013 Aug 29, 2017
1d6930b
Removed example. Added to look-controls doc. Conditionally returning …
jsimonson2013 Aug 29, 2017
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
1 change: 1 addition & 0 deletions docs/components/look-controls.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ component](camera.md).
| Property | Description | Default Value |
|------------------|------------------------------------------------------------------|---------------|
| enabled | Whether look controls are enabled. | true |
| touchEnabled | Whether to use touch controls in magic window mode. | true |
| hmdEnabled | Whether to use VR headset pose in VR mode. | true |
| reverseMouseDrag | Whether to reverse mouse drag. | false |
| standing | Whether standing mode is enabled (passed to `THREE.VRControls`). | true |
Expand Down
5 changes: 3 additions & 2 deletions src/components/look-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ module.exports.Component = registerComponent('look-controls', {

schema: {
enabled: {default: true},
touchEnabled: {default: true},
hmdEnabled: {default: true},
reverseMouseDrag: {default: false},
standing: {default: true}
Expand Down Expand Up @@ -311,7 +312,7 @@ module.exports.Component = registerComponent('look-controls', {
* Register touch down to detect touch drag.
*/
onTouchStart: function (evt) {
if (evt.touches.length !== 1) { return; }
if (evt.touches.length !== 1 || !this.data.touchEnabled) { return; }
this.touchStart = {
x: evt.touches[0].pageX,
y: evt.touches[0].pageY
Expand All @@ -327,7 +328,7 @@ module.exports.Component = registerComponent('look-controls', {
var deltaY;
var yawObject = this.yawObject;

if (!this.touchStarted) { return; }
if (!this.touchStarted || !this.data.touchEnabled) { return; }

deltaY = 2 * Math.PI * (evt.touches[0].pageX - this.touchStart.x) / canvas.clientWidth;

Expand Down