Merge pull request #24 from Live2D/develop

Update to Cubism 5 SDK for Web R1 beta3

Author: itoh-at-live2d-com

CHANGELOG.md

@@ -5,6 +5,9 @@ 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-beta.3] - 2023-11-30
+
+
 ## [5-r.1-beta.2] - 2023-09-28
 
 ### Added
@@ -215,6 +218,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Reformat code using Prettier and ESLint.
 
 
+[5-r.1-beta.3]: https://github.com/Live2D/CubismWebFramework/compare/5-r.1-beta.2...5-r.1-beta.3
 [5-r.1-beta.2]: https://github.com/Live2D/CubismWebFramework/compare/5-r.1-beta.1...5-r.1-beta.2
 [5-r.1-beta.1]: https://github.com/Live2D/CubismWebFramework/compare/4-r.7...5-r.1-beta.1
 [4-r.7]: https://github.com/Live2D/CubismWebFramework/compare/4-r.6.2...4-r.7

README.ja.md

@@ -30,13 +30,13 @@ Cubism 5 Editorに搭載された新機能のSDK対応については [こちら
 
 ### Node.js
 
-* 20.7.0
-* 18.18.0
+* 21.2.0
+* 20.10.0
 
 
 ### TypeScript
 
-5.2.2
+5.3.2
 
 
 ## 開発環境構築

README.md

@@ -30,12 +30,12 @@ For compatibility with previous versions of Cubism SDK, please refer to [here](h
 
 ### Node.js
 
-* 20.7.0
-* 18.18.0
+* 21.2.0
+* 20.10.0
 
 ### TypeScript
 
-5.2.2
+5.3.2
 
 
 ## Development environment construction

package-lock.json

@@ -8,13 +8,13 @@
     "clean": "rimraf dist"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^6.7.2",
-    "@typescript-eslint/parser": "^6.7.2",
-    "eslint": "^8.49.0",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
+    "@typescript-eslint/parser": "^6.12.0",
+    "eslint": "^8.54.0",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "prettier": "^3.0.3",
-    "rimraf": "^5.0.1",
-    "typescript": "^5.2.2"
+    "eslint-plugin-prettier": "^5.0.1",
+    "prettier": "^3.1.0",
+    "rimraf": "^5.0.5",
+    "typescript": "^5.3.2"
   }
 }

package.json

@@ -87,8 +87,9 @@ export class CubismEyeBlink {
     this._userTimeSeconds += deltaTimeSeconds;
     let parameterValue: number;
     let t = 0.0;
+    const blinkingState: EyeState = this._blinkingState;
 
-    switch (this._blinkingState) {
+    switch (blinkingState) {
       case EyeState.EyeState_Closing:
         t =
           (this._userTimeSeconds - this._stateStartTimeSeconds) /

src/effect/cubismeyeblink.ts

@@ -1225,10 +1225,10 @@ export class CubismModel {
     )
       ? CubismBlendMode.CubismBlendMode_Additive
       : Live2DCubismCore.Utils.hasBlendMultiplicativeBit(
-          constantFlags[drawableIndex]
-        )
-      ? CubismBlendMode.CubismBlendMode_Multiplicative
-      : CubismBlendMode.CubismBlendMode_Normal;
+            constantFlags[drawableIndex]
+          )
+        ? CubismBlendMode.CubismBlendMode_Multiplicative
+        : CubismBlendMode.CubismBlendMode_Normal;
   }
 
   /**

src/model/cubismmodel.ts

@@ -844,7 +844,9 @@ export class CubismMotion extends ACubismMotion {
           curveCount,
           segmentPosition
         );
-        switch (segment) {
+
+        const segmentType: CubismMotionSegmentType = segment;
+        switch (segmentType) {
           case CubismMotionSegmentType.CubismMotionSegmentType_Linear: {
             this._motionData.segments.at(totalSegmentCount).segmentType =
               CubismMotionSegmentType.CubismMotionSegmentType_Linear;