Skip to content

Commit efb93f2

Browse files
itoh-at-live2d-comitoh-at-live2d-com
authored
Merge pull request #49 from Live2D/develop
Update to Cubism 5 SDK for Native R4
2 parents 0a0aa9c + 6e77bfe commit efb93f2

289 files changed

Lines changed: 2478 additions & 11422 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@
55
/Core/**/*.dylib
66
/Core/**/*.lib
77
/Core/**/*.so
8+
#Core development files
9+
/.CoreDev/Archive/
810

911
# Sample build directories
1012
/Samples/**/build/
13+
/.ci/DllTest/**/build/
1114
# HarmonyOS files
1215
Samples/OpenGL/Demo/proj.harmonyos.cmake/Full/entry/src/main/resources/rawfile/
1316
# Sample third party files

‎CHANGELOG.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,29 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66

77

8+
## [5-r.4] - 2025-05-29
9+
10+
### Added
11+
12+
* Add a feature to fix the frame rate to a specified value in Windows OpenGL.
13+
* Add a flag to enable the function that verifies the consistency when loading `motion3.json`.
14+
15+
### Changed
16+
17+
* Move some overlapping functions to `Common`.
18+
* Change the default version of the JDK used for compilation to be fixed at 17.
19+
* Change the blend mode when using the USERENDERTARGET or USEMODELRENDER_TARGET macro, and apply Premultiplied Alpha to the color settings of rendering targets.
20+
Also adjust the return value of the GetSproteAlpha function.
21+
* Change to separate shader code from the framework layer.
22+
* Change `LAppPal::LoadFileAsBytes()` behaviour on macOS.
23+
* Convert to an absolute path, if a relative path is specified.
24+
25+
### Fixed
26+
27+
* Fix the errors that occur when building in a Unicode environment with D3D9 and D3D11.
28+
* Fix an issue where the priority was not reset if the motion was not read correctly.
29+
30+
831
## [5-r.3] - 2025-02-18
932

1033
### Fixed
@@ -468,6 +491,7 @@ See [Core Changelog] for details.
468491
* What was `Package.json` is currently being changed to`cubism-info.yml`.
469492

470493

494+
[5-r.4]: https://github.com/Live2D/CubismNativeSamples/compare/5-r.3...5-r.4
471495
[5-r.3]: https://github.com/Live2D/CubismNativeSamples/compare/5-r.2...5-r.3
472496
[5-r.2]: https://github.com/Live2D/CubismNativeSamples/compare/5-r.1...5-r.2
473497
[5-r.1]: https://github.com/Live2D/CubismNativeSamples/compare/5-r.1-beta.4...5-r.1

‎Core/CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,22 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66

77

8+
## 2025-04-24
9+
10+
### Added
11+
12+
* Add the function `csmGetParameterRepeats`.
13+
* This function retrieves whether the parameters are set to repeat.
14+
15+
### Changed
16+
17+
* Upgrade Core version to 05.01.0000.
18+
19+
### Fixed
20+
21+
* Fix `csmGetParameterKeyCounts()` and `csmGetParameterKeyValues()` symbols in the DLL.
22+
23+
824
## 2024-12-19
925

1026
### Removed

‎Framework‎

Submodule Framework updated 49 files

‎NOTICE.ja.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,39 @@
44

55
# お知らせ
66

