update 1.1.1

Author: EnoxSoftware

Assets/CVVTuberExample/CVVTuber/Addons/Live2DCubism5CVVTuber.unitypackage

@@ -20,8 +20,8 @@ public class VideoCaptureCVVTuberExample : MonoBehaviour
         void Start()
         {
             // Load global settings.
-            dlibFaceLandmarkGetter.dlibShapePredictorFileName = CVVTuberExample.dlibShapePredictorFileName;
-            dlibFaceLandmarkGetter.dlibShapePredictorMobileFileName = CVVTuberExample.dlibShapePredictorFileName;
+            dlibFaceLandmarkGetter.dlibShapePredictorFilePath = CVVTuberExample.dlibShapePredictorFilePath;
+            dlibFaceLandmarkGetter.dlibShapePredictorMobileFilePath = CVVTuberExample.dlibShapePredictorFilePath;
         }
 
         /// <summary>

Assets/CVVTuberExample/CVVTuber/Addons/UnityChanCVVTuber.unitypackage

@@ -20,8 +20,8 @@ public class WebCamTextureCVVTuberExample : MonoBehaviour
         void Start()
         {
             // Load global settings.
-            dlibFaceLandmarkGetter.dlibShapePredictorFileName = CVVTuberExample.dlibShapePredictorFileName;
-            dlibFaceLandmarkGetter.dlibShapePredictorMobileFileName = CVVTuberExample.dlibShapePredictorFileName;
+            dlibFaceLandmarkGetter.dlibShapePredictorFilePath = CVVTuberExample.dlibShapePredictorFilePath;
+            dlibFaceLandmarkGetter.dlibShapePredictorMobileFilePath = CVVTuberExample.dlibShapePredictorFilePath;
         }
 
         /// <summary>

Assets/CVVTuberExample/CVVTuber/Addons/VRM10CVVTuber.unitypackage

@@ -20,15 +20,7 @@ protected virtual IEnumerator Start()
             if (processOrderList == null)
                 yield break;
 
-            foreach (var item in processOrderList)
-            {
-                if (item == null)
-                    continue;
-
-                //Debug.Log("Setup : "+item.gameObject.name);
-
-                item.Setup();
-            }
+            SetupAllProcess();
 
             enabled = true;
         }
@@ -82,5 +74,21 @@ public virtual void Dispose()
         {
 
         }
+
+        public virtual void SetupAllProcess()
+        {
+            if (processOrderList == null)
+                return;
+
+            foreach (var item in processOrderList)
+            {
+                if (item == null)
+                    continue;
+
+                //Debug.Log("Setup : "+item.gameObject.name);
+
+                item.Setup();
+            }
+        }
     }
 }

Assets/CVVTuberExample/CVVTuber/Addons/VRM10CVVTuber.unitypackage.meta

@@ -45,9 +45,11 @@ protected IFaceRectGetter faceRectGetterInterface
 
         [Header("[Setting]")]
 
-        public string dlibShapePredictorFileName;
+        [Tooltip("Set the shape predictor file path, relative to the starting point of the \"StreamingAssets\" folder, or absolute path.")]
+        public string dlibShapePredictorFilePath;
 
-        public string dlibShapePredictorMobileFileName;
+        [Tooltip("Set the shape predictor mobile file path, relative to the starting point of the \"StreamingAssets\" folder, or absolute path.")]
+        public string dlibShapePredictorMobileFilePath;
 
         [Header("[Debug]")]
 
@@ -69,11 +71,11 @@ protected IFaceRectGetter faceRectGetterInterface
 
         protected FaceLandmarkDetector faceLandmarkDetector;
 
-        protected static readonly string DLIB_SHAPEPREDICTOR_FILENAME_PRESET = "DlibFaceLandmarkDetector/sp_human_face_68.dat";
+        protected static readonly string DLIB_SHAPEPREDICTOR_FILEPATH_PRESET = "DlibFaceLandmarkDetector/sp_human_face_68.dat";
 
-        protected static readonly string DLIB_SHAPEPREDICTOR_MOBILE_FILENAME_PRESET = "DlibFaceLandmarkDetector/sp_human_face_68_for_mobile.dat";
+        protected static readonly string DLIB_SHAPEPREDICTOR_MOBILE_FILEPATH_PRESET = "DlibFaceLandmarkDetector/sp_human_face_68_for_mobile.dat";
 
