@xpadev-net/niconicomments 0.1.9 → 0.1.12

package/dist/bundle.js

@@ -1,6 +1,6 @@
 /*!
-  niconicomments.js v0.1.9
-  (c) 2021 xpadev-net https://xpadevn.et
+  niconicomments.js v0.1.12
+  (c) 2021 xpadev-net https://xpadev.net
   Released under the MIT License.
 */
 (function (global, factory) {
@@ -24,29 +24,30 @@
         this.canvas = canvas;
         this.context = canvas.getContext("2d");
         this.context.strokeStyle = "rgba(0,0,0,0.7)";
-        this.context.textAlign = "left";
-        this.context.textBaseline = "top";
+        this.context.textAlign = "start";
+        this.context.textBaseline = "alphabetic";
         this.context.lineWidth = 4;
 
         if (options.useLegacy) {
-          this.commentYOffset = 0.25;
+          this.commentYOffset = 0.0;
         } else {
-          this.commentYOffset = 0.2;
+          this.commentYOffset = 0.0;
         }
 
-        this.commentYMarginTop = 0.08;
+        this.commentYPaddingTop = 0.08;
+        this.commentYMarginBottom = 0.24;
         this.fontSize = {
           "small": {
             "default": 47,
-            "resized": 27.5
+            "resized": 26.1
           },
           "medium": {
-            "default": 76,
-            "resized": 39
+            "default": 74,
+            "resized": 38.7
           },
           "big": {
-            "default": 118,
-            "resized": 62.5
+            "default": 111,
+            "resized": 61
           }
         };
         this.defaultCommandValue = {
@@ -90,6 +91,7 @@
         this.collision_left = {};
         this.collision_ue = {};
         this.collision_shita = {};
+        this.lastVpos = null;
         this.useLegacy = options.useLegacy;
         this.preRendering();
         this.fpsCount = 0;
@@ -176,7 +178,7 @@
           this.data[i]._live = command._live;
           this.data[i].long = command.long;
           this.data[i].invisible = command.invisible;
-          this.data[i].content = this.data[i].content.replaceAll("\t", "       ");
+          this.data[i].content = this.data[i].content.replaceAll("\t", "  ");
         }
       }
       /**
@@ -469,10 +471,10 @@
         width = width_arr.reduce((p, c) => p + c, 0) / width_arr.length;
         width_max = Math.max(...width_arr);
         width_min = Math.min(...width_arr);
-        height = (comment.fontSize + this.commentYMarginTop * comment.fontSize) * lines.length;
+        height = comment.fontSize * (1 + this.commentYPaddingTop) * lines.length + this.commentYMarginBottom * comment.fontSize;
 
         if (comment.loc !== "naka" && !comment.tateRisized) {
-          if (comment.full && width_max > 1920) {
+          if (comment.full && width_max > 1840) {
             comment.fontSize -= 1;
             comment.resized = true;
             comment.yokoResized = true;
@@ -566,9 +568,9 @@
               posY;
 
           if (comment.loc === "shita") {
-            posY = 1080 - comment.posY + i * (comment.fontSize + this.commentYMarginTop * comment.fontSize) - comment.height + this.commentYOffset * comment.fontSize;
+            posY = 1080 - comment.posY - comment.height + (Number(i) + 1) * comment.fontSize * (1 + this.commentYPaddingTop);
           } else {
-            posY = comment.posY + i * (comment.fontSize + this.commentYMarginTop * comment.fontSize) + this.commentYOffset * comment.fontSize;
+            posY = comment.posY + (Number(i) + 1) * comment.fontSize * (1 + this.commentYPaddingTop);
           }
 
           this.context.strokeText(line, posX, posY);
@@ -576,7 +578,7 @@
 
           if (this.showCollision) {
             this.context.strokeStyle = "rgba(255,255,0,0.5)";
-            this.context.strokeRect(posX, posY, comment.width_max, comment.fontSize);
+            this.context.strokeRect(posX, posY, comment.width_max, comment.fontSize * -1);
 
             if (comment.color === "#000000") {
               this.context.strokeStyle = "rgba(255,255,255,0.7)";
@@ -886,6 +888,8 @@
 
 
       drawCanvas(vpos) {
+        if (this.lastVpos === vpos) return;
+        this.lastVpos = vpos;
         this.fpsCount++;
         this.context.clearRect(0, 0, this.canvas.width, this.canvas.height);
 
@@ -946,8 +950,14 @@
         if (this.showCommentCount) {
           this.context.font = parseFont("defont", 60, this.useLegacy);
           this.context.fillStyle = "#00FF00";
-          this.context.strokeText("Count:" + this.timeline[vpos].length, 100, 200);
-          this.context.fillText("Count:" + this.timeline[vpos].length, 100, 200);
+
+          if (this.timeline[vpos]) {
+            this.context.strokeText("Count:" + this.timeline[vpos].length, 100, 200);
+            this.context.fillText("Count:" + this.timeline[vpos].length, 100, 200);
+          } else {
+            this.context.strokeText("Count:0", 100, 200);
+            this.context.fillText("Count:0", 100, 200);
+          }
         }
       }
       /**

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@xpadev-net/niconicomments",
-  "version": "0.1.9",
+  "version": "0.1.12",
   "description": "NiconiComments is a comment drawing library that is somewhat compatible with the official Nico Nico Douga player.",
   "main": "dist/bundle.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "rollup -c rollup.config.js",
+    "watch": "rollup -c rollup.config.js -w",
     "prepublishOnly": "rollup -c rollup.config.js"
   },
   "repository": {