Skip to content

Commit d2296a1

Browse files
committed
update 1.1.1
1 parent b33c861 commit d2296a1

File tree

11 files changed

+26
-26209
lines changed

11 files changed

+26
-26209
lines changed
2.77 MB
Binary file not shown.

Assets/FaceSwapperExample/Texture2DFaceChangerExample/Texture2DFaceChangerExample.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,22 +101,22 @@ void Start()
101101
getFilePath_Coroutine = GetFilePath();
102102
StartCoroutine(getFilePath_Coroutine);
103103
#else
104-
haarcascade_frontalface_alt_xml_filepath = OpenCVForUnity.UnityUtils.Utils.getFilePath("haarcascade_frontalface_alt.xml");
105-
sp_human_face_68_dat_filepath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath("sp_human_face_68.dat");
104+
haarcascade_frontalface_alt_xml_filepath = OpenCVForUnity.UnityUtils.Utils.getFilePath("DlibFaceLandmarkDetector/haarcascade_frontalface_alt.xml");
105+
sp_human_face_68_dat_filepath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath("DlibFaceLandmarkDetector/sp_human_face_68.dat");
106106
Run();
107107
#endif
108108
}
109109

110110
#if UNITY_WEBGL
111111
private IEnumerator GetFilePath()
112112
{
113-
var getFilePathAsync_0_Coroutine = OpenCVForUnity.UnityUtils.Utils.getFilePathAsync("haarcascade_frontalface_alt.xml", (result) =>
113+
var getFilePathAsync_0_Coroutine = OpenCVForUnity.UnityUtils.Utils.getFilePathAsync("DlibFaceLandmarkDetector/haarcascade_frontalface_alt.xml", (result) =>
114114
{
115115
haarcascade_frontalface_alt_xml_filepath = result;
116116
});
117117
yield return getFilePathAsync_0_Coroutine;
118118

119-
var getFilePathAsync_1_Coroutine = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePathAsync("sp_human_face_68.dat", (result) =>
119+
var getFilePathAsync_1_Coroutine = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePathAsync("DlibFaceLandmarkDetector/sp_human_face_68.dat", (result) =>
120120
{
121121
sp_human_face_68_dat_filepath = result;
122122
});
@@ -186,7 +186,7 @@ private void Run()
186186
if (cascade == null)
187187
cascade = new CascadeClassifier(haarcascade_frontalface_alt_xml_filepath);
188188
//if (cascade.empty ()) {
189-
// Debug.LogError ("cascade file is not loaded.Please copy from “FaceTrackerExample/StreamingAssets/” to “Assets/StreamingAssets/” folder. ");
189+
// Debug.LogError ("cascade file is not loaded. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/DlibFaceLandmarkDetector/” to “Assets/StreamingAssets/DlibFaceLandmarkDetector/” folder. ");
190190
//}
191191

192192
// convert image to greyscale.

Assets/FaceSwapperExample/Texture2DFaceSwapperExample/Texture2DFaceSwapperExample.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,22 +111,22 @@ void Start()
111111
getFilePath_Coroutine = GetFilePath();
112112
StartCoroutine(getFilePath_Coroutine);
113113
#else
114-
haarcascade_frontalface_alt_xml_filepath = OpenCVForUnity.UnityUtils.Utils.getFilePath("haarcascade_frontalface_alt.xml");
115-
sp_human_face_68_dat_filepath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath("sp_human_face_68.dat");
114+
haarcascade_frontalface_alt_xml_filepath = OpenCVForUnity.UnityUtils.Utils.getFilePath("DlibFaceLandmarkDetector/haarcascade_frontalface_alt.xml");
115+
sp_human_face_68_dat_filepath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath("DlibFaceLandmarkDetector/sp_human_face_68.dat");
116116
Run();
117117
#endif
118118
}
119119

120120
#if UNITY_WEBGL
121121
private IEnumerator GetFilePath()
122122
{
123-
var getFilePathAsync_0_Coroutine = OpenCVForUnity.UnityUtils.Utils.getFilePathAsync("haarcascade_frontalface_alt.xml", (result) =>
123+
var getFilePathAsync_0_Coroutine = OpenCVForUnity.UnityUtils.Utils.getFilePathAsync("DlibFaceLandmarkDetector/haarcascade_frontalface_alt.xml", (result) =>
124124
{
125125
haarcascade_frontalface_alt_xml_filepath = result;
126126
});
127127
yield return getFilePathAsync_0_Coroutine;
128128

129-
var getFilePathAsync_1_Coroutine = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePathAsync("sp_human_face_68.dat", (result) =>
129+
var getFilePathAsync_1_Coroutine = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePathAsync("DlibFaceLandmarkDetector/sp_human_face_68.dat", (result) =>
130130
{
131131
sp_human_face_68_dat_filepath = result;
132132
});
@@ -198,7 +198,7 @@ private void Run()
198198
cascade = new CascadeClassifier(haarcascade_frontalface_alt_xml_filepath);
199199
//if (cascade.empty())
200200
//{
201-
// Debug.LogError("cascade file is not loaded.Please copy from “FaceTrackerExample/StreamingAssets/” to “Assets/StreamingAssets/” folder. ");
201+
// Debug.LogError("cascade file is not loaded. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/DlibFaceLandmarkDetector/” to “Assets/StreamingAssets/DlibFaceLandmarkDetector/” folder. ");
202202
//}
203203

204204
// convert image to greyscale.

Assets/FaceSwapperExample/VideoCaptureFaceSwapperExample/VideoCaptureFaceSwapperExample.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public class VideoCaptureFaceSwapperExample : MonoBehaviour
110110
/// <summary>
111111
/// VIDEO_FILENAME
112112
/// </summary>
113-
protected static readonly string VIDEO_FILENAME = "couple_mjpeg.mjpeg";
113+
protected static readonly string VIDEO_FILENAME = "DlibFaceLandmarkDetector/couple_mjpeg.mjpeg";
114114

115115
/// <summary>
116116
/// The face landmark detector.
@@ -172,22 +172,22 @@ void Start()
172172
getFilePath_Coroutine = GetFilePath();
173173
StartCoroutine(getFilePath_Coroutine);
174174
#else
175-
haarcascade_frontalface_alt_xml_filepath = OpenCVForUnity.UnityUtils.Utils.getFilePath("haarcascade_frontalface_alt.xml");
176-
sp_human_face_68_dat_filepath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath("sp_human_face_68.dat");
175+
haarcascade_frontalface_alt_xml_filepath = OpenCVForUnity.UnityUtils.Utils.getFilePath("DlibFaceLandmarkDetector/haarcascade_frontalface_alt.xml");
176+
sp_human_face_68_dat_filepath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath("DlibFaceLandmarkDetector/sp_human_face_68.dat");
177177
Run();
178178
#endif
179179
}
180180

181181
#if UNITY_WEBGL
182182
private IEnumerator GetFilePath()
183183
{
184-
var getFilePathAsync_0_Coroutine = OpenCVForUnity.UnityUtils.Utils.getFilePathAsync("haarcascade_frontalface_alt.xml", (result) =>
184+
var getFilePathAsync_0_Coroutine = OpenCVForUnity.UnityUtils.Utils.getFilePathAsync("DlibFaceLandmarkDetector/haarcascade_frontalface_alt.xml", (result) =>
185185
{
186186
haarcascade_frontalface_alt_xml_filepath = result;
187187
});
188188
yield return getFilePathAsync_0_Coroutine;
189189

190-
var getFilePathAsync_1_Coroutine = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePathAsync("sp_human_face_68.dat", (result) =>
190+
var getFilePathAsync_1_Coroutine = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePathAsync("DlibFaceLandmarkDetector/sp_human_face_68.dat", (result) =>
191191
{
192192
sp_human_face_68_dat_filepath = result;
193193
});
@@ -270,7 +270,7 @@ public void OnVideoCaptureToMatHelperInitialized()
270270
cascade = new CascadeClassifier(haarcascade_frontalface_alt_xml_filepath);
271271
//if (cascade.empty())
272272
//{
273-
// Debug.LogError("cascade file is not loaded.Please copy from “FaceTrackerExample/StreamingAssets/” to “Assets/StreamingAssets/” folder. ");
273+
// Debug.LogError("cascade file is not loaded. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/DlibFaceLandmarkDetector/” to “Assets/StreamingAssets/DlibFaceLandmarkDetector/” folder. ");
274274
//}
275275

276276
frontalFaceChecker = new FrontalFaceChecker(width, height);

Assets/FaceSwapperExample/WebCamTextureFaceChangerExample/WebCamTextureFaceChangerExample.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,22 +177,22 @@ void Start()
177177
getFilePath_Coroutine = GetFilePath();
178178
StartCoroutine(getFilePath_Coroutine);
179179
#else
180-
haarcascade_frontalface_alt_xml_filepath = OpenCVForUnity.UnityUtils.Utils.getFilePath("haarcascade_frontalface_alt.xml");
181-
sp_human_face_68_dat_filepath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath("sp_human_face_68.dat");
180+
haarcascade_frontalface_alt_xml_filepath = OpenCVForUnity.UnityUtils.Utils.getFilePath("DlibFaceLandmarkDetector/haarcascade_frontalface_alt.xml");
181+
sp_human_face_68_dat_filepath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath("DlibFaceLandmarkDetector/sp_human_face_68.dat");
182182
Run();
183183
#endif
184184
}
185185

186186
#if UNITY_WEBGL
187187
private IEnumerator GetFilePath()
188188
{
189-
var getFilePathAsync_0_Coroutine = OpenCVForUnity.UnityUtils.Utils.getFilePathAsync("haarcascade_frontalface_alt.xml", (result) =>
189+
var getFilePathAsync_0_Coroutine = OpenCVForUnity.UnityUtils.Utils.getFilePathAsync("DlibFaceLandmarkDetector/haarcascade_frontalface_alt.xml", (result) =>
190190
{
191191
haarcascade_frontalface_alt_xml_filepath = result;
192192
});
193193
yield return getFilePathAsync_0_Coroutine;
194194

195-
var getFilePathAsync_1_Coroutine = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePathAsync("sp_human_face_68.dat", (result) =>
195+
var getFilePathAsync_1_Coroutine = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePathAsync("DlibFaceLandmarkDetector/sp_human_face_68.dat", (result) =>
196196
{
197197
sp_human_face_68_dat_filepath = result;
198198
});
@@ -269,7 +269,7 @@ public void OnWebCamTextureToMatHelperInitialized()
269269
cascade = new CascadeClassifier(haarcascade_frontalface_alt_xml_filepath);
270270
//if (cascade.empty())
271271
//{
272-
// Debug.LogError("cascade file is not loaded.Please copy from “FaceTrackerExample/StreamingAssets/” to “Assets/StreamingAssets/” folder. ");
272+
// Debug.LogError("cascade file is not loaded. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/DlibFaceLandmarkDetector/” to “Assets/StreamingAssets/DlibFaceLandmarkDetector/” folder. ");
273273
//}
274274

275275
frontalFaceChecker = new FrontalFaceChecker(width, height);

Assets/FaceSwapperExample/WebCamTextureFaceSwapperExample/WebCamTextureFaceSwapperExample.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,22 +167,22 @@ void Start()
167167
getFilePath_Coroutine = GetFilePath();
168168
StartCoroutine(getFilePath_Coroutine);
169169
#else
170-
haarcascade_frontalface_alt_xml_filepath = OpenCVForUnity.UnityUtils.Utils.getFilePath("haarcascade_frontalface_alt.xml");
171-
sp_human_face_68_dat_filepath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath("sp_human_face_68.dat");
170+
haarcascade_frontalface_alt_xml_filepath = OpenCVForUnity.UnityUtils.Utils.getFilePath("DlibFaceLandmarkDetector/haarcascade_frontalface_alt.xml");
171+
sp_human_face_68_dat_filepath = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePath("DlibFaceLandmarkDetector/sp_human_face_68.dat");
172172
Run();
173173
#endif
174174
}
175175

176176
#if UNITY_WEBGL
177177
private IEnumerator GetFilePath()
178178
{
179-
var getFilePathAsync_0_Coroutine = OpenCVForUnity.UnityUtils.Utils.getFilePathAsync("haarcascade_frontalface_alt.xml", (result) =>
179+
var getFilePathAsync_0_Coroutine = OpenCVForUnity.UnityUtils.Utils.getFilePathAsync("DlibFaceLandmarkDetector/haarcascade_frontalface_alt.xml", (result) =>
180180
{
181181
haarcascade_frontalface_alt_xml_filepath = result;
182182
});
183183
yield return getFilePathAsync_0_Coroutine;
184184

185-
var getFilePathAsync_1_Coroutine = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePathAsync("sp_human_face_68.dat", (result) =>
185+
var getFilePathAsync_1_Coroutine = DlibFaceLandmarkDetector.UnityUtils.Utils.getFilePathAsync("DlibFaceLandmarkDetector/sp_human_face_68.dat", (result) =>
186186
{
187187
sp_human_face_68_dat_filepath = result;
188188
});
@@ -262,7 +262,7 @@ public void OnWebCamTextureToMatHelperInitialized()
262262
cascade = new CascadeClassifier(haarcascade_frontalface_alt_xml_filepath);
263263
//if (cascade.empty())
264264
//{
265-
// Debug.LogError("cascade file is not loaded.Please copy from “FaceTrackerExample/StreamingAssets/” to “Assets/StreamingAssets/” folder. ");
265+
// Debug.LogError("cascade file is not loaded. Please copy from “DlibFaceLandmarkDetector/StreamingAssets/DlibFaceLandmarkDetector/” to “Assets/StreamingAssets/DlibFaceLandmarkDetector/” folder. ");
266266
//}
267267

268268
frontalFaceChecker = new FrontalFaceChecker(width, height);

Assets/StreamingAssets.meta

Lines changed: 0 additions & 7 deletions
This file was deleted.
-1.83 MB
Binary file not shown.

Assets/StreamingAssets/couple_mjpeg.mjpeg.meta

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)