Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion src/core/a-assets.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,11 @@ function mediaElementLoaded (el) {
if (secondsBuffered >= el.duration) {
// Set in cache because we won't be needing to call three.js loader if we have.
// a loaded media element.
THREE.Cache.files[el.getAttribute('src')] = el;
// Store video elements only. three.js loader is used for audio elements.
// See assetParse too.
if (el.tagName === 'VIDEO') {
THREE.Cache.files[el.getAttribute('src')] = el;
}
resolve();
}
}
Expand Down
75 changes: 75 additions & 0 deletions tests/components/sound.test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/* global assert, process, sinon, setup, suite, test */
var entityFactory = require('../helpers').entityFactory;
var THREE = require('index').THREE;

suite('sound', function () {
setup(function (done) {
THREE.Cache.files = {};
var el = this.el = entityFactory();
el.setAttribute('sound', {
autoplay: true,
Expand Down Expand Up @@ -199,4 +201,77 @@ suite('sound', function () {
assert.ok(sound.stop.called);
});
});

suite('asset', function () {
test('audio tag', function (done) {
var sceneEl = this.el.sceneEl;
var assetsEl = sceneEl.querySelector('a-assets');
sceneEl.removeChild(assetsEl);
process.nextTick(function () {
assetsEl = document.createElement('a-assets');
var audioEl = document.createElement('audio');
audioEl.setAttribute('src', 'base/tests/assets/test.ogg');
audioEl.setAttribute('id', 'testogg');
assetsEl.appendChild(audioEl);
sceneEl.appendChild(assetsEl);
process.nextTick(function () {
var el = document.createElement('a-entity');
el.setAttribute('sound', 'src', '#testogg');
el.addEventListener('sound-loaded', function () {
assert.ok(this.components.sound.loaded);
done();
});
sceneEl.appendChild(el);
});
});
});

test('preloading audio tag', function (done) {
var sceneEl = this.el.sceneEl;
var assetsEl = sceneEl.querySelector('a-assets');
sceneEl.removeChild(assetsEl);
process.nextTick(function () {
assetsEl = document.createElement('a-assets');
var audioEl = document.createElement('audio');
audioEl.setAttribute('src', 'base/tests/assets/test.ogg');
audioEl.setAttribute('id', 'testogg');
audioEl.setAttribute('autoplay', '');
assetsEl.appendChild(audioEl);
sceneEl.appendChild(assetsEl);
process.nextTick(function () {
var el = document.createElement('a-entity');
el.setAttribute('sound', 'src', '#testogg');
el.addEventListener('sound-loaded', function () {
assert.ok(this.components.sound.loaded);
done();
});
sceneEl.appendChild(el);
});
});
});

test('a-asset-item', function (done) {
var sceneEl = this.el.sceneEl;
var assetsEl = sceneEl.querySelector('a-assets');
sceneEl.removeChild(assetsEl);
process.nextTick(function () {
assetsEl = document.createElement('a-assets');
var assetItemEl = document.createElement('a-asset-item');
assetItemEl.setAttribute('src', 'base/tests/assets/test.ogg');
assetItemEl.setAttribute('id', 'testogg');
assetItemEl.setAttribute('response-type', 'arraybuffer');
assetsEl.appendChild(assetItemEl);
sceneEl.appendChild(assetsEl);
process.nextTick(function () {
var el = document.createElement('a-entity');
el.setAttribute('sound', 'src', '#testogg');
el.addEventListener('sound-loaded', function () {
assert.ok(this.components.sound.loaded);
done();
});
sceneEl.appendChild(el);
});
});
});
});
});