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

pimped up beat colors

Browse Source
This commit is contained in:
Diego F. Goberna
2018-12-07 01:05:59 +01:00
committed by Diego Marcos
parent 09685d7bd8
commit 745095c533
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/img/atlas.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

BIN
assets/img/envmap.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
assets/img/envmap.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 24 KiB

2
src/assets.html
View File

@@ -62,7 +62,7 @@
<img id="backglowTexture" src="assets/img/backglow.png"> <img id="backglowTexture" src="assets/img/backglow.png">
<img id="cursorMeshImg" src="assets/models/laser/laser.png"> <img id="cursorMeshImg" src="assets/models/laser/laser.png">
<img id="downIconImg" src="assets/img/downIcon.png"> <img id="downIconImg" src="assets/img/downIcon.png">
<img id="envmapTexture" src="assets/img/envMap.png"> <img id="envmapTexture" src="assets/img/envMap.jpg">
<img id="envmapWallTexture" src="assets/img/envmapwall.jpg"> <img id="envmapWallTexture" src="assets/img/envmapwall.jpg">
<img id="neonImg" src="assets/img/neon.png"> <img id="neonImg" src="assets/img/neon.png">
<img id="gridImg" src="assets/img/grid.png"> <img id="gridImg" src="assets/img/grid.png">

18
src/components/beat.js
View File

@@ -254,11 +254,11 @@ AFRAME.registerComponent('beat', {
if (!blockEl) { return; } if (!blockEl) { return; }
blockEl.setAttribute('material', { blockEl.setAttribute('material', {
metalness: 0.9, metalness: 0.7,
roughness: 0.10, roughness: 0.1,
sphericalEnvMap: '#envmapTexture', sphericalEnvMap: '#envmapTexture',
emissive: this.materialColor[this.data.color], emissive: this.materialColor[this.data.color],
emissiveIntensity: 0.17, emissiveIntensity: 0.05,
color: this.materialColor[this.data.color] color: this.materialColor[this.data.color]
}); });
this.setObjModelFromTemplate(blockEl, this.models[this.data.type]); this.setObjModelFromTemplate(blockEl, this.models[this.data.type]);
@@ -368,11 +368,11 @@ AFRAME.registerComponent('beat', {
} }
partLeftEl.setAttribute('material', { partLeftEl.setAttribute('material', {
metalness: 0.8, metalness: 0.7,
roughness: 0.12, roughness: 0.1,
sphericalEnvMap: '#envmapTexture', sphericalEnvMap: '#envmapTexture',
emissive: this.materialColor[this.data.color], emissive: this.materialColor[this.data.color],
emissiveIntensity: 0.17, emissiveIntensity: 0.05,
color: this.materialColor[this.data.color], color: this.materialColor[this.data.color],
side: 'double' side: 'double'
}); });
@@ -387,11 +387,11 @@ AFRAME.registerComponent('beat', {
this.setObjModelFromTemplate(cutLeftEl, this.models.dot); this.setObjModelFromTemplate(cutLeftEl, this.models.dot);
partRightEl.setAttribute('material', { partRightEl.setAttribute('material', {
metalness: 0.8, metalness: 0.7,
roughness: 0.12, roughness: 0.1,
sphericalEnvMap: '#envmapTexture', sphericalEnvMap: '#envmapTexture',
emissive: this.materialColor[this.data.color], emissive: this.materialColor[this.data.color],
emissiveIntensity: 0.17, emissiveIntensity: 0.05,
color: this.materialColor[this.data.color], color: this.materialColor[this.data.color],
side: 'double' side: 'double'
}); });

4
src/constants/colors.js
View File

@@ -25,8 +25,8 @@ module.exports = {
TEXT_NORMAL: '#444', TEXT_NORMAL: '#444',
TEXT_BOLD: '#888', TEXT_BOLD: '#888',
BEAT_RED: '#46021c', BEAT_RED: '#660338',
BEAT_BLUE: '#01261a', BEAT_BLUE: '#036657',
MINE_RED: '#1c060e', MINE_RED: '#1c060e',
MINE_RED_EMISSION: '#2a0d1b', MINE_RED_EMISSION: '#2a0d1b',