Skip to content

Commit 68e00b7

Browse files
Update to Cubism 4 SDK for Native R5 beta3
1 parent 15bb611 commit 68e00b7

16 files changed

+355
-94
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66

7+
## [4-r.5-beta.3] - 2022-06-16
8+
9+
### Fixed
10+
11+
* `GetDrawableTextureIndices` function in `CubismModel` has been renamed to `GetDrawableTextureIndex` because the name was not correct.
12+
* `GetDrawableTextureIndices` function is marked as deprecated.
13+
* Fix physics system behaviour when exists Physics Fps Setting in .physics3.json.
14+
* Fix force close problem when invalid `physics3.json` is read.
15+
* Fixed memory leak in Cocos2d-x.
16+
717

818
## [4-r.5-beta.2] - 2022-06-02
919

@@ -163,6 +173,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
163173
* Fix invalid expressions of `CubismCdiJson`.
164174

165175

176+
[4-r.5-beta.3]: https://github.com/Live2D/CubismNativeFramework/compare/4-r.5-beta.2...4-r.5-beta.3
166177
[4-r.5-beta.2]: https://github.com/Live2D/CubismNativeFramework/compare/4-r.5-beta.1...4-r.5-beta.2
167178
[4-r.5-beta.1]: https://github.com/Live2D/CubismNativeFramework/compare/4-r.4...4-r.5-beta.1
168179
[4-r.4]: https://github.com/Live2D/CubismNativeFramework/compare/4-r.4-beta.1...4-r.4

src/Model/CubismModel.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,11 @@ csmInt32 CubismModel::GetDrawableCount() const
445445
}
446446

447447
csmInt32 CubismModel::GetDrawableTextureIndices(csmInt32 drawableIndex) const
448+
{
449+
return GetDrawableTextureIndex(drawableIndex);
450+
}
451+
452+
csmInt32 CubismModel::GetDrawableTextureIndex(csmInt32 drawableIndex) const
448453
{
449454
const csmInt32* textureIndices = Core::csmGetDrawableTextureIndices(_model);
450455
return textureIndices[drawableIndex];

src/Model/CubismModel.hpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,9 @@ class CubismModel
341341
const csmInt32* GetDrawableRenderOrders() const;
342342

343343
/**
344+
* @deprecated
345+
* 関数名が誤っていたため、代替となる getDrawableTextureIndex を追加し、この関数は非推奨となりました。
346+
*
344347
* @brief Drawableのテクスチャインデックスリストの取得
345348
*
346349
* Drawableのテクスチャインデックスリストを取得する。
@@ -350,6 +353,16 @@ class CubismModel
350353
*/
351354
csmInt32 GetDrawableTextureIndices(csmInt32 drawableIndex) const;
352355

356+
/**
357+
* @brief Drawableのテクスチャインデックスリストの取得
358+
*
359+
* Drawableのテクスチャインデックスを取得する。
360+
*
361+
* @param[in] drawableIndex Drawableのインデックス
362+
* @return Drawableのテクスチャインデックス
363+
*/
364+
csmInt32 GetDrawableTextureIndex(csmInt32 drawableIndex) const;
365+
353366
/**
354367
* @brief Drawableの頂点インデックスの個数の取得
355368
*

0 commit comments

Comments
 (0)