Skip to content

Commit

Permalink
Update to Cubism 4 SDK for Web R5 beta5
Browse files Browse the repository at this point in the history
  • Loading branch information
wada-at-live2d-com committed Aug 4, 2022
1 parent 328f071 commit 2a2d4f3
Show file tree
Hide file tree
Showing 24 changed files with 1,935 additions and 1,948 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@ 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/).


## [4-r.5-beta.5] - 2022-08-04

### Changed

* Update `Mao` model.

### Fixed

* Fix crash with exception when reading .moc3 files of unsupported versions.


## [4-r.5-beta.4] - 2022-07-07

### Added
Expand Down Expand Up @@ -135,6 +146,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
* Fix issue with reloading model images in WebKit.


[4-r.5-beta.5]: https://github.com/Live2D/CubismWebSamples/compare/4-r.5-beta.4...4-r.5-beta.5
[4-r.5-beta.4]: https://github.com/Live2D/CubismWebSamples/compare/4-r.5-beta.3...4-r.5-beta.4
[4-r.5-beta.3]: https://github.com/Live2D/CubismWebSamples/compare/4-r.5-beta.2...4-r.5-beta.3
[4-r.5-beta.2]: https://github.com/Live2D/CubismWebSamples/compare/4-r.5-beta.1...4-r.5-beta.2
Expand Down
7 changes: 7 additions & 0 deletions Core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/).


## 2022-08-04

### Fixed

* [Web] Fix `csmGetMocVersion` function argument.


## 2022-07-07

### Added
Expand Down
2 changes: 1 addition & 1 deletion Framework
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,28 +80,28 @@ NOTE: デバック用の設定は、`.vscode/launch.json` に記述していま

### Node.js

* 18.4.0
* 16.15.1
* 14.19.3
* 18.7.0
* 16.16.0
* 14.20.0


## 動作確認環境

| プラットフォーム | ブラウザ | バージョン |
| --- | --- | --- |
| Android | Google Chrome | 103.0.5060.70 |
| Android | Google Chrome | 103.0.5060.129 |
| Android | Microsoft Edge | 101.0.1210.47 |
| Android | Mozilla Firefox | 100.1.2 |
| iOS / iPadOS | Google Chrome | 101.0.4951.58 |
| iOS / iPadOS | Microsoft Edge | 101.1210.47 |
| iOS / iPadOS | Mozilla Firefox | 100.1 |
| iOS / iPadOS | Safari | 605.1.15 |
| iOS / iPadOS | Safari | 15.6 |
| macOS | Google Chrome | 101.0.4951.64 |
| macOS | Microsoft Edge | 101.0.1210.47 |
| macOS | Mozilla Firefox | 100.0.1 |
| macOS | Safari | 15.5 |
| macOS | Safari | 15.6 |
| Windows | Google Chrome | 102.0.5005.115 |
| Windows | Microsoft Edge | 103.0.1264.44 |
| Windows | Microsoft Edge | 103.0.1264.71 |
| Windows | Mozilla Firefox | 100.0 |

