v1.0.6 update OpenCVForUnity version to 2.5.0. update DlibLandmarkDetector version to 1.3.4.

EnoxSoftware · EnoxSoftware · commit 28831831df7d · 2022-12-17T02:19:38.000+09:00
diff --git a/Assets/HoloLensWithDlibFaceLandmarkDetectorExample/HLARHeadExample/HLARHeadExample.cs b/Assets/HoloLensWithDlibFaceLandmarkDetectorExample/HLARHeadExample/HLARHeadExample.cs
@@ -295,7 +295,7 @@ public class HLARHeadExample : MonoBehaviour
         /// <summary>
         /// The dlib shape predictor file name.
         /// </summary>
-        string dlibShapePredictorFileName = "sp_human_face_68.dat";
+        string dlibShapePredictorFileName = "DlibFaceLandmarkDetector/sp_human_face_68.dat";
 
         /// <summary>
         /// The dlib shape predictor file path.
@@ -413,14 +413,14 @@ protected void Start()
             dlibShapePredictorFilePath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath(dlibShapePredictorFileName);
             if (string.IsNullOrEmpty(dlibShapePredictorFilePath))
             {
-                Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/” to “Assets/StreamingAssets/” folder. ");
+                Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/DlibFaceLandmarkDetector/” to “Assets/StreamingAssets/DlibFaceLandmarkDetector/” folder. ");
             }
             faceLandmarkDetector = new FaceLandmarkDetector(dlibShapePredictorFilePath);
 
-            dlibShapePredictorFilePath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath("sp_human_face_6.dat");
+            dlibShapePredictorFilePath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath("DlibFaceLandmarkDetector/sp_human_face_6.dat");
             if (string.IsNullOrEmpty(dlibShapePredictorFilePath))
             {
-                Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/” to “Assets/StreamingAssets/” folder. ");
+                Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/DlibFaceLandmarkDetector/” to “Assets/StreamingAssets/DlibFaceLandmarkDetector/” folder. ");
             }
             faceLandmarkDetector4Thread = new FaceLandmarkDetector(dlibShapePredictorFilePath);
 
@@ -587,24 +587,24 @@ public void OnWebCamTextureToMatHelperInitialized()
 
             //grayMat = new Mat();
             cascade = new CascadeClassifier();
-            cascade.load(Utils.getFilePath("objdetect/lbpcascade_frontalface.xml"));
+            cascade.load(Utils.getFilePath("OpenCVForUnity/objdetect/lbpcascade_frontalface.xml"));
 #if !WINDOWS_UWP || UNITY_EDITOR
             // "empty" method is not working on the UWP platform.
             if (cascade.empty())
             {
-                Debug.LogError("cascade file is not loaded. Please copy from “OpenCVForUnity/StreamingAssets/objdetect/” to “Assets/StreamingAssets/objdetect/” folder. ");
+                Debug.LogError("cascade file is not loaded. Please copy from “OpenCVForUnity/StreamingAssets/OpenCVForUnity/objdetect/” to “Assets/StreamingAssets/OpenCVForUnity/objdetect/” folder. ");
             }
 #endif
 
             grayMat4Thread = new Mat();
             cascade4Thread = new CascadeClassifier();
-            //cascade4Thread.load(Utils.getFilePath("objdetect/haarcascade_frontalface_alt.xml"));
-            cascade4Thread.load(Utils.getFilePath("objdetect/lbpcascade_frontalface.xml"));
+            //cascade4Thread.load(Utils.getFilePath("OpenCVForUnity/objdetect/haarcascade_frontalface_alt.xml"));
+            cascade4Thread.load(Utils.getFilePath("OpenCVForUnity/objdetect/lbpcascade_frontalface.xml"));
 #if !WINDOWS_UWP || UNITY_EDITOR
             // "empty" method is not working on the UWP platform.
             if (cascade4Thread.empty())
             {
-                Debug.LogError("cascade file is not loaded. Please copy from “OpenCVForUnity/StreamingAssets/objdetect/” to “Assets/StreamingAssets/objdetect/” folder. ");
+                Debug.LogError("cascade file is not loaded. Please copy from “OpenCVForUnity/StreamingAssets/OpenCVForUnity/objdetect/” to “Assets/StreamingAssets/OpenCVForUnity/objdetect/” folder. ");
             }
 #endif
         }
