Merge pull request #77 from Live2D/develop

Update to Cubism 5 SDK for Unity R1

Author: itoh-at-live2d-com

Assets/Live2D/Cubism/CHANGELOG.md

@@ -5,6 +5,35 @@ 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.1] - 2024-03-26
+
+### Added
+
+* Add `CubimMath` class in namespace `Live2D.Cubism.Framework.Utils`.
+* Add function `ModF()` to compute floating-point remainder in `CubismMath` class.
+
+### Changed
+
+* Change the message to output the latest Moc version supported by the CubismCore when the `.moc3` file fails to load correctly.
+* Change the version of the development project to `2021.3.36f1`.
+
+### Deprecated
+
+* The `ToIndex()` and `ReturnTiles()` functions of the `CubismMaskTilePool` class are not used.
+
+### Fixed
+
+* Fix fade calculation bug in MotionFade.
+* Fix a bug in which masks were not generated correctly when using multiple render textures and displaying two or more models.
+* Fix an issue where normal processing could not be performed when `CubismMaskTilePool.Subdivisions` is less than `1`.
+
+### Removed
+
+* Remove `CubismWebGLPluginProcessor.cs`.
+ * This change is due to the removal of Cubism Core built with `Emscripten 1.38.48`.
+ * See `CHANGELOG.md` in Core.
+
+
 ## [5-r.1-beta.4] - 2024-01-18
 
 ### Added
@@ -367,6 +396,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Fix issue where Priority value was not reset after playing motion with CubismMotionController.
 
 
+[5-r.1]: https://github.com/Live2D/CubismUnityComponents/compare/5-r.1-beta.4...5-r.1
 [5-r.1-beta.4]: https://github.com/Live2D/CubismUnityComponents/compare/5-r.1-beta.3...5-r.1-beta.4
 [5-r.1-beta.3]: https://github.com/Live2D/CubismUnityComponents/compare/5-r.1-beta.2...5-r.1-beta.3
 [5-r.1-beta.2]: https://github.com/Live2D/CubismUnityComponents/compare/5-r.1-beta.1...5-r.1-beta.2

Assets/Live2D/Cubism/Core/CubismMoc.cs

@@ -42,7 +42,8 @@ public static CubismMoc CreateFrom(byte[] moc3, bool shouldCheckMocConsistency =
         {
             if (shouldCheckMocConsistency && !HasMocConsistency(moc3))
             {
-                Debug.LogError("This Moc3 is Invalid. This model generation process is aborted and prefab is not created.");
+                Debug.LogError("This Moc3 is Invalid. This model generation process is aborted and prefab is not created.\n" +
+                                           $"Please check Model's Moc version. This CubismCore supported latest Moc version is `{LatestVersion}`.");
                 return null;
             }
 

Assets/Live2D/Cubism/Framework/MotionFade/CubismFadeController.cs

@@ -176,14 +176,15 @@ public void OnLateUpdate()
                 }
 
                 var playingMotions = _fadeStates[i].GetPlayingMotions();
-                for (int j = 0; j < playingMotions.Count && playingMotions.Count > 2;)
+                for (var j = playingMotions.Count - 2; j >= 0; --j)
                 {
                     var playingMotion = playingMotions[j];
                     if (time <= playingMotion.EndTime)
                     {
-                        j++;
                         continue;
                     }
+
+                    // If fade-in has been completed, delete the motion that has been played back.
                     _fadeStates[i].StopAnimation(j);
                 }
             }

Assets/Live2D/Cubism/Framework/Utils.meta

@@ -0,0 +1,36 @@
+/**
+ * Copyright(c) Live2D Inc. All rights reserved.
+ *
+ * Use of this source code is governed by the Live2D Open Software license
+ * that can be found at https://www.live2d.com/eula/live2d-open-software-license-agreement_en.html.
+ */
+
+
+using UnityEngine;
+
+
+namespace Live2D.Cubism.Framework.Utils
+{
+    public class CubismMath : MonoBehaviour
+    {
+        /// <summary>
+        /// Returns the remainder of the division of two numbers.
+        /// If invalid dividend or divisor is passed, it returns <see cref="float.NaN"/>.
+        /// </summary>
+        /// <param name="dividend"><see cref="Mathf.Infinity"/>, <see cref="Mathf.NegativeInfinity"/> and <see cref="float.NaN"/> are not allowed.</param>
+        /// <param name="divisor"><see cref="float.NaN"/> and Zero is not allowed.</param>
+        /// <returns></returns>
+        public static float ModF(float dividend, float divisor)
+        {
+            if (!float.IsFinite(dividend) || Mathf.Approximately(divisor, 0)
+                || float.IsNaN(dividend) || float.IsNaN(divisor))
+            {
+                Debug.LogWarning($"Invalid dividend or divisor. divided: {dividend}, divisor: {divisor} Mod() returns 'NaN'.");
+                return float.NaN;
+            }
+
+            // Calculate the remainder of the division.
+            return dividend % divisor;
+        }
+    }
+}