Note: 動作確認時のサーバの起動は `./Samples/TypeScript/Demo/package.json``serve` スクリプトを使用して行っています。
Expand Down
44 changes: 22 additions & 22 deletions Samples/Resources/Mao/Mao.cdi3.json
Original file line number Diff line number Diff line change
Expand Up @@ -192,37 +192,37 @@
"Name": "右肩の上下"
},
{
"Id": "ParamArmAL01",
"Id": "ParamArmLA01",
"GroupId": "ParamGroupArmLA",
"Name": "左腕A 肩の回転"
},
{
"Id": "ParamArmAL02",
"Id": "ParamArmLA02",
"GroupId": "ParamGroupArmLA",
"Name": "左腕A 肘の回転"
},
{
"Id": "ParamArmAL03",
"Id": "ParamArmLA03",
"GroupId": "ParamGroupArmLA",
"Name": "左腕A 手首の回転"
},
{
"Id": "ParamHandAL",
"Id": "ParamHandLA",
"GroupId": "ParamGroupArmLA",
"Name": "左手A"
},
{
"Id": "ParamArmAR01",
"Id": "ParamArmRA01",
"GroupId": "ParamGroupArmRA",
"Name": "右腕A 肩の回転"
},
{
"Id": "ParamArmAR02",
"Id": "ParamArmRA02",
"GroupId": "ParamGroupArmRA",
"Name": "右腕A 肘の回転"
},
{
"Id": "ParamArmAR03",
"Id": "ParamArmRA03",
"GroupId": "ParamGroupArmRA",
"Name": "右腕A 手首の回転"
},
Expand All @@ -232,7 +232,7 @@
"Name": "杖の回転"
},
{
"Id": "ParamHandAR",
"Id": "ParamHandRA",
"GroupId": "ParamGroupArmRA",
"Name": "右手A"
},
Expand All @@ -252,22 +252,22 @@
"Name": "インク垂れ 表示"
},
{
"Id": "ParamArmBL01",
"Id": "ParamArmLB01",
"GroupId": "ParamGroupArmLB",
"Name": "左腕B 肩の回転"
},
{
"Id": "ParamArmBL02",
"Id": "ParamArmLB02",
"GroupId": "ParamGroupArmLB",
"Name": "左腕B 肘の回転"
},
{
"Id": "ParamArmBL03",
"Id": "ParamArmLB03",
"GroupId": "ParamGroupArmLB",
"Name": "左腕B 手首の回転"
},
{
"Id": "ParamHandBL",
"Id": "ParamHandLB",
"GroupId": "ParamGroupArmLB",
"Name": "左手B"
},
Expand All @@ -277,27 +277,27 @@
"Name": "帽子の変形"
},
{
"Id": "ParamArmBR01",
"Id": "ParamArmRB01",
"GroupId": "ParamGroupArmRB",
"Name": "右腕B 肩の回転"
},
{
"Id": "ParamArmBR02",
"Id": "ParamArmRB02",
"GroupId": "ParamGroupArmRB",
"Name": "右腕B 肘の回転"
},
{
"Id": "ParamArmBR02Y",
"Id": "ParamArmRB02Y",
"GroupId": "ParamGroupArmRB",
"Name": "右腕B 腕のY"
},
{
"Id": "ParamArmBR03",
"Id": "ParamArmRB03",
"GroupId": "ParamGroupArmRB",
"Name": "右腕B 手首の回転"
},
{
"Id": "ParamHandBR",
"Id": "ParamHandRB",
"GroupId": "ParamGroupArmRB",
"Name": "右手B"
},
Expand Down Expand Up @@ -437,7 +437,7 @@
"Name": "爆発光溜め"
},
{
"Id": "Param",
"Id": "ParamExplosionOn",
"GroupId": "ParamGroupEffectsMistake",
"Name": "爆発 表示"
},
Expand Down Expand Up @@ -734,19 +734,19 @@
"Name": ""
},
{
"Id": "PartArmAL",
"Id": "PartArmLA",
"Name": "左腕A"
},
{
"Id": "PartArmAR",
"Id": "PartArmRA",
"Name": "右腕A"
},
{
"Id": "PartArmBL",
"Id": "PartArmLB",
"Name": "左腕B"
},
{
"Id": "PartArmBR",
"Id": "PartArmRB",
"Name": "右腕B"
},
{
Expand Down
Binary file modified Samples/Resources/Mao/Mao.moc3
Binary file not shown.
8 changes: 4 additions & 4 deletions Samples/Resources/Mao/Mao.pose3.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
"Groups": [
[
{
"Id": "PartArmAL",
"Id": "PartArmLA",
"Link": []
},
{
"Id": "PartArmBL",
"Id": "PartArmLB",
"Link": []
}
],
[
{
"Id": "PartArmAR",
"Id": "PartArmRA",
"Link": []
},
{
"Id": "PartArmBR",
"Id": "PartArmRB",
"Link": []
}
]
Expand Down
20 changes: 20 additions & 0 deletions Samples/Resources/Mao/expressions/exp_01.exp3.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeLForm",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeROpen",
"Value": 0,
Expand All @@ -28,6 +33,21 @@
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeRForm",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeBallX",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeBallY",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeBallForm",
"Value": 0,
Expand Down
20 changes: 20 additions & 0 deletions Samples/Resources/Mao/expressions/exp_02.exp3.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
"Value": 1,
"Blend": "Add"
},
{
"Id": "ParamEyeLForm",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeROpen",
"Value": -1.2,
Expand All @@ -28,6 +33,21 @@
"Value": 1,
"Blend": "Add"
},
{
"Id": "ParamEyeRForm",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeBallX",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeBallY",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeBallForm",
"Value": 0,
Expand Down
20 changes: 20 additions & 0 deletions Samples/Resources/Mao/expressions/exp_03.exp3.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeLForm",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeROpen",
"Value": -1.2,
Expand All @@ -28,6 +33,21 @@
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeRForm",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeBallX",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeBallY",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeBallForm",
"Value": 0,
Expand Down
20 changes: 20 additions & 0 deletions Samples/Resources/Mao/expressions/exp_04.exp3.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
"Value": 1,
"Blend": "Add"
},
{
"Id": "ParamEyeLForm",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeROpen",
"Value": 1.2,
Expand All @@ -28,6 +33,21 @@
"Value": 1,
"Blend": "Add"
},
{
"Id": "ParamEyeRForm",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeBallX",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeBallY",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeBallForm",
"Value": 0,
Expand Down
Loading

0 comments on commit 2a2d4f3

Please sign in to comment.