Merge pull request Live2D#26 from Live2D/original_workflow_beta

Add MotionController and refactoring code.

Author: ono-at-live2d-com

Assets/Live2D/Cubism/Core/ArrayExtensionMethods.cs

@@ -6,9 +6,8 @@
  */
 
 
-using System;
-using System.Runtime.InteropServices;
 using Live2D.Cubism.Core.Unmanaged;
+using System;
 using UnityEngine;
 
 
@@ -29,9 +28,22 @@ public static class ArrayExtensionMethods
         /// <returns>Parameter on success; <see langword="null"/> otherwise.</returns>
         public static CubismParameter FindById(this CubismParameter[] self, string id)
         {
-            return (self != null)
-                ? Array.Find(self, i => i.name == id)
-                : null;
+            if (self == null)
+            {
+                return null;
+            }
+
+            for (var i = 0; i < self.Length; ++i)
+            {
+                if (self[i].name != id)
+                {
+                    continue;
+                }
+
+                return self[i];
+            }
+
+            return null;
         }
 
 
@@ -101,9 +113,22 @@ internal static void ReadFrom(this CubismParameter[] self, CubismUnmanagedModel
         /// <returns>Part if found; <see langword="null"/> otherwise.</returns>
         public static CubismPart FindById(this CubismPart[] self, string id)
         {
-            return (self != null)
-                ? Array.Find(self, i => i.name == id)
-                : null;
+            if (self == null)
+            {
+                return null;
+            }
+
+            for (var i = 0; i < self.Length; ++i)
+            {
+                if (self[i].name != id)
+                {
+                    continue;
+                }
+
+                return self[i];
+            }
+
+            return null;
         }
 
 
@@ -154,9 +179,22 @@ internal static void WriteTo(this CubismPart[] self, CubismUnmanagedModel unmana
         /// <returns>Part if found; <see langword="null"/> otherwise.</returns>
         public static CubismDrawable FindById(this CubismDrawable[] self, string id)
         {
-            return (self != null)
-                ? Array.Find(self, i => i.name == id)
-                : null;
+            if (self == null)
+            {
+                return null;
+            }
+
+            for (var i = 0; i < self.Length; ++i)
+            {
+                if (self[i].name != id)
+                {
+                    continue;
+                }
+
+                return self[i];
+            }
+
+            return null;
         }
 
 

Assets/Live2D/Cubism/Core/CubismDrawable.cs

@@ -6,10 +6,8 @@
  */
 
 
-using Live2D.Cubism.Framework;
-using System;
-using System.Runtime.InteropServices;
 using Live2D.Cubism.Core.Unmanaged;
+using Live2D.Cubism.Framework;
 using UnityEngine;
 
 

Assets/Live2D/Cubism/Core/CubismDynamicDrawableData.cs

@@ -6,8 +6,6 @@
  */
 
 
-using System;
-using System.Runtime.InteropServices;
 using Live2D.Cubism.Core.Unmanaged;
 using UnityEngine;
 

Assets/Live2D/Cubism/Core/CubismLogging.cs

@@ -7,9 +7,9 @@
 
 
 using AOT;
+using Live2D.Cubism.Core.Unmanaged;
 using System;
 using System.Runtime.InteropServices;
-using Live2D.Cubism.Core.Unmanaged;
 using UnityEngine;
 
 

Assets/Live2D/Cubism/Core/CubismMoc.cs

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright(c) Live2D Inc. All rights reserved.
  * 
  * Use of this source code is governed by the Live2D Open Software license
@@ -7,7 +7,6 @@
 
 
 using System;
-using System.Runtime.InteropServices;
 using Live2D.Cubism.Core.Unmanaged;
 using UnityEngine;
 

Assets/Live2D/Cubism/Core/CubismModel.cs

@@ -194,7 +194,6 @@ private bool CanRevive
             get { return Moc != null; }
         }
 
-
         /// <summary>
         /// Revives instance.
         /// </summary>

Assets/Live2D/Cubism/Core/CubismParameter.cs

@@ -6,10 +6,8 @@
  */
 
 
-using Live2D.Cubism.Framework;
-using System;
-using System.Runtime.InteropServices;
 using Live2D.Cubism.Core.Unmanaged;
+using Live2D.Cubism.Framework;
 using UnityEngine;
 
 

Assets/Live2D/Cubism/Core/CubismPart.cs

@@ -6,10 +6,8 @@
  */
 
 
-using Live2D.Cubism.Framework;
-using System;
-using System.Runtime.InteropServices;
 using Live2D.Cubism.Core.Unmanaged;
+using Live2D.Cubism.Framework;
 using UnityEngine;
 
 

Assets/Live2D/Cubism/Core/CubismTaskableModel.cs

@@ -6,10 +6,8 @@
  */
 
 
-using System;
-using System.Runtime.InteropServices;
-using System.Threading;
 using Live2D.Cubism.Core.Unmanaged;
+using System.Threading;
 
 
 namespace Live2D.Cubism.Core

Assets/Live2D/Cubism/Editor/CubismAssetProcessor.cs

@@ -6,13 +6,13 @@
  */
 
 
+using Live2D.Cubism.Editor.Deleters;
+using Live2D.Cubism.Editor.Importers;
 using Live2D.Cubism.Rendering;
 using Live2D.Cubism.Rendering.Masking;
 using System.IO;
 using System.Linq;
 using System.Xml.Linq;
-using Live2D.Cubism.Editor.Importers;
-using Live2D.Cubism.Editor.Deleters;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Rendering;
@@ -50,11 +50,11 @@ private static void OnPostprocessAllAssets(
             string[] movedAssetPaths,
             string[] movedFromAssetPaths)
         {
-			// Make sure builtin resources are available.
-			GenerateBuiltinResources();
+            // Make sure builtin resources are available.
+            GenerateBuiltinResources();
 
 
-			// Handle any imported Cubism assets.
+            // Handle any imported Cubism assets.
             foreach (var assetPath in importedAssetPaths)
             {
                 var importer = CubismImporter.GetImporterAtPath(assetPath);
@@ -148,7 +148,7 @@ private static void AllowUnsafeCode()
 
         #endregion
 
-		#region Resources Generation
+        #region Resources Generation
 
         /// <summary>
         /// Sets Cubism-style normal blending for a material.
@@ -203,29 +203,29 @@ private static void EnableMasking(Material material)
             shaderKeywords.RemoveAll(k => k == "CUBISM_MASK_OFF");
 
 
-			if (!shaderKeywords.Contains("CUBISM_MASK_ON"))
-			{
-				shaderKeywords.Add("CUBISM_MASK_ON");
-			}
+            if (!shaderKeywords.Contains("CUBISM_MASK_ON"))
+            {
+                shaderKeywords.Add("CUBISM_MASK_ON");
+            }
 
 
-			material.shaderKeywords = shaderKeywords.ToArray();
+            material.shaderKeywords = shaderKeywords.ToArray();
         }
 
 
         /// <summary>
         /// Generates the builtin resources as necessary.
         /// </summary>
-		private static void GenerateBuiltinResources()
-		{
-			var resourcesRoot = AssetDatabase
-				.GetAssetPath(CubismBuiltinShaders.Unlit)
-				.Replace("/Shaders/Unlit.shader", "");
+        private static void GenerateBuiltinResources()
+        {
+            var resourcesRoot = AssetDatabase
+                .GetAssetPath(CubismBuiltinShaders.Unlit)
+                .Replace("/Shaders/Unlit.shader", "");
 
 
-			// Create materials.
-			if (CubismBuiltinMaterials.Mask == null)
-			{
+            // Create materials.
+            if (CubismBuiltinMaterials.Mask == null)
+            {
                 var materialsRoot = resourcesRoot + "/Materials";
 
 
@@ -305,23 +305,23 @@ private static void GenerateBuiltinResources()
                 AssetDatabase.CreateAsset(material, string.Format("{0}/{1}.mat", materialsRoot, material.name));
 
 
-				EditorUtility.SetDirty(CubismBuiltinShaders.Unlit);
-				AssetDatabase.SaveAssets();
-			}
+                EditorUtility.SetDirty(CubismBuiltinShaders.Unlit);
+                AssetDatabase.SaveAssets();
+            }
 
 
-			// Create global mask texture.
-			if (CubismMaskTexture.GlobalMaskTexture == null)
-			{
+            // Create global mask texture.
+            if (CubismMaskTexture.GlobalMaskTexture == null)
+            {
                 var globalMaskTexture = ScriptableObject.CreateInstance<CubismMaskTexture>();
 
                 globalMaskTexture.name = "GlobalMaskTexture";
 
 
                 AssetDatabase.CreateAsset(globalMaskTexture, string.Format("{0}/{1}.asset", resourcesRoot, globalMaskTexture.name));
-			}
-		}
+            }
+        }
 
-		#endregion
+        #endregion
     }
 }