@@ -1583,7 +1583,7 @@ public void OnStopButtonClick()
         /// </summary>
         public void OnChangeCameraButtonClick()
         {
-            webCamTextureToMatHelper.requestedIsFrontFacing = !webCamTextureToMatHelper.IsFrontFacing();
+            webCamTextureToMatHelper.requestedIsFrontFacing = !webCamTextureToMatHelper.requestedIsFrontFacing;
         }
 
         /// <summary>
diff --git a/Assets/HoloLensWithDlibFaceLandmarkDetectorExample/HLFaceLandmarkDetectionExample/HLFaceLandmarkDetectionExample.cs b/Assets/HoloLensWithDlibFaceLandmarkDetectorExample/HLFaceLandmarkDetectionExample/HLFaceLandmarkDetectionExample.cs
@@ -124,7 +124,7 @@ public class HLFaceLandmarkDetectionExample : MonoBehaviour
         /// <summary>
         /// The dlib shape predictor file name.
         /// </summary>
-        string dlibShapePredictorFileName = "sp_human_face_68.dat";
+        string dlibShapePredictorFileName = "DlibFaceLandmarkDetector/sp_human_face_68.dat";
 
         /// <summary>
         /// The dlib shape predictor file path.
@@ -239,15 +239,15 @@ protected void Start()
             dlibShapePredictorFilePath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath(dlibShapePredictorFileName);
             if (string.IsNullOrEmpty(dlibShapePredictorFilePath))
             {
-                Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/” to “Assets/StreamingAssets/” folder. ");
+                Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/DlibFaceLandmarkDetector/” to “Assets/StreamingAssets/DlibFaceLandmarkDetector/” folder. ");
             }
             faceLandmarkDetector = new FaceLandmarkDetector(dlibShapePredictorFilePath);
 
 
-            dlibShapePredictorFilePath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath("sp_human_face_6.dat");
+            dlibShapePredictorFilePath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath("DlibFaceLandmarkDetector/sp_human_face_6.dat");
             if (string.IsNullOrEmpty(dlibShapePredictorFilePath))
             {
-                Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/” to “Assets/StreamingAssets/” folder. ");
+                Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/DlibFaceLandmarkDetector/” to “Assets/StreamingAssets/DlibFaceLandmarkDetector/” folder. ");
             }
             faceLandmarkDetector4Thread = new FaceLandmarkDetector(dlibShapePredictorFilePath);
         }
@@ -307,24 +307,24 @@ public void OnWebCamTextureToMatHelperInitialized()
 
 
             cascade = new CascadeClassifier();
-            cascade.load(Utils.getFilePath("objdetect/lbpcascade_frontalface.xml"));
+            cascade.load(Utils.getFilePath("OpenCVForUnity/objdetect/lbpcascade_frontalface.xml"));
 #if !WINDOWS_UWP || UNITY_EDITOR
             // "empty" method is not working on the UWP platform.
             if (cascade.empty())
             {
-                Debug.LogError("cascade file is not loaded. Please copy from “OpenCVForUnity/StreamingAssets/objdetect/” to “Assets/StreamingAssets/objdetect/” folder. ");
+                Debug.LogError("cascade file is not loaded. Please copy from “OpenCVForUnity/StreamingAssets/OpenCVForUnity/objdetect/” to “Assets/StreamingAssets/OpenCVForUnity/objdetect/” folder. ");
             }
 #endif
 
             grayMat4Thread = new Mat();
             cascade4Thread = new CascadeClassifier();
