Merge pull request #3196 from delapuente/issue-3090-allow-camera-in-mixin

Make camera system aware of mixins.

Author: ngokevin

src/systems/camera.js

@@ -100,7 +100,7 @@ module.exports.System = registerSystem('camera', {
     cameraEls = sceneEl.querySelectorAll('[camera]');
     for (i = 0; i < cameraEls.length; i++) {
       cameraEl = cameraEls[i];
-      if (newCameraEl === cameraEl) { continue; }
+      if (!cameraEl.isEntity || newCameraEl === cameraEl) { continue; }
       cameraEl.setAttribute('camera', 'active', false);
       cameraEl.pause();
     }

tests/systems/camera.test.js

@@ -1,4 +1,4 @@
-/* global assert, process, setup, suite, test */
+/* global assert, process, setup, suite, test, sinon */
 var entityFactory = require('../helpers').entityFactory;
 
 suite('camera system', function () {
@@ -52,6 +52,59 @@ suite('camera system', function () {
       assert.equal(el.sceneEl.camera, el.components.camera.camera);
     });
 
+    test('does not get affected by mixins', function (done) {
+      var sceneEl = this.el.sceneEl;
+      var assetsEl = document.querySelector('a-assets');
+      var cameraEl = document.createElement('a-entity');
+      var mixin = document.createElement('a-mixin');
+      var cameraSystem = sceneEl.systems.camera;
+      sinon.spy(cameraSystem, 'setActiveCamera');
+
+      cameraEl.setAttribute('camera', '');
+      mixin.setAttribute('camera', '');
+
+      assetsEl.appendChild(mixin);
+      mixin.addEventListener('loaded', function () {
+        assert.ok(cameraSystem.setActiveCamera.notCalled);
+        sceneEl.appendChild(cameraEl);
+        cameraEl.addEventListener('loaded', function () {
+          assert.ok(cameraEl.getAttribute('camera').active);
+          assert.ok(cameraSystem.setActiveCamera.calledOnce);
+          assert.equal(cameraSystem.activeCameraEl, cameraEl);
+          cameraSystem.setActiveCamera.reset();
+          done();
+        });
+      });
+    });
+
+    test('does not switch active camera to a mixin', function (done) {
+      var sceneEl = this.el.sceneEl;
+      var assetsEl = document.querySelector('a-assets');
+      var cameraEl = document.createElement('a-entity');
+      var mixin = document.createElement('a-mixin');
+      var cameraSystem = sceneEl.systems.camera;
+      sinon.spy(cameraSystem, 'setActiveCamera');
+
+      cameraEl.setAttribute('camera', '');
+      mixin.setAttribute('camera', '');
+
+      sceneEl.appendChild(cameraEl);
+      cameraEl.addEventListener('loaded', function () {
+        assert.ok(cameraEl.getAttribute('camera').active);
+        assert.ok(cameraSystem.setActiveCamera.calledOnce);
+        assert.equal(cameraSystem.activeCameraEl, cameraEl);
+
+        assetsEl.appendChild(mixin);
+        mixin.addEventListener('loaded', function () {
+          assert.ok(cameraEl.getAttribute('camera').active);
+          assert.ok(cameraSystem.setActiveCamera.calledOnce);
+          assert.equal(cameraSystem.activeCameraEl, cameraEl);
+          cameraSystem.setActiveCamera.reset();
+          done();
+        });
+      });
+    });
+
     test('switches active camera', function (done) {
       var sceneEl = this.el.sceneEl;
       var camera1El = document.createElement('a-entity');