Modified to support animations

Author: jabbany

build/CommentCoreLibrary.js

@@ -280,12 +280,22 @@ var CoreComment = (function () {
         if (init.hasOwnProperty("motion")) {
             this._motionStart = [];
             this._motionEnd = [];
+            this.motion = init["motion"];
+            var head = 0;
             for (var i = 0; i < init["motion"].length; i++) {
+                this._motionStart.push(head);
                 var maxDur = 0;
                 for (var k in init["motion"][i]) {
-                    maxDur = Math.max(init["motion"][i][k].dur, maxDur);
+                    var m = init["motion"][i][k];
+                    maxDur = Math.max(m.dur, maxDur);
+                    if (m.easing === null || m.easing === undefined) {
+                        init["motion"][i][k]["easing"] = CoreComment.LINEAR;
+                    }
                 }
+                head += maxDur;
+                this._motionEnd.push(head);
             }
+            this._curMotion = 0;
         }
         if (init.hasOwnProperty("color")) {
             this._color = init["color"];
@@ -341,6 +351,9 @@ var CoreComment = (function () {
         if (this._y !== undefined) {
             this.y = this._y;
         }
+        if (this._alpha !== 1) {
+            this.alpha = this._alpha;
+        }
     };
 
     Object.defineProperty(CoreComment.prototype, "x", {
@@ -569,7 +582,20 @@ var CoreComment = (function () {
     * groups.
     */
     CoreComment.prototype.animate = function () {
-        for (var i = 0; i < this.motion.length; i++) {
+        if (this.motion.length === 0) {
+            return;
+        }
+        if (this.dur - this.ttl > this._motionEnd[this._curMotion]) {
+            this._curMotion++;
+        } else {
+            var currentMotion = this.motion[this._curMotion];
+            var time = (this.dur - Math.max(this.ttl, 0)) - this._motionStart[this._curMotion];
+            for (var prop in currentMotion) {
+                if (currentMotion.hasOwnProperty(prop)) {
+                    var m = currentMotion[prop];
+                    this[prop] = m.easing(Math.max(time - m.delay, 0), m.from, m.to - m.from, m.dur);
+                }
+            }
         }
     };
 
@@ -579,6 +605,17 @@ var CoreComment = (function () {
     CoreComment.prototype.finish = function () {
         this.parent.finish(this);
     };
+
+    /**
+    * Returns string representation of comment
+    * @returns {string}
+    */
+    CoreComment.prototype.toString = function () {
+        return ["[", this.stime, "|", this.ttl, "/", this.dur, "]", "(", this.mode, ")", this.text].join("");
+    };
+    CoreComment.LINEAR = function (t, b, c, d) {
+        return t * c / d + b;
+    };
     return CoreComment;
 })();
 
@@ -1020,26 +1057,31 @@ function BilibiliParser(xmlDoc, text, warn){
 					try{
 						adv = JSON.parse(format(text));
 						obj.shadow = true;
-						obj.x = parseInt(adv[0]);
-						obj.y = parseInt(adv[1]);
+						obj.x = parseInt(adv[0], 10);
+						obj.y = parseInt(adv[1], 10);
 						obj.text = adv[4].replace(/(\/n|\\n|\n|\r\n)/g, "\n");
 						obj.rZ = 0;
 						obj.rY = 0;
 						if(adv.length >= 7){
-							obj.rZ = parseInt(adv[5]);
-							obj.rY = parseInt(adv[6]);
+							obj.rZ = parseInt(adv[5], 10);
+							obj.rY = parseInt(adv[6], 10);
 						}
+						obj.motion = [];
 						obj.movable = false;
 						if(adv.length >= 11){
 							obj.movable = true;
-							obj.toX = adv[7];
-							obj.toY = adv[8];
-							obj.moveDuration = 500;
-							obj.moveDelay = 0;
-							if(adv[9]!='')
-								obj.moveDuration = adv[9];
-							if(adv[10]!="")
-								obj.moveDelay = adv[10];
+							var motion = {
+								x:{from: obj.x, to:parseInt(adv[7], 10), dur:500, delay:0},
+								y:{from: obj.y, to:parseInt(adv[8], 10), dur:500, delay:0},
+							}
+							if(adv[9] !== ''){
+								motion.x.dur = parseInt(adv[9], 10);
+								motion.y.dur = parseInt(adv[9], 10);
+							}
+							if(adv[10] !== ''){
+								motion.x.delay = parseInt(adv[10], 10);
+								motion.y.delay = parseInt(adv[10], 10);
+							}
 							if(adv.length > 11){
 								obj.shadow = adv[11];
 								if(obj.shadow === "true"){
@@ -1048,20 +1090,27 @@ function BilibiliParser(xmlDoc, text, warn){
 								if(obj.shadow === "false"){
 									obj.shadow = false;
 								}
-								if(adv[12]!=null)
+								if(adv[12] != null){
 									obj.font = adv[12];
+								}
 							}
+							obj.motion.push(motion);
 						}
-						obj.duration = 2500;
+						obj.dur = 2500;
 						if(adv[3] < 12){
-							obj.duration = adv[3] * 1000;
+							obj.dur = adv[3] * 1000;
 						}
-						obj.alphaFrom = 1;
-						obj.alphaTo = 1;
 						var tmp = adv[2].split('-');
 						if(tmp != null && tmp.length>1){
-							obj.alphaFrom = parseFloat(tmp[0]);
-							obj.alphaTo = parseFloat(tmp[1]);
+							var alphaFrom = parseFloat(tmp[0]);
+							var alphaTo = parseFloat(tmp[1]);
+							obj.opacity = alphaFrom;
+							var alphaObj = {from:alphaFrom, to:alphaTo, dur:obj.dur, delay:0};
+							if(obj.motion.length > 0){
+								obj.motion[0]["alpha"] = alphaObj;
+							}else{
+								obj.motion.push({alpha:alphaObj});
+							}
 						}
 					}catch(e){
 						console.log('[Err] Error occurred in JSON parsing');