Merge pull request #47 from Live2D/develop

Update to Cubism 5 SDK for Native R2

.editorconfig

@@ -25,3 +25,6 @@ charset = unset
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.{cpp,hpp,h}]
+charset = utf-8-bom

.gitignore

@@ -8,6 +8,8 @@
 
 # Sample build directories
 /Samples/**/build/
+# HarmonyOS files
+Samples/OpenGL/Demo/proj.harmonyos.cmake/Full/entry/src/main/resources/rawfile/
 # Sample third party files
 /Samples/**/thirdParty/*
 !/Samples/**/thirdParty/scripts/*

CHANGELOG.md

@@ -5,6 +5,59 @@ 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.2] - 2024-12-19
+
+### Added
+
+* Add Vulkan support in Ubuntu 22.04 and AlmaLinux 9.
+* Add a function to notify when motion playback starts.
+* Add shader setup classes for D3D9, D3D11, OpenGL, Vulkan.
+* Add the sample for OpenGL API in HarmonyOS.
+
+### Changed
+
+* Change to overwrite motion fade by the value specified in .model3.json on Framework.
+* Change to use multi-buffering in Vulkan.
+* Change the screen orientation and rotation direction to be unified across Android, iPhone, and iPad.
+* Change specify the NDK version of the Android sample.
+* Change to read shader source codes from files.
+* Change the compile and target SDK version of Android OS to 15.0 (API 35).
+  * Upgrade the version of Android Gradle Plugin from 8.1.1 to 8.6.1.
+  * Upgrade the version of Gradle from 8.2 to 8.7.
+  * Upgrade the version of NDK from 25.2.9519653 to 26.3.11579264.
+  * Change the minimum version of Android Studio to Ladybug(2024.2.1 Patch 2).
+* Change the minimum support version of Java to 8.
+* Change the function for playing back expression motions from CubismExpressionMotionManager::StartMotionPriority() to CubismExpressionMotionManager::StartMotion().
+* Change to use GLSurfaceView event queues to handle touch events.
+
+### Fixed
+
+* Fix memory leak in Vulkan.
+* Fixed drawing failure when enabling `USE_RENDER_TARGET` macros in Vulkan samples.
+* Fix memory leak when exit in D3D9 and D3D11.
+* Fix exit error in Vulkan.
+* Fix the processing of anisotropy filtering in Vulkan to match that of other renderers.
+* Fix an issue on Windows where an error would occur if the model name contained certain characters.
+* Implement support for `MSVC19.40` in the VS2022 build. by [@tatsuya-shiozawa](https://github.com/Live2D/CubismNativeSamples/pull/46)
+* Fix an issue where a compile error occurred due to missing includes in the OpenGL iOS minimum sample.
+* Fix an issue in the Android sample where the model display would reset after performing certain operations.
+* Fix a memory leak in the compilation process of shader strings in OpenGL.
+* Fix an issue that could cause drawing errors when the application is restored from the background.
+* Fix an issue in the OpenGL sample where the textures are not released.
+* Fix a warning due to the initial value of programId being NULL.
+* Fix an issue that caused white edge-like objects to be drawn when enabling the `USE_RENDER_TARGET` or `USE_MODEL_RENDER_TARGET` flag in `LAppLive2DManager`.
+* Fix an issue causing a decrease in rendering resolution when using render targets in the Metal sample project.
+* Fix an issue where rendering would break when using the iPad with `USE_RENDER_TARGET` or `USE_MODEL_RENDER_TARGET` defined in OpenGL samples.
+
+### Removed
+
+* Remove Visual Studio 2013 samples.
+* Remove armeabi-v7a from architecture support.
+* Remove the Cocos2d-x sample project.
+* Remove the callback what motion playback finishes on the minimum sample.
+* Remove unnecessary declarations in the OpenGL Android sample.
+
+
 ## [5-r.1] - 2024-03-26
 
 ### Added
@@ -17,6 +70,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * The log function was changed because it was ambiguous whether or not a newline was inserted.
 * Change so that `LAppSprite` is not depend on `LAppDelegate` in D3D11 and D3D9, Metal, Vulkan.
 * Some function arguments in `LAppSprite` are changed in D3D11 and D3D9, Metal, Vulkan.
+* Change to read shader source codes from files.
 
 ### Fixed
 
@@ -43,7 +97,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Change so that `LAppSprite` is not depend on `LAppDelegate` in Android.
 * Change so that `ViewController` is not include on `LAppSprite` in iOS.
 * Change the path acquisition process to a library function on OpenGL Mac and Linux.
-* Change the compile and target SDK version of Android OS to 14.0 (API 34). 
+* Change the compile and target SDK version of Android OS to 14.0 (API 34).
   * Upgrade the version of Android Gradle Plugin from 8.0.2 to 8.1.1.
   * Upgrade the version of Gradle from 8.1.1 to 8.2.
   * Change the minimum version of Android Studio to Hedgehog(2023.1.1).
@@ -407,6 +461,7 @@ See [Core Changelog] for details.
 * What was `Package.json` is currently being changed to`cubism-info.yml`.
 
 
+[5-r.2]: https://github.com/Live2D/CubismNativeSamples/compare/5-r.1...5-r.2
 [5-r.1]: https://github.com/Live2D/CubismNativeSamples/compare/5-r.1-beta.4...5-r.1
 [5-r.1-beta.4]: https://github.com/Live2D/CubismNativeSamples/compare/5-r.1-beta.3...5-r.1-beta.4
 [5-r.1-beta.3]: https://github.com/Live2D/CubismNativeSamples/compare/5-r.1-beta.2...5-r.1-beta.3

Core/CHANGELOG.md

@@ -5,6 +5,31 @@ 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/).
 
 
+## 2024-12-19
+
+### Removed
+
+* [Native] Remove Visual Studio 2013 (MSVC 120) static library.
+
+
+## 2024-11-07
+
+### Added
+
+* [Native] Add experimental support `arm64` library for linux.
+
+### Removed
+
+* [Unity,Native,Java] Remove Android ARM v7 library.
+
+
+## 2024-04-04
+
+### Added
+
+* [Unity] Add library(.so) for HarmonyOS build.
+
+
 ## 2024-03-26
 
 ### Remove

Core/README.ja.md

@@ -29,12 +29,12 @@ Core
 | プラットフォーム | アーキテクチャ | dll | lib | パス | 注記 |
 | --- | --- | --- | --- | --- | --- |
 | Android | ARM64 | ✓ | ✓ | android/arm64-v8a |   |
-| Android | ARMv7 | ✓ | ✓ | android/armeabi-v7a | このライブラリは現在非推奨で、近日中に削除される予定です。 |
 | Android | x86 | ✓ | ✓ | android/x86 |   |
 | Android | x86_64 | ✓ | ✓ | android/x86_64 |   |
 | iOS | ARM64 |   | ✓ | ios/xxx-iphoneos | iOSデバイス |
 | iOS | x86_64 |   | ✓ | ios/xxx-iphonesimulator | iOS Simulator |
 | Linux | x86_64 | ✓ | ✓ | linux/x86_64 |   |
+| Linux | ARM64 | ✓ | ✓ | experimental/linux/ARM64 |   |
 | macOS | ARM64 | ✓ | ✓ | macos/arm64 |   |
 | macOS | x86_64 | ✓ | ✓ | macos/x86_64 |   |
 | Mac Catalyst | ARM64 |   | ✓ | experimental/catalyst | Universal Binary |
@@ -59,7 +59,6 @@ Core
 
 | VC++バージョン | Visual Studioバージョン |
 | ---: | --- |
-| 120 | Visual Studio 2013 |
 | 140 | Visual Studio 2015 |
 | 141 | Visual Studio 2017 |
 | 142 | Visual Studio 2019 |

Core/README.md

@@ -31,12 +31,12 @@ Core
 | Platform | Architecture | dll | lib | Path | Note |
 | --- | --- | --- | --- | --- | --- |
 | Android | ARM64 | ✓ | ✓ | android/arm64-v8a |   |
-| Android | ARMv7 | ✓ | ✓ | android/armeabi-v7a | This library is currently deprecated and will be removed in the near future. |
 | Android | x86 | ✓ | ✓ | android/x86 |   |
 | Android | x86_64 | ✓ | ✓ | android/x86_64 |   |
 | iOS | ARM64 |   | ✓ | ios/xxx-iphoneos | iOS Devices |
 | iOS | x86_64 |   | ✓ | ios/xxx-iphonesimulator | iOS Simulator |
 | Linux | x86_64 | ✓ | ✓ | linux/x86_64 |   |
+| Linux | ARM64 | ✓ | ✓ | experimental/linux/ARM64 |   |
 | macOS | ARM64 | ✓ | ✓ | macos/arm64 |   |
 | macOS | x86_64 | ✓ | ✓ | macos/x86_64 |   |
 | Mac Catalyst | ARM64 |   | ✓ | experimental/catalyst | Universal Binary |
@@ -61,7 +61,6 @@ Below is the Visual Studio version for the VC++ version.
 
 | VC++ version | Visual Studio version |
 | ---: | --- |
-| 120 | Visual Studio 2013 |
 | 140 | Visual Studio 2015 |
 | 141 | Visual Studio 2017 |
 | 142 | Visual Studio 2019 |

Core/RedistributableFiles.txt

@@ -2,7 +2,6 @@ The following is a list of files available for redistribution
 under the terms of the Live2D Proprietary Software License Agreement:
 
 - dll/android/arm64-v8a/libLive2DCubismCore.so
-- dll/android/armeabi-v7a/libLive2DCubismCore.so
 - dll/android/x86/libLive2DCubismCore.so
 - dll/android/x86_64/libLive2DCubismCore.so
 - dll/experimental/rpi/libLive2DCubismCore.so
@@ -11,14 +10,14 @@ under the terms of the Live2D Proprietary Software License Agreement:
 - dll/experimental/uwp/x64/Live2DCubismCore.dll
 - dll/experimental/uwp/x86/Live2DCubismCore.dll
 - dll/linux/x86_64/libLive2DCubismCore.so
+- dll/experimental/linux/arm64/libLive2DCubismCore.so
 - dll/macos/Live2DCubismCore.bundle
 - dll/macos/libLive2DCubismCore.dylib
 - dll/windows/x86/Live2DCubismCore.dll
 - dll/windows/x86/Live2DCubismCore.lib
 - dll/windows/x86_64/Live2DCubismCore.dll
 - dll/windows/x86_64/Live2DCubismCore.lib
 - lib/android/arm64-v8a/libLive2DCubismCore.a
-- lib/android/armeabi-v7a/libLive2DCubismCore.a
 - lib/android/x86/libLive2DCubismCore.a
 - lib/android/x86_64/libLive2DCubismCore.so
 - lib/experimental/catalyst/libLive2DCubismCore.a
@@ -28,12 +27,9 @@ under the terms of the Live2D Proprietary Software License Agreement:
 - lib/ios/Release-iphoneos/libLive2DCubismCore.a
 - lib/ios/Release-iphonesimulator/libLive2DCubismCore.a
 - lib/linux/x86_64/libLive2DCubismCore.a
+- lib/experimental/linux/arm64/libLive2DCubismCore.a
 - lib/macos/arm64/libLive2DCubismCore.a
 - lib/macos/x86_64/libLive2DCubismCore.a
-- lib/windows/x86/120/Live2DCubismCore_MD.lib
-- lib/windows/x86/120/Live2DCubismCore_MDd.lib
-- lib/windows/x86/120/Live2DCubismCore_MT.lib
-- lib/windows/x86/120/Live2DCubismCore_MTd.lib
 - lib/windows/x86/140/Live2DCubismCore_MD.lib
 - lib/windows/x86/140/Live2DCubismCore_MDd.lib
 - lib/windows/x86/140/Live2DCubismCore_MT.lib
@@ -50,10 +46,6 @@ under the terms of the Live2D Proprietary Software License Agreement:
 - lib/windows/x86/143/Live2DCubismCore_MDd.lib
 - lib/windows/x86/143/Live2DCubismCore_MT.lib
 - lib/windows/x86/143/Live2DCubismCore_MTd.lib
-- lib/windows/x86_64/120/Live2DCubismCore_MD.lib
-- lib/windows/x86_64/120/Live2DCubismCore_MDd.lib
-- lib/windows/x86_64/120/Live2DCubismCore_MT.lib
-- lib/windows/x86_64/120/Live2DCubismCore_MTd.lib
 - lib/windows/x86_64/140/Live2DCubismCore_MD.lib
 - lib/windows/x86_64/140/Live2DCubismCore_MDd.lib
 - lib/windows/x86_64/140/Live2DCubismCore_MT.lib

NOTICE.ja.md

@@ -4,6 +4,12 @@
 
 # お知らせ
 
+## [注意事項] Cubism SDK for NativeのCocos2d-xサポートについて (2024-12-19)
+
+Cubism SDK for NativeのCocos2d-x対応につきまして、Cubism 5 SDK for Native R2でサポートを終了いたしました。
+本件のお問い合わせにつきましては、[お問合せフォーム](<https://www.live2d.jp/contact/>)からご連絡ください。　
+
+
 ## [注意事項] Apple社のPrivacy Manifest Policy対応について
 
 Apple社が対応を必要としているPrivacy Manifest Policyについて、本製品では指定されているAPI及びサードパーティ製品を使用しておりません。
@@ -36,26 +42,9 @@ MetalのMac Catalystのビルド時にエラーが発生する場合がござい
 * cmakeを3.27未満のバージョンで使用する
 
 
-## [注意事項] Cocos2d-xセットアップのエラーについて (2022-03-15)
-
-Cocos2d-xサンプルプロジェクトのセットアップ時に実行するsetup-cocos2dバッチにおいてエラーが発生いたします。
-これはGitHubがGitプロトコルセキュリティを改善したことに起因し、GitにてCocos2d-xのsubmodule取得が失敗するためです。
-具体的には`git://`経由での接続ができなくなったためエラーが発生しています。
+## [注意事項] Metal の macOSサンプルビルドにおけるメモリリークについて (2021-12-09)
 
-詳しくはGitHub公式ブログをご確認ください。
-
-* [GitHub 公式ブログ](https://github.blog/2021-09-01-improving-git-protocol-security-github/)
-
-### 回避方法
-
-* ターミナルもしくはコマンドプロンプトにて以下のコマンドを実行することで、`git://`を用いた接続を`https://`に置き換える
-  * `git config --global url."https://github.com/".insteadOf git://github.com/`
-    * このコマンドは実行端末の全ユーザのgitconfigに影響します。ご了承ください。
-
-
-## [注意事項] Metal及びCocos2d-x v4.0 の macOSサンプルビルドにおけるメモリリークについて (2021-12-09)
-
-Metal及びCocos2d-x v4.0 の macOSサンプルビルドにおいてメモリリークが発生いたします。
+Metal の macOSサンプルビルドにおいてメモリリークが発生いたします。
 これはMetalフレームワーク内で発生するため、公式の対応をお待ち下さい。
 本件のお問い合わせについて弊社ではお答えいたしかねますので、ご了承ください。
 
@@ -64,35 +53,6 @@ Metal及びCocos2d-x v4.0 の macOSサンプルビルドにおいてメモリリ
 * [Apple Developer Forums - Memory leak in MTLCommandBuffer?](https://developer.apple.com/forums/thread/120931)
 
 
-## [制限事項] Cocos2d-x v4.0 の Linux(Ubuntu)サンプルビルドについて (2021-04-15)
-
-Cocos2d-x v4.0 は `Ubuntu 20.04` ビルドに対応しておりません。
-使用する際は以下の回避方法を確認し、いずれかを適用してご利用いただきますようお願いいたします。
-
-### 回避方法
-
-* `Ubuntu 16.04` または `Ubuntu 18.04` を使用する
-
-* 以下issueを確認し、`Cocos2d-x v4.0` で使用されている `libchipmunk` ライブラリを差し替える
-  * [cocos2d/cocos2d-x linking error when integrating with libchipmunk on linux#20471](https://github.com/cocos2d/cocos2d-x/issues/20471)
-  * WARNING: この回避方法を使用してビルドしたプロジェクトはいかなる場合でも保守いたしかねます
-
-
-## [注意事項] Visual Studio 2013 ご利用時の OpenGL サンプルビルドについて (2021-02-17)
-
-`Visual Studio 2013` を使用した `OpenGL` サンプルビルドでは、`setup_glew_glfw.bat` をそのまま使用してビルドすると `GLEW` にてリンクエラーが発生します。
-以下回避方法を確認し、ご利用いただきますようお願いいたします。
-
-### 回避方法
-
-* `GLEW 2.2.0` を使用する場合
-  * `glew` プロジェクトから `libvcruntime.lib` の参照を削除する
-  * `Visual Studio 2013` 以降の Visual Studio を使用する
-
-* `GLEW 2.1.0` を使用する場合
-  * `setup_glew_glfw_vs2013.bat` を使用して `thirdParty` のセットアップを行う
-
-
 ## Cubism Core
 
 ### [注意事項] macOS Catalina 以降のバージョンでの `.bundle` と `.dylib` の利用について

NOTICE.md

@@ -4,6 +4,12 @@
 
 # Notices
 
+## [Caution] Regarding Cubism SDK for Native Cocos2d-x Support (2024-12-19)
+
+Support for Cocos2d-x in the Cubism SDK for Native has been discontinued starting with Cubism 5 SDK for Native R2. 
+For any inquiries regarding this matter, please contact us through the [contact form]](<https://www.live2d.jp/contact/>).
+
+
 ## [Caution] Support for Apple's Privacy Manifest Policy
 
 This product does not use the APIs or third-party products specified in Apple's privacy manifest policy.
@@ -36,26 +42,9 @@ We will continue to investigate the details.
 * Use cmake with versions less than 3.27
 
 
-## [Caution] About Cocos2d-x setup error (2022-03-15)
-
-An error occurs in the setup-cocos2d batch that is executed when setting up the Cocos2d-x sample project.
-This is because GitHub has improved the security of the Git protocol, and Git fails to get the Cocos2d-x submodule.
-Specifically, an error has occurred because the connection via `git://` is no longer possible.
+## [Caution] Memory leak in macOS sample builds of Metal (2021-12-09)
 
-Please check the official GitHub blog for details.
-
-* [GitHub Official Blog](https://github.blog/2021-09-01-improving-git-protocol-security-github/)
-
-### Workaround
-
-* Replace the connection using `git://` with `https://` by executing the following command in the terminal or command prompt.
-  * `git config --global url."https://github.com/".insteadOf git://github.com/`
-    * Please note that this command affects gitconfig for all users of the execution terminal.
-
-
-## [Caution] Memory leak in macOS sample builds of Metal and Cocos2d-x v4.0 (2021-12-09)
-
-A memory leak occurs in the macOS sample builds of Metal and Cocos2d-x v4.0.
+A memory leak occurs in the macOS sample builds of Metal.
 This happens within the Metal framework, so please wait for official support.
 Note that we cannot answer inquiries regarding this matter.
 
@@ -64,35 +53,6 @@ Please check the Apple Developer Forums for more information.
 * [Apple Developer Forums - Memory leak in MTLCommandBuffer?](https://developer.apple.com/forums/thread/120931)
 
 
-## [Limitation] About the Linux (Ubuntu) sample builds of Cocos2d-x v4.0 (2021-04-15)
-
-Cocos2d-x v4.0 does not support `Ubuntu 20.04` builds.
-Please check and apply one of the following workarounds when using it.
-
-### Workaround
-
-* Use `Ubuntu 16.04` or `Ubuntu 18.04`
-
-* Check the following issue and replace the `libchipmunk` library used in `Cocos2d-x v4.0`
-  * [cocos2d/cocos2d-x linking error when integrating with libchipmunk on linux#20471](https://github.com/cocos2d/cocos2d-x/issues/20471)
-  * WARNING: Projects built using this workaround cannot be maintained under any circumstances.
-
-
-## [Caution] About OpenGL sample builds when using Visual Studio 2013 (2021-02-17)
-
-In the `OpenGL` sample builds using `Visual Studio 2013`, a link error will occur in `GLEW` if you build using `setup_glew_glfw.bat` as is.
-Please check and use the workaround below.
-
-### Workaround
-
-* When using `GLEW 2.2.0`
-  * Remove the reference to `libvcruntime.lib` from the `glew` project
-  * Use Visual Studio later than `Visual Studio 2013`
-
-* When using `GLEW 2.1.0`
-  * Use `setup_glew_glfw_vs2013.bat` to set up `thirdParty`
-
-
 ## Cubism Core
 
 ### [Caution] About using `.bundle` and `.dylib` on macOS Catalina or later