supermedium brand colors
This commit is contained in:
Diego F. Goberna
committed by
Diego Marcos
Diego Marcos
parent
6d78a80525
commit
09685d7bd8
@@ -18,7 +18,7 @@
|
||||
|
||||
<a-scene
|
||||
stats
|
||||
mixin="gameoverAnimation bgColorAnimation tunnelColorAnimation leftLaserColorAnimation rightLaserColorAnimation textGlowColorAnimation"
|
||||
mixin="gameoverAnimation bgColorAnimation tunnelColorAnimation leftLaserColorAnimation rightLaserColorAnimation textGlowColorAnimation floorColorAnimation"
|
||||
bind__beat-loader="challengeId: challenge.id; difficulty: menuSelectedChallenge.difficulty; isPlaying: isPlaying; menuSelectedChallengeId: menuSelectedChallenge.id"
|
||||
bind__gameover="isGameOver: isGameOver"
|
||||
bind__intro-song="isPlaying: menuActive && !menuSelectedChallenge.id; isSearching: isSearching"
|
||||
@@ -41,18 +41,16 @@
|
||||
pool__beat-mine="mixin: mine; size: 12; container: #beatContainer"
|
||||
pool__beatscoreok="mixin: beatScoreOk; size: 2; container: #beatContainer"
|
||||
pool__beatscoregood="mixin: beatScoreGood; size: 2; container: #beatContainer"
|
||||
pool__beatscoregreat="mixin: beatScoreGreat; size: 2; container: #beatContainer"
|
||||
pool__beatscoreexcellent="mixin: beatScoreExcellent; size: 2; container: #beatContainer"
|
||||
pool__beatscoresuper="mixin: beatScoreSuper; size: 2; container: #beatContainer"
|
||||
pool__wall="mixin: wall; size: 10; container: #beatContainer"
|
||||
proxy-event__cleargame1="event: gamemenuexit; as: cleargame; to: a-scene"
|
||||
proxy-event__cleargame2="event: gamemenurestart; as: cleargame; to: a-scene"
|
||||
play-sound__beatwrong="sound: #beatMissSound; event: beatwrong; volume: 0.4"
|
||||
play-sound__beatwrong="sound: #beatMissSound; event: beatwrong; volume: 0.75"
|
||||
proxy-event__pausegame="event: pausegame; as: textglowoff; to: a-scene"
|
||||
proxy-event__resumegame="event: gamemenuresume; as: textglownormal; to: a-scene"
|
||||
play-sound__victory="sound: #victorySong; event: victory"
|
||||
play-sound__crescendo="sound: #crescendo; event: victory; volume: 0.75"
|
||||
play-sound__victory="sound: #victorySong; event: victory"
|
||||
search
|
||||
stage-colors="color: blue"
|
||||
vr-mode-ui="enterVRButton: #vrButton"
|
||||
@@ -113,7 +111,7 @@
|
||||
particleplayer="src: #mineParticlesJSON; pscale: 0.5; scale: 1.4; loop: false; on: explode; img: #sparkImg; count: 20%; animateScale: true; initialScale: 3 1 1; finalScale: 0.2 0.2 1"></a-entity>
|
||||
<a-entity
|
||||
id="sparkParticles"
|
||||
particleplayer="src: #sparksJSON; color: #fcc; pscale: 0.7; on: explode; scale: 0.1; loop: false; img: #spark2Img; dur: 700; count: 50%; animateScale: true; initialScale: 3 0.5 1; finalScale: 0.1 0.5 1"></a-entity>
|
||||
particleplayer="src: #sparksJSON; color: #fcc; pscale: 0.7; on: explode; scale: 0.3; loop: false; img: #spark2Img; dur: 700; count: 50%; animateScale: true; initialScale: 3 0.5 1; finalScale: 0.1 0.5 1"></a-entity>
|
||||
|
||||
<a-mixin
|
||||
id="cursorMesh"
|
||||
@@ -149,78 +147,74 @@
|
||||
{% macro saber (hand, otherHand, bladeColor, beamColor) %}
|
||||
<a-entity id="{{ hand }}Hand"
|
||||
class="saber"
|
||||
mixin="raycaster"
|
||||
bind__hand-swapper="enabled: {{ otherHand }}RaycasterActive"
|
||||
bind__menu-controls="page: search.page; selectedChallengeId: menuSelectedChallenge.id"
|
||||
bind__pauser="enabled: isPlaying"
|
||||
bind__raycaster="enabled: {{ hand }}RaycasterActive"
|
||||
bind__raycaster-game="enabled: isPlaying"
|
||||
bind__saber-controls="bladeEnabled: isPlaying; isPaused: isPaused"
|
||||
bind__saber-particles="enabled: isPlaying"
|
||||
bind__trail="enabled: isPlaying"
|
||||
haptics="events: mouseenter; dur: 35; force: 0.075"
|
||||
haptics__beat="eventsFrom: #beatContainer; events: beatcollide{{ hand }}; dur: 80; force: 0.3"
|
||||
haptics__beat="eventsFrom: #beatContainer; events: beatcollide{{ hand }}; dur: 80; force: 0.2"
|
||||
haptics__draw="events: drawblade; dur: 750; force: 0.025"
|
||||
haptics-saber
|
||||
haptics-wall
|
||||
raycaster="objects: [raycastable]; far: 5"
|
||||
raycaster__game="objects: [raycastable-game]:not(.blade{{ hand }}); far: 1; interval: 50"
|
||||
saber-particles="hand: {{ hand }}"
|
||||
saber-controls="hand: {{ hand }}"
|
||||
thumb-controls
|
||||
thumb-controls-debug="enabled: false; hand: {{ hand }}; controllerType: vive-controls"
|
||||
trail="color: {{ bladeColor }}; hand: {{ hand }}">
|
||||
<a-entity
|
||||
id="saberLengthOffset"
|
||||
bind__position="controllerType === 'oculus-touch-controls' && '0 0 0.025' || '0 0 0.06'">
|
||||
|
||||
<a-entity id="{{ hand }}Laser"
|
||||
id="{{ hand }}Laser"
|
||||
bind__cursor-laser="enabled: menuActive && activeHand === '{{ hand }}'"
|
||||
geometry="primitive: cylinder; height: 1; radius: 0.005"
|
||||
material="color: {{ beamColor }}; shader: flat"
|
||||
rotation="-90 0 0"></a-entity>
|
||||
|
||||
<a-entity class="saberContainer" rotation="90 0 0">
|
||||
<a-entity class="saberContainer" rotation="90 0 0">
|
||||
<a-entity
|
||||
class="bladeContainer"
|
||||
bind__visible="isPlaying"
|
||||
animation="property: scale; from: 0 0 0; to: 1 1 1; dur: 750; easing: linear; startEvents: drawblade"
|
||||
scale="0.001 0.001 0.001">
|
||||
<a-entity
|
||||
class="bladeContainer"
|
||||
bind__visible="isPlaying"
|
||||
animation="property: scale; from: 0 0 0; to: 1 1 1; dur: 750; easing: linear; startEvents: drawblade"
|
||||
scale="0.001 0.001 0.001">
|
||||
<a-entity
|
||||
class="blade blade{{ hand }}"
|
||||
geometry="primitive: box; height: 0.9; depth: 0.02; width: 0.02"
|
||||
material="shader: flat; color: #fff"
|
||||
raycastable-game
|
||||
position="0 -0.55 0"></a-entity>
|
||||
<a-entity
|
||||
class="saberglow"
|
||||
obj-model="obj: #saberGlowObj"
|
||||
material="shader: flat; color: {{ bladeColor }}; blending: additive; opacity: 0.08"
|
||||
position="0 -0.55 0"></a-entity>
|
||||
</a-entity>
|
||||
class="blade blade{{ hand }}"
|
||||
geometry="primitive: box; height: 0.9; depth: 0.02; width: 0.02"
|
||||
material="shader: flat; color: #fff"
|
||||
raycastable-game
|
||||
position="0 -0.55 0"></a-entity>
|
||||
<a-entity
|
||||
class="saberHandle"
|
||||
geometry="primitive: box; height: 0.2; depth: 0.025; width: 0.025"
|
||||
material="shader: flat; color: #151515">
|
||||
<a-entity
|
||||
class="highlightTop"
|
||||
geometry="primitive: box; height: 0.18; depth: 0.005; width: 0.005"
|
||||
material="shader: flat; color: {{ bladeColor }}"
|
||||
position="0 0 0.0125"></a-entity>
|
||||
<a-entity
|
||||
class="highlightBottom"
|
||||
geometry="primitive: box; height: 0.18; depth: 0.005; width: 0.005"
|
||||
material="shader: flat; color: {{ bladeColor }}"
|
||||
position="0 0 -0.0125"></a-entity>
|
||||
</a-entity>
|
||||
class="saberglow"
|
||||
obj-model="obj: #saberGlowObj"
|
||||
material="shader: flat; color: {{ bladeColor }}; blending: additive; opacity: 0.08"
|
||||
position="0 -0.55 0"></a-entity>
|
||||
</a-entity>
|
||||
<a-entity
|
||||
class="fakeGlow"
|
||||
fake-glow="color: {{ beamColor }}"
|
||||
position="0 0.01 0"
|
||||
rotation="90 0 0"
|
||||
bind__visible="!isPlaying">
|
||||
class="saberHandle"
|
||||
geometry="primitive: box; height: 0.2; depth: 0.025; width: 0.025"
|
||||
material="shader: flat; color: #151515">
|
||||
<a-entity
|
||||
class="highlightTop"
|
||||
geometry="primitive: box; height: 0.18; depth: 0.005; width: 0.005"
|
||||
material="shader: flat; color: {{ bladeColor }}"
|
||||
position="0 0 0.0125"></a-entity>
|
||||
<a-entity
|
||||
class="highlightBottom"
|
||||
geometry="primitive: box; height: 0.18; depth: 0.005; width: 0.005"
|
||||
material="shader: flat; color: {{ bladeColor }}"
|
||||
position="0 0 -0.0125"></a-entity>
|
||||
</a-entity>
|
||||
</a-entity>
|
||||
|
||||
<a-entity
|
||||
class="fakeGlow"
|
||||
fake-glow="color: {{ beamColor }}"
|
||||
position="0 0.01 0"
|
||||
rotation="90 0 0"
|
||||
bind__visible="!isPlaying">
|
||||
</a-entity>
|
||||
</a-entity>
|
||||
|
||||
<a-entity
|
||||
@@ -233,8 +227,8 @@
|
||||
scale="1.3 1.3 1.3"></a-entity>
|
||||
{% endmacro %}
|
||||
|
||||
{{ saber('left', 'right', '#f00', 'pink') }}
|
||||
{{ saber('right', 'left', '#00f', 'cyan') }}
|
||||
{{ saber('left', 'right', '#850e3e', 'pink') }}
|
||||
{{ saber('right', 'left', '#256c43', 'cyan') }}
|
||||
</a-entity>
|
||||
|
||||
<a-entity
|
||||
@@ -248,6 +242,7 @@
|
||||
<a-entity
|
||||
id="mouseCursor"
|
||||
bind__raycaster="enabled: !inVR"
|
||||
mixin="raycaster"
|
||||
cursor="rayOrigin: mouse"
|
||||
raycaster="objects: [raycastable]"></a-entity>
|
||||
<a-entity
|
||||
|
||||
Reference in New Issue
Block a user