Skip to content

Commit a452b31

Browse files
itoh-at-live2d-comitoh-at-live2d-com
authored
Merge pull request #55 from Live2D/develop
Update to Cubism 5 SDK for Web R1
2 parents cf4a925 + cd42c48 commit a452b31

15 files changed

Lines changed: 1683 additions & 6542 deletions

‎.vscode/launch.json‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,8 @@
55
"type": "chrome",
66
"request": "launch",
77
"name": "Launch Chrome",
8-
"url": "http://localhost:5000/Samples/TypeScript/Demo/",
9-
"webRoot": "${workspaceFolder}",
10-
"sourceMaps": true,
11-
"sourceMapPathOverrides": {
12-
"webpack:///./*": "${workspaceFolder}/Samples/TypeScript/Demo/*",
13-
"webpack:///${workspaceFolder}/Framework/*": "${workspaceFolder}/Framework/*",
14-
},
15-
"trace": true
8+
"url": "http://localhost:5000",
9+
"webRoot": "${workspaceFolder}/Samples/TypeScript/Demo",
1610
}
1711
]
1812
}

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66

77

8+
## [5-r.1] - 2024-03-26
9+
10+
### Changed
11+
12+
* Change development environment from webpack to Vite.
13+
14+
815
## [5-r.1-beta.4] - 2024-01-18
916

1017
### Added
@@ -247,6 +254,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
247254
* Fix issue with reloading model images in WebKit.
248255

249256

257+
[5-r.1]: https://github.com/Live2D/CubismWebSamples/compare/5-r.1-beta.4...5-r.1
250258
[5-r.1-beta.4]: https://github.com/Live2D/CubismWebSamples/compare/5-r.1-beta.3...5-r.1-beta.4
251259
[5-r.1-beta.3]: https://github.com/Live2D/CubismWebSamples/compare/5-r.1-beta.2...5-r.1-beta.3
252260
[5-r.1-beta.2]: https://github.com/Live2D/CubismWebSamples/compare/5-r.1-beta.1...5-r.1-beta.2

‎Core/CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66

77

8+
## 2024-03-26
9+
10+
### Remove
11+
12+
* [Unity] Remove built with Emscripten 1.38.48.
13+
* Unity 2021.2 or later uses only Core under `Assets/Live2D/Cubism/Plugins/Experimental/Emscripten/latest`.
14+
15+
16+
## 2023-09-28
17+
18+
### Remove
19+
20+
* Remove bitcode from IOS build.
21+
22+
823
## 2023-08-17
924

1025
### Added

‎Framework‎

‎README.ja.md‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -83,35 +83,39 @@ NOTE: デバック用の設定は、`.vscode/launch.json` に記述していま
8383

8484
## 変更履歴
8585

86-
当リポジトリの変更履歴については [CHANGELOG.md](CHANGELOG.md) を参照ください。
86+
Samples : [CHANGELOG.md](CHANGELOG.md)
87+
88+
Framework : [CHANGELOG.md](Framework/CHANGELOG.md)
89+
90+
Core : [CHANGELOG.md](Core/CHANGELOG.md)
8791

8892

8993
## 開発環境
9094

9195
### Node.js
9296

93-
* 21.5.0
94-
* 20.11.0
97+
* 21.7.1
98+
* 20.11.1
9599

96100

97101
## 動作確認環境
98102

99103
| プラットフォーム | ブラウザ | バージョン |
100104
| --- | --- | --- |
101-
| Android | Google Chrome | 120.0.6099.210 |
102-
| Android | Microsoft Edge | 120.0.2210.115 |
103-
| Android | Mozilla Firefox | 121.1.0 |
104-
| iOS / iPadOS | Google Chrome | 120.0.6099.119 |
105-
| iOS / iPadOS | Microsoft Edge | 120.0.2210.126 |
106-
| iOS / iPadOS | Mozilla Firefox | 121.2 |
107-
| iOS / iPadOS | Safari | 17.2 |
108-
| macOS | Google Chrome | 120.0.6099.216 |
109-
| macOS | Microsoft Edge | 120.0.2210.121 |
110-
| macOS | Mozilla Firefox | 121.0.1 |
111-
| macOS | Safari | 17.2.1 |
112-
| Windows | Google Chrome | 120.0.6099.217 |
113-
| Windows | Microsoft Edge | 120.0.2210.121 |
114-
| Windows | Mozilla Firefox | 121.0.1 |
105+
| Android | Google Chrome | 122.0.6261.106 |
106+
| Android | Microsoft Edge | 122.0.2365.86 |
107+
| Android | Mozilla Firefox | 123.1.0 |
108+
| iOS / iPadOS | Google Chrome | 122.0.6261.89 |
109+
| iOS / iPadOS | Microsoft Edge | 122.0.2365.86 |
110+
| iOS / iPadOS | Mozilla Firefox | 123.4 |
111+
| iOS / iPadOS | Safari | 17.4 |
112+
| macOS | Google Chrome | 122.0.6261.129 |
113+
| macOS | Microsoft Edge | 122.0.2365.80 |
114+
| macOS | Mozilla Firefox | 123.0.1 |
115+
| macOS | Safari | 17.4 |
116+
| Windows | Google Chrome | 122.0.6261.129 |
117+
| Windows | Microsoft Edge | 122.0.2365.80 |
118+
| Windows | Mozilla Firefox | 123.0.1 |
115119

