@xpadev-net/niconicomments 0.1.11 → 0.1.12

package/LICENSE

@@ -1,7 +1,7 @@
-Copyright (c) 2021 xpadev https://xpadev.net
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2021 xpadev https://xpadev.net
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,24 +1,24 @@
-# [niconicomments](https://xpadev.net/niconicomments/)
-[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/xpadev-net/niconicomments/blob/master/LICENSE)  
-ニコニコ動画の公式プレイヤーに多少の互換性を持つコメント描画ライブラリです  
-This is a comment drawing library that is somewhat compatible with the official Nico Nico Douga player.  
-Reference： https://xpadev.net/niconicomments/docs/  
-Github： https://github.com/xpadev-net/niconicomments  
-
-## Installation
-```html
-<script src="https://cdn.jsdelivr.net/npm/@xpadev-net/niconicomments@latest/dist/bundle.min.js"></script>
-```
-or
-```
-npm i @xpadev-net/niconicomments
-```
-
-## Examples
-```javascript
-const niconiComments = new NiconiComments(canvas, comments);
-niconiComments.drawCanvas(vpos)
-```
-
-## Sample
-https://xpadev.net/niconicomments/sample.html
+# [niconicomments](https://xpadev.net/niconicomments/)
+[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/xpadev-net/niconicomments/blob/master/LICENSE)  
+ニコニコ動画の公式プレイヤーに多少の互換性を持つコメント描画ライブラリです  
+This is a comment drawing library that is somewhat compatible with the official Nico Nico Douga player.  
+Reference： https://xpadev.net/niconicomments/docs/  
+Github： https://github.com/xpadev-net/niconicomments  
+
+## Installation
+```html
+<script src="https://cdn.jsdelivr.net/npm/@xpadev-net/niconicomments@latest/dist/bundle.min.js"></script>
+```
+or
+```
+npm i @xpadev-net/niconicomments
+```
+
+## Examples
+```javascript
+const niconiComments = new NiconiComments(canvas, comments);
+niconiComments.drawCanvas(vpos)
+```
+
+## Sample
+https://xpadev.net/niconicomments/sample.html

package/dist/bundle.js

@@ -1,5 +1,5 @@
 /*!
-  niconicomments.js v0.1.11
+  niconicomments.js v0.1.12
   (c) 2021 xpadev-net https://xpadev.net
   Released under the MIT License.
 */
@@ -10,11 +10,11 @@
 })(this, (function () { 'use strict';
 
     class NiconiComments {
-      /**
-       * NiconiComments Constructor
-       * @param {HTMLCanvasElement} canvas - 描画対象のキャンバス
-       * @param {[]} data - 描画用のコメント
-       * @param {{useLegacy: boolean, formatted: boolean, video: HTMLVideoElement|null}} options - 細かい設定類
+      /**
+       * NiconiComments Constructor
+       * @param {HTMLCanvasElement} canvas - 描画対象のキャンバス
+       * @param {[]} data - 描画用のコメント
+       * @param {{useLegacy: boolean, formatted: boolean, video: HTMLVideoElement|null}} options - 細かい設定類
        */
       constructor(canvas, data, options = {
         useLegacy: false,
@@ -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 = {
@@ -77,7 +78,7 @@
           this.data = this.parseData(data);
         }
 
-        this.video = options.video || null;
+        this.video = options.video ? options.video : null;
         this.showCollision = false;
         this.showFPS = false;
         this.showCommentCount = false;
@@ -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;
@@ -99,10 +101,10 @@
           this.fpsCount = 0;
         }, 500);
       }
-      /**
-       * ニコニコが吐き出したデータを処理しやすいように変換する
-       * @param {[]} data - ニコニコが吐き出したコメントデータ
-       * @returns {*[]} - 独自フォーマットのコメントデータ
+      /**
+       * ニコニコが吐き出したデータを処理しやすいように変換する
+       * @param {[]} data - ニコニコが吐き出したコメントデータ
+       * @returns {*[]} - 独自フォーマットのコメントデータ
        */
 
 
@@ -146,8 +148,8 @@
         });
         return data_;
       }
-      /**
-       * 事前に当たり判定を考慮してコメントの描画場所を決定する
+      /**
+       * 事前に当たり判定を考慮してコメントの描画場所を決定する
        */
 
 
@@ -157,8 +159,8 @@
         this.getCommentPos();
         this.sortComment();
       }
-      /**
-       * コマンドをもとに各コメントに適用するフォントを決定する
+      /**
+       * コマンドをもとに各コメントに適用するフォントを決定する
        */
 
 
@@ -176,11 +178,11 @@
           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", "  ");
         }
       }
-      /**
-       * コメントの描画サイズを計算する
+      /**
+       * コメントの描画サイズを計算する
        */
 
 
