juni/junisaber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corridor, laser neons

Browse Source
This commit is contained in:
Diego F. Goberna
2018-12-05 00:12:12 +01:00
committed by Diego Marcos
parent f1e9765e5e
commit 28bae66b20
12 changed files with 239 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/beat-loader.js
View File

@@ -286,31 +286,27 @@ AFRAME.registerComponent('beat-loader', {
case 1:
this.stageColors.setColor('tunnel', event._value);
break;
case 200:
this.stageColors.setColor('leftStageLaser0', event._value);
this.stageColors.setColor('leftStageLaser1', event._value);
this.stageColors.setColor('leftStageLaser2', event._value);
case 2:
this.stageColors.setColor('leftlaser', event._value);
break;
case 300:
this.stageColors.setColor('rightStageLaser0', event._value);
this.stageColors.setColor('rightStageLaser1', event._value);
this.stageColors.setColor('rightStageLaser2', event._value);
case 3:
this.stageColors.setColor('rightlaser', event._value);
break;
case 400:
this.stageColors.setColor('floor', event._value);
this.stageColors.setColor('stageNeon', event._value);
break;
case 800:
case 8:
this.twister.components.twister.pulse(event._value);
break;
case 900:
case 9:
// zoom was a bit disturbing
this.twister.components.twister.pulse(event._value);
break;
case 1200:
case 12:
this.leftStageLasers.components['stage-lasers'].pulse(event._value);
break;
case 1300:
case 13:
this.rightStageLasers.components['stage-lasers'].pulse(event._value);
break;
}

1
src/components/beat.js
View File

@@ -629,7 +629,6 @@ AFRAME.registerComponent('beat', {
returnToPool: function (force) {
if (!this.backToPool && !force) { return; }
console.log('returning ' + this.poolName + ' to pool');
this.el.sceneEl.components[this.poolName].returnEntity(this.el);
},

7
src/components/materials.js
View File

@@ -9,7 +9,7 @@ AFRAME.registerSystem('materials', {
this.stageNormal = new THREE.ShaderMaterial({
uniforms: {
color: {value: new THREE.Vector3(0, 0.48, 0.72) },
color: {value: new THREE.Vector3(0, 0.48, 0.72)},
src: {value: new THREE.TextureLoader().load(document.getElementById('atlasImg').src)},
},
vertexShader: stageNormalShaders.vertexShader,
@@ -20,7 +20,10 @@ AFRAME.registerSystem('materials', {
this.stageAdditive = new THREE.ShaderMaterial({
uniforms: {
tunnelNeon: {value: new THREE.Vector3(0, 0, 1) },
tunnelNeon: {value: new THREE.Vector3(0, 0, 1)},
floorNeon: {value: new THREE.Vector3(0, 0, 1)},
leftLaser: {value: new THREE.Vector3(0, 0, 1)},
rightLaser: {value: new THREE.Vector3(0, 0, 1)},
src: {value: new THREE.TextureLoader().load(document.getElementById('atlasImg').src)},
},
vertexShader: stageAdditiveShaders.vertexShader,