-            //cascade4Thread.load(Utils.getFilePath("objdetect/haarcascade_frontalface_alt.xml"));
-            cascade4Thread.load(Utils.getFilePath("objdetect/lbpcascade_frontalface.xml"));
+            //cascade4Thread.load(Utils.getFilePath("OpenCVForUnity/objdetect/haarcascade_frontalface_alt.xml"));
+            cascade4Thread.load(Utils.getFilePath("OpenCVForUnity/objdetect/lbpcascade_frontalface.xml"));
 #if !WINDOWS_UWP || UNITY_EDITOR
             // "empty" method is not working on the UWP platform.
             if (cascade4Thread.empty())
             {
-                Debug.LogError("cascade file is not loaded. Please copy from “OpenCVForUnity/StreamingAssets/objdetect/” to “Assets/StreamingAssets/objdetect/” folder. ");
+                Debug.LogError("cascade file is not loaded. Please copy from “OpenCVForUnity/StreamingAssets/OpenCVForUnity/objdetect/” to “Assets/StreamingAssets/OpenCVForUnity/objdetect/” folder. ");
             }
 #endif
         }
@@ -1131,7 +1131,7 @@ public void OnStopButtonClick()
         /// </summary>
         public void OnChangeCameraButtonClick()
         {
-            webCamTextureToMatHelper.requestedIsFrontFacing = !webCamTextureToMatHelper.IsFrontFacing();
+            webCamTextureToMatHelper.requestedIsFrontFacing = !webCamTextureToMatHelper.requestedIsFrontFacing;
         }
 
         /// <summary>
diff --git a/Assets/HoloLensWithDlibFaceLandmarkDetectorExample/HLPhotoCaptureExample/HLPhotoCaptureExample.cs b/Assets/HoloLensWithDlibFaceLandmarkDetectorExample/HLPhotoCaptureExample/HLPhotoCaptureExample.cs
@@ -38,7 +38,7 @@ public class HLPhotoCaptureExample : MonoBehaviour
         private uint numPhotos = 0;
 
         private FaceLandmarkDetector faceLandmarkDetector;
-        private string dlibShapePredictorFileName = "sp_human_face_68.dat";
+        private string dlibShapePredictorFileName = "DlibFaceLandmarkDetector/sp_human_face_68.dat";
         private string dlibShapePredictorFilePath;
 
         private IEnumerator Start()
@@ -48,7 +48,7 @@ private IEnumerator Start()
             dlibShapePredictorFilePath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath(dlibShapePredictorFileName);
             if (string.IsNullOrEmpty(dlibShapePredictorFilePath))
             {
-                Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/” to “Assets/StreamingAssets/” folder. ");
+                Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/DlibFaceLandmarkDetector/” to “Assets/StreamingAssets/DlibFaceLandmarkDetector/” folder. ");
             }
             faceLandmarkDetector = new FaceLandmarkDetector(dlibShapePredictorFilePath);
 
diff --git a/Assets/HoloLensWithDlibFaceLandmarkDetectorExample/HoloLensWithDlibFaceLandmarkDetectorExample.cs b/Assets/HoloLensWithDlibFaceLandmarkDetectorExample/HoloLensWithDlibFaceLandmarkDetectorExample.cs
@@ -35,7 +35,7 @@ public static string dlibShapePredictorFileName
         {
             get
             {
-                return dlibShapePredictorName.ToString() + ".dat";
+                return "DlibFaceLandmarkDetector/" + dlibShapePredictorName.ToString() + ".dat";
             }
         }
 