@@ -189,7 +191,7 @@
 
         for (let i in tmpData) {
           for (let j in tmpData[i]) {
-            this.context.font = parseFont("defont", j, this.useLegacy);
+            this.context.font = parseFont(i, j, this.useLegacy);
 
             for (let k in tmpData[i][j]) {
               let comment = tmpData[i][j][k];
@@ -206,14 +208,14 @@
 
               if (measure.resized) {
                 this.data[comment.index].fontSize = measure.fontSize;
-                this.context.font = parseFont("defont", j, this.useLegacy);
+                this.context.font = parseFont(i, j, this.useLegacy);
               }
             }
           }
         }
       }
-      /**
-       * 計算された描画サイズをもとに各コメントの配置位置を決定する
+      /**
+       * 計算された描画サイズをもとに各コメントの配置位置を決定する
        */
 
 
@@ -426,11 +428,11 @@
           });
         }
       }
-      /**
-       * context.measureTextの複数行対応版
-       * 画面外にはみ出すコメントの縮小も行う
-       * @param comment - 独自フォーマットのコメントデータ
-       * @returns {{resized: boolean, width: number, width_max: number, fontSize: number, width_min: number, height: number}} - 描画サイズとリサイズの情報
+      /**
+       * context.measureTextの複数行対応版
+       * 画面外にはみ出すコメントの縮小も行う
+       * @param comment - 独自フォーマットのコメントデータ
+       * @returns {{resized: boolean, width: number, width_max: number, fontSize: number, width_min: number, height: number}} - 描画サイズとリサイズの情報
        */
 
 
@@ -447,17 +449,17 @@
             comment.fontSize = this.fontSize.big.resized;
             comment.resized = true;
             comment.tateRisized = true;
-            this.context.font = parseFont("defont", comment.fontSize, this.useLegacy);
+            this.context.font = parseFont(comment.font, comment.fontSize, this.useLegacy);
           } else if (comment.size === "medium" && lines.length > 4) {
             comment.fontSize = this.fontSize.medium.resized;
             comment.resized = true;
             comment.tateRisized = true;
-            this.context.font = parseFont("defont", comment.fontSize, this.useLegacy);
+            this.context.font = parseFont(comment.font, comment.fontSize, this.useLegacy);
           } else if (comment.size === "small" && lines.length > 6) {
             comment.fontSize = this.fontSize.small.resized;
             comment.resized = true;
             comment.tateRisized = true;
-            this.context.font = parseFont("defont", comment.fontSize, this.useLegacy);
+            this.context.font = parseFont(comment.font, comment.fontSize, this.useLegacy);
           }
         }
 
@@ -469,36 +471,36 @@
         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;
-            this.context.font = parseFont("defont", comment.fontSize, this.useLegacy);
+            this.context.font = parseFont(comment.font, comment.fontSize, this.useLegacy);
             return this.measureText(comment);
           } else if (!comment.full && width_max > 1440) {
             comment.fontSize -= 1;
             comment.resized = true;
             comment.yokoResized = true;
-            this.context.font = parseFont("defont", comment.fontSize, this.useLegacy);
+            this.context.font = parseFont(comment.font, comment.fontSize, this.useLegacy);
             return this.measureText(comment);
           }
         } else if (comment.loc !== "naka" && comment.tateRisized && (comment.full && width_max > 1920 || !comment.full && width_max > 1440) && !comment.yokoResized) {
           comment.fontSize = this.fontSize[comment.size].default;
           comment.resized = true;
           comment.yokoResized = true;
-          this.context.font = parseFont("defont", comment.fontSize, this.useLegacy);
+          this.context.font = parseFont(comment.font, comment.fontSize, this.useLegacy);
           return this.measureText(comment);
         } else if (comment.loc !== "naka" && comment.tateRisized && comment.yokoResized) {
           if (comment.full && width_max > this.doubleResizeMaxWidth.full[this.useLegacy ? "legacy" : "default"]) {
             comment.fontSize -= 1;
-            this.context.font = parseFont("defont", comment.fontSize, this.useLegacy);
+            this.context.font = parseFont(comment.font, comment.fontSize, this.useLegacy);
             return this.measureText(comment);
           } else if (!comment.full && width_max > this.doubleResizeMaxWidth.normal[this.useLegacy ? "legacy" : "default"]) {
             comment.fontSize -= 1.;
-            this.context.font = parseFont("defont", comment.fontSize, this.useLegacy);
+            this.context.font = parseFont(comment.font, comment.fontSize, this.useLegacy);
             return this.measureText(comment);
           }
         }
@@ -512,10 +514,10 @@
           "fontSize": comment.fontSize
         };
       }
-      /**
-       * コマンドをもとに所定の位置にコメントを表示する
-       * @param comment - 独自フォーマットのコメントデータ
-       * @param {number} vpos - 動画の現在位置の100倍 ニコニコから吐き出されるコメントの位置情報は主にこれ
+      /**
+       * コマンドをもとに所定の位置にコメントを表示する
+       * @param comment - 独自フォーマットのコメントデータ
+       * @param {number} vpos - 動画の現在位置の100倍 ニコニコから吐き出されるコメントの位置情報は主にこれ
        */
 
 
