Added relative coordinate support and slightly enhanced AcFun parser

Author: jabbany

build/CommentCoreLibrary.js

@@ -34,7 +34,7 @@
 ## 定位弹幕
 ### 定位弹幕简单模式
     可选参量：Array[x,y,opacity,duration,text]
-定位弹幕简单模式允许用户对弹幕进行精确定位和透明度渐变，但是本身不包含任何3D排版效果。opacity为形如：```[Float]-[Float]```，分别定义了始末透明度。
+定位弹幕简单模式允许用户对弹幕进行精确定位和透明度渐变，但是本身不包含任何3D排版效果。opacity为形如：```[Float]-[Float]```，分别定义了始末透明度。x,y都小于1的时候我们认为是百分比。
 
 ### 定位弹幕扩展模式
     可选参量：Array[x,y,opacity,duration,text,rotateZ,rotateY]

docs/CommentTypes.md

@@ -26,15 +26,17 @@ function AcfunParser(jsond){
 			data.color = '#' + fillRGB(parseInt(xc[1]).toString(16));
 			data.mode = parseInt(xc[2]);
 			data.size = parseInt(xc[3]);
+			data.hash = xc[4];
+			data.date = parseInt(xc[5]);
+			data.position = "relative";
 			if(data.mode != 7){
 				data.text = jsondt[i].m.replace(/(\/n|\\n|\n|\r\n|\\r)/g,"\n");
 				data.text = data.text.replace(/\r/g,"\n");
 				data.text = data.text.replace(/\s/g,"\u00a0");
-			}else
+			}else{
 				data.text = jsondt[i].m;
-			data.hash = xc[4];
-			data.date = parseInt(xc[5]);
-			if(data.mode ==7){
+			}
+			if(data.mode == 7){
 				//High level positioned dm
 				try{
 					var x = JSON.parse(data.text);
@@ -47,22 +49,31 @@ function AcfunParser(jsond){
 				data.text = data.text.replace(/\ /g,"\u00a0");
 				console.log(data.text);
 				if(x.p != null){
-					data.x = x.p.x;
-					data.y = x.p.y;
+					data.x = x.p.x / 1000; // relative position
+					data.y = x.p.y / 1000;
 				}else{
 					data.x = 0;
 					data.y = 0;
 				}
 				data.shadow = x.b;
 				data.duration = 4000;
 				if(x.l != null)
-					data.duration = x.l* 1000;
-				if(x.z != null){
+					data.moveDelay = x.l * 1000;
+				if(x.z != null && x.z.length > 0){
 					data.movable = true;
-					data.toX = x.z[0].x;
-					data.toY = x.z[0].y;
+					data.toX = x.z[0].x / 1000;
+					data.toY = x.z[0].y / 1000;
+					data.alphaTo = x.z[0].t;
+					data.colorTo = x.z[0].c;
 					data.moveDuration = x.z[0].l != null ? (x.z[0].l * 1000) : 500;
-					data.moveDelay = 0;
+					data.duration = data.moveDelay + data.moveDuration;
+				}
+				if(x.r != null && x.k != null){
+					data.rX = x.r;
+					data.rY = x.k;
+				}
+				if(x.a){
+					data.alphaFrom = x.a;
 				}
 			}
 			list.push(data);

parsers/AcfunFormat.js

@@ -30,6 +30,7 @@ function BilibiliParser(xmlDoc){
 			obj.mode = parseInt(opt[1]);
 			obj.date = parseInt(opt[4]);
 			obj.pool = parseInt(opt[5]);
+			obj.position = "absolute";
 			if(opt[7] != null)
 				obj.dbid = parseInt(opt[7]);
 			obj.hash = opt[6];

parsers/BilibiliFormat.js

@@ -220,8 +220,13 @@ CommentManager.prototype.sendComment = function(data){
 		case 6:{this.csa.reverse.add(cmt);}break;
 		case 17:
 		case 7:{
-			cmt.style.top = data.y + "px";
-			cmt.style.left = data.x + "px";
+			if(cmt.data.position !== "relative"){
+				cmt.style.top = cmt.data.y + "px";
+				cmt.style.left = cmt.data.x + "px";
+			}else{
+				cmt.style.top = cmt.data.y * this.stage.height + "px";
+				cmt.style.left = cmt.data.x * this.stage.width + "px";
+			}
 			cmt.ttl = Math.round(data.duration * this.def.globalScale);
 			cmt.dur = Math.round(data.duration * this.def.globalScale);
 			if(data.rY !== 0 || data.rZ !== 0){
@@ -290,8 +295,13 @@ CommentManager.prototype.onTimerEvent = function(timePassed,cmObj){
 				cmt.style.opacity = (cmt.data.alphaFrom - cmt.data.alphaTo) * (cmt.ttl/cmt.dur) + cmt.data.alphaTo;
 			}
 			if(cmt.mode == 7 && cmt.data.movable){
-				cmt.style.top = ((cmt.data.toY - cmt.data.y) * (Math.min(Math.max(cmt.dur - cmt.data.moveDelay - cmt.ttl,0),cmt.data.moveDuration) / cmt.data.moveDuration) + parseInt(cmt.data.y)) + "px";
-				cmt.style.left = ((cmt.data.toX - cmt.data.x) * (Math.min(Math.max(cmt.dur - cmt.data.moveDelay - cmt.ttl,0),cmt.data.moveDuration) / cmt.data.moveDuration) + parseInt(cmt.data.x)) + "px";
+				if(cmt.data.position !== "relative"){
+					cmt.style.top = ((cmt.data.toY - cmt.data.y) * (Math.min(Math.max(cmt.dur - cmt.data.moveDelay - cmt.ttl,0),cmt.data.moveDuration) / cmt.data.moveDuration) + cmt.data.y) + "px";
+					cmt.style.left = ((cmt.data.toX - cmt.data.x) * (Math.min(Math.max(cmt.dur - cmt.data.moveDelay - cmt.ttl,0),cmt.data.moveDuration) / cmt.data.moveDuration) + cmt.data.x) + "px";
+				}else{
+					cmt.style.top = ((cmt.data.toY - cmt.data.y) * cmObj.stage.height * (Math.min(Math.max(cmt.dur - cmt.data.moveDelay - cmt.ttl,0),cmt.data.moveDuration)  / cmt.data.moveDuration) + cmt.data.y * cmObj.stage.height) + "px";
+					cmt.style.left = ((cmt.data.toX - cmt.data.x) * cmObj.stage.width * (Math.min(Math.max(cmt.dur - cmt.data.moveDelay - cmt.ttl,0),cmt.data.moveDuration)  / cmt.data.moveDuration) + cmt.data.x * cmObj.stage.width) + "px";
+				}
 			}
 		}
 		if(cmObj.filter != null){