update 1.0.9

Author: EnoxSoftware

Assets/MarkerLessARExample/CapturePattern.cs

@@ -247,6 +247,13 @@ public void OnCaptureButtonClick()
         {
             Mat patternMat = new Mat(outputMat, patternRect);
 
+            detector.detect(patternMat, keypoints);
+            if (keypoints.total() == 0)
+            {
+                Debug.LogWarning("Input image could not be used as pattern image due to missing keypoints.");
+                return;
+            }
+
             Texture2D patternTexture = new Texture2D(patternMat.width(), patternMat.height(), TextureFormat.RGBA32, false);
 
             Utils.matToTexture2D(patternMat, patternTexture);

Assets/MarkerLessARExample/MarkerLessAR/PatternDetector.cs

@@ -3,6 +3,7 @@
 using OpenCVForUnity.Features2dModule;
 using OpenCVForUnity.ImgprocModule;
 using System.Collections.Generic;
+using UnityEngine;
 
 namespace OpenCVMarkerLessAR
 {
@@ -157,7 +158,7 @@ public void train(Pattern pattern)
         /// </summary>
         /// <param name="image">Image.</param>
         /// <param name="pattern">Pattern.</param>
-        public void buildPatternFromImage(Mat image, Pattern pattern)
+        public bool buildPatternFromImage(Mat image, Pattern pattern)
         {
             //int numImages = 4;
             //float step = Mathf.Sqrt (2.0f);
@@ -201,7 +202,7 @@ public void buildPatternFromImage(Mat image, Pattern pattern)
             pattern.points3d.fromList(points3dList);
 
 
-            extractFeatures(pattern.grayImg, pattern.keypoints, pattern.descriptors);
+            return extractFeatures(pattern.grayImg, pattern.keypoints, pattern.descriptors);
         }
 
         /// <summary>
@@ -216,7 +217,9 @@ public bool findPattern(Mat image, PatternTrackingInfo info)
             getGray(image, m_grayImg);
 
             // Extract feature points from input gray image
-            extractFeatures(m_grayImg, m_queryKeypoints, m_queryDescriptors);
+            bool result = extractFeatures(m_grayImg, m_queryKeypoints, m_queryDescriptors);
+            if (!result)
+                return false;
 
             // Get matches with current pattern
             getMatches(m_queryDescriptors, m_matches);
@@ -251,7 +254,9 @@ public bool findPattern(Mat image, PatternTrackingInfo info)
                     using (MatOfDMatch refinedMatches = new MatOfDMatch())
                     {
                         // Detect features on warped image
-                        extractFeatures(m_warpedImg, warpedKeypoints, m_queryDescriptors);
+                        result = extractFeatures(m_warpedImg, warpedKeypoints, m_queryDescriptors);
+                        if (!result)
+                            return false;
 
                         // Match with pattern
                         getMatches(m_queryDescriptors, refinedMatches);

Assets/MarkerLessARExample/ReadMe.pdf

@@ -153,12 +153,16 @@ void Start()
 
             PatternDetector patternDetector = new PatternDetector(null, null, null, true);
 
-            patternDetector.buildPatternFromImage(patternMat, pattern);
-            patternDetector.train(pattern);
+            bool patternFound = false;
+            bool patternBuildSucceeded = patternDetector.buildPatternFromImage(patternMat, pattern);
 
+            Debug.Log("patternBuildSucceeded " + patternBuildSucceeded);
 
-
-            bool patternFound = patternDetector.findPattern(imgMat, patternTrackingInfo);
+            if (patternBuildSucceeded)
+            {
+                patternDetector.train(pattern);
+                patternFound = patternDetector.findPattern(imgMat, patternTrackingInfo);
+            }
 
             Debug.Log("patternFound " + patternFound);
 

Assets/MarkerLessARExample/Texture2DMarkerLessARExample/Texture2DMarkerLessARExample.cs

@@ -18,6 +18,11 @@ namespace MarkerLessARExample
     [RequireComponent(typeof(WebCamTextureToMatHelper))]
     public class WebCamTextureMarkerLessARExample : MonoBehaviour
     {
+        /// <summary>
+        /// The pattern texture.
+        /// </summary>
+        public Texture2D patternTexture;
+
         /// <summary>
         /// The pattern raw image.
         /// </summary>
@@ -83,6 +88,11 @@ public class WebCamTextureMarkerLessARExample : MonoBehaviour
         /// </summary>
         public GameObject video;
 
+        /// <summary>
+        /// The CapturePattern Button.
+        /// </summary>
+        public Button CapturePatternButton;
+
         /// <summary>
         /// The pattern mat.
         /// </summary>
@@ -152,9 +162,22 @@ void Start()
 
             webCamTextureToMatHelper = gameObject.GetComponent<WebCamTextureToMatHelper>();
 
-            patternMat = Imgcodecs.imread(Application.persistentDataPath + "/patternImg.jpg");
 
-            if (patternMat.total() == 0)
+            if (patternTexture != null)
+            {
+                patternMat = new Mat(patternTexture.height, patternTexture.width, CvType.CV_8UC3);
+                Utils.texture2DToMat(patternTexture, patternMat);
+                Imgproc.cvtColor(patternMat, patternMat, Imgproc.COLOR_RGB2BGR);
+                Debug.Log("patternMat dst ToString " + patternMat.ToString());
+
+                CapturePatternButton.interactable = false;
+            }
+            else
+            {
+                patternMat = Imgcodecs.imread(Application.persistentDataPath + "/patternImg.jpg");
+            }
+
+            if (patternMat == null || patternMat.total() == 0)
             {
                 OnCapturePatternButtonClick();
             }
@@ -176,11 +199,18 @@ void Start()
 
                 patternDetector = new PatternDetector(null, null, null, true);
 
-                patternDetector.buildPatternFromImage(patternMat, pattern);
-                patternDetector.train(pattern);
+                bool patternBuildSucceeded = patternDetector.buildPatternFromImage(patternMat, pattern);
 
+                if (patternBuildSucceeded)
+                {
+                    patternDetector.train(pattern);
 
-                webCamTextureToMatHelper.Initialize();
+                    webCamTextureToMatHelper.Initialize();
+                }
+                else 
+                {
+                    Debug.LogError("Input image could not be used as pattern image due to missing keypoints.");
+                }
             }
         }
 

Assets/MarkerLessARExample/WebCamTextureMarkerLessARExample/WebCamTextureMarkerLessARExample.cs

@@ -2584,6 +2584,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 22005a6c954e9d24585ceafd5dfb3dc0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  patternTexture: {fileID: 0}
   patternRawImage: {fileID: 1756129323}
   ARGameObject: {fileID: 1586187710}
   ARCamera: {fileID: 2069525336}
@@ -2597,6 +2598,7 @@ MonoBehaviour:
   displayVideo: 0
   displayVideoToggle: {fileID: 1977600973}
   video: {fileID: 1522842811}
+  CapturePatternButton: {fileID: 909783135}
 --- !u!114 &1499518484
 MonoBehaviour:
   m_ObjectHideFlags: 0