This commit is contained in:
Diego F. Goberna
2018-12-05 23:42:54 +01:00
committed by Diego Marcos
parent cba2bb9459
commit 25ec36e686
10 changed files with 7285 additions and 128 deletions

View File

@@ -33,8 +33,7 @@ AFRAME.registerComponent('logoflicker', {
this.sparkPositions[Math.floor(Math.random() * this.sparkPositions.length)],
false);
this.timeout = setTimeout(this.setOn,
50 + Math.floor(Math.random() * 100));
this.timeout = setTimeout(this.setOn, 50);
},
setOn: function () {

View File

@@ -1,5 +1,6 @@
const stageNormalShaders = require('../../assets/shaders/stageNormal.js');
const stageAdditiveShaders = require('../../assets/shaders/stageAdditive.js');
const flatShaders = require('../../assets/shaders/flat.js');
const COLORS = require('../constants/colors.js');
AFRAME.registerSystem('materials', {
@@ -30,6 +31,29 @@ AFRAME.registerSystem('materials', {
fog: false,
transparent: true
});
this.logo = new THREE.ShaderMaterial({
uniforms: {
src: {value: new THREE.TextureLoader().load(document.getElementById('logotexImg').src)},
},
vertexShader: flatShaders.vertexShader,
fragmentShader: flatShaders.fragmentShader,
depthTest: false,
fog: false,
transparent: true
});
this.logoadditive = new THREE.ShaderMaterial({
uniforms: {
src: {value: new THREE.TextureLoader().load(document.getElementById('logotexImg').src)},
},
vertexShader: flatShaders.vertexShader,
fragmentShader: flatShaders.fragmentShader,
depthTest: false,
blending: THREE.AdditiveBlending,
fog: false,
transparent: true
});
}
});