7+
## [注意事項] Visual Studio 2017 ビルドについて (2025-05-29)
8+
9+
Visual Studio 2017 は Windows 10 SDK 10.0.17763.0 までの提供となっており、その状態では実行に問題が発生する場合がございます。
10+
Visual Studio 2017 で動作させる場合は手動でWindows SDKの最新版をインストールしてご利用ください。
11+
12+
## [注意事項] Mac CatalystにおけるMetalレンダラのビルドについて (2025-05-29)
13+
14+
Mac CatalystにおけるMetalレンダラのビルドにつきまして、CMakeが3.27未満でないとNSURLが見つからないというエラーが発生する現象を確認しております。
15+
本プラットフォーム利用時はCMakeを3.26以前をご利用ください。
16+
17+
## [注意事項] CMake 4.0 の対応について (2025-05-29)
18+
19+
CMake 4.0対応につきまして、本製品で利用している `GLEW 2.2.0` がCMake 4.0に対応していないため、本サンプルはCMake 4.0に対応しておりません。
20+
GLEWが対応され次第追従いたしますのであらかじめご了承ください。
21+
22+
詳しくは以下のissueをご参照ください。
23+
24+
* [GLEW issue](https://github.com/nigels-com/glew/issues/432)
25+
26+
## [注意事項] iOS ARM ビルドについて (2025-05-29)
27+
28+
iOS実機端末で利用する ARM ビルドにつきまして、Cubism SDK for Nativeで使用している ios-cmake 4.5.0 の影響で実機端末へのインストール時にエラーが発生することを確認しております。
29+
詳細については継続して調査いたします。
30+
31+
### 回避方法
32+
33+
1. ios-cmake のバージョンを 4.4.1 等に戻す
34+
35+
2. .xcodeproj の設定画面にて TARGETS で Demo 等ビルドするアプリを選択し、Build Setting > User-Defined から以下をすべてYESに変更する
36+
2.1. CODE_SIGNING_ALLOWED 及びそのツリー内部
37+
2.2. CODE_SIGNING_REQUIED 及びそのツリー内部
38+
39+
740
## [注意事項] Cubism SDK for NativeのCocos2d-xサポートについて (2024-12-19)
841

942
Cubism SDK for NativeのCocos2d-x対応につきまして、Cubism 5 SDK for Native R2でサポートを終了いたしました。

‎NOTICE.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,39 @@
44

55
# Notices
66

7+
## [Notes] Building with Visual Studio 2017 (2025-05-29)
8+
9+
Visual Studio 2017 provides Windows 10 SDK versions up to 10.0.17763.0 only, which may cause execution issues in some situations.
10+
If you are building on Visual Studio 2017, please manually install and use the latest version of the Windows SDK.
11+
12+
## [Notes] Building Metal Renderer for Mac Catalyst (2025-05-29)
13+
14+
When building Metal renderer for Mac Catalyst, an issue has been confirmed in which an error ("NSURL not found") occurs with CMake versions 3.27 or higher.
15+
If you're utilizing this platform, please use CMake version 3.26 or earlier.
16+
17+
## [Caution] Support for CMake 4.0 in Linux OpenGL Environment (2025-05-29)
18+
19+
Regarding support for CMake 4.0, the product currently uses `GLEW 2.2.0`, which does not support CMake 4.0.
20+
Therefore, this sample is not compatible with CMake 4.0. We will update accordingly once GLEW supports it, so please be aware of this in advance.
21+
22+
Please refer to the issue below for details.
23+
24+
* [GLEW issue](https://github.com/nigels-com/glew/issues/432)
25+
26+
## [Caution] Regarding iOS ARM Builds (2025-05-29)
27+
28+
Regarding ARM builds for deployment on physical iOS devices, we have identified an issue causing installation errors on devices due to ios-cmake 4.5.0 used in Cubism SDK for Native.
29+
We are continuing to investigate this issue.
30+
31+
### Workaround
32+
33+
1. Revert ios-cmake to version 4.4.1 or another stable version.
34+
35+
2. In your .xcodeproj settings, select your build target (such as "Demo") under "TARGETS", then in Build Settings > User-Defined, set the following all to YES:
36+
2.1. CODE_SIGNING_ALLOWED and all child settings under this key
37+
2.2. CODE_SIGNING_REQUIRED and all child settings under this key
38+
39+
740
## [Caution] Regarding Cubism SDK for Native Cocos2d-x Support (2024-12-19)
841

942
Support for Cocos2d-x in the Cubism SDK for Native has been discontinued starting with Cubism 5 SDK for Native R2.

‎README.ja.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,14 @@ Core : [CHANGELOG.md](Core/CHANGELOG.md)
110110

111111
| 開発ツール | バージョン |
112112
| --- | --- |
113-
| Android Studio | Ladybug 2024.2.1 Patch 3 |
113+
| Android Studio | Meerkat Feature Drop 2024.3.2 |
114114
| DevEco Studio | 5.0.5.306 |
115-
| CMake | 3.31.2 |
115+
| CMake | 3.31.7 |
116116
| Visual Studio 2015 | Update 3 |
117-
| Visual Studio 2017 | 15.9.68 |
118-
| Visual Studio 2019 | 16.11.42 |
119-
| Visual Studio 2022 | 17.12.3 |
120-
| Xcode | 16.2 |
117+
| Visual Studio 2017 | 15.9.73 |
118+
| Visual Studio 2019 | 16.11.47 |
119+
| Visual Studio 2022 | 17.14.2 |
120+
| Xcode | 16.3 |
121121

122122
### Android
123123

@@ -140,7 +140,7 @@ Core : [CHANGELOG.md](Core/CHANGELOG.md)
140140
| Red Hat | Amazon Linux 2 | `amazonlinux:2` | 7.3.1 |
141141
| Red Hat | AlmaLinux | `almalinux:latest` | 11.4.1 |
142142
| Debian | Ubuntu 22.04.4 | `ubuntu:22.04` | 11.4.0 |
143-
| Debian | Ubuntu 24.04.1 | `ubuntu:24.04` | 13.3.0 |
143+
| Debian | Ubuntu 24.04.2 | `ubuntu:24.04` | 13.3.0 |
144144

145145
#### Mesa ライブラリ
146146

@@ -156,10 +156,10 @@ Core : [CHANGELOG.md](Core/CHANGELOG.md)
156156

157157
| プラットフォーム | バージョン |
158158
| --- | --- |
159-
| iOS / iPadOS | 18.2 |
160-
| macOS | 15.2 |
159+
| iOS / iPadOS | 18.5 |
160+
| macOS | 15.5 |
161161
| Windows 10 | 23H2 |
162-
| Windows 11 | 23H2 |
162+
| Windows 11 | 24H2 |
163163

164164
### Android
165165

@@ -180,7 +180,7 @@ Core : [CHANGELOG.md](Core/CHANGELOG.md)
180180
| --- | --- | --- |
181181
| Red Hat | Amazon Linux | 2 |
182182
| Red Hat | AlmaLinux | 9 |
183-
| Debian | Ubuntu | 24.04.1 |
183+
| Debian | Ubuntu | 24.04.2 |
184184

185185
## プロジェクトへの貢献
186186

‎README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,14 @@ Core : [CHANGELOG.md](Core/CHANGELOG.md)
109109

110110
| Development Tool | Version |
111111
| --- | --- |
112-
| Android Studio | Ladybug 2024.2.1 Patch 3 |
112+
| Android Studio | Meerkat Feature Drop 2024.3.2 |
113113
| DevEco Studio | 5.0.5.306 |
114-
| CMake | 3.31.2 |
114+
| CMake | 3.31.7 |
115115
| Visual Studio 2015 | Update 3 |
116-
| Visual Studio 2017 | 15.9.68 |
117-
| Visual Studio 2019 | 16.11.42 |
118-
| Visual Studio 2022 | 17.12.3 |
119-
| Xcode | 16.2 |
116+
| Visual Studio 2017 | 15.9.73 |
117+
| Visual Studio 2019 | 16.11.47 |
118+
| Visual Studio 2022 | 17.14.2 |
119+
| Xcode | 16.3 |
120120

121121
### Android
122122

@@ -139,7 +139,7 @@ Core : [CHANGELOG.md](Core/CHANGELOG.md)
139139
| Red Hat | Amazon Linux 2 | `amazonlinux:2` | 7.3.1 |
140140
| Red Hat | AlmaLinux | `almalinux:latest` | 11.4.1 |
141141
| Debian | Ubuntu 22.04.4 | `ubuntu:22.04` | 11.4.0 |
142-
| Debian | Ubuntu 24.04.1 | `ubuntu:24.04` | 13.3.0 |
142+
| Debian | Ubuntu 24.04.2 | `ubuntu:24.04` | 13.3.0 |
143143

144144
#### Mesa library
145145

@@ -155,10 +155,10 @@ Core : [CHANGELOG.md](Core/CHANGELOG.md)
155155

156156
| Platform | Version |
157157
| --- | --- |
158-
| iOS / iPadOS | 18.2 |
159-
| macOS | 15.2 |
158+
| iOS / iPadOS | 18.5 |
159+
| macOS | 15.5 |
160160
| Windows 10 | 23H2 |
161-
| Windows 11 | 23H2 |
161+
| Windows 11 | 24H2 |
162162

163163
### Android
164164

@@ -179,7 +179,7 @@ Core : [CHANGELOG.md](Core/CHANGELOG.md)
179179
| --- | --- | --- |
180180
| Red Hat | Amazon Linux | 2 |
181181
| Red Hat | AlmaLinux | 9 |
182-
| Debian | Ubuntu | 24.04.1 |
182+
| Debian | Ubuntu | 24.04.2 |
183183

184184
## Contributing
185185

‎Samples/Common/CMakeLists.txt‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
if (CSM_MINIMUM_DEMO)
2+
target_sources(${APP_NAME}
3+
PRIVATE
4+
${CMAKE_CURRENT_SOURCE_DIR}/CubismSampleViewMatrix_Common.cpp
5+
${CMAKE_CURRENT_SOURCE_DIR}/CubismSampleViewMatrix_Common.hpp
6+
${CMAKE_CURRENT_SOURCE_DIR}/LAppAllocator_Common.cpp
7+
${CMAKE_CURRENT_SOURCE_DIR}/LAppAllocator_Common.hpp
8+
${CMAKE_CURRENT_SOURCE_DIR}/LAppModel_Common.cpp
9+
${CMAKE_CURRENT_SOURCE_DIR}/LAppModel_Common.hpp
10+
${CMAKE_CURRENT_SOURCE_DIR}/LAppSprite_Common.cpp
11+
${CMAKE_CURRENT_SOURCE_DIR}/LAppSprite_Common.hpp
12+
${CMAKE_CURRENT_SOURCE_DIR}/LAppTextureManager_Common.cpp
13+
${CMAKE_CURRENT_SOURCE_DIR}/LAppTextureManager_Common.hpp
14+
${CMAKE_CURRENT_SOURCE_DIR}/LAppView_Common.cpp
15+
${CMAKE_CURRENT_SOURCE_DIR}/LAppView_Common.hpp
16+
${CMAKE_CURRENT_SOURCE_DIR}/MouseActionManager_Common.cpp
17+
${CMAKE_CURRENT_SOURCE_DIR}/MouseActionManager_Common.hpp
18+
${CMAKE_CURRENT_SOURCE_DIR}/TouchManager_Common.cpp
19+
${CMAKE_CURRENT_SOURCE_DIR}/TouchManager_Common.hpp
20+
)
21+
else ()
22+
target_sources(${APP_NAME}
23+
PRIVATE
24+
${CMAKE_CURRENT_SOURCE_DIR}/LAppAllocator_Common.cpp
25+
${CMAKE_CURRENT_SOURCE_DIR}/LAppAllocator_Common.hpp
26+
${CMAKE_CURRENT_SOURCE_DIR}/LAppModel_Common.cpp
27+
${CMAKE_CURRENT_SOURCE_DIR}/LAppModel_Common.hpp
28+
${CMAKE_CURRENT_SOURCE_DIR}/LAppSprite_Common.cpp
29+
${CMAKE_CURRENT_SOURCE_DIR}/LAppSprite_Common.hpp
30+
${CMAKE_CURRENT_SOURCE_DIR}/LAppTextureManager_Common.cpp
31+
${CMAKE_CURRENT_SOURCE_DIR}/LAppTextureManager_Common.hpp
32+
${CMAKE_CURRENT_SOURCE_DIR}/LAppView_Common.cpp
33+
${CMAKE_CURRENT_SOURCE_DIR}/LAppView_Common.hpp
34+
${CMAKE_CURRENT_SOURCE_DIR}/LAppWavFileHandler_Common.cpp
35+
${CMAKE_CURRENT_SOURCE_DIR}/LAppWavFileHandler_Common.hpp
36+
${CMAKE_CURRENT_SOURCE_DIR}/TouchManager_Common.cpp
37+
${CMAKE_CURRENT_SOURCE_DIR}/TouchManager_Common.hpp
38+
)
39+
endif ()
40+
41+
42+
target_include_directories(${APP_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

Samples/D3D11/Demo/proj.d3d11.cmake/src/CubismSampleViewMatrix.cpp renamed to Samples/Common/CubismSampleViewMatrix_Common.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
* that can be found at https://www.live2d.com/eula/live2d-open-software-license-agreement_en.html.
66
*/
77

8-
#include "CubismSampleViewMatrix.hpp"
8+
#include "CubismSampleViewMatrix_Common.hpp"
9+
#include <math.h>
910
#include "LAppDefine.hpp"
1011

11-
#include <Rendering/D3D11/CubismRenderer_D3D11.hpp>
12-
13-
CubismSampleViewMatrix::CubismSampleViewMatrix(Csm::CubismMatrix44*& deviceToScreen, int windowWidth, int windowHeight)
12+
CubismSampleViewMatrix_Common::CubismSampleViewMatrix_Common(Csm::CubismMatrix44*& deviceToScreen, int windowWidth, int windowHeight)
1413
: CubismViewMatrix()
1514
{
1615
if (windowWidth == 0 || windowHeight == 0)
@@ -62,6 +61,6 @@ CubismSampleViewMatrix::CubismSampleViewMatrix(Csm::CubismMatrix44*& deviceToScr
6261
);
6362
}
6463

65-
CubismSampleViewMatrix::~CubismSampleViewMatrix()
64+
CubismSampleViewMatrix_Common::~CubismSampleViewMatrix_Common()
6665
{
6766
}

0 commit comments

Comments
 (0)