Merge pull request #8 from Live2D/develop

Update to Cubism 5 SDK for Java R1 beta2

Author: itoh-at-live2d-com

CHANGELOG.md

@@ -4,6 +4,18 @@ 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.2] - 2023-09-28
+
+### Added
+
+* Add final modifier to some private fields in `CubismModel`.
+
+### Changed
+
+* Change getter functions to get some data without `getIdManager` in `CubismModel`.
+* Change some private fields in `CubismModel` to `final` variable.
+
+
 ## [5-r.1-beta.1] - 2023-08-17
 
 ### Added
@@ -122,6 +134,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 * New released!
 
+[5-r.1-beta.2]: https://github.com/Live2D/CubismJavaFramework/compare/5-r.1-beta.1...5-r.1-beta.2
 [5-r.1-beta.1]: https://github.com/Live2D/CubismJavaFramework/compare/4-r.1...5-r.1-beta.1
 [4-r.1]: https://github.com/Live2D/CubismJavaFramework/compare/4-r.1-beta.4...4-r.1
 [4-r.1-beta.4]: https://github.com/Live2D/CubismJavaFramework/compare/4-r.1-beta.3...4-r.1-beta.4

README.ja.md

@@ -104,9 +104,9 @@ Live2Dコミュニティでは、問題のレポートと機能リクエスト
 
 SDKの将来についてのフィードバックにも関心があります。Live2Dコミュニティで提案や機能のリクエストを送信できます。このプロセスをより効果的にするために、それらをより明確に定義するのに役立つより多くの情報を含めるようお願いしています。
 
-## コミュニティ
+## フォーラム
 
-ユーザー同士でCubism SDKの活用方法の提案や質問をしたい場合は、是非コミュニティをご活用ください。
+ユーザー同士でCubism SDKの活用方法の提案や質問をしたい場合は、是非フォーラムをご活用ください。
 
-- [Live2D 公式コミュニティ](https://creatorsforum.live2d.com/)
-- [Live2D community(English)](https://community.live2d.com/)
+- [Live2D 公式クリエイターズフォーラム](https://creatorsforum.live2d.com/)
+- [Live2D Creator's Forum(English)](https://community.live2d.com/)

README.md

@@ -104,9 +104,9 @@ We are regularly checking issue-reports and feature requests at Live2D Community
 
 We're also interested in your feedback for the future of the SDK. You can submit a suggestion or feature request at Live2D Community. To make this process more effective, we're asking that you include more information to help define them more clearly.
 
-## Community
+## Forum
 
-If you want to suggest or ask questions about how to use the Cubism SDK between users, please use the community.
+If you want to suggest or ask questions about how to use the Cubism SDK between users, please use the forum.
 
-- [Live2D community](https://community.live2d.com/)
-- [Live2D 公式コミュニティ (Japanese)](https://creatorsforum.live2d.com/)
+- [Live2D Creator's Forum](https://community.live2d.com/)
+- [Live2D 公式クリエイターズフォーラム (Japanese)](https://creatorsforum.live2d.com/)

framework/src/main/java/com/live2d/sdk/cubism/framework/model/CubismModel.java

@@ -267,8 +267,8 @@ public int getPartIndex(CubismId partId) {
      * @return パーツのID
      */
     public CubismId getPartId(int partIndex){
-        String partId = model.getPartViews()[partIndex].getId();
-        return CubismFramework.getIdManager().getId(partId);
+        assert (0 <= partIndex && partIndex < partIds.size());
+        return partIds.get(partIndex);
     }
 
     /**
@@ -395,7 +395,8 @@ public int getParameterIndex(CubismId parameterId) {
      * @return パラメータのID
      */
     public CubismId getParameterId(int parameterIndex) {
-        return CubismFramework.getIdManager().getId(parameterIds.get(parameterIndex));
+        assert (0 <= parameterIndex && parameterIndex < parameterIds.size());
+        return parameterIds.get(parameterIndex);
     }
 
     /**
@@ -669,8 +670,8 @@ public int getDrawableCount() {
      * @return Drawable ID
      */
     public CubismId getDrawableId(int drawableIndex) {
-        final String drawableId = model.getDrawableViews()[drawableIndex].getId();
-        return CubismFramework.getIdManager().getId(drawableId);
+        assert (0 <= drawableIndex && drawableIndex < drawableIds.size());
+        return drawableIds.get(drawableIndex);
     }
 
     /**
@@ -1573,9 +1574,9 @@ private void setOverwriteColorsForPartColors(
      */
     private float modelOpacity = 1.0f;
 
-    private List<CubismId> parameterIds = new ArrayList<CubismId>();
-    private List<CubismId> partIds = new ArrayList<CubismId>();
-    private List<CubismId> drawableIds = new ArrayList<CubismId>();
+    private final List<CubismId> parameterIds = new ArrayList<>();
+    private final List<CubismId> partIds = new ArrayList<>();
+    private final List<CubismId> drawableIds = new ArrayList<>();
 
     /**
      * Drawableの乗算色のリスト