Skip to content

Commit 2d3596a

Browse files
Merge pull request #26 from Live2D/develop
Update to Cubism 5 SDK for Web R1
2 parents 8fd172c + ac5eb9e commit 2d3596a

24 files changed

+630
-445
lines changed

.eslintrc.yml

Lines changed: 64 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,83 @@ rules:
2323
format:
2424
- camelCase
2525
- selector: variable
26+
format:
27+
custom: {
28+
# 指定の文字列で始まるものと特定の文字を含むものは許容
29+
regex: '^[A-Z]|^csm|^iterator|Shader',
30+
match: true
31+
}
32+
modifiers: ['exported','const']
33+
- selector: variable
34+
format:
35+
- camelCase
36+
- selector: variable
37+
format:
38+
custom: {
39+
# 指定の文字列で始まるものは許容
40+
regex: '^[A-Z]|^s_',
41+
match: true
42+
}
43+
modifiers: ['global']
44+
- selector: enum
45+
format:
46+
- PascalCase
47+
- selector: enumMember
48+
format:
49+
custom: {
50+
# 大文字から始まること
51+
regex: '^[A-Z]',
52+
match: true
53+
}
54+
- selector: classProperty
55+
format:
56+
- PascalCase
57+
modifiers: ['static','readonly']
58+
- selector: classProperty
2659
format:
2760
- camelCase
28-
- UPPER_CASE
2961
leadingUnderscore: allow
30-
trailingUnderscore: allow
3162
- selector: class
3263
format:
64+
custom: {
65+
# 指定の文字列で始まるか、指定の文字列で終わること
66+
regex: '^[A-Z]|^csm|^iterator|_WebGL$',
67+
match: true
68+
}
69+
- selector: interface
70+
format:
71+
- camelCase
3372
- PascalCase
34-
trailingUnderscore: allow
3573
- selector: parameter
3674
format:
3775
- camelCase
38-
leadingUnderscore: allow
39-
- selector: memberLike
40-
modifiers:
41-
- private
76+
- selector: classMethod
4277
format:
4378
- camelCase
44-
leadingUnderscore: require
45-
- selector: typeLike
79+
- selector: objectLiteralProperty
4680
format:
81+
- camelCase
4782
- PascalCase
83+
- selector: typeAlias
84+
format:
85+
custom: {
86+
# 指定の文字列で始まるものは許容
87+
regex: '^[A-Z]|^[a-z]|^CSM_|^csm|^iterator',
88+
match: true
89+
}
90+
modifiers: ['exported']
91+
- selector: typeAlias
92+
format:
93+
- camelCase
94+
- selector: typeParameter
95+
format:
96+
custom: {
97+
# 「大文字+アンダースコア以外の文字」、あるいは「大文字1文字」
98+
# あるいは、「`T`+アンダースコア」で始まる場合
99+
regex: '^[A-Z][^_]|^[A-Z]|^T_$',
100+
match: true
101+
}
102+
leadingUnderscore: allow
48103
'@typescript-eslint/no-use-before-define': off
49104
no-empty-function: off
50105
'@typescript-eslint/no-empty-function':

CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,32 @@ 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+
### Added
11+
12+
* Add function `mod()` to compute floating-point remainder in `CubismMath` class.
13+
14+
### Changed
15+
16+
* Change the weight value in `Expression` from `CubismExpressionMotion` to have it in the `CubismExpressionMotionManager`.
17+
* Reorganize the names of some functions and variables.
18+
* This is a change that depends on fixing `eslintrc.yml`.
19+
* Change to output log if the argument `motionQueueEntry` is `null` in the `updateFadeWeight()` function of the `ACubismMotion` class.
20+
21+
### Fixed
22+
23+
* Fix `eslintrc.yml` to conform to the exact wording.
24+
25+
### Deprecated
26+
27+
* Deprecate the `_fadeWeight` variable and the `getFadeWeight()` function of the `CubismExpressionMotion` class.
28+
* The `_fadeWeight` variable of the `CubismExpressionMotion` class can cause problems.
29+
* Please use the `getFadeWeight()` function of the `CubismExpressionMotionManager` class with one argument from now on.
30+
* The `startMotion()` function of the `CubismMotionQueueManager` class with the unnecessary third argument `userTimeSeconds` is deprecated.
31+
* Please use the `startMotion()` function with one arguments from now on.
32+
33+
834
## [5-r.1-beta.4] - 2024-01-18
935

1036
### Changed
@@ -230,6 +256,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
230256
* Reformat code using Prettier and ESLint.
231257

232258

259+
[5-r.1]: https://github.com/Live2D/CubismWebFramework/compare/5-r.1-beta.4...5-r.1
233260
[5-r.1-beta.4]: https://github.com/Live2D/CubismWebFramework/compare/5-r.1-beta.3...5-r.1-beta.4
234261
[5-r.1-beta.3]: https://github.com/Live2D/CubismWebFramework/compare/5-r.1-beta.2...5-r.1-beta.3
235262
[5-r.1-beta.2]: https://github.com/Live2D/CubismWebFramework/compare/5-r.1-beta.1...5-r.1-beta.2

README.ja.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ Cubism 5 Editorに搭載された新機能のSDK対応については [こちら
3030

3131
### Node.js
3232

33-
* 21.5.0
34-
* 20.11.0
33+
* 21.7.1
34+
* 20.11.1
3535

3636

3737
### TypeScript
3838

39-
5.3.3
39+
5.4.2
4040

4141

4242
## 開発環境構築
@@ -153,7 +153,7 @@ JSONパーサーやログ出力などのユーティリティ機能を提供し
153153

154154
### フォークとプルリクエスト
155155

156-
修正、改善、さらには新機能をもたらすかどうかにかかわらず、プルリクエストに感謝します。ただし、ラッパーは可能な限り軽量で浅くなるように設計されているため、バグ修正とメモリ/パフォーマンスの改善のみを行う必要があることに注意してください。メインリポジトリを可能な限りクリーンに保つために、必要に応じて個人用フォークと機能ブランチを作成してください。
156+
修正、改善、さらには新機能をもたらすかどうかにかかわらず、プルリクエストに感謝します。メインリポジトリを可能な限りクリーンに保つために、必要に応じて個人用フォークと機能ブランチを作成してください。
157157

158158
### バグ
159159

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ For compatibility with previous versions of Cubism SDK, please refer to [here](h
3030

3131
### Node.js
3232

33-
* 21.5.0
34-
* 20.11.0
33+
* 21.7.1
34+
* 20.11.1
3535

3636

3737
### TypeScript
3838

39-
5.3.3
39+
5.4.2
4040

4141

4242
## Development environment construction
@@ -153,7 +153,7 @@ There are many ways to contribute to the project: logging bugs, submitting pull
153153

154154
### Forking And Pull Requests
155155

156-
We very much appreciate your pull requests, whether they bring fixes, improvements, or even new features. Note, however, that the wrapper is designed to be as lightweight and shallow as possible and should therefore only be subject to bug fixes and memory/performance improvements. To keep the main repository as clean as possible, create a personal fork and feature branches there as needed.
156+
We very much appreciate your pull requests, whether they bring fixes, improvements, or even new features. To keep the main repository as clean as possible, create a personal fork and feature branches there as needed.
157157

158158
### Bugs
159159

0 commit comments

Comments
 (0)