-        protected string dlibShapePredictorFilePath;
+        protected string dlibShapePredictorFileFullPath;
 
 #if UNITY_WEBGL
         protected IEnumerator getFilePath_Coroutine;
@@ -89,37 +91,59 @@ public override string GetDescription()
 
         public override void Setup()
         {
+            Dispose();
+
             NullCheck(matSourceGetterInterface, "matSourceGetter");
 
-            if (string.IsNullOrEmpty(dlibShapePredictorFileName))
-                dlibShapePredictorFileName = DLIB_SHAPEPREDICTOR_FILENAME_PRESET;
+            if (string.IsNullOrEmpty(dlibShapePredictorFilePath))
+                dlibShapePredictorFilePath = DLIB_SHAPEPREDICTOR_FILEPATH_PRESET;
+
+            if (string.IsNullOrEmpty(dlibShapePredictorMobileFilePath))
+                dlibShapePredictorMobileFilePath = DLIB_SHAPEPREDICTOR_MOBILE_FILEPATH_PRESET;
 
-            if (string.IsNullOrEmpty(dlibShapePredictorMobileFileName))
-                dlibShapePredictorMobileFileName = DLIB_SHAPEPREDICTOR_MOBILE_FILENAME_PRESET;
 
 #if UNITY_WEBGL
-            getFilePath_Coroutine = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePathAsync(dlibShapePredictorMobileFileName, (result) =>
+            Uri uri;
+            if (Uri.TryCreate(dlibShapePredictorMobileFilePath, UriKind.Absolute, out uri))
             {
-                getFilePath_Coroutine = null;
-
-                dlibShapePredictorFilePath = result;
-                if (string.IsNullOrEmpty(dlibShapePredictorFilePath))
-                {
-                    Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/DlibFaceLandmarkDetector/” to “Assets/StreamingAssets/DlibFaceLandmarkDetector/” folder. ");
-                }
+                dlibShapePredictorFileFullPath = uri.OriginalString;
                 Run();
-            });
-            StartCoroutine(getFilePath_Coroutine);
+            }
+            else
+            {
+                getFilePath_Coroutine = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePathAsync(dlibShapePredictorMobileFilePath, (result) =>
+                {
+                    getFilePath_Coroutine = null;
+
+                    dlibShapePredictorFileFullPath = result;
+                    Run();
+                });
+                StartCoroutine(getFilePath_Coroutine);
+            }
 #else
+
 #if UNITY_ANDROID || UNITY_IOS
-            dlibShapePredictorFilePath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath(dlibShapePredictorMobileFileName);
+            Uri uri;
+            if (Uri.TryCreate(dlibShapePredictorMobileFilePath, UriKind.Absolute, out uri))
+            {
+                dlibShapePredictorFileFullPath = uri.OriginalString;
+            }
+            else
+            {
+                dlibShapePredictorFileFullPath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath(dlibShapePredictorMobileFilePath);
+            }
 #else
-            dlibShapePredictorFilePath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath(dlibShapePredictorFileName);
-#endif
-            if (string.IsNullOrEmpty(dlibShapePredictorFilePath))
+            Uri uri;
+            if (Uri.TryCreate(dlibShapePredictorFilePath, UriKind.Absolute, out uri))
             {
-                Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/DlibFaceLandmarkDetector/” to “Assets/StreamingAssets/DlibFaceLandmarkDetector/” folder. ");
+                dlibShapePredictorFileFullPath = uri.OriginalString;
+            }
+            else
+            {
+                dlibShapePredictorFileFullPath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath(dlibShapePredictorFilePath);
             }
+#endif     
+
             Run();
 #endif
         }
@@ -254,7 +278,10 @@ public override void UpdateValue()
         public override void Dispose()
         {
             if (faceLandmarkDetector != null)
+            {
                 faceLandmarkDetector.Dispose();
+                faceLandmarkDetector = null;
+            }
 
             if (debugMat != null)
             {
@@ -282,7 +309,12 @@ public override void Dispose()
 
         protected virtual void Run()
         {
-            faceLandmarkDetector = new FaceLandmarkDetector(dlibShapePredictorFilePath);
+            if (string.IsNullOrEmpty(dlibShapePredictorFileFullPath))
+            {
+                Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/DlibFaceLandmarkDetector/” to “Assets/StreamingAssets/DlibFaceLandmarkDetector/” folder. ");
+            }
+
+            faceLandmarkDetector = new FaceLandmarkDetector(dlibShapePredictorFileFullPath);
 
             didUpdateFaceLanmarkPoints = false;
         }