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

fixes #10 - now smoke does not mix with lasers

Browse Source
This commit is contained in:
Diego F. Goberna
2018-09-19 01:10:11 +02:00
parent 54e5291ab7
commit 43ab0a2d75
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/materials.js
View File

@@ -9,7 +9,7 @@ AFRAME.registerSystem('materials', {
AFRAME.registerComponent('materials', {
schema: {
default: 'black',
oneOf: ['black', 'red', 'blueneon']
oneOf: ['black', 'default', 'neon']
},
update: function () {
this.el.object3D.traverse(o => o.material = this.system[this.data]);

4
src/templates/stage.html
View File

@@ -37,9 +37,9 @@
<a-entity class="laser" mixin="laser" position="10 2 -38"></a-entity>
<a-entity class="laser" mixin="laser" position="14 -1.5 -36"></a-entity>
<a-entity geometry="primitive: cylinder; radius: 10; height: 15; openEnded: true; segmentsHeight: 1; segmentsRadial: 9" additive material="repeat: 2 1; side: double; fog: false; depthTest: false; src: #smokeTexture; shader: flat; transparent: true; color: #111" position="0 1.4 0" animation="property: rotation.y; from: 0; to: 360; dur: 200000; easing: linear; loop: true"></a-entity>
<a-entity id="smoke1" geometry="primitive: cylinder; radius: 10; height: 15; openEnded: true; segmentsHeight: 1; segmentsRadial: 9" additive material="repeat: 2 1; side: double; fog: true; src: #smokeTexture; shader: flat; transparent: true; color: #111" position="0 1.4 0" animation="property: rotation.y; from: 0; to: 360; dur: 200000; easing: linear; loop: true"></a-entity>
<a-entity geometry="primitive: cylinder; radius: 20; height: 15; openEnded: true; segmentsHeight: 1; segmentsRadial: 9" additive material="repeat: 2 1; side: double; fog: false; depthTest: false; src: #smokeTexture; shader: flat; transparent: true; color: #111" position="0 1.8 0" animation="property: rotation.y; from: 0; to: 360; dur: 243000; easing: linear; loop: true"></a-entity>
<a-entity id="smoke2" geometry="primitive: cylinder; radius: 20; height: 15; openEnded: true; segmentsHeight: 1; segmentsRadial: 9" additive material="repeat: 2 1; side: double; fog: true; src: #smokeTexture; shader: flat; transparent: true; color: #111" position="0 1.8 0" animation="property: rotation.y; from: 0; to: 360; dur: 243000; easing: linear; loop: true"></a-entity>
<a-entity light="type: directional; intensity: 3" position="0 10 10"></a-entity>
</a-entity>