Merge pull request #55 from Live2D/develop

Update to Cubism 5 SDK for Web R1
Live2D · Mar 26, 2024 · a452b31 · a452b31
2 parents cf4a925 + cd42c48
commit a452b31
Show file tree

Hide file tree

Showing 15 changed files with 1,683 additions and 6,542 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -5,14 +5,8 @@
       "type": "chrome",
       "request": "launch",
       "name": "Launch Chrome",
-      "url": "http://localhost:5000/Samples/TypeScript/Demo/",
-      "webRoot": "${workspaceFolder}",
-      "sourceMaps": true,
-      "sourceMapPathOverrides": {
-        "webpack:///./*": "${workspaceFolder}/Samples/TypeScript/Demo/*",
-        "webpack:///${workspaceFolder}/Framework/*": "${workspaceFolder}/Framework/*",
-      },
-      "trace": true
+      "url": "http://localhost:5000",
+      "webRoot": "${workspaceFolder}/Samples/TypeScript/Demo",
     }
   ]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ 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.1] - 2024-03-26
+
+### Changed
+
+ * Change development environment from webpack to Vite.
+
+
 ## [5-r.1-beta.4] - 2024-01-18
 
 ### Added
@@ -247,6 +254,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.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
 [5-r.1-beta.2]: https://github.com/Live2D/CubismWebSamples/compare/5-r.1-beta.1...5-r.1-beta.2

diff --git a/Core/CHANGELOG.md b/Core/CHANGELOG.md
@@ -5,6 +5,21 @@ 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-03-26
+
+### Remove
+
+* [Unity] Remove built with Emscripten 1.38.48.
+ * Unity 2021.2 or later uses only Core under `Assets/Live2D/Cubism/Plugins/Experimental/Emscripten/latest`.
+
+
+## 2023-09-28
+
+### Remove
+
+* Remove bitcode from IOS build.
+
+
 ## 2023-08-17
 
 ### Added

diff --git a/Framework b/Framework
diff --git a/README.ja.md b/README.ja.md
@@ -83,35 +83,39 @@ NOTE: デバック用の設定は、`.vscode/launch.json` に記述していま
 
 ## 変更履歴
 
-当リポジトリの変更履歴については [CHANGELOG.md](CHANGELOG.md) を参照ください。
+Samples : [CHANGELOG.md](CHANGELOG.md)
+
+Framework : [CHANGELOG.md](Framework/CHANGELOG.md)
+
+Core : [CHANGELOG.md](Core/CHANGELOG.md)
 
 
 ## 開発環境
 
 ### Node.js
 
-* 21.5.0
-* 20.11.0
+* 21.7.1
+* 20.11.1
 
 
 ## 動作確認環境
 
 | プラットフォーム | ブラウザ | バージョン |
 | --- | --- | --- |
-| Android | Google Chrome | 120.0.6099.210 |
-| Android | Microsoft Edge | 120.0.2210.115 |
-| Android | Mozilla Firefox | 121.1.0 |
-| iOS / iPadOS | Google Chrome | 120.0.6099.119 |
-| iOS / iPadOS | Microsoft Edge | 120.0.2210.126 |
-| iOS / iPadOS | Mozilla Firefox | 121.2 |
-| iOS / iPadOS | Safari | 17.2 |
-| macOS | Google Chrome | 120.0.6099.216 |
-| macOS | Microsoft Edge | 120.0.2210.121 |
-| macOS | Mozilla Firefox | 121.0.1 |
-| macOS | Safari | 17.2.1 |
-| Windows | Google Chrome | 120.0.6099.217 |
-| Windows | Microsoft Edge | 120.0.2210.121 |
-| Windows | Mozilla Firefox | 121.0.1 |
+| 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 |
 
 Note: 動作確認時のサーバの起動は `./Samples/TypeScript/Demo/package.json` の `serve` スクリプトを使用して行っています。
 

diff --git a/README.md b/README.md
@@ -84,35 +84,39 @@ NOTE: Settings for debugging are described in `.vscode/launch.json`.
 
 ## Changelog
 
