Skip to content

setActiveCamera: call play() and modified camera-set-active event #1502

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 1 commit into from
May 25, 2016
Merged

setActiveCamera: call play() and modified camera-set-active event #1502

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Added camera.play() in setActiveCamera and move event emission to the… 
… end
  • Loading branch information
@fernandojsg
fernandojsg committed May 25, 2016
commit 6efa3dc2a6a80b457e3afeee1db67d1ccaa74c37
3 changes: 2 additions & 1 deletion src/systems/camera.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ module.exports.System = registerSystem('camera', {

// Make new camera active.
this.activeCameraEl = newCameraEl;
this.activeCameraEl.play();
sceneEl.camera = newCamera;
sceneEl.emit('camera-set-active', {cameraEl: newCameraEl});

// Disable current camera
if (previousCamera) {
Expand All @@ -91,6 +91,7 @@ module.exports.System = registerSystem('camera', {
cameraEl.setAttribute('camera', 'active', false);
cameraEl.pause();
}
sceneEl.emit('camera-set-active', {cameraEl: newCameraEl});
}
});

Expand Down