Merge pull request #74 from Live2D/develop

Update to Cubism 5 SDK for Unity R1 beta2

Author: itoh-at-live2d-com

.editorconfig

@@ -15,7 +15,7 @@ indent_size = 4
 [*.{csproj,sln}]
 end_of_line = crlf
 
-[*.{anim,asset,controller,mat,meta,prefab,unity}]
+[*.{anim,asset,controller,mat,meta,prefab,unity,asmdef}]
 insert_final_newline = unset
 trim_trailing_whitespace = unset
 

Assets/Live2D/Cubism/CHANGELOG.md

@@ -4,6 +4,23 @@ 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.2] - 2023-09-28
+
+### Added
+
+* Added configuration file so that assemblies are split.
+
+### Changed
+
+* Replace the sample model `Mao` with the updated version that is compatible with Cubism 5.0.
+
+### Fixed
+
+* Fix an issue where 1 byte of memory was allocated unnecessarily.
+* Fix a bug where automatic eye blinking did not close the eyes fully.
+
+
 ## [5-r.1-beta.1] - 2023-08-17
 
 ### Changed
@@ -315,6 +332,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.2]: https://github.com/Live2D/CubismUnityComponents/compare/5-r.1-beta.1...5-r.1-beta.2
 [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

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

@@ -97,7 +97,7 @@ public unsafe float this[int index]
         /// </summary>
         /// <param name="address">Unmanaged buffer address.</param>
         /// <param name="length">Length of unmanaged buffer (in types).</param>
-        internal unsafe CubismUnmanagedFloatArrayView(float* address, int length)
+        public unsafe CubismUnmanagedFloatArrayView(float* address, int length)
         {
             UnmanagedFixedAddress = address;
             Length = length;
@@ -108,7 +108,7 @@ internal unsafe CubismUnmanagedFloatArrayView(float* address, int length)
         /// </summary>
         /// <param name="address">Unmanaged buffer address.</param>
         /// <param name="length">Length of unmanaged buffer (in types).</param>
-        internal unsafe CubismUnmanagedFloatArrayView(IntPtr address, int length)
+        public unsafe CubismUnmanagedFloatArrayView(IntPtr address, int length)
         {
             UnmanagedFixedAddress = (float*)address.ToPointer();
             Length = length;
@@ -275,7 +275,7 @@ public unsafe int this[int index]
         /// </summary>
         /// <param name="address">Unmanaged buffer address.</param>
         /// <param name="length">Length of unmanaged buffer (in types).</param>
-        internal unsafe CubismUnmanagedIntArrayView(int* address, int length)
+        public unsafe CubismUnmanagedIntArrayView(int* address, int length)
         {
             UnmanagedFixedAddress = address;
             Length = length;
@@ -286,7 +286,7 @@ internal unsafe CubismUnmanagedIntArrayView(int* address, int length)
         /// </summary>
         /// <param name="address">Unmanaged buffer address.</param>
         /// <param name="length">Length of unmanaged buffer (in types).</param>
-        internal unsafe CubismUnmanagedIntArrayView(IntPtr address, int length)
+        public unsafe CubismUnmanagedIntArrayView(IntPtr address, int length)
         {
             UnmanagedFixedAddress = (int*)address.ToPointer();
             Length = length;
@@ -453,7 +453,7 @@ public unsafe Byte this[int index]
         /// </summary>
         /// <param name="address">Unmanaged buffer address.</param>
         /// <param name="length">Length of unmanaged buffer (in types).</param>
-        internal unsafe CubismUnmanagedByteArrayView(Byte* address, int length)
+        public unsafe CubismUnmanagedByteArrayView(Byte* address, int length)
         {
             UnmanagedFixedAddress = address;
             Length = length;
@@ -464,7 +464,7 @@ internal unsafe CubismUnmanagedByteArrayView(Byte* address, int length)
         /// </summary>
         /// <param name="address">Unmanaged buffer address.</param>
         /// <param name="length">Length of unmanaged buffer (in types).</param>
-        internal unsafe CubismUnmanagedByteArrayView(IntPtr address, int length)
+        public unsafe CubismUnmanagedByteArrayView(IntPtr address, int length)
         {
             UnmanagedFixedAddress = (Byte*)address.ToPointer();
             Length = length;
@@ -631,7 +631,7 @@ public unsafe ushort this[int index]
         /// </summary>
         /// <param name="address">Unmanaged buffer address.</param>
         /// <param name="length">Length of unmanaged buffer (in types).</param>
-        internal unsafe CubismUnmanagedUshortArrayView(ushort* address, int length)
+        public unsafe CubismUnmanagedUshortArrayView(ushort* address, int length)
         {
             UnmanagedFixedAddress = address;
             Length = length;
@@ -642,7 +642,7 @@ internal unsafe CubismUnmanagedUshortArrayView(ushort* address, int length)
         /// </summary>
         /// <param name="address">Unmanaged buffer address.</param>
         /// <param name="length">Length of unmanaged buffer (in types).</param>
-        internal unsafe CubismUnmanagedUshortArrayView(IntPtr address, int length)
+        public unsafe CubismUnmanagedUshortArrayView(IntPtr address, int length)
         {
             UnmanagedFixedAddress = (ushort*)address.ToPointer();
             Length = length;

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

@@ -18,7 +18,7 @@ namespace Live2D.Cubism.Core.Unmanaged
     /// <summary>
     /// Unmanaged memory helper methods.
     /// </summary>
-    internal static class CubismUnmanagedMemory
+    public static class CubismUnmanagedMemory
     {
         #region Allocation
 
@@ -69,7 +69,7 @@ public static IntPtr Allocate(int size, int align)
 
 
             // Allocate unaligned memory block.
-            var unalignedAddress = Marshal.AllocHGlobal(size + align);
+            var unalignedAddress = Marshal.AllocHGlobal(size + align - 1);
 
 
             // Get aligned address.

Assets/Live2D/Cubism/Editor/Live2D.Cubism.Editor.asmdef

@@ -0,0 +1,18 @@
+{
+  "name": "Live2D.Cubism.Editor",
+  "rootNamespace": "",
+  "references": [
+      "GUID:b2b60b59554a33b41b16ef821fecbac2"
+  ],
+  "includePlatforms": [
+      "Editor"
+  ],
+  "excludePlatforms": [],
+  "allowUnsafeCode": false,
+  "overrideReferences": false,
+  "precompiledReferences": [],
+  "autoReferenced": true,
+  "defineConstraints": [],
+  "versionDefines": [],
+  "noEngineReferences": false
+}