Load stones.jpg for Android correctly

cpvrlab · Apr 3, 2017 · 59b1e78 · 59b1e78
1 parent dea9fec
commit 59b1e78
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/_data/images/textures/planartracking.jpg → _data/images/textures/stones.jpg b/_data/images/textures/planartracking.jpg → _data/images/textures/stones.jpg
diff --git a/app-Demo-Android/app/CMakeLists.txt b/app-Demo-Android/app/CMakeLists.txt
@@ -205,7 +205,8 @@ file(GLOB_RECURSE TEXTURES      ${CMAKE_CURRENT_SOURCE_DIR}/../../_data/images/t
                                 ${CMAKE_CURRENT_SOURCE_DIR}/../../_data/images/textures/wood*.jpg
                                 ${CMAKE_CURRENT_SOURCE_DIR}/../../_data/images/textures/cursor.png
                                 ${CMAKE_CURRENT_SOURCE_DIR}/../../_data/images/textures/Vision*.png
-                                ${CMAKE_CURRENT_SOURCE_DIR}/../../_data/images/textures/LiveVideoError.png)
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../../_data/images/textures/LiveVideoError.png,
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../../_data/images/textures/stones.jpg)
 
 file(GLOB_RECURSE FONTS         ${CMAKE_CURRENT_SOURCE_DIR}/../../_data/images/fonts/*.png)
 

diff --git a/lib-SLProject/source/CV/SLCVTrackerFeatures.cpp b/lib-SLProject/source/CV/SLCVTrackerFeatures.cpp
@@ -81,10 +81,10 @@ SLCVTrackerFeatures::SLCVTrackerFeatures(SLNode *node) :
 
 //------------------------------------------------------------------------------
 void SLCVTrackerFeatures::loadModelPoints() {
-    // Read marker
-    //TODO: Loading for Android
-    Mat planartracking = imread("../_data/images/textures/planartracking.jpg");
-    cvtColor(planartracking, _map.frameGray, CV_RGB2GRAY);
+    // Read reference marker
+    SLGLTexture trackerTexture("stones.jpg");
+    SLCVImage* img = trackerTexture.images()[0];
+    cvtColor(img->cvMat(), _map.frameGray, CV_RGB2GRAY);
 
     // Detect and compute features in marker image
      SLScene::current->_detector->detect(_map.frameGray, _map.keypoints);