Skip to content

try to fix intermittent material tests failures #2684

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 19, 2017
Merged

try to fix intermittent material tests failures #2684

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion src/utils/material.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,9 @@ function handleTextureEvents (el, texture) {

texture.image.addEventListener('loadeddata', function emitVideoTextureLoadedDataAll () {
// Check to see if we need to use iOS 10 HLS shader.
// Only override the shader if it is a stock (or test) shader that we know doesn't correct.
// Only override the shader if it is stock shader that we know doesn't correct.
if (!el.components || !el.components.material) { return; }

if (texture.needsCorrectionBGRA && texture.needsCorrectionFlipY &&
['standard', 'flat'].indexOf(el.components.material.data.shader) !== -1) {
el.setAttribute('material', 'shader', 'ios10hls');
Expand Down
4 changes: 1 addition & 3 deletions tests/shaders/ios10hls.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/* global AFRAME, CustomEvent, assert, process, setup, suite, test */
var entityFactory = require('../helpers').entityFactory;

var VIDEO = 'base/tests/assets/test.mp4';

suite('ios10hls', function () {
setup(function (done) {
this.el = entityFactory();
Expand All @@ -19,7 +17,6 @@ suite('ios10hls', function () {

// Set up and verify video element to be treated as HLS.
var videoEl = document.createElement('video');
videoEl.src = VIDEO;
videoEl.type = 'application/x-mpegurl';
assert.equal(AFRAME.utils.material.isHLS(videoEl.src, videoEl.type), true);

Expand All @@ -28,6 +25,7 @@ suite('ios10hls', function () {

setTimeout(function () {
assert.equal(el.getAttribute('material').shader, 'ios10hls');
el.sceneEl.isIOS = false;
done();
});
});
Expand Down
22 changes: 18 additions & 4 deletions tests/shaders/standard.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var VIDEO = 'base/tests/assets/test.mp4';
suite('standard material', function () {
setup(function (done) {
var el = this.el = entityFactory();
el.setAttribute('material', 'shader: standard');
el.setAttribute('material', {shader: 'standard'});
if (el.hasLoaded) { done(); }
el.addEventListener('loaded', function () {
done();
Expand All @@ -25,7 +25,10 @@ suite('standard material', function () {
var el = this.el;
var imageUrl = 'base/tests/assets/test.png';
assert.isNull(el.getObject3D('mesh').material.aoMap);
el.setAttribute('material', 'ambientOcclusionMapIntensity: 0.4; ambientOcclusionMap: url(' + imageUrl + ');');
el.setAttribute('material', {
ambientOcclusionMapIntensity: 0.4,
ambientOcclusionMap: `url(${imageUrl})`
});
assert.equal(el.getObject3D('mesh').material.aoMapIntensity, 0.4);
el.addEventListener('materialtextureloaded', function (evt) {
assert.equal(el.getObject3D('mesh').material.aoMap, evt.detail.texture);
Expand All @@ -37,7 +40,12 @@ suite('standard material', function () {
var el = this.el;
var imageUrl = 'base/tests/assets/test.png';
assert.isNull(el.getObject3D('mesh').material.normalMap);
el.setAttribute('material', 'normalScale: 0.3 -0.4; normalMap: url(' + imageUrl + '); normalTextureRepeat: 2 2; normalTextureOffset: 0.1 0.1;');
el.setAttribute('material', {
normalScale: {x: 0.3, y: -0.4},
normalMap: `url(${imageUrl})`,
normalTextureRepeat: {x: 2, y: 2},
normalTextureOffset: {x: 0.1, y: 0.1}
});
assert.equal(el.getObject3D('mesh').material.normalScale.x, 0.3);
assert.equal(el.getObject3D('mesh').material.normalScale.y, -0.4);
el.addEventListener('materialtextureloaded', function (evt) {
Expand All @@ -52,7 +60,13 @@ suite('standard material', function () {
var el = this.el;
var imageUrl = 'base/tests/assets/test.png';
assert.isNull(el.getObject3D('mesh').material.displacementMap);
el.setAttribute('material', 'displacementScale: 0.3; displacementBias: 0.2; displacementMap: url(' + imageUrl + '); displacementTextureRepeat: 2 2; displacementTextureOffset: 0.1 0.1;');
el.setAttribute('material', {
displacementScale: 0.3,
displacementBias: 0.2,
displacementMap: `url(${imageUrl})`,
displacementTextureRepeat: {x: 2, y: 2},
displacementTextureOffset: {x: 0.1, y: 0.1}
});
assert.equal(el.getObject3D('mesh').material.displacementScale, 0.3);
assert.equal(el.getObject3D('mesh').material.displacementBias, 0.2);
el.addEventListener('materialtextureloaded', function (evt) {
Expand Down