Merge pull request #40 from Live2D/develop

Cubism 4 SDK for Native R5 beta3
Live2D · Jun 16, 2022 · d3a5810 · d3a5810
2 parents 500fd01 + 68e00b7
commit d3a5810
Show file tree

Hide file tree

Showing 16 changed files with 355 additions and 94 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,16 @@ 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.3] - 2022-06-16
+
+### Fixed
+
+* `GetDrawableTextureIndices` function in `CubismModel` has been renamed to `GetDrawableTextureIndex` because the name was not correct.
+  * `GetDrawableTextureIndices` function is marked as deprecated.
+* Fix physics system behaviour when exists Physics Fps Setting in .physics3.json.
+* Fix force close problem when invalid `physics3.json` is read.
+* Fixed memory leak in Cocos2d-x.
+
 
 ## [4-r.5-beta.2] - 2022-06-02
 
@@ -163,6 +173,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Fix invalid expressions of `CubismCdiJson`.
 
 
+[4-r.5-beta.3]: https://github.com/Live2D/CubismNativeFramework/compare/4-r.5-beta.2...4-r.5-beta.3
 [4-r.5-beta.2]: https://github.com/Live2D/CubismNativeFramework/compare/4-r.5-beta.1...4-r.5-beta.2
 [4-r.5-beta.1]: https://github.com/Live2D/CubismNativeFramework/compare/4-r.4...4-r.5-beta.1
 [4-r.4]: https://github.com/Live2D/CubismNativeFramework/compare/4-r.4-beta.1...4-r.4

diff --git a/src/Model/CubismModel.cpp b/src/Model/CubismModel.cpp
@@ -445,6 +445,11 @@ csmInt32 CubismModel::GetDrawableCount() const
 }
 
 csmInt32 CubismModel::GetDrawableTextureIndices(csmInt32 drawableIndex) const
+{
+    return GetDrawableTextureIndex(drawableIndex);
+}
+
+csmInt32 CubismModel::GetDrawableTextureIndex(csmInt32 drawableIndex) const
 {
     const csmInt32* textureIndices = Core::csmGetDrawableTextureIndices(_model);
     return textureIndices[drawableIndex];

diff --git a/src/Model/CubismModel.hpp b/src/Model/CubismModel.hpp
@@ -341,6 +341,9 @@ class CubismModel
     const csmInt32*     GetDrawableRenderOrders() const;
 
     /**
+     * @deprecated
+     * 関数名が誤っていたため、代替となる getDrawableTextureIndex を追加し、この関数は非推奨となりました。
+     *
      * @brief Drawableのテクスチャインデックスリストの取得
      *
      * Drawableのテクスチャインデックスリストを取得する。
@@ -350,6 +353,16 @@ class CubismModel
      */
     csmInt32            GetDrawableTextureIndices(csmInt32 drawableIndex) const;
 
+    /**
+     * @brief Drawableのテクスチャインデックスリストの取得
+     *
+     * Drawableのテクスチャインデックスを取得する。
+     *
+     * @param[in]   drawableIndex   Drawableのインデックス
+     * @return  Drawableのテクスチャインデックス
+     */
+    csmInt32            GetDrawableTextureIndex(csmInt32 drawableIndex) const;
+
     /**
      * @brief Drawableの頂点インデックスの個数の取得
      *