diff --git a/ProjectAssets.jpg b/ProjectAssets.jpg
diff --git a/README.md b/README.md
@@ -15,8 +15,8 @@
 * Visual Studio 2019
 * Unity 2019.4.31f1 / 2020.3.38f1
 * [Microsoft Mixed Reality Toolkit](https://github.com/Microsoft/MixedRealityToolkit-Unity/releases) v2.8.2  
-* [OpenCV for Unity](https://assetstore.unity.com/packages/tools/integration/opencv-for-unity-21088?aid=1011l4ehR) 2.4.9+ 
-* [Dlib FaceLandmarkDetector](https://assetstore.unity.com/packages/tools/integration/dlib-facelandmark-detector-64314?aid=1011l4ehR) 1.3.3+ 
+* [OpenCV for Unity](https://assetstore.unity.com/packages/tools/integration/opencv-for-unity-21088?aid=1011l4ehR) 2.5.0+ 
+* [Dlib FaceLandmarkDetector](https://assetstore.unity.com/packages/tools/integration/dlib-facelandmark-detector-64314?aid=1011l4ehR) 1.3.4+ 
 * [EnoxSoftware/HoloLensCameraStream](https://github.com/EnoxSoftware/HoloLensCameraStream)
 
 
@@ -25,11 +25,13 @@
 1. Create a new project. (`HoloLensWithDlibFaceLandmarkDetectorExample`)
     * Change the platform to `UWP` in the "Build Settings" window.
 1. Import the OpenCVForUnity.
-    * Setup the OpenCVForUnity. (Tools > OpenCV for Unity > Set Plugin Import Settings)
-    * Move the "OpenCVForUnity/StreamingAssets/objdetect/haarcascade_frontalface_alt.xml" and "OpenCVForUnity/StreamingAssets/objdetect/lbpcascade_frontalface.xml" to the "Assets/StreamingAssets/objdetect/" folder.
+    * Select MenuItem[Tools/OpenCV for Unity/Open Setup Tools].
+    * Click the [Move StreamingAssets Folder] button.
+    * Leave the following files and delete the rest. ("StreamingAssets/OpenCVForUnity/objdetect/haarcascade_frontalface_alt.xml", "lbpcascade_ frontalface.xml")
 1. Import the DlibFaceLandmarkDetector.
-    * Setup the OpenCVForUnity. (Tools > Dlib FaceLandmarkDetector > Set Plugin Import Settings)
-    * Move the "DlibFaceLandmarkDetector/StreamingAssets/sp_human_face_68.dat", "sp_human_face_68_for_mobile.dat", "sp_human_face_17.dat", "sp_human_face_17_for_mobile.dat" and "sp_human_face_6.dat" to the "Assets/StreamingAssets/" folder. 
+    * Select MenuItem[Tools/Dlib FaceLandmark Detector/Open Setup Tools].
+    * Click the [Move StreamingAssets Folder] button.
+    * Leave the following files and delete the rest. ("StreamingAssets/DlibFaceLandmarkDetector/sp_human_face_68.dat", "sp_human_face_68_for_mobile.dat", "sp_human_face_17.dat", "sp_human_face_17_for_mobile.dat" and "sp_human_face_6.dat")
 1. Clone HoloLensCameraStream repository.
     * Copy the "HoloLensCameraStream/HoloLensVideoCaptureExample/Assets/CamStream/" folder to the "Assets/" folder.
 1. Import the Microsoft Mixed Reality Toolkit. (Recommend using [MixedRealityFeatureTool](https://www.microsoft.com/en-us/download/details.aspx?id=102778))

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ public class HLARHeadExample : MonoBehaviour`
`295`	`295`	`/// <summary>`
`296`	`296`	`/// The dlib shape predictor file name.`
`297`	`297`	`/// </summary>`
`298`		`- string dlibShapePredictorFileName = "sp_human_face_68.dat";`
	`298`	`+ string dlibShapePredictorFileName = "DlibFaceLandmarkDetector/sp_human_face_68.dat";`
`299`	`299`
`300`	`300`	`/// <summary>`
`301`	`301`	`/// The dlib shape predictor file path.`
`@@ -413,14 +413,14 @@ protected void Start()`
`413`	`413`	`dlibShapePredictorFilePath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath(dlibShapePredictorFileName);`
`414`	`414`	`if (string.IsNullOrEmpty(dlibShapePredictorFilePath))`
`415`	`415`	`{`
`416`		`- Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/” to “Assets/StreamingAssets/” folder. ");`
	`416`	`+ Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/DlibFaceLandmarkDetector/” to “Assets/StreamingAssets/DlibFaceLandmarkDetector/” folder. ");`
`417`	`417`	`}`
`418`	`418`	`faceLandmarkDetector = new FaceLandmarkDetector(dlibShapePredictorFilePath);`
`419`	`419`
`420`		`- dlibShapePredictorFilePath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath("sp_human_face_6.dat");`
	`420`	`+ dlibShapePredictorFilePath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath("DlibFaceLandmarkDetector/sp_human_face_6.dat");`
`421`	`421`	`if (string.IsNullOrEmpty(dlibShapePredictorFilePath))`
`422`	`422`	`{`
`423`		`- Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/” to “Assets/StreamingAssets/” folder. ");`
	`423`	`+ Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/DlibFaceLandmarkDetector/” to “Assets/StreamingAssets/DlibFaceLandmarkDetector/” folder. ");`
`424`	`424`	`}`
`425`	`425`	`faceLandmarkDetector4Thread = new FaceLandmarkDetector(dlibShapePredictorFilePath);`
`426`	`426`
`@@ -587,24 +587,24 @@ public void OnWebCamTextureToMatHelperInitialized()`
`587`	`587`
`588`	`588`	`//grayMat = new Mat();`
`589`	`589`	`cascade = new CascadeClassifier();`
`590`		`- cascade.load(Utils.getFilePath("objdetect/lbpcascade_frontalface.xml"));`
	`590`	`+ cascade.load(Utils.getFilePath("OpenCVForUnity/objdetect/lbpcascade_frontalface.xml"));`
`591`	`591`	`#if !WINDOWS_UWP \|\| UNITY_EDITOR`
`592`	`592`	`// "empty" method is not working on the UWP platform.`
`593`	`593`	`if (cascade.empty())`
`594`	`594`	`{`
`595`		`- Debug.LogError("cascade file is not loaded. Please copy from “OpenCVForUnity/StreamingAssets/objdetect/” to “Assets/StreamingAssets/objdetect/” folder. ");`
	`595`	`+ Debug.LogError("cascade file is not loaded. Please copy from “OpenCVForUnity/StreamingAssets/OpenCVForUnity/objdetect/” to “Assets/StreamingAssets/OpenCVForUnity/objdetect/” folder. ");`
`596`	`596`	`}`
`597`	`597`	`#endif`
`598`	`598`
`599`	`599`	`grayMat4Thread = new Mat();`
`600`	`600`	`cascade4Thread = new CascadeClassifier();`
`601`		`- //cascade4Thread.load(Utils.getFilePath("objdetect/haarcascade_frontalface_alt.xml"));`
`602`		`- cascade4Thread.load(Utils.getFilePath("objdetect/lbpcascade_frontalface.xml"));`
	`601`	`+ //cascade4Thread.load(Utils.getFilePath("OpenCVForUnity/objdetect/haarcascade_frontalface_alt.xml"));`
	`602`	`+ cascade4Thread.load(Utils.getFilePath("OpenCVForUnity/objdetect/lbpcascade_frontalface.xml"));`
`603`	`603`	`#if !WINDOWS_UWP \|\| UNITY_EDITOR`
`604`	`604`	`// "empty" method is not working on the UWP platform.`
`605`	`605`	`if (cascade4Thread.empty())`
`606`	`606`	`{`
`607`		`- Debug.LogError("cascade file is not loaded. Please copy from “OpenCVForUnity/StreamingAssets/objdetect/” to “Assets/StreamingAssets/objdetect/” folder. ");`
	`607`	`+ Debug.LogError("cascade file is not loaded. Please copy from “OpenCVForUnity/StreamingAssets/OpenCVForUnity/objdetect/” to “Assets/StreamingAssets/OpenCVForUnity/objdetect/” folder. ");`
`608`	`608`	`}`
`609`	`609`	`#endif`
`610`	`610`	`}`
`@@ -1583,7 +1583,7 @@ public void OnStopButtonClick()`
`1583`	`1583`	`/// </summary>`
`1584`	`1584`	`public void OnChangeCameraButtonClick()`
`1585`	`1585`	`{`
`1586`		`- webCamTextureToMatHelper.requestedIsFrontFacing = !webCamTextureToMatHelper.IsFrontFacing();`
	`1586`	`+ webCamTextureToMatHelper.requestedIsFrontFacing = !webCamTextureToMatHelper.requestedIsFrontFacing;`
`1587`	`1587`	`}`
`1588`	`1588`
`1589`	`1589`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public class HLFaceLandmarkDetectionExample : MonoBehaviour`
`124`	`124`	`/// <summary>`
`125`	`125`	`/// The dlib shape predictor file name.`
`126`	`126`	`/// </summary>`
`127`		`- string dlibShapePredictorFileName = "sp_human_face_68.dat";`
	`127`	`+ string dlibShapePredictorFileName = "DlibFaceLandmarkDetector/sp_human_face_68.dat";`
`128`	`128`
`129`	`129`	`/// <summary>`
`130`	`130`	`/// The dlib shape predictor file path.`
`@@ -239,15 +239,15 @@ protected void Start()`
`239`	`239`	`dlibShapePredictorFilePath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath(dlibShapePredictorFileName);`
`240`	`240`	`if (string.IsNullOrEmpty(dlibShapePredictorFilePath))`
`241`	`241`	`{`
`242`		`- Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/” to “Assets/StreamingAssets/” folder. ");`
	`242`	`+ Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/DlibFaceLandmarkDetector/” to “Assets/StreamingAssets/DlibFaceLandmarkDetector/” folder. ");`
`243`	`243`	`}`
`244`	`244`	`faceLandmarkDetector = new FaceLandmarkDetector(dlibShapePredictorFilePath);`
`245`	`245`
`246`	`246`
`247`		`- dlibShapePredictorFilePath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath("sp_human_face_6.dat");`
	`247`	`+ dlibShapePredictorFilePath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath("DlibFaceLandmarkDetector/sp_human_face_6.dat");`
`248`	`248`	`if (string.IsNullOrEmpty(dlibShapePredictorFilePath))`
`249`	`249`	`{`
`250`		`- Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/” to “Assets/StreamingAssets/” folder. ");`
	`250`	`+ Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/DlibFaceLandmarkDetector/” to “Assets/StreamingAssets/DlibFaceLandmarkDetector/” folder. ");`
`251`	`251`	`}`
`252`	`252`	`faceLandmarkDetector4Thread = new FaceLandmarkDetector(dlibShapePredictorFilePath);`
`253`	`253`	`}`
`@@ -307,24 +307,24 @@ public void OnWebCamTextureToMatHelperInitialized()`
`307`	`307`
`308`	`308`
`309`	`309`	`cascade = new CascadeClassifier();`
`310`		`- cascade.load(Utils.getFilePath("objdetect/lbpcascade_frontalface.xml"));`
	`310`	`+ cascade.load(Utils.getFilePath("OpenCVForUnity/objdetect/lbpcascade_frontalface.xml"));`
`311`	`311`	`#if !WINDOWS_UWP \|\| UNITY_EDITOR`
`312`	`312`	`// "empty" method is not working on the UWP platform.`
`313`	`313`	`if (cascade.empty())`
`314`	`314`	`{`
`315`		`- Debug.LogError("cascade file is not loaded. Please copy from “OpenCVForUnity/StreamingAssets/objdetect/” to “Assets/StreamingAssets/objdetect/” folder. ");`
	`315`	`+ Debug.LogError("cascade file is not loaded. Please copy from “OpenCVForUnity/StreamingAssets/OpenCVForUnity/objdetect/” to “Assets/StreamingAssets/OpenCVForUnity/objdetect/” folder. ");`
`316`	`316`	`}`
`317`	`317`	`#endif`
`318`	`318`
`319`	`319`	`grayMat4Thread = new Mat();`
`320`	`320`	`cascade4Thread = new CascadeClassifier();`
`321`		`- //cascade4Thread.load(Utils.getFilePath("objdetect/haarcascade_frontalface_alt.xml"));`
`322`		`- cascade4Thread.load(Utils.getFilePath("objdetect/lbpcascade_frontalface.xml"));`
	`321`	`+ //cascade4Thread.load(Utils.getFilePath("OpenCVForUnity/objdetect/haarcascade_frontalface_alt.xml"));`
	`322`	`+ cascade4Thread.load(Utils.getFilePath("OpenCVForUnity/objdetect/lbpcascade_frontalface.xml"));`
`323`	`323`	`#if !WINDOWS_UWP \|\| UNITY_EDITOR`
`324`	`324`	`// "empty" method is not working on the UWP platform.`
`325`	`325`	`if (cascade4Thread.empty())`
`326`	`326`	`{`
`327`		`- Debug.LogError("cascade file is not loaded. Please copy from “OpenCVForUnity/StreamingAssets/objdetect/” to “Assets/StreamingAssets/objdetect/” folder. ");`
	`327`	`+ Debug.LogError("cascade file is not loaded. Please copy from “OpenCVForUnity/StreamingAssets/OpenCVForUnity/objdetect/” to “Assets/StreamingAssets/OpenCVForUnity/objdetect/” folder. ");`
`328`	`328`	`}`
`329`	`329`	`#endif`
`330`	`330`	`}`
`@@ -1131,7 +1131,7 @@ public void OnStopButtonClick()`
`1131`	`1131`	`/// </summary>`
`1132`	`1132`	`public void OnChangeCameraButtonClick()`
`1133`	`1133`	`{`
`1134`		`- webCamTextureToMatHelper.requestedIsFrontFacing = !webCamTextureToMatHelper.IsFrontFacing();`
	`1134`	`+ webCamTextureToMatHelper.requestedIsFrontFacing = !webCamTextureToMatHelper.requestedIsFrontFacing;`
`1135`	`1135`	`}`
`1136`	`1136`
`1137`	`1137`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public class HLPhotoCaptureExample : MonoBehaviour`
`38`	`38`	`private uint numPhotos = 0;`
`39`	`39`
`40`	`40`	`private FaceLandmarkDetector faceLandmarkDetector;`
`41`		`- private string dlibShapePredictorFileName = "sp_human_face_68.dat";`
	`41`	`+ private string dlibShapePredictorFileName = "DlibFaceLandmarkDetector/sp_human_face_68.dat";`
`42`	`42`	`private string dlibShapePredictorFilePath;`
`43`	`43`
`44`	`44`	`private IEnumerator Start()`
`@@ -48,7 +48,7 @@ private IEnumerator Start()`
`48`	`48`	`dlibShapePredictorFilePath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath(dlibShapePredictorFileName);`
`49`	`49`	`if (string.IsNullOrEmpty(dlibShapePredictorFilePath))`
`50`	`50`	`{`
`51`		`- Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/” to “Assets/StreamingAssets/” folder. ");`
	`51`	`+ Debug.LogError("shape predictor file does not exist. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/DlibFaceLandmarkDetector/” to “Assets/StreamingAssets/DlibFaceLandmarkDetector/” folder. ");`
`52`	`52`	`}`
`53`	`53`	`faceLandmarkDetector = new FaceLandmarkDetector(dlibShapePredictorFilePath);`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public static string dlibShapePredictorFileName`
`35`	`35`	`{`
`36`	`36`	`get`
`37`	`37`	`{`
`38`		`- return dlibShapePredictorName.ToString() + ".dat";`
	`38`	`+ return "DlibFaceLandmarkDetector/" + dlibShapePredictorName.ToString() + ".dat";`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`