@@ -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)";
@@ -586,10 +588,10 @@
           }
         }
       }
-      /**
-       * コメントに含まれるコマンドを解釈する
-       * @param comment- 独自フォーマットのコメントデータ
-       * @returns {{loc: string|null, size: string|null, color: string|null, fontSize: number|null, ender: boolean, font: string|null, full: boolean, _live: boolean, invisible: boolean, long:number|null}}
+      /**
+       * コメントに含まれるコマンドを解釈する
+       * @param comment- 独自フォーマットのコメントデータ
+       * @returns {{loc: string|null, size: string|null, color: string|null, fontSize: number|null, ender: boolean, font: string|null, full: boolean, _live: boolean, invisible: boolean, long:number|null}}
        */
 
 
@@ -879,13 +881,15 @@
 
         return data;
       }
-      /**
-       * キャンバスを描画する
-       * @param vpos - 動画の現在位置の100倍 ニコニコから吐き出されるコメントの位置情報は主にこれ
+      /**
+       * キャンバスを描画する
+       * @param vpos - 動画の現在位置の100倍 ニコニコから吐き出されるコメントの位置情報は主にこれ
        */
 
 
       drawCanvas(vpos) {
+        if (this.lastVpos === vpos) return;
+        this.lastVpos = vpos;
         this.fpsCount++;
         this.context.clearRect(0, 0, this.canvas.width, this.canvas.height);
 
@@ -956,8 +960,8 @@
           }
         }
       }
-      /**
-       * キャンバスを消去する
+      /**
+       * キャンバスを消去する
        */
 
 
@@ -966,12 +970,12 @@
       }
 
     }
-    /**
-     * 配列を複数のキーでグループ化する
-     * @param {{}} array
-     * @param {string} key
-     * @param {string} key2
-     * @returns {{}}
+    /**
+     * 配列を複数のキーでグループ化する
+     * @param {{}} array
+     * @param {string} key
+     * @param {string} key2
+     * @returns {{}}
      */
 
 
@@ -993,12 +997,12 @@
 
       return data;
     };
-    /**
-     * フォント名とサイズをもとにcontextで使えるフォントを生成する
-     * @param {string} font
-     * @param {number} size
-     * @param {boolean} useLegacy
-     * @returns {string}
+    /**
+     * フォント名とサイズをもとにcontextで使えるフォントを生成する
+     * @param {string} font
+     * @param {number} size
+     * @param {boolean} useLegacy
+     * @returns {string}
      */
 
 
@@ -1019,11 +1023,11 @@
 
       }
     };
-    /**
-     * phpのarray_push的なあれ
-     * @param array
-     * @param {string} key
-     * @param push
+    /**
+     * phpのarray_push的なあれ
+     * @param array
+     * @param {string} key
+     * @param push
      */
 
 
@@ -1038,10 +1042,10 @@
 
       array[key].push(push);
     };
-    /**
-     * Hexからrgbに変換する(_live用)
-     * @param {string} hex
-     * @return {array} RGB
+    /**
+     * Hexからrgbに変換する(_live用)
+     * @param {string} hex
+     * @return {array} RGB
      */
 
 

package/package.json

@@ -1,31 +1,32 @@
-{
-  "name": "@xpadev-net/niconicomments",
-  "version": "0.1.11",
-  "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",
-    "prepublishOnly": "rollup -c rollup.config.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/xpadev-net/niconicomments.git"
-  },
-  "keywords": [
-    "niconico"
-  ],
-  "author": "xpadev(xpadev.net)",
-  "bugs": {
-    "url": "https://github.com/xpadev-net/niconicomments/issues"
-  },
-  "files": [
-    "dist/bundle.js"
-  ],
-  "homepage": "https://xpadev.net/niconicomments/docs/",
-  "license": "MIT",
-  "devDependencies": {
-    "rollup": "^2.61.1",
-    "@rollup/plugin-babel": "^5.3.0"
-  }
-}
+{
+  "name": "@xpadev-net/niconicomments",
+  "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": {
+    "type": "git",
+    "url": "git+https://github.com/xpadev-net/niconicomments.git"
+  },
+  "keywords": [
+    "niconico"
+  ],
+  "author": "xpadev(xpadev.net)",
+  "bugs": {
+    "url": "https://github.com/xpadev-net/niconicomments/issues"
+  },
+  "files": [
+    "dist/bundle.js"
+  ],
+  "homepage": "https://xpadev.net/niconicomments/docs/",
+  "license": "MIT",
+  "devDependencies": {
+    "rollup": "^2.61.1",
+    "@rollup/plugin-babel": "^5.3.0"
+  }
+}