sunyu
/
live2demo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Cubism 4 SDK for Web R5 beta5

translate
wada 2022-08-04 11:20:51 +09:00
parent 328f0718d0
commit 2a2d4f34c6
24 changed files with 1927 additions and 1940 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CHANGELOG.md
View File

@ -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
@ -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

7
Core/CHANGELOG.md
View File

@ -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

2
Framework

@ -1 +1 @@
Subproject commit 4e14ef622de211092a4d096375024ac1b20c780a
Subproject commit e115df6e1e7a190ecdd7795c15ef222254fb193c

14
README.md
View File

@ -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` スクリプトを使用して行っています。

44
Samples/Resources/Mao/Mao.cdi3.json
View File

@ -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　手首の回転"
},
@ -232,7 +232,7 @@
"Name": "杖の回転"
},
{
"Id": "ParamHandAR",
"Id": "ParamHandRA",
"GroupId": "ParamGroupArmRA",
"Name": "右手A"
},
@ -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"
},
@ -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"
},
@ -437,7 +437,7 @@
"Name": "爆発光溜め"
},
{
"Id": "Param",
"Id": "ParamExplosionOn",
"GroupId": "ParamGroupEffectsMistake",
"Name": "爆発　表示"
},
@ -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"
},
{

BIN
Samples/Resources/Mao/Mao.moc3
View File

Binary file not shown.

8
Samples/Resources/Mao/Mao.pose3.json
View File

@ -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": []
}
]

20
Samples/Resources/Mao/expressions/exp_01.exp3.json
View File

@ -18,6 +18,11 @@
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeLForm",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeROpen",
"Value": 0,
@ -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,

20
Samples/Resources/Mao/expressions/exp_02.exp3.json
View File

@ -18,6 +18,11 @@
"Value": 1,
"Blend": "Add"
},
{
"Id": "ParamEyeLForm",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeROpen",
"Value": -1.2,
@ -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,

20
Samples/Resources/Mao/expressions/exp_03.exp3.json
View File

@ -18,6 +18,11 @@
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeLForm",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeROpen",
"Value": -1.2,
@ -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,

20
Samples/Resources/Mao/expressions/exp_04.exp3.json
View File

@ -18,6 +18,11 @@
"Value": 1,
"Blend": "Add"
},
{
"Id": "ParamEyeLForm",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeROpen",
"Value": 1.2,
@ -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,

20
Samples/Resources/Mao/expressions/exp_05.exp3.json
View File

@ -18,6 +18,11 @@
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeLForm",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeROpen",
"Value": 0,
@ -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,

20
Samples/Resources/Mao/expressions/exp_06.exp3.json
View File

@ -18,6 +18,11 @@
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeLForm",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeROpen",
"Value": 0,
@ -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,

20
Samples/Resources/Mao/expressions/exp_07.exp3.json
View File

@ -18,6 +18,11 @@
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeLForm",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeROpen",
"Value": 1.2,
@ -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": -1,

18
Samples/Resources/Mao/expressions/exp_08.exp3.json
View File

@ -10,8 +10,8 @@
},
{
"Id": "ParamEyeLOpen",
"Value": 1,
"Blend": "Multiply"
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeLSmile",
@ -25,8 +25,8 @@
},
{
"Id": "ParamEyeROpen",
"Value": 1,
"Blend": "Multiply"
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeRSmile",
@ -38,6 +38,16 @@
"Value": 1,
"Blend": "Add"
},
{
"Id": "ParamEyeBallX",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeBallY",
"Value": 0,
"Blend": "Add"
},
{
"Id": "ParamEyeBallForm",
"Value": 0,

44
Samples/Resources/Mao/motions/mtn_01.motion3.json
View File

@ -845,7 +845,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAL01",
"Id": "ParamArmLA01",
"FadeInTime": 1.0,
"FadeOutTime": 1.0,
"Segments": [
@ -890,7 +890,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAL02",
"Id": "ParamArmLA02",
"FadeInTime": 1.0,
"FadeOutTime": 1.0,
"Segments": [
@ -942,7 +942,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAL03",
"Id": "ParamArmLA03",
"FadeInTime": 1.0,
"FadeOutTime": 1.0,
"Segments": [
@ -959,7 +959,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandAL",
"Id": "ParamHandLA",
"FadeInTime": 1.0,
"FadeOutTime": 1.0,
"Segments": [
@ -976,7 +976,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAR01",
"Id": "ParamArmRA01",
"FadeInTime": 1.0,
"FadeOutTime": 1.0,
"Segments": [
@ -1021,7 +1021,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAR02",
"Id": "ParamArmRA02",
"FadeInTime": 1.0,
"FadeOutTime": 1.0,
"Segments": [
@ -1073,7 +1073,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAR03",
"Id": "ParamArmRA03",
"FadeInTime": 1.0,
"FadeOutTime": 1.0,
"Segments": [
@ -1107,7 +1107,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandAR",
"Id": "ParamHandRA",
"FadeInTime": 1.0,
"FadeOutTime": 1.0,
"Segments": [
@ -1285,7 +1285,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBL01",
"Id": "ParamArmLB01",
"FadeInTime": 1.0,
"FadeOutTime": 1.0,
"Segments": [
@ -1298,7 +1298,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBL02",
"Id": "ParamArmLB02",
"FadeInTime": 1.0,
"FadeOutTime": 1.0,
"Segments": [
@ -1311,7 +1311,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBL03",
"Id": "ParamArmLB03",
"FadeInTime": 1.0,
"FadeOutTime": 1.0,
"Segments": [
@ -1324,7 +1324,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandBL",
"Id": "ParamHandLB",
"FadeInTime": 1.0,
"FadeOutTime": 1.0,
"Segments": [
@ -1350,7 +1350,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR01",
"Id": "ParamArmRB01",
"FadeInTime": 1.0,
"FadeOutTime": 1.0,
"Segments": [
@ -1363,7 +1363,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR02",
"Id": "ParamArmRB02",
"FadeInTime": 1.0,
"FadeOutTime": 1.0,
"Segments": [
@ -1376,7 +1376,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR02Y",
"Id": "ParamArmRB02Y",
"FadeInTime": 1.0,
"FadeOutTime": 1.0,
"Segments": [
@ -1389,7 +1389,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR03",
"Id": "ParamArmRB03",
"FadeInTime": 1.0,
"FadeOutTime": 1.0,
"Segments": [
@ -1402,7 +1402,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandBR",
"Id": "ParamHandRB",
"FadeInTime": 1.0,
"FadeOutTime": 1.0,
"Segments": [
@ -1766,7 +1766,7 @@
},
{
"Target": "Parameter",
"Id": "Param",
"Id": "ParamExplosionOn",
"Segments": [
0,
0,
@ -2089,7 +2089,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmAL",
"Id": "PartArmLA",
"Segments": [
0,
1,
@ -2100,7 +2100,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmAR",
"Id": "PartArmRA",
"Segments": [
0,
1,
@ -2111,7 +2111,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmBL",
"Id": "PartArmLB",
"Segments": [
0,
0,
@ -2122,7 +2122,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmBR",
"Id": "PartArmRB",
"Segments": [
0,
0,

44
Samples/Resources/Mao/motions/mtn_02.motion3.json
View File

@ -767,7 +767,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAL01",
"Id": "ParamArmLA01",
"Segments": [
0,
0,
@ -876,7 +876,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAL02",
"Id": "ParamArmLA02",
"Segments": [
0,
0,
@ -950,7 +950,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAL03",
"Id": "ParamArmLA03",
"Segments": [
0,
0,
@ -1031,7 +1031,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandAL",
"Id": "ParamHandLA",
"Segments": [
0,
0,
@ -1056,7 +1056,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAR01",
"Id": "ParamArmRA01",
"Segments": [
0,
0,
@ -1165,7 +1165,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAR02",
"Id": "ParamArmRA02",
"Segments": [
0,
0,
@ -1239,7 +1239,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAR03",
"Id": "ParamArmRA03",
"Segments": [
0,
0,
@ -1331,7 +1331,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandAR",
"Id": "ParamHandRA",
"Segments": [
0,
0,
@ -1389,7 +1389,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBL01",
"Id": "ParamArmLB01",
"Segments": [
0,
0,
@ -1400,7 +1400,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBL02",
"Id": "ParamArmLB02",
"Segments": [
0,
0,
@ -1411,7 +1411,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBL03",
"Id": "ParamArmLB03",
"Segments": [
0,
0,
@ -1422,7 +1422,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandBL",
"Id": "ParamHandLB",
"Segments": [
0,
0,
@ -1444,7 +1444,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR01",
"Id": "ParamArmRB01",
"Segments": [
0,
0,
@ -1455,7 +1455,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR02",
"Id": "ParamArmRB02",
"Segments": [
0,
0,
@ -1466,7 +1466,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR02Y",
"Id": "ParamArmRB02Y",
"Segments": [
0,
0,
@ -1477,7 +1477,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR03",
"Id": "ParamArmRB03",
"Segments": [
0,
0,
@ -1488,7 +1488,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandBR",
"Id": "ParamHandRB",
"Segments": [
0,
0,
@ -1796,7 +1796,7 @@
},
{
"Target": "Parameter",
"Id": "Param",
"Id": "ParamExplosionOn",
"Segments": [
0,
0,
@ -2071,7 +2071,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmAL",
"Id": "PartArmLA",
"Segments": [
0,
1,
@ -2082,7 +2082,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmAR",
"Id": "PartArmRA",
"Segments": [
0,
1,
@ -2093,7 +2093,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmBL",
"Id": "PartArmLB",
"Segments": [
0,
0,
@ -2104,7 +2104,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmBR",
"Id": "PartArmRB",
"Segments": [
0,
0,

44
Samples/Resources/Mao/motions/mtn_03.motion3.json
View File

@ -917,7 +917,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAL01",
"Id": "ParamArmLA01",
"Segments": [
0,
0,
@ -970,7 +970,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAL02",
"Id": "ParamArmLA02",
"Segments": [
0,
0,
@ -1009,7 +1009,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAL03",
"Id": "ParamArmLA03",
"Segments": [
0,
0,
@ -1027,7 +1027,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandAL",
"Id": "ParamHandLA",
"Segments": [
0,
0,
@ -1038,7 +1038,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAR01",
"Id": "ParamArmRA01",
"Segments": [
0,
0,
@ -1084,7 +1084,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAR02",
"Id": "ParamArmRA02",
"Segments": [
0,
0,
@ -1123,7 +1123,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAR03",
"Id": "ParamArmRA03",
"Segments": [
0,
0,
@ -1194,7 +1194,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandAR",
"Id": "ParamHandRA",
"Segments": [
0,
0,
@ -1238,7 +1238,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBL01",
"Id": "ParamArmLB01",
"Segments": [
0,
0,
@ -1249,7 +1249,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBL02",
"Id": "ParamArmLB02",
"Segments": [
0,
0,
@ -1260,7 +1260,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBL03",
"Id": "ParamArmLB03",
"Segments": [
0,
0,
@ -1271,7 +1271,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandBL",
"Id": "ParamHandLB",
"Segments": [
0,
0,
@ -1293,7 +1293,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR01",
"Id": "ParamArmRB01",
"Segments": [
0,
0,
@ -1304,7 +1304,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR02",
"Id": "ParamArmRB02",
"Segments": [
0,
0,
@ -1315,7 +1315,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR02Y",
"Id": "ParamArmRB02Y",
"Segments": [
0,
0,
@ -1326,7 +1326,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR03",
"Id": "ParamArmRB03",
"Segments": [
0,
0,
@ -1337,7 +1337,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandBR",
"Id": "ParamHandRB",
"Segments": [
0,
0,
@ -1666,7 +1666,7 @@
},
{
"Target": "Parameter",
"Id": "Param",
"Id": "ParamExplosionOn",
"Segments": [
0,
0,
@ -1941,7 +1941,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmAL",
"Id": "PartArmLA",
"Segments": [
0,
1,
@ -1952,7 +1952,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmAR",
"Id": "PartArmRA",
"Segments": [
0,
1,
@ -1963,7 +1963,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmBL",
"Id": "PartArmLB",
"Segments": [
0,
0,
@ -1974,7 +1974,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmBR",
"Id": "PartArmRB",
"Segments": [
0,
0,

44
Samples/Resources/Mao/motions/mtn_04.motion3.json
View File

@ -1131,7 +1131,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAL01",
"Id": "ParamArmLA01",
"Segments": [
0,
0,
@ -1142,7 +1142,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAL02",
"Id": "ParamArmLA02",
"Segments": [
0,
0,
@ -1153,7 +1153,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAL03",
"Id": "ParamArmLA03",
"Segments": [
0,
0,
@ -1164,7 +1164,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandAL",
"Id": "ParamHandLA",
"Segments": [
0,
0,
@ -1175,7 +1175,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAR01",
"Id": "ParamArmRA01",
"Segments": [
0,
0,
@ -1242,7 +1242,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAR02",
"Id": "ParamArmRA02",
"Segments": [
0,
0,
@ -1302,7 +1302,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAR03",
"Id": "ParamArmRA03",
"Segments": [
0,
0,
@ -1359,7 +1359,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandAR",
"Id": "ParamHandRA",
"Segments": [
0,
0,
@ -1417,7 +1417,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBL01",
"Id": "ParamArmLB01",
"Segments": [
0,
0,
@ -1498,7 +1498,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBL02",
"Id": "ParamArmLB02",
"Segments": [
0,
0,
@ -1572,7 +1572,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBL03",
"Id": "ParamArmLB03",
"Segments": [
0,
0,
@ -1646,7 +1646,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandBL",
"Id": "ParamHandLB",
"Segments": [
0,
0,
@ -1752,7 +1752,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR01",
"Id": "ParamArmRB01",
"Segments": [
0,
0,
@ -1763,7 +1763,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR02",
"Id": "ParamArmRB02",
"Segments": [
0,
0,
@ -1774,7 +1774,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR02Y",
"Id": "ParamArmRB02Y",
"Segments": [
0,
0,
@ -1785,7 +1785,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR03",
"Id": "ParamArmRB03",
"Segments": [
0,
0,
@ -1796,7 +1796,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandBR",
"Id": "ParamHandRB",
"Segments": [
0,
0,
@ -2125,7 +2125,7 @@
},
{
"Target": "Parameter",
"Id": "Param",
"Id": "ParamExplosionOn",
"Segments": [
0,
0,
@ -2400,7 +2400,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmAL",
"Id": "PartArmLA",
"Segments": [
0,
0,
@ -2411,7 +2411,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmAR",
"Id": "PartArmRA",
"Segments": [
0,
1,
@ -2422,7 +2422,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmBL",
"Id": "PartArmLB",
"Segments": [
0,
1,
@ -2433,7 +2433,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmBR",
"Id": "PartArmRB",
"Segments": [
0,
0,

44
Samples/Resources/Mao/motions/special_01.motion3.json
View File

@ -1302,7 +1302,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAL01",
"Id": "ParamArmLA01",
"Segments": [
0,
0,
@ -1397,7 +1397,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAL02",
"Id": "ParamArmLA02",
"Segments": [
0,
0,
@ -1478,7 +1478,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAL03",
"Id": "ParamArmLA03",
"Segments": [
0,
0,
@ -1538,7 +1538,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandAL",
"Id": "ParamHandLA",
"Segments": [
0,
0,
@ -1549,7 +1549,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAR01",
"Id": "ParamArmRA01",
"Segments": [
0,
0,
@ -1560,7 +1560,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAR02",
"Id": "ParamArmRA02",
"Segments": [
0,
0,
@ -1571,7 +1571,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAR03",
"Id": "ParamArmRA03",
"Segments": [
0,
0,
@ -1593,7 +1593,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandAR",
"Id": "ParamHandRA",
"Segments": [
0,
0,
@ -1637,7 +1637,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBL01",
"Id": "ParamArmLB01",
"Segments": [
0,
0,
@ -1648,7 +1648,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBL02",
"Id": "ParamArmLB02",
"Segments": [
0,
0,
@ -1659,7 +1659,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBL03",
"Id": "ParamArmLB03",
"Segments": [
0,
0,
@ -1670,7 +1670,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandBL",
"Id": "ParamHandLB",
"Segments": [
0,
0,
@ -1692,7 +1692,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR01",
"Id": "ParamArmRB01",
"Segments": [
0,
0,
@ -1801,7 +1801,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR02",
"Id": "ParamArmRB02",
"Segments": [
0,
0,
@ -1910,7 +1910,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR02Y",
"Id": "ParamArmRB02Y",
"Segments": [
0,
0,
@ -2005,7 +2005,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR03",
"Id": "ParamArmRB03",
"Segments": [
0,
0,
@ -2107,7 +2107,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandBR",
"Id": "ParamHandRB",
"Segments": [
0,
0,
@ -2464,7 +2464,7 @@
},
{
"Target": "Parameter",
"Id": "Param",
"Id": "ParamExplosionOn",
"Segments": [
0,
0,
@ -3167,7 +3167,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmAL",
"Id": "PartArmLA",
"Segments": [
0,
1,
@ -3178,7 +3178,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmAR",
"Id": "PartArmRA",
"Segments": [
0,
0,
@ -3189,7 +3189,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmBL",
"Id": "PartArmLB",
"Segments": [
0,
0,
@ -3200,7 +3200,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmBR",
"Id": "PartArmRB",
"Segments": [
0,
1,

44
Samples/Resources/Mao/motions/special_02.motion3.json
View File

@ -2041,7 +2041,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAL01",
"Id": "ParamArmLA01",
"Segments": [
0,
0,
@ -2150,7 +2150,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAL02",
"Id": "ParamArmLA02",
"Segments": [
0,
0,
@ -2245,7 +2245,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAL03",
"Id": "ParamArmLA03",
"Segments": [
0,
0,
@ -2326,7 +2326,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandAL",
"Id": "ParamHandLA",
"Segments": [
0,
0,
@ -2337,7 +2337,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAR01",
"Id": "ParamArmRA01",
"Segments": [
0,
0,
@ -2348,7 +2348,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAR02",
"Id": "ParamArmRA02",
"Segments": [
0,
0,
@ -2359,7 +2359,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmAR03",
"Id": "ParamArmRA03",
"Segments": [
0,
0,
@ -2381,7 +2381,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandAR",
"Id": "ParamHandRA",
"Segments": [
0,
0,
@ -2425,7 +2425,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBL01",
"Id": "ParamArmLB01",
"Segments": [
0,
0,
@ -2436,7 +2436,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBL02",
"Id": "ParamArmLB02",
"Segments": [
0,
0,
@ -2447,7 +2447,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBL03",
"Id": "ParamArmLB03",
"Segments": [
0,
0,
@ -2458,7 +2458,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandBL",
"Id": "ParamHandLB",
"Segments": [
0,
0,
@ -2480,7 +2480,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR01",
"Id": "ParamArmRB01",
"Segments": [
0,
0,
@ -2603,7 +2603,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR02",
"Id": "ParamArmRB02",
"Segments": [
0,
0,
@ -2740,7 +2740,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR02Y",
"Id": "ParamArmRB02Y",
"Segments": [
0,
0,
@ -2818,7 +2818,7 @@
},
{
"Target": "Parameter",
"Id": "ParamArmBR03",
"Id": "ParamArmRB03",
"Segments": [
0,
0,
@ -2941,7 +2941,7 @@
},
{
"Target": "Parameter",
"Id": "ParamHandBR",
"Id": "ParamHandRB",
"Segments": [
0,
0,
@ -3467,7 +3467,7 @@
},
{
"Target": "Parameter",
"Id": "Param",
"Id": "ParamExplosionOn",
"Segments": [
0,
0,
@ -3984,7 +3984,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmAL",
"Id": "PartArmLA",
"Segments": [
0,
1,
@ -3995,7 +3995,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmAR",
"Id": "PartArmRA",
"Segments": [
0,
0,
@ -4006,7 +4006,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmBL",
"Id": "PartArmLB",
"Segments": [
0,
0,
@ -4017,7 +4017,7 @@
},
{
"Target": "PartOpacity",
"Id": "PartArmBR",
"Id": "PartArmRB",
"Segments": [
0,
1,

3328
Samples/TypeScript/Demo/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

22
Samples/TypeScript/Demo/package.json
View File

@ -11,19 +11,19 @@
"clean": "rimraf dist"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^5.23.0",
"@typescript-eslint/parser": "^5.23.0",
"eslint": "^8.15.0",
"@typescript-eslint/eslint-plugin": "^5.31.0",
"@typescript-eslint/parser": "^5.31.0",
"eslint": "^8.20.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-prettier": "^4.0.0",
"prettier": "^2.6.2",
"eslint-plugin-prettier": "^4.2.1",
"prettier": "^2.7.1",
"rimraf": "^3.0.2",
"serve": "^13.0.2",
"ts-loader": "^9.3.0",
"typescript": "^4.6.4",
"webpack": "^5.72.1",
"webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.9.0"
"serve": "^14.0.1",
"ts-loader": "^9.3.1",
"typescript": "^4.7.4",
"webpack": "^5.74.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.9.3"
},
"dependencies": {
"whatwg-fetch": "^3.6.2"

8
Samples/TypeScript/Demo/src/lappmodel.ts
View File

@ -32,7 +32,7 @@ import { csmMap } from '@framework/type/csmmap';
import { csmRect } from '@framework/type/csmrectf';
import { csmString } from '@framework/type/csmstring';
import { csmVector } from '@framework/type/csmvector';
import { CubismLogInfo } from '@framework/utils/cubismdebug';
import { CubismLogError, CubismLogInfo } from '@framework/utils/cubismdebug';
import * as LAppDefine from './lappdefine';
import { canvas, frameBuffer, gl, LAppDelegate } from './lappdelegate';
@ -326,6 +326,12 @@ export class LAppModel extends CubismUserModel {
// Layout
const setupLayout = (): void => {
const layout: csmMap<string, number> = new csmMap<string, number>();
if (this._modelSetting == null || this._modelMatrix == null) {
CubismLogError('Failed to setupLayout().');
return;
}
this._modelSetting.getLayoutMap(layout);
this._modelMatrix.setupFromLayout(layout);
this._state = LoadStep.LoadMotion;