Updated usage version of OpenCVForUnity to 2.2.1.

This commit is contained in:
EnoxSoftware 2017-08-31 05:17:47 +09:00
Родитель 9a0ef51edd
Коммит 3a145dd39f
12 изменённых файлов: 75 добавлений и 38 удалений

Просмотреть файл

@ -14,7 +14,7 @@ using OpenCVForUnity;
namespace HoloLensWithOpenCVForUnityExample
{
/// <summary>
/// HoloLens ArUco example.
/// HoloLens ArUco Example
/// An example of marker based AR using OpenCVForUnity on Hololens.
/// Referring to https://github.com/opencv/opencv_contrib/blob/master/modules/aruco/samples/detect_markers.cpp.
/// </summary>
@ -406,7 +406,7 @@ namespace HoloLensWithOpenCVForUnityExample
Imgproc.cvtColor (downScaleRgbaMat, grayMat, Imgproc.COLOR_RGBA2GRAY);
// Detect markers and estimate Pose
Aruco.detectMarkers (grayMat, dictionary, corners, ids, detectorParams, rejected);
Aruco.detectMarkers (grayMat, dictionary, corners, ids, detectorParams, rejected, camMatrix, distCoeffs);
if (applyEstimationPose && ids.total () > 0){
Aruco.estimatePoseSingleMarkers (corners, markerLength, camMatrix, distCoeffs, rvecs, tvecs);

Просмотреть файл

@ -172,7 +172,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 50.000004, y: -30, z: 0}
--- !u!1001 &110278492
Prefab:
@ -848,7 +848,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: DisplayCamreaPreview
m_Text: Display Camrea Preview
--- !u!222 &677858458
CanvasRenderer:
m_ObjectHideFlags: 0
@ -2163,7 +2163,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: ChangeCamera
m_Text: Change Camera
--- !u!222 &1620370071
CanvasRenderer:
m_ObjectHideFlags: 0
@ -2373,7 +2373,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1709852086
MonoBehaviour:

Просмотреть файл

@ -10,7 +10,7 @@ using OpenCVForUnity;
namespace HoloLensWithOpenCVForUnityExample
{
/// <summary>
/// HoloLens ComicFilter example.
/// HoloLens Comic Filter Example
/// An example of image processing (comic filter) using OpenCVForUnity on Hololens.
/// Referring to http://dev.classmethod.jp/smartphone/opencv-manga-2/.
/// </summary>

Просмотреть файл

@ -142,7 +142,7 @@ RectTransform:
- {fileID: 1343783943}
- {fileID: 1197189832}
m_Father: {fileID: 1478280153}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -735,7 +735,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: ChangeCamera
m_Text: Change Camera
--- !u!1001 &864547286
Prefab:
m_ObjectHideFlags: 0
@ -1586,8 +1586,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0.9}
m_LocalScale: {x: 0.0005, y: 0.0005, z: 0.0005}
m_Children:
- {fileID: 270024293}
- {fileID: 62512752}
- {fileID: 270024293}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Просмотреть файл

@ -15,7 +15,7 @@ using Rect = OpenCVForUnity.Rect;
namespace HoloLensWithOpenCVForUnityExample
{
/// <summary>
/// HoloLens face detection example.
/// HoloLens Face Detection Example
/// An example of detecting face using OpenCVForUnity on Hololens.
/// Referring to https://github.com/Itseez/opencv/blob/master/modules/objdetect/src/detection_based_tracker.cpp.
/// </summary>

Просмотреть файл

@ -13,7 +13,7 @@ OcclusionCullingSettings:
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 7
serializedVersion: 8
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
@ -25,6 +25,7 @@ RenderSettings:
m_AmbientGroundColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 3
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
@ -41,7 +42,7 @@ RenderSettings:
--- !u!157 &4
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 7
serializedVersion: 9
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
@ -53,7 +54,7 @@ LightmapSettings:
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 4
serializedVersion: 8
m_Resolution: 1
m_BakeResolution: 50
m_TextureWidth: 1024
@ -66,13 +67,27 @@ LightmapSettings:
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 0
m_DirectLightInLightProbes: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 1024
m_ReflectionCompression: 2
m_MixedBakeMode: 1
m_BakeBackend: 0
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 500
m_PVRBounces: 2
m_PVRFiltering: 0
m_PVRFilteringMode: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousColorSigma: 1
m_PVRFilteringAtrousNormalSigma: 1
m_PVRFilteringAtrousPositionSigma: 1
m_LightingDataAsset: {fileID: 0}
m_RuntimeCPUUsage: 25
m_ShadowMaskMode: 2
--- !u!196 &5
NavMeshSettings:
serializedVersion: 2
@ -89,6 +104,8 @@ NavMeshSettings:
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666666
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &62512751
@ -1036,7 +1053,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: ChangeCamera
m_Text: Change Camera
--- !u!1001 &864547286
Prefab:
m_ObjectHideFlags: 0
@ -1245,6 +1262,7 @@ MeshRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!64 &1076083697
MeshCollider:
@ -1824,7 +1842,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: UseSeparateDetection
m_Text: Use Separate Detection
--- !u!222 &1317361340
CanvasRenderer:
m_ObjectHideFlags: 0
@ -2120,7 +2138,7 @@ Canvas:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1478280149}
m_Enabled: 1
serializedVersion: 2
serializedVersion: 3
m_RenderMode: 2
m_Camera: {fileID: 1076969803}
m_PlaneDistance: 100
@ -2129,6 +2147,7 @@ Canvas:
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
@ -2522,7 +2541,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: DisplayCameraImage
m_Text: Display Camera Image
--- !u!222 &1976741144
CanvasRenderer:
m_ObjectHideFlags: 0

Просмотреть файл

@ -15,7 +15,7 @@ using Rect = OpenCVForUnity.Rect;
namespace HoloLensWithOpenCVForUnityExample
{
/// <summary>
/// HoloLens face detection overlay example.
/// HoloLens Face Detection Overlay Example
/// An example of overlay display of face area rectangles using OpenCVForUnity on Hololens.
/// Referring to https://github.com/Itseez/opencv/blob/master/modules/objdetect/src/detection_based_tracker.cpp.
/// </summary>

Просмотреть файл

@ -804,7 +804,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: ChangeCamera
m_Text: Change Camera
--- !u!1001 &864547286
Prefab:
m_ObjectHideFlags: 0
@ -2033,7 +2033,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: UseSeparateDetection
m_Text: Use Separate Detection
--- !u!222 &1619485362
CanvasRenderer:
m_ObjectHideFlags: 0

Просмотреть файл

@ -13,7 +13,7 @@ using OpenCVForUnity;
namespace HoloLensWithOpenCVForUnityExample
{
/// <summary>
/// HoloLens photo capture example.
/// HoloLens PhotoCapture Example
/// An example of holographic photo blending using the PhotocCapture class on Hololens.
/// Referring to https://forum.unity3d.com/threads/holographic-photo-blending-with-photocapture.416023/.
/// </summary>

Просмотреть файл

@ -13,7 +13,7 @@ OcclusionCullingSettings:
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 7
serializedVersion: 8
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
@ -25,6 +25,7 @@ RenderSettings:
m_AmbientGroundColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 3
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
@ -41,7 +42,7 @@ RenderSettings:
--- !u!157 &4
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 7
serializedVersion: 9
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
@ -53,7 +54,7 @@ LightmapSettings:
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 4
serializedVersion: 8
m_Resolution: 1
m_BakeResolution: 50
m_TextureWidth: 1024
@ -66,13 +67,27 @@ LightmapSettings:
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 0
m_DirectLightInLightProbes: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 1024
m_ReflectionCompression: 2
m_MixedBakeMode: 1
m_BakeBackend: 0
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 500
m_PVRBounces: 2
m_PVRFiltering: 0
m_PVRFilteringMode: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousColorSigma: 1
m_PVRFilteringAtrousNormalSigma: 1
m_PVRFilteringAtrousPositionSigma: 1
m_LightingDataAsset: {fileID: 0}
m_RuntimeCPUUsage: 25
m_ShadowMaskMode: 2
--- !u!196 &5
NavMeshSettings:
serializedVersion: 2
@ -89,6 +104,8 @@ NavMeshSettings:
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666666
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &525382
@ -581,7 +598,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: HoloLensFaceDetectionOverlayExample
m_Text: HoloLens Face Detection Overlay Example
--- !u!222 &405148670
CanvasRenderer:
m_ObjectHideFlags: 0
@ -1001,7 +1018,7 @@ Canvas:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 965925560}
m_Enabled: 1
serializedVersion: 2
serializedVersion: 3
m_RenderMode: 2
m_Camera: {fileID: 0}
m_PlaneDistance: 100
@ -1010,6 +1027,7 @@ Canvas:
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
@ -1288,7 +1306,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: HoloLensFaceDetectionExample
m_Text: HoloLens Face Detection Example
--- !u!222 &1084706039
CanvasRenderer:
m_ObjectHideFlags: 0
@ -1657,7 +1675,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: ShowLicense
m_Text: Show License
--- !u!222 &1353284455
CanvasRenderer:
m_ObjectHideFlags: 0
@ -1734,7 +1752,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: HoloLensPhotoCaptureExample
m_Text: HoloLens PhotoCapture Example
--- !u!222 &1506704325
CanvasRenderer:
m_ObjectHideFlags: 0
@ -1847,7 +1865,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: HoloLensArUcoExample
m_Text: HoloLens ArUco Example
--- !u!222 &1636116238
CanvasRenderer:
m_ObjectHideFlags: 0
@ -2070,7 +2088,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: HoloLensComicFilterExample
m_Text: HoloLens Comic Filter Example
--- !u!222 &1869573385
CanvasRenderer:
m_ObjectHideFlags: 0

Двоичные данные
HoloLensWithOpenCVForUnityExample.unitypackage

Двоичный файл не отображается.

Просмотреть файл

@ -1,4 +1,4 @@
HoloLens With OpenCVForUnity Example
HoloLens with OpenCV for Unity Example
====================
Demo Video
@ -11,7 +11,7 @@ Environment
Windows 10
Unity 5.6.1f1
HoloToolKit v1.5.7.0 ([https://github.com/Microsoft/HoloToolkit-Unity/releases](https://github.com/Microsoft/HoloToolkit-Unity/releases))
OpenCV for Unity 2.2.0 ([https://www.assetstore.unity3d.com/en/#!/content/21088](https://www.assetstore.unity3d.com/en/#!/content/21088))
OpenCV for Unity 2.2.1 ([https://www.assetstore.unity3d.com/en/#!/content/21088](https://www.assetstore.unity3d.com/en/#!/content/21088))
Setup