-Please refer to [CHANGELOG.md](CHANGELOG.md) for the changelog of this repository.
+Samples : [CHANGELOG.md](CHANGELOG.md)
+
+Framework : [CHANGELOG.md](Framework/CHANGELOG.md)
+
+Core : [CHANGELOG.md](Core/CHANGELOG.md)
 
 
 ## Development environment
 
 ### Node.js
 
-* 21.5.0
-* 20.11.0
+* 21.7.1
+* 20.11.1
 
 
 ## Operation environment
 
 | Platform | Browser | Version |
 | --- | --- | --- |
-| Android | Google Chrome | 120.0.6099.210 |
-| Android | Microsoft Edge | 120.0.2210.115 |
-| Android | Mozilla Firefox | 121.1.0 |
-| iOS / iPadOS | Google Chrome | 120.0.6099.119 |
-| iOS / iPadOS | Microsoft Edge | 120.0.2210.126 |
-| iOS / iPadOS | Mozilla Firefox | 121.2 |
-| iOS / iPadOS | Safari | 17.2 |
-| macOS | Google Chrome | 120.0.6099.216 |
-| macOS | Microsoft Edge | 120.0.2210.121 |
-| macOS | Mozilla Firefox | 121.0.1 |
-| macOS | Safari | 17.2.1 |
-| Windows | Google Chrome | 120.0.6099.217 |
-| Windows | Microsoft Edge | 120.0.2210.121 |
-| Windows | Mozilla Firefox | 121.0.1 |
+| 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 |
 
 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/copy_resources.js b/Samples/TypeScript/Demo/copy_resources.js
@@ -0,0 +1,16 @@
+/**
+ * Copyright(c) Live2D Inc. All rights reserved.
+ *
+ * Use of this source code is governed by the Live2D Open Software license
+ * that can be found at https://www.live2d.com/eula/live2d-open-software-license-agreement_en.html.
+ */
+
+"use strict";
+const fs = require('fs');
+const publicResources = [
+  {src: '../../../Core', dst: './public/Core'},
+  {src: '../../Resources', dst: './public/Resources'},
+];
+
+publicResources.forEach((e)=>{if (fs.existsSync(e.dst)) fs.rmSync(e.dst, { recursive: true })});
+publicResources.forEach((e)=>fs.cpSync(e.src, e.dst, {recursive: true}));
diff --git a/Samples/TypeScript/Demo/index.html b/Samples/TypeScript/Demo/index.html
@@ -16,9 +16,9 @@
     }
   </style>
   <!-- Live2DCubismCore script -->
-  <script src = "../../../Core/live2dcubismcore.js"></script>
+  <script src = "./Core/live2dcubismcore.js"></script>
   <!-- Build script -->
-  <script src = "./dist/bundle.js"></script>
+  <script src = "./src/main.ts" type="module"></script>
 </head>
 <body>
 </body>
+64 −9		.eslintrc.yml
+27 −0		CHANGELOG.md
+4 −4		README.ja.md
+4 −4		README.md
+157 −157		package-lock.json
+5 −5		package.json
+17 −13		src/cubismmodelsettingjson.ts
+1 −1		src/id/cubismid.ts
+1 −1		src/id/cubismidmanager.ts
+33 −0		src/math/cubismmath.ts
+50 −50		src/model/cubismmodel.ts
+42 −16		src/motion/acubismmotion.ts
+37 −28		src/motion/cubismexpressionmotion.ts
+40 −4		src/motion/cubismexpressionmotionmanager.ts
+12 −12		src/motion/cubismmotion.ts
+1 −1		src/motion/cubismmotionmanager.ts
+2 −2		src/motion/cubismmotionqueuemanager.ts
+30 −38		src/physics/cubismphysics.ts
+19 −19		src/rendering/cubismclippingmanager.ts
+16 −16		src/rendering/cubismrenderer.ts
+3 −3		src/rendering/cubismrenderer_webgl.ts
+51 −56		src/rendering/cubismshader_webgl.ts
+2 −2		src/type/csmvector.ts
+12 −4		src/utils/cubismjson.ts