Skip to content

Commit 3a145dd

Browse files
EnoxSoftwareEnoxSoftware
committed
Updated usage version of OpenCVForUnity to 2.2.1.
1 parent 9a0ef51 commit 3a145dd

12 files changed

Lines changed: 75 additions & 38 deletions

File tree

‎Assets/HoloLensWithOpenCVForUnityExample/HoloLensArUcoExample/HoloLensArUcoExample.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
namespace HoloLensWithOpenCVForUnityExample
1515
{
1616
/// <summary>
17-
/// HoloLens ArUco example.
17+
/// HoloLens ArUco Example
1818
/// An example of marker based AR using OpenCVForUnity on Hololens.
1919
/// Referring to https://github.com/opencv/opencv_contrib/blob/master/modules/aruco/samples/detect_markers.cpp.
2020
/// </summary>
@@ -406,7 +406,7 @@ private void DetectARUcoMarker()
406406
Imgproc.cvtColor (downScaleRgbaMat, grayMat, Imgproc.COLOR_RGBA2GRAY);
407407

408408
// Detect markers and estimate Pose
409-
Aruco.detectMarkers (grayMat, dictionary, corners, ids, detectorParams, rejected);
409+
Aruco.detectMarkers (grayMat, dictionary, corners, ids, detectorParams, rejected, camMatrix, distCoeffs);
410410

411411
if (applyEstimationPose && ids.total () > 0){
412412
Aruco.estimatePoseSingleMarkers (corners, markerLength, camMatrix, distCoeffs, rvecs, tvecs);

‎Assets/HoloLensWithOpenCVForUnityExample/HoloLensArUcoExample/HoloLensArUcoExample.unity‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ Transform:
172172
m_LocalScale: {x: 1, y: 1, z: 1}
173173
m_Children: []
174174
m_Father: {fileID: 0}
175-
m_RootOrder: 0
175+
m_RootOrder: 1
176176
m_LocalEulerAnglesHint: {x: 50.000004, y: -30, z: 0}
177177
--- !u!1001 &110278492
178178
Prefab:
@@ -848,7 +848,7 @@ MonoBehaviour:
848848
m_HorizontalOverflow: 0
849849
m_VerticalOverflow: 0
850850
m_LineSpacing: 1
851-
m_Text: DisplayCamreaPreview
851+
m_Text: Display Camrea Preview
852852
--- !u!222 &677858458
853853
CanvasRenderer:
854854
m_ObjectHideFlags: 0
@@ -2163,7 +2163,7 @@ MonoBehaviour:
21632163
m_HorizontalOverflow: 0
21642164
m_VerticalOverflow: 0
21652165
m_LineSpacing: 1
2166-
m_Text: ChangeCamera
2166+
m_Text: Change Camera
21672167
--- !u!222 &1620370071
21682168
CanvasRenderer:
21692169
m_ObjectHideFlags: 0
@@ -2373,7 +2373,7 @@ Transform:
23732373
m_LocalScale: {x: 1, y: 1, z: 1}
23742374
m_Children: []
23752375
m_Father: {fileID: 0}
2376-
m_RootOrder: 1
2376+
m_RootOrder: 0
23772377
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
23782378
--- !u!114 &1709852086
23792379
MonoBehaviour:

‎Assets/HoloLensWithOpenCVForUnityExample/HoloLensComicFilterExample/HoloLensComicFilterExample.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
namespace HoloLensWithOpenCVForUnityExample
1111
{
1212
/// <summary>
13-
/// HoloLens ComicFilter example.
13+
/// HoloLens Comic Filter Example
1414
/// An example of image processing (comic filter) using OpenCVForUnity on Hololens.
1515
/// Referring to http://dev.classmethod.jp/smartphone/opencv-manga-2/.
1616
/// </summary>

‎Assets/HoloLensWithOpenCVForUnityExample/HoloLensComicFilterExample/HoloLensComicFilterExample.unity‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ RectTransform:
142142
- {fileID: 1343783943}
143143
- {fileID: 1197189832}
144144
m_Father: {fileID: 1478280153}
145-
m_RootOrder: 1
145+
m_RootOrder: 0
146146
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
147147
m_AnchorMin: {x: 0, y: 0}
148148
m_AnchorMax: {x: 1, y: 1}
@@ -735,7 +735,7 @@ MonoBehaviour:
735735
m_HorizontalOverflow: 0
736736
m_VerticalOverflow: 0
737737
m_LineSpacing: 1
738-
m_Text: ChangeCamera
738+
m_Text: Change Camera
739739
--- !u!1001 &864547286
740740
Prefab:
741741
m_ObjectHideFlags: 0
@@ -1586,8 +1586,8 @@ RectTransform:
15861586
m_LocalPosition: {x: 0, y: 0, z: 0.9}
15871587
m_LocalScale: {x: 0.0005, y: 0.0005, z: 0.0005}
15881588
m_Children:
1589-
- {fileID: 270024293}
15901589
- {fileID: 62512752}
1590+
- {fileID: 270024293}
15911591
m_Father: {fileID: 0}
15921592
m_RootOrder: 2
15931593
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

‎Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionExample/HoloLensFaceDetectionExample.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
namespace HoloLensWithOpenCVForUnityExample
1616
{
1717
/// <summary>
18-
/// HoloLens face detection example.
18+
/// HoloLens Face Detection Example
1919
/// An example of detecting face using OpenCVForUnity on Hololens.
2020
/// Referring to https://github.com/Itseez/opencv/blob/master/modules/objdetect/src/detection_based_tracker.cpp.
2121
/// </summary>

‎Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionExample/HoloLensFaceDetectionExample.unity‎

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
1313
--- !u!104 &2
1414
RenderSettings:
1515
m_ObjectHideFlags: 0
16-
serializedVersion: 7
16+
serializedVersion: 8
1717
m_Fog: 0
1818
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
1919
m_FogMode: 3
@@ -25,6 +25,7 @@ RenderSettings:
2525
m_AmbientGroundColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
2626
m_AmbientIntensity: 1
2727
m_AmbientMode: 3
28+
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
2829
m_SkyboxMaterial: {fileID: 0}
2930
m_HaloStrength: 0.5
3031
m_FlareStrength: 1
@@ -41,7 +42,7 @@ RenderSettings:
4142
--- !u!157 &4
4243
LightmapSettings:
4344
m_ObjectHideFlags: 0
44-
serializedVersion: 7
45+
serializedVersion: 9
4546
m_GIWorkflowMode: 1
4647
m_GISettings:
4748
serializedVersion: 2
@@ -53,7 +54,7 @@ LightmapSettings:
5354
m_EnableBakedLightmaps: 1
5455
m_EnableRealtimeLightmaps: 0
5556
m_LightmapEditorSettings:
56-
serializedVersion: 4
57+
serializedVersion: 8
5758
m_Resolution: 1
5859
m_BakeResolution: 50
5960
m_TextureWidth: 1024
@@ -66,13 +67,27 @@ LightmapSettings:
6667
m_LightmapParameters: {fileID: 0}
6768
m_LightmapsBakeMode: 1
6869
m_TextureCompression: 0
69-
m_DirectLightInLightProbes: 1
7070
m_FinalGather: 0
7171
m_FinalGatherFiltering: 1
7272
m_FinalGatherRayCount: 1024
7373
m_ReflectionCompression: 2
74+
m_MixedBakeMode: 1
75+
m_BakeBackend: 0
76+
m_PVRSampling: 1
77+
m_PVRDirectSampleCount: 32
78+
m_PVRSampleCount: 500
79+
m_PVRBounces: 2
80+
m_PVRFiltering: 0
81+
m_PVRFilteringMode: 1
82+
m_PVRCulling: 1
83+
m_PVRFilteringGaussRadiusDirect: 1
84+
m_PVRFilteringGaussRadiusIndirect: 5
85+
m_PVRFilteringGaussRadiusAO: 2
86+
m_PVRFilteringAtrousColorSigma: 1
87+
m_PVRFilteringAtrousNormalSigma: 1
88+
m_PVRFilteringAtrousPositionSigma: 1
7489
m_LightingDataAsset: {fileID: 0}
75-
m_RuntimeCPUUsage: 25
90+
m_ShadowMaskMode: 2
7691
--- !u!196 &5
7792
NavMeshSettings:
7893
serializedVersion: 2
@@ -89,6 +104,8 @@ NavMeshSettings:
89104
minRegionArea: 2
90105
manualCellSize: 0
91106
cellSize: 0.16666666
107+
manualTileSize: 0
108+
tileSize: 256
92109
accuratePlacement: 0
93110
m_NavMeshData: {fileID: 0}
94111
--- !u!1 &62512751
@@ -1036,7 +1053,7 @@ MonoBehaviour:
10361053
m_HorizontalOverflow: 0
10371054
m_VerticalOverflow: 0
10381055
m_LineSpacing: 1
1039-
m_Text: ChangeCamera
1056+
m_Text: Change Camera
10401057
--- !u!1001 &864547286
10411058
Prefab:
10421059
m_ObjectHideFlags: 0
@@ -1245,6 +1262,7 @@ MeshRenderer:
12451262
m_AutoUVMaxAngle: 89
12461263
m_LightmapParameters: {fileID: 0}
12471264
m_SortingLayerID: 0
1265+
m_SortingLayer: 0
12481266
m_SortingOrder: 0
12491267
--- !u!64 &1076083697
12501268
MeshCollider:
@@ -1824,7 +1842,7 @@ MonoBehaviour:
18241842
m_HorizontalOverflow: 0
18251843
m_VerticalOverflow: 0
18261844
m_LineSpacing: 1
1827-
m_Text: UseSeparateDetection
1845+
m_Text: Use Separate Detection
18281846
--- !u!222 &1317361340
18291847
CanvasRenderer:
18301848
m_ObjectHideFlags: 0
@@ -2120,7 +2138,7 @@ Canvas:
21202138
m_PrefabInternal: {fileID: 0}
21212139
m_GameObject: {fileID: 1478280149}
21222140
m_Enabled: 1
2123-
serializedVersion: 2
2141+
serializedVersion: 3
21242142
m_RenderMode: 2
21252143
m_Camera: {fileID: 1076969803}
21262144
m_PlaneDistance: 100
@@ -2129,6 +2147,7 @@ Canvas:
21292147
m_OverrideSorting: 0
21302148
m_OverridePixelPerfect: 0
21312149
m_SortingBucketNormalizedSize: 0
2150+
m_AdditionalShaderChannelsFlag: 25
21322151
m_SortingLayerID: 0
21332152
m_SortingOrder: 0
21342153
m_TargetDisplay: 0
@@ -2522,7 +2541,7 @@ MonoBehaviour:
25222541
m_HorizontalOverflow: 0
25232542
m_VerticalOverflow: 0
25242543
m_LineSpacing: 1
2525-
m_Text: DisplayCameraImage
2544+
m_Text: Display Camera Image
25262545
--- !u!222 &1976741144
25272546
CanvasRenderer:
25282547
m_ObjectHideFlags: 0

‎Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionOverlayExample/HoloLensFaceDetectionOverlayExample.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
namespace HoloLensWithOpenCVForUnityExample
1616
{
1717
/// <summary>
18-
/// HoloLens face detection overlay example.
18+
/// HoloLens Face Detection Overlay Example
1919
/// An example of overlay display of face area rectangles using OpenCVForUnity on Hololens.
2020
/// Referring to https://github.com/Itseez/opencv/blob/master/modules/objdetect/src/detection_based_tracker.cpp.
2121
/// </summary>

‎Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionOverlayExample/HoloLensFaceDetectionOverlayExample.unity‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ MonoBehaviour:
804804
m_HorizontalOverflow: 0
805805
m_VerticalOverflow: 0
806806
m_LineSpacing: 1
807-
m_Text: ChangeCamera
807+
m_Text: Change Camera
808808
--- !u!1001 &864547286
809809
Prefab:
810810
m_ObjectHideFlags: 0
@@ -2033,7 +2033,7 @@ MonoBehaviour:
20332033
m_HorizontalOverflow: 0
20342034
m_VerticalOverflow: 0
20352035
m_LineSpacing: 1
2036-
m_Text: UseSeparateDetection
2036+
m_Text: Use Separate Detection
20372037
--- !u!222 &1619485362
20382038
CanvasRenderer:
20392039
m_ObjectHideFlags: 0

‎Assets/HoloLensWithOpenCVForUnityExample/HoloLensPhotoCaptureExample/HoloLensPhotoCaptureExample.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace HoloLensWithOpenCVForUnityExample
1414
{
1515
/// <summary>
16-
/// HoloLens photo capture example.
16+
/// HoloLens PhotoCapture Example
1717
/// An example of holographic photo blending using the PhotocCapture class on Hololens.
1818
/// Referring to https://forum.unity3d.com/threads/holographic-photo-blending-with-photocapture.416023/.
1919
/// </summary>

0 commit comments

Comments
 (0)