From b34325254905208f69a50d15851db30e1d2a0bb5 Mon Sep 17 00:00:00 2001 From: wada Date: Fri, 8 Jul 2022 11:12:56 +0900 Subject: [PATCH] Update to Cubism 4 SDK for Native R5 beta4_1 --- CHANGELOG.md | 9 +++++++++ src/Model/CubismModel.cpp | 4 ++-- src/Model/CubismModel.hpp | 3 ++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f97a65..8a249d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ 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.4.1] - 2022-07-08 + +### Fixed + +* Fix Core API called in GetDrawableParentPartIndex function. + + ## [4-r.5-beta.4] - 2022-07-07 ### Added @@ -191,6 +199,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.4.1]: https://github.com/Live2D/CubismNativeFramework/compare/4-r.5-beta.4...4-r.5-beta.4.1 [4-r.5-beta.4]: https://github.com/Live2D/CubismNativeFramework/compare/4-r.5-beta.3...4-r.5-beta.4 [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 diff --git a/src/Model/CubismModel.cpp b/src/Model/CubismModel.cpp index f8bf020..001507b 100644 --- a/src/Model/CubismModel.cpp +++ b/src/Model/CubismModel.cpp @@ -508,9 +508,9 @@ Core::csmVector4 CubismModel::GetDrawableScreenColor(csmInt32 drawableIndex) con return screenColors[drawableIndex]; } -csmInt32 CubismModel::GetDrawableParentPartIndex(csmUint32 parameterIndex) const +csmInt32 CubismModel::GetDrawableParentPartIndex(csmUint32 drawableIndex) const { - return Core::csmGetPartParentPartIndices(_model)[parameterIndex]; + return Core::csmGetDrawableParentPartIndices(_model)[drawableIndex]; } csmInt32 CubismModel::GetDrawableCulling(csmInt32 drawableIndex) const diff --git a/src/Model/CubismModel.hpp b/src/Model/CubismModel.hpp index 03dc3ea..1c9a4b8 100644 --- a/src/Model/CubismModel.hpp +++ b/src/Model/CubismModel.hpp @@ -468,9 +468,10 @@ class CubismModel * * Drawableの親パーツのインデックスを取得する。 * + * @param[in] drawableIndex Drawableのインデックス * @return drawableの親パーツのインデックス */ - csmInt32 GetDrawableParentPartIndex(csmUint32 parameterIndex) const; + csmInt32 GetDrawableParentPartIndex(csmUint32 drawableIndex) const; /** * @brief Drawableのカリング情報の取得