From 26df7dadea5f5a7bde2da1739ed6316709a8af9d Mon Sep 17 00:00:00 2001
From: Kevin Ngo <me@ngokevin.com>
Date: Mon, 12 Nov 2018 17:47:03 +0800
Subject: [PATCH] clean up score-text code

---
 src/assets.html              | 11 ++++++-----
 src/components/beat.js       | 35 ++++++++++++++++++++---------------
 src/components/score-beat.js | 14 ++++++++++++++
 3 files changed, 40 insertions(+), 20 deletions(-)
 create mode 100644 src/components/score-beat.js

diff --git a/src/assets.html b/src/assets.html
index 8c7e50c..f360e20 100644
--- a/src/assets.html
+++ b/src/assets.html
@@ -70,11 +70,12 @@
 <a-mixin
   id="beatScore"
   mixin="font"
+  score-beat
   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"
+  animation__opacityin="property: components.text.material.uniforms.opacity.value; from: .5; to: 1; dur: 500; startEvents: beatscorestart"
+  animation__opacityout="property: components.text.material.uniforms.opacity.value; from: 1; to: 0; dur: 500; delay: 700; startEvents: beatscorestart"
+  animation__motionz="property: object3D.position.z; from: -2; to: -6; dur: 500; easing: easeOutQuart; startEvents: beatscorestart"
+  animation__motiony="property: object3D.position.y; to: 0.1; dur: 500; easing: easeOutQuart; startEvents: beatscorestart"
 ></a-mixin>
 
 <a-mixin
@@ -108,4 +109,4 @@
   animation__mouseleave1="property: components.slice9.material.color; type: color; from: #FFF; to: #999; startEvents: mouseleave; pauseEvents: mouseenter; dur: 150"
   animation__mouseenter2="property: scale; from: 1 1 1; to: 1.1 1.1 1.1; startEvents: mouseenter; pauseEvents: mouseleave; dur: 150"
   animation__mouseleave2="property: scale; to: 1 1 1; from: 1.1 1.1 1.1; startEvents: mouseleave; pauseEvents: mouseenter; dur: 150">
-</a-mixin>
\ No newline at end of file
+</a-mixin>
diff --git a/src/components/beat.js b/src/components/beat.js
index 90ab47e..c46bf12 100644
--- a/src/components/beat.js
+++ b/src/components/beat.js
@@ -7,6 +7,13 @@ const BEAT_WARMUP_ROTATION_TIME = 750;
 const ONCE = {once: true};
 const SIGN_MATERIAL = {shader: 'flat', color: '#88f'};
 
+const SCORE = {
+  OK: 'OK',
+  GOOD: 'GOOD',
+  EXCELLENT: 'EXCELLENT',
+  SUPER: 'SUPER'
+};
+
 /**
  * Create beat from pool, collision detection, clipping planes.
  */
@@ -85,6 +92,8 @@ AFRAME.registerComponent('beat', {
     this.returnToPoolTimer = 800;
     this.rotationAxis = new THREE.Vector3();
     this.saberEls = this.el.sceneEl.querySelectorAll('[saber-controls]');
+    this.scoreEl = null;
+    this.scoreElTime = undefined;
     this.startPositionZ = undefined;
     this.rightCutPlanePoints = [
       new THREE.Vector3(),
@@ -167,6 +176,7 @@ AFRAME.registerComponent('beat', {
 
     if (this.destroyed) {
       this.tockDestroyed(timeDelta);
+      // Check to remove score entity from pool.
     } else {
       // Only check collisions when close.
       const collisionZThreshold = -4;
@@ -708,9 +718,8 @@ AFRAME.registerComponent('beat', {
     var hitEventDetail = this.hitEventDetail;
     var maxAngle;
     var saberControls = this.hitSaberEl.components['saber-controls'];
-    var score = 0;
     var scoreText;
-    var scoreEl;
+
     // Harcoded temporarily.
     const saberRotation = 3.14 / 12;
 
@@ -724,30 +733,26 @@ AFRAME.registerComponent('beat', {
 
     const angleBeforeHit = Math.max(0, (this.angleBeforeHit - saberRotation) * 180 / Math.PI);
     const angleAfterHit = Math.max(0, (maxAngle - saberRotation) * 180 / Math.PI);
+
+    let score = 0;
     score += angleBeforeHit >= 85 ? 70 : (angleBeforeHit / 80) * 70;
     score += angleAfterHit >= 60 ? 30 : (angleAfterHit / 60) * 30;
 
     hitEventDetail.score = score;
-
     this.el.emit('beathit', hitEventDetail, true);
 
-    scoreEl = this.el.sceneEl.components.pool__beatscore.requestEntity();
+    const 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'; }
+      if (score < 60) { scoreText = SCORE.OK; }
+      else if (score < 80) { scoreText = SCORE.GOOD; }
+      else if (score < 100) { scoreText = SCORE.EXCELLENT; }
+      else { scoreText = SCORE.SUPER; }
 
       scoreEl.object3D.position.copy(this.el.object3D.position);
-      scoreEl.setAttribute('text', {value: scoreText});
+      scoreEl.setAttribute('text', 'value', scoreText);
       scoreEl.play();
-      scoreEl.emit('startanim');
-      setTimeout(() => {
-        this.el.sceneEl.components.pool__beatscore.returnEntity(scoreEl);
-      }, 1200);
+      scoreEl.emit('beatscorestart', null, false);
     }
-
-    // console.log("BEAT SCORE: " + score + " " + angleBeforeHit + " " + angleAfterHit);
   },
 
   /**
diff --git a/src/components/score-beat.js b/src/components/score-beat.js
new file mode 100644
index 0000000..34282f0
--- /dev/null
+++ b/src/components/score-beat.js
@@ -0,0 +1,14 @@
+/**
+ * Score beat, auto-return to pool in 1.2s.
+ */
+AFRAME.registerComponent('score-beat', {
+  play: function () {
+    this.startTime = this.el.sceneEl.time;
+  },
+
+  tick: function (time) {
+    if (time > this.startTime + 1200) {
+      this.el.sceneEl.components.pool__beatscore.returnEntity(this.el);
+    }
+  }
+});