Merge pull request #73 from Live2D/develop

Update to Cubism 5 SDK for Unity R1 beta1

.editorconfig

@@ -18,3 +18,6 @@ end_of_line = crlf
 [*.{anim,asset,controller,mat,meta,prefab,unity}]
 insert_final_newline = unset
 trim_trailing_whitespace = unset
+
+[*.md]
+trim_trailing_whitespace = false

Assets/Live2D/Cubism/CHANGELOG.md

@@ -4,6 +4,18 @@ 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-beta.1] - 2023-08-17
+
+### Changed
+
+* When importing a Cubism Model in Unity Workflow, the AnimatorController is now set to the Animator in the Model Prefab.
+* Change so that multiply and screen colors applied to parent parts are propagated to child parts.
+
+### Fixed
+
+* Fix an issue where information was being got using indexes instead of IDs when getting cdi3.json data.
+* Fix a bug that prevented proper operation when the Unity Transition was longer than the motion fade.
+
 
 ## [4-r.7] - 2023-05-25
 
@@ -303,6 +315,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-beta.1]: https://github.com/Live2D/CubismUnityComponents/compare/4-r.7...5-r.1-beta.1
 [4-r.7]: https://github.com/Live2D/CubismUnityComponents/compare/4-r.6.2...4-r.7
 [4-r.6.2]: https://github.com/Live2D/CubismUnityComponents/compare/4-r.6.1...4-r.6.2
 [4-r.6.1]: https://github.com/Live2D/CubismUnityComponents/compare/4-r.6...4-r.6.1

Assets/Live2D/Cubism/Core/CubismPart.cs

@@ -95,6 +95,21 @@ public string Id
         [SerializeField, HideInInspector]
         public float Opacity;
 
+        /// <summary>
+        /// Parent part position in unmanaged arrays.
+        /// </summary>
+        internal int UnmanagedParentIndex
+        {
+            get
+            {
+                if (UnmanagedIndex > 0)
+                {
+                    // Pull data.
+                    return UnmanagedParts.ParentIndices[UnmanagedIndex];
+                }
+                return -1;
+            }
+        }
 
         /// <summary>
         /// Revives instance.

Assets/Live2D/Cubism/Core/Unmanaged/CubismCoreDll.cs

@@ -56,9 +56,13 @@ public static class CubismCoreDll
         /// </sumamry>
         public const int MocVersion_40 = 3;
         /// <sumamry>
-        /// .moc3 file version 4.2.00 -
+        /// .moc3 file version 4.2.00 - 4.2.04
         /// </sumamry>
         public const int MocVersion_42 = 4;
+        /// <sumamry>
+        /// .moc3 file version 5.0.00 -
+        /// </sumamry>
+        public const int MocVersion_50 = 5;
 
 
         /// <sumamry>

Assets/Live2D/Cubism/Editor/Inspectors/CubismPartColorsEditorInspector.cs

@@ -16,6 +16,7 @@ namespace Live2D.Cubism.Editor.Inspectors
     internal sealed class PortfolioPartBlendColorEditorInspector : UnityEditor.Editor
     {
         private SerializedProperty childDrawableRenderers;
+        private SerializedProperty childParts;
 
         #region Editor
 
@@ -37,12 +38,21 @@ public override void OnInspectorGUI()
             {
                 childDrawableRenderers = serializedObject.FindProperty("_childDrawableRenderers");
             }
+            if (childParts == null)
+            {
+                childParts = serializedObject.FindProperty("_childParts");
+            }
 
             if (childDrawableRenderers != null)
             {
                 // Show renderers.
                 EditorGUILayout.PropertyField(childDrawableRenderers);
             }
+            if (childParts != null)
+            {
+                // Show parts.
+                EditorGUILayout.PropertyField(childParts);
+            }
 
             EditorGUI.BeginChangeCheck();