116120
Note: 動作確認時のサーバの起動は `./Samples/TypeScript/Demo/package.json` の `serve` スクリプトを使用して行っています。
117121

‎README.md‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -84,35 +84,39 @@ NOTE: Settings for debugging are described in `.vscode/launch.json`.
8484

8585
## Changelog
8686

87-
Please refer to [CHANGELOG.md](CHANGELOG.md) for the changelog of this repository.
87+
Samples : [CHANGELOG.md](CHANGELOG.md)
88+
89+
Framework : [CHANGELOG.md](Framework/CHANGELOG.md)
90+
91+
Core : [CHANGELOG.md](Core/CHANGELOG.md)
8892

8993

9094
## Development environment
9195

9296
### Node.js
9397

94-
* 21.5.0
95-
* 20.11.0
98+
* 21.7.1
99+
* 20.11.1
96100

97101

98102
## Operation environment
99103

100104
| Platform | Browser | Version |
101105
| --- | --- | --- |
102-
| Android | Google Chrome | 120.0.6099.210 |
103-
| Android | Microsoft Edge | 120.0.2210.115 |
104-
| Android | Mozilla Firefox | 121.1.0 |
105-
| iOS / iPadOS | Google Chrome | 120.0.6099.119 |
106-
| iOS / iPadOS | Microsoft Edge | 120.0.2210.126 |
107-
| iOS / iPadOS | Mozilla Firefox | 121.2 |
108-
| iOS / iPadOS | Safari | 17.2 |
109-
| macOS | Google Chrome | 120.0.6099.216 |
110-
| macOS | Microsoft Edge | 120.0.2210.121 |
111-
| macOS | Mozilla Firefox | 121.0.1 |
112-
| macOS | Safari | 17.2.1 |
113-
| Windows | Google Chrome | 120.0.6099.217 |
114-
| Windows | Microsoft Edge | 120.0.2210.121 |
115-
| Windows | Mozilla Firefox | 121.0.1 |
106+
| Android | Google Chrome | 122.0.6261.106 |
107+
| Android | Microsoft Edge | 122.0.2365.86 |
108+
| Android | Mozilla Firefox | 123.1.0 |
109+
| iOS / iPadOS | Google Chrome | 122.0.6261.89 |
110+
| iOS / iPadOS | Microsoft Edge | 122.0.2365.86 |
111+
| iOS / iPadOS | Mozilla Firefox | 123.4 |
112+
| iOS / iPadOS | Safari | 17.4 |
113+
| macOS | Google Chrome | 122.0.6261.129 |
114+
| macOS | Microsoft Edge | 122.0.2365.80 |
115+
| macOS | Mozilla Firefox | 123.0.1 |
116+
| macOS | Safari | 17.4 |
117+
| Windows | Google Chrome | 122.0.6261.129 |
118+
| Windows | Microsoft Edge | 122.0.2365.80 |
119+
| Windows | Mozilla Firefox | 123.0.1 |
116120

117121
Note: You can start the server for operation check by running the `serve` script of `./Samples/TypeScript/Demo/package.json`.
118122

‎Samples/TypeScript/Demo/copy_resources.js‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/**
2+
* Copyright(c) Live2D Inc. All rights reserved.
3+
*
4+
* Use of this source code is governed by the Live2D Open Software license
5+
* that can be found at https://www.live2d.com/eula/live2d-open-software-license-agreement_en.html.
6+
*/
7+
8+
"use strict";
9+
const fs = require('fs');
10+
const publicResources = [
11+
{src: '../../../Core', dst: './public/Core'},
12+
{src: '../../Resources', dst: './public/Resources'},
13+
];
14+
15+
publicResources.forEach((e)=>{if (fs.existsSync(e.dst)) fs.rmSync(e.dst, { recursive: true })});
16+
publicResources.forEach((e)=>fs.cpSync(e.src, e.dst, {recursive: true}));

‎Samples/TypeScript/Demo/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
}
1717
</style>
1818
<!-- Live2DCubismCore script -->
19-
<script src = "../../../Core/live2dcubismcore.js"></script>
19+
<script src = "./Core/live2dcubismcore.js"></script>
2020
<!-- Build script -->
21-
<script src = "./dist/bundle.js"></script>
21+
<script src = "./src/main.ts" type="module"></script>
2222
</head>
2323
<body>
2424
</body>

0 commit comments

Comments
 (0)