Assets/Live2D/Cubism/Framework/Utils/CubismMath.cs

@@ -4,25 +4,34 @@
 
 # お知らせ
 
-## [注意事項] Windows 11の対応状況について (2021-12-09)
-
-Windows 11対応につきまして、Windows 11上にて成果物の動作を確認しております。
-ただし、Windows 11を利用したビルドにつきましては動作を保証しておりません、ご了承ください。
-対応バージョンや時期につきましては今後のリリースをもってお知らせいたします。
-
 ## [制限事項] Windows ARM64向けの対応状況について (2024-01-18)
 
 Unity 2023.1以降にて指定可能となったWindows ARM64向けビルドにつきまして、Cubim SDK for Unityは現在対応しておりません。
 対応バージョンや時期につきましては今後のリリースをもってお知らせいたします。
 
 
+## [注意事項] Apple社のPrivacy Manifest Policy対応について
+
+Apple社が対応を必要としているPrivacy Manifest Policyについて、本製品では指定されているAPI及びサードパーティ製品を使用しておりません。
+もし本製品で対応が必要と判断した場合、今後のアップデートにて順次対応する予定です。
+詳しくはApple社が公開しているドキュメントをご確認ください。
+
+[Privacy updates for App Store submissions](https://developer.apple.com/news/?id=3d8a9yyh)
+
+
 ## [注意事項] macOS Catalina 以降での `.bundle` と `.dylib` の利用について
 
 macOS Catalina 以降で `.bundle` と `.dylib` を利用する際、公証の確認のためオンライン環境に接続している必要があります。
 
 詳しくは、Apple社 公式ドキュメントをご確認ください。
 
 * [Apple社 公式ドキュメント](https://developer.apple.com/documentation/security/notarizing_your_app_before_distribution)
+
+
+## [制限事項] 実行中のマスク用テクスチャの `RenderTextureCount` の値操作について (2024-03-26)
+
+シーン実行中に `CubismMaskTexture.RenderTextureCount` を実行開始時よりも大きい値に変更すると、マスクが正常に再生成されない不具合を確認しています。
+対応バージョンや時期につきましては今後のリリースをもってお知らせいたします。
 ---
 
 ©Live2D

Assets/Live2D/Cubism/Plugins/Editor/CubismWebGLPluginProcessor.cs.meta renamed to Assets/Live2D/Cubism/Framework/Utils/CubismMath.cs.meta

@@ -4,25 +4,34 @@
 
 # Notices
 
-## [Caution] Support for Windows 11 (2021-12-09)
-
-Regarding Windows 11 compatibility, we have confirmed that the deliverables work on Windows 11.
-However, please note that we do not guarantee the operation of builds using Windows 11.
-Supported version will be announced with a future release.
-
 ## [Restrictions] Support for Windows ARM64 (2024-01-18)
 
 Cubism SDK for Unity currently does not support Windows ARM64 builds for Unity 2023.1 or later.
 A supported version will be announced in a future release.
 
 
+## [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.
+This will be addressed in future updates if this product requires such support.
+Please check the documentation published by Apple for details.
+
+[Privacy updates for App Store submissions](https://developer.apple.com/news/?id=3d8a9yyh)
+
+
 ### [Caution] About using `.bundle` and `.dylib` on macOS Catalina or later
 
 To use `.bundle` and `.dylib` on macOS Catalina or later, you need to be connected to an online environment to verify your notarization.
 
 For details, please check the official Apple documentation.
 
 * [Apple Official Documentation](https://developer.apple.com/documentation/security/notarizing_your_app_before_distribution)
+
+
+### [Restrictions] Manipulation of `RenderTextureCount` value for mask textures during execution (2024-03-26)
+
+If `CubismMaskTexture.RenderTextureCount` is changed during scene execution to a value greater than that at the start of execution, the mask will not be regenerated correctly.
+A supported version will be announced in a future release.
 ---
 
 ©Live2D

Assets/Live2D/Cubism/NOTICE.ja.md

@@ -5,6 +5,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/).
 
 
+## 2024-03-26
+
+### Remove
+
+* [Unity] Remove built with Emscripten 1.38.48.
+ * Unity 2021.2 or later uses only Core under `Assets/Live2D/Cubism/Plugins/Experimental/Emscripten/latest`.
+
+
 ## 2023-09-28
 
 ### Remove