From 648931bc99087c524569e76a38674608a7bcbe30 Mon Sep 17 00:00:00 2001
From: "Diego F. Goberna" <diego@feiss.be>
Date: Fri, 2 Nov 2018 21:00:54 +0100
Subject: [PATCH] show beat score (fixes #146)

---
 src/assets.html        | 10 ++++++++++
 src/components/beat.js | 18 ++++++++++++++++++
 src/index.html         |  1 +
 3 files changed, 29 insertions(+)

diff --git a/src/assets.html b/src/assets.html
index 2bce3e1..2c90d50 100644
--- a/src/assets.html
+++ b/src/assets.html
@@ -61,6 +61,16 @@
 
 <a-mixin id="wall" geometry wall material="shader: wall-shader; tex: #noiseTexture; env: #envmapWallTexture; repeat: 2 2; transparent: true; side: double">
 
+<a-mixin
+  id="beatScore"
+  mixin="font"
+  text="opacity: 0; wrapCount: 19; color: #AAA"
+  animation__opacityin="property: components.text.material.uniforms.opacity.value; from: .5; to: 1; dur: 500; startEvents: startanim"
+  animation__opacityout="property: components.text.material.uniforms.opacity.value; from: 1; to: 0; dur: 500; delay: 700; startEvents: startanim"
+  animation__motionz="property: object3D.position.z; from: -2; to: -6; dur: 500; easing: easeOutQuart; startEvents: startanim"
+  animation__motiony="property: object3D.position.y; to: 0.1; dur: 500; easing: easeOutQuart; startEvents: startanim"
+  ></a-mixin>
+
 <a-mixin
   id="beatWrong"
   geometry="primitive: plane; height: 0.3; width: 0.3"
diff --git a/src/components/beat.js b/src/components/beat.js
index c172ec6..5bac10b 100644
--- a/src/components/beat.js
+++ b/src/components/beat.js
@@ -707,6 +707,8 @@ AFRAME.registerComponent('beat', {
     var maxAngle;
     var saberControls = this.hitSaberEl.components['saber-controls'];
     var score = 0;
+    var scoreText;
+    var scoreEl;
 
     if (cutDirection === 'up' || cutDirection === 'down') {
       maxAngle = saberControls.maxAnglePlaneX;
@@ -725,6 +727,22 @@ AFRAME.registerComponent('beat', {
 
     this.el.emit('beathit', hitEventDetail, true);
 
+    scoreEl = this.el.sceneEl.components.pool__beatscore.requestEntity();
+    if (scoreEl) {
+      if (score < 60) { scoreText = 'OK'; }
+      else if (score < 80) { scoreText = 'GOOD'; }
+      else if (score < 100) { scoreText = 'EXCELLENT'; }
+      else { scoreText = 'SUPER'; }
+
+      scoreEl.object3D.position.copy(this.el.object3D.position);
+      scoreEl.setAttribute('text', {value: scoreText});
+      scoreEl.play();
+      scoreEl.emit('startanim');
+      setTimeout(() => {
+        this.el.sceneEl.components.pool__beatscore.returnEntity(scoreEl);
+      }, 1200);
+    }
+
     // console.log("BEAT SCORE: " + score + " " + angleBeforeHit + " " + angleAfterHit);
   },
 
diff --git a/src/index.html b/src/index.html
index cd07555..14dd89f 100644
--- a/src/index.html
+++ b/src/index.html
@@ -37,6 +37,7 @@
       pool__beat-dot-red="mixin: dotRedBeat; size: 10; container: #beatContainer"
       pool__beat-mine="mixin: mine; size: 10; container: #beatContainer"
       pool__wall="mixin: wall; size: 10; container: #beatContainer"
+      pool__beatscore="mixin: beatScore; size: 5; container: #beatContainer"
       proxy-event__cleargame1="event: gamemenuexit; as: cleargame; to: a-scene"
       proxy-event__cleargame2="event: gamemenurestart; as: cleargame; to: a-scene"
       search