Merge pull request #56 from Live2D/develop

Update to Cubism 5 SDK for Web R2
Live2D · Dec 19, 2024 · ab36f45 · ab36f45
2 parents a452b31 + 8de9441
commit ab36f45
Show file tree

Hide file tree

Showing 23 changed files with 2,421 additions and 1,930 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,27 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 
+## [5-r.2] - 2024-12-19
+
+### Added
+
+* Add a function to notify when motion playback starts.
+
+### Changed
+
+* Modify to run `tsc --noEmit` command during development build for type checking.
+* Change to be able to handle multiple `<canvas>`.
+* The interfaces MouseEvent and TouchEvent are deprecated and consolidate into PointerEvent.
+* Change to overwrite motion fade by the value specified in .model3.json on Framework.
+* Change the  function for playing back expression motions from CustomExpressionMotionManager.startMotionPriority() to CustomExpressionMotionManager.startMotion().
+
+### Fixed
+
+* Fix `eslintrc.yml` to conform to the exact wording.
+* Fix a bug that the eye tracking behavior was not released when dragging is released outside of a canvas element.
+* Fix an issue where `WebGLRenderingContext.deleteTexture()` was not being called in `releaseTextures()`, `releaseTextureByTexture()`, and `releaseTextureByFilePath()`.
+
+
 ## [5-r.1] - 2024-03-26
 
 ### Changed
@@ -254,6 +275,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Fix issue with reloading model images in WebKit.
 
 
+[5-r.2]: https://github.com/Live2D/CubismWebSamples/compare/5-r.1...5-r.2
 [5-r.1]: https://github.com/Live2D/CubismWebSamples/compare/5-r.1-beta.4...5-r.1
 [5-r.1-beta.4]: https://github.com/Live2D/CubismWebSamples/compare/5-r.1-beta.3...5-r.1-beta.4
 [5-r.1-beta.3]: https://github.com/Live2D/CubismWebSamples/compare/5-r.1-beta.2...5-r.1-beta.3

diff --git a/Core/CHANGELOG.md b/Core/CHANGELOG.md
@@ -5,6 +5,31 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 
+## 2024-12-19
+
+### Removed
+
+* [Native] Remove Visual Studio 2013 (MSVC 120) static library.
+
+
+## 2024-11-07
+
+### Added
+
+* [Native] Add experimental support `arm64` library for linux.
+
+### Removed
+
+* [Unity,Native,Java] Remove Android ARM v7 library.
+
+
+## 2024-04-04
+
+### Added
+
+* [Unity] Add library(.so) for HarmonyOS build.
+
+
 ## 2024-03-26
 
 ### Remove

diff --git a/Framework b/Framework
diff --git a/README.ja.md b/README.ja.md
@@ -60,7 +60,7 @@ Coreディレクトリのファイルをコピーしてください。
 1. タスク一覧から　`npm: install - Samples/TypeScript/Demo` を選択して依存パッケージのダウンロードを行います
 1. タスク一覧から `npm: build - Samples/TypeScript/Demo` を選択してサンプルデモのビルドを行います
 1. タスク一覧から `npm: serve - Samples/TypeScript/Demo` を選択して動作確認用の簡易サーバを起動します
-1. ブラウザの URL 欄に `http://localhost:5000/Samples/TypeScript/Demo/` と入力してアクセスします
+1. ブラウザの URL 欄に `http://localhost:5000` と入力してアクセスします
 1. コマンドパレットから `>Tasks: Terminate Task` を入力して `npm: serve` を選択すると簡易サーバが終了します
 
 その他のタスクに関してはサンプルプロジェクトの [README.md](Samples/TypeScript/README.ja.md) を参照ください。
@@ -94,28 +94,28 @@ Core : [CHANGELOG.md](Core/CHANGELOG.md)
 
 ### Node.js
 
-* 21.7.1
-* 20.11.1
+* 23.4.0
+* 22.12.0
 
 
 ## 動作確認環境
 
 | プラットフォーム | ブラウザ | バージョン |
 | --- | --- | --- |
-| Android | Google Chrome | 122.0.6261.106 |
-| Android | Microsoft Edge | 122.0.2365.86 |
-| Android | Mozilla Firefox | 123.1.0 |
-| iOS / iPadOS | Google Chrome | 122.0.6261.89 |
-| iOS / iPadOS | Microsoft Edge | 122.0.2365.86 |
-| iOS / iPadOS | Mozilla Firefox | 123.4 |
-| iOS / iPadOS | Safari | 17.4 |
-| macOS | Google Chrome | 122.0.6261.129 |
-| macOS | Microsoft Edge | 122.0.2365.80 |
-| macOS | Mozilla Firefox | 123.0.1 |
-| macOS | Safari | 17.4 |
-| Windows | Google Chrome | 122.0.6261.129 |
-| Windows | Microsoft Edge | 122.0.2365.80 |
-| Windows | Mozilla Firefox | 123.0.1 |
+| Android | Google Chrome | 131.0.6778.135 |
+| Android | Microsoft Edge | 131.0.2903.87 |
+| Android | Mozilla Firefox | 133.0.3 |
+| iOS / iPadOS | Google Chrome | 131.0.6778.134 |
+| iOS / iPadOS | Microsoft Edge | 131.0.2903.92 |
+| iOS / iPadOS | Mozilla Firefox | 133.3 |
+| iOS / iPadOS | Safari | 18.2 |
+| macOS | Google Chrome | 131.0.6778.140 |
+| macOS | Microsoft Edge | 131.0.2903.99 |
+| macOS | Mozilla Firefox | 133.0.3 |
+| macOS | Safari | 18.2 |
+| Windows | Google Chrome | 131.0.6778.140 |
+| Windows | Microsoft Edge | 131.0.2903.99 |
+| Windows | Mozilla Firefox | 133.0.3 |
 
 Note: 動作確認時のサーバの起動は `./Samples/TypeScript/Demo/package.json` の `serve` スクリプトを使用して行っています。
 

diff --git a/README.md b/README.md
@@ -61,7 +61,7 @@ Enter `>Tasks: Run Task` in the command palette (*View > Command Palette...*) to
 1. Select `npm: install - Samples/TypeScript/Demo` from the task list to download the dependent packages
 1. Select `npm: build - Samples/TypeScript/Demo` from the task list to build the sample demo
 1. Select `npm: serve - Samples/TypeScript/Demo` from the task list to start the simple server for operation check
-1. Enter `http://localhost:5000/Samples/TypeScript/Demo/` in the URL field of your browser to access it
+1. Enter `http://localhost:5000` in the URL field of your browser to access it
 1. Enter `>Tasks: Terminate Task` from the command palette and select `npm: serve` to terminate the simple server
 
 For other tasks, see [README.md](Samples/TypeScript/README.md) of the sample project.
@@ -95,28 +95,28 @@ Core : [CHANGELOG.md](Core/CHANGELOG.md)
 
 ### Node.js
 
-* 21.7.1
-* 20.11.1
+* 23.4.0
+* 22.12.0
 
 
 ## Operation environment
 
 | Platform | Browser | Version |
 | --- | --- | --- |
-| Android | Google Chrome | 122.0.6261.106 |
-| Android | Microsoft Edge | 122.0.2365.86 |
-| Android | Mozilla Firefox | 123.1.0 |
-| iOS / iPadOS | Google Chrome | 122.0.6261.89 |
-| iOS / iPadOS | Microsoft Edge | 122.0.2365.86 |
-| iOS / iPadOS | Mozilla Firefox | 123.4 |
-| iOS / iPadOS | Safari | 17.4 |
-| macOS | Google Chrome | 122.0.6261.129 |
-| macOS | Microsoft Edge | 122.0.2365.80 |
-| macOS | Mozilla Firefox | 123.0.1 |
-| macOS | Safari | 17.4 |
-| Windows | Google Chrome | 122.0.6261.129 |
-| Windows | Microsoft Edge | 122.0.2365.80 |
-| Windows | Mozilla Firefox | 123.0.1 |
+| Android | Google Chrome | 131.0.6778.135 |
+| Android | Microsoft Edge | 131.0.2903.87 |
+| Android | Mozilla Firefox | 133.0.3 |
+| iOS / iPadOS | Google Chrome | 131.0.6778.134 |
+| iOS / iPadOS | Microsoft Edge | 131.0.2903.92 |
+| iOS / iPadOS | Mozilla Firefox | 133.3 |
+| iOS / iPadOS | Safari | 18.2 |
+| macOS | Google Chrome | 131.0.6778.140 |
+| macOS | Microsoft Edge | 131.0.2903.99 |
+| macOS | Mozilla Firefox | 133.0.3 |
+| macOS | Safari | 18.2 |
+| Windows | Google Chrome | 131.0.6778.140 |
+| Windows | Microsoft Edge | 131.0.2903.99 |
+| Windows | Mozilla Firefox | 133.0.3 |
 
 Note: You can start the server for operation check by running the `serve` script of `./Samples/TypeScript/Demo/package.json`.
 

diff --git a/Samples/TypeScript/Demo/.eslintrc.yml b/Samples/TypeScript/Demo/.eslintrc.yml
@@ -18,7 +18,93 @@ rules:
     - singleQuote: true
       trailingComma: none
       arrowParens: avoid
-  'camelcase': warn
+  camelcase: "off"
+  '@typescript-eslint/naming-convention':
+    - warn
+    - selector: default
+      format:
+      - camelCase
+    - selector: 'import'
+      format:
+      - PascalCase
+    - selector: variable
+      format:
+      custom: {
+        # 指定の文字列で始まるものと特定の文字を含むものは許容
+        regex: '^[A-Z]|^csm|^iterator|Shader',
+        match: true
+      }
+      modifiers: ['exported','const']
+    - selector: variable
+      format:
+      - camelCase
+    - selector: variable
+      format:
+      custom: {
+        # 指定の文字列で始まるものは許容
+        regex: '^[A-Z]|^s_',
+        match: true
+      }
+      modifiers: ['global']
+    - selector: enum
+      format:
+      - PascalCase
+    - selector: enumMember
+      format:
+      custom: {
+        # 大文字から始まること
+        regex: '^[A-Z]',
+        match: true
+      }
+    - selector: classProperty
+      format:
+      - PascalCase
+      modifiers: ['static','readonly']
+    - selector: classProperty
+      format:
+      - camelCase
+      leadingUnderscore: allow
+    - selector: class
+      format:
+      custom: {
+        # 指定の文字列で始まるか、指定の文字列で終わること
+        regex: '^[A-Z]|^csm|^iterator|_WebGL$',
+        match: true
+      }
+    - selector: interface
+      format:
+      - camelCase
+      - PascalCase
+    - selector: parameter
+      format:
+      - camelCase
+    - selector: classMethod
+      format:
+      - camelCase
+    - selector: objectLiteralProperty
+      format:
+      - camelCase
+      - PascalCase
+    - selector: typeAlias
+      format:
+      custom: {
+        # 指定の文字列で始まるものは許容
+        regex: '^[A-Z]|^[a-z]|^CSM_|^csm|^iterator',
+        match: true
+      }
+      modifiers: ['exported']
+    - selector: typeAlias
+      format:
+      - camelCase
+    - selector: typeParameter
+      format:
+      custom: {
+        # 「大文字+アンダースコア以外の文字」、あるいは「大文字1文字」
+        # あるいは、「`T`+アンダースコア」で始まる場合
+        regex: '^[A-Z][^_]|^[A-Z]|^T_$',
+        match: true
+      }
+      leadingUnderscore: allow
   '@typescript-eslint/no-use-before-define': off
   '@typescript-eslint/ban-ts-comment': off
   '@typescript-eslint/unbound-method': off

diff --git a/Samples/TypeScript/Demo/index.html b/Samples/TypeScript/Demo/index.html
@@ -6,13 +6,20 @@
   <title>TypeScript HTML App</title>
   <style>
     html, body {
-        margin: 0;
-        overflow: hidden;
+      overflow: hidden;
+      margin: 0;
     }
-    canvas {
-        width: 100vw;
-        height: 100vh;
-        display: block;
+    html {
+      overscroll-behavior-x: none;
+      touch-action: none;
+    }
+    body {
+      display: flex;
+      flex-wrap: wrap;
+    }
+    body > canvas:only-child {
+      width: 100vw;
+      height: 100vh;
     }
   </style>
   <!-- Live2DCubismCore script -->
+40 −0		CHANGELOG.md
+3 −3		README.ja.md
+3 −3		README.md
+809 −836		package-lock.json
+6 −6		package.json
+113 −112		src/cubismmodelsettingjson.ts
+1 −1		src/effect/cubismbreath.ts
+7 −1		src/effect/cubismpose.ts
+1 −1		src/math/cubismmath.ts
+45 −3		src/model/cubismusermodel.ts
+33 −0		src/motion/acubismmotion.ts
+70 −10		src/motion/cubismexpressionmotionmanager.ts
+24 −2		src/motion/cubismmotion.ts
+86 −0		src/motion/cubismmotionjson.ts
+9 −13		src/rendering/cubismrenderer_webgl.ts
+81 −27		src/rendering/cubismshader_webgl.ts
+15 −1		src/type/csmmap.ts
+9 −3		src/utils/cubismjsonextension.ts