Merge pull request #4 from SolarFramework/feature/UnityPlugin

solarBcom · web-flow · commit f9164e2933bb · 2019-03-11T16:33:38.000+01:00
merge 5.1.0 version
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.7.2)
 
 ##################################################
-set (VERSION_NUMBER "0.5.0")
+set (VERSION_NUMBER "0.5.1")
 project("SolARModuleFBOW")
 set (SOURCES 
 	src/SolARModuleFBOW.cpp
@@ -14,14 +14,6 @@ set (HEADERS
     interfaces/SolARKeyframeRetrieverFBOW.h
 )
 
-find_package(OpenGL REQUIRED)
-
-
-
-include_directories(
-	src/
-)
-
 install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/xpcf_SolARModuleFBOW_registry.xml" DESTINATION $ENV{BCOMDEVROOT}/.xpcf/SolAR/	)
 
 ##################################################
diff --git a/SolARModuleFBOW.pro b/SolARModuleFBOW.pro
@@ -6,7 +6,7 @@ CONFIG -= qt
 TARGET = SolARModuleFBOW
 INSTALLSUBDIR = bcomBuild
 FRAMEWORK = $$TARGET
-VERSION=0.5.0
+VERSION=0.5.1
 
 DEFINES += MYVERSION=$${VERSION}
 DEFINES += TEMPLATE_LIBRARY
diff --git a/packagedependencies.txt b/packagedependencies.txt
@@ -1,6 +1,6 @@
 opencv|3.4.3|opencv|thirdParties|url_repo_artifactory
 fbow|0.0.1|fbow|thirdParties|http://repository.b-com.com/amc-generic
-SolARFramework|0.5.0|SolARFramework|bcomBuild|url_repo_artifactory
+SolARFramework|0.5.1|SolARFramework|bcomBuild|url_repo_artifactory
 xpcf|2.1.0|xpcf|thirdParties|http://repository.b-com.com/amc-generic
 boost|1.68.0|boost|thirdParties|http://repository.b-com.com/amc-generic
 spdlog|0.14.0|spdlog|thirdParties|http://repository.b-com.com/amc-generic
diff --git a/src/SolARKeyframeRetrieverFBOW.cpp b/src/SolARKeyframeRetrieverFBOW.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "SolARKeyframeRetrieverFBOW.h"
+#include <core/Log.h>
 
 namespace xpcf = org::bcom::xpcf;
 
diff --git a/tests/ClosestKeyframeRetrieval/ReadMe.md b/tests/ClosestKeyframeRetrieval/ReadMe.md
@@ -0,0 +1,2 @@
+Download first the fbow vocabularies on https://github.com/SolarFramework/binaries/releases/download/fbow%2F0.0.1%2Fwin/fbow_voc.zip
+Unzip this file in your working directory
diff --git a/tests/ClosestKeyframeRetrieval/SolARTestModuleFBOWClosestKeyframeRetrieval.pro b/tests/ClosestKeyframeRetrieval/SolARTestModuleFBOWClosestKeyframeRetrieval.pro
@@ -1,5 +1,5 @@
 TARGET = SolARTestModuleFBOWClosestKeyframeRetrieval
-VERSION=0.5.0
+VERSION=0.5.1
 
 CONFIG += c++11
 CONFIG -= qt
diff --git a/tests/ClosestKeyframeRetrieval/conf_ClosestKeyframeRetrieval.xml b/tests/ClosestKeyframeRetrieval/conf_ClosestKeyframeRetrieval.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <xpcf-registry>
     
-	<module uuid="15e1990b-86b2-445c-8194-0cbe80ede970" name="SolARModuleOpenCV"  description="SolARModuleOpenCV" path="$BCOMDEVROOT/bcomBuild/SolARModuleOpenCV/0.5.0/lib/x86_64/shared">
+	<module uuid="15e1990b-86b2-445c-8194-0cbe80ede970" name="SolARModuleOpenCV"  description="SolARModuleOpenCV" path="$BCOMDEVROOT/bcomBuild/SolARModuleOpenCV/0.5.1/lib/x86_64/shared">
 		<component uuid="e42d6526-9eb1-4f8a-bb68-53e06f09609c" name="SolARImageLoaderOpencv" description="SolARImageLoaderOpencv">
                 <interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect"/>
                 <interface uuid="6FCDAA8D-6EA9-4C3F-97B0-46CD11B67A9B" name="IImageLoader" description="IImageLoader"/>
@@ -16,7 +16,7 @@
         </component>
     </module>
 	
-    <module uuid="b81f0b90-bdbc-11e8-a355-529269fb1459" name="SolARModuleFBOW"  description="SolARModuleFBOW" path="$BCOMDEVROOT/bcomBuild/SolARModuleFBOW/0.5.0/lib/x86_64/shared">
+    <module uuid="b81f0b90-bdbc-11e8-a355-529269fb1459" name="SolARModuleFBOW"  description="SolARModuleFBOW" path="$BCOMDEVROOT/bcomBuild/SolARModuleFBOW/0.5.1/lib/x86_64/shared">
         <component uuid="9d1b1afa-bdbc-11e8-a355-529269fb1459" name="SolARKeyframeRetrieverFBOW" description="SolARKeyframeRetrieverFBOW">
                 <interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect"/>
                 <interface uuid="f60980ce-bdbd-11e8-a355-529269fb1459" name="IKeyframeRetriever" description="IKeyframeRetriever"/>
diff --git a/tests/ClosestKeyframeRetrieval/main.cpp b/tests/ClosestKeyframeRetrieval/main.cpp
@@ -35,6 +35,7 @@
 #include "api/features/IKeypointDetector.h"
 #include "api/features/IDescriptorsExtractor.h"
 #include "api/reloc/IKeyframeRetriever.h"
+#include "core/Log.h"
 
 
 using namespace SolAR;
diff --git a/tests/ClosestKeyframeRetrieval/packagedependencies.txt b/tests/ClosestKeyframeRetrieval/packagedependencies.txt
@@ -1,7 +1,6 @@
-SolARFramework|0.5.0|SolARFramework|bcomBuild|url_repo_artifactory
-SolARModuleOpenCV|0.5.0|SolARModuleOpenCV|bcomBuild|url_repo_artifactory
-SolARModuleFBOW|0.5.0|SolARModuleFBOW|bcomBuild|url_repo_artifactory
-SolARModuleTools|0.5.0|SolARModuleTools|bcomBuild|url_repo_artifactory
+SolARFramework|0.5.1|SolARFramework|bcomBuild|url_repo_artifactory
+SolARModuleOpenCV|0.5.1|SolARModuleOpenCV|bcomBuild|url_repo_artifactory
+SolARModuleFBOW|0.5.1|SolARModuleFBOW|bcomBuild|url_repo_artifactory
 xpcf|2.1.0|xpcf|thirdParties|http://repository.b-com.com/
 boost|1.68.0|boost|thirdParties|http://repository.b-com.com/
 opencv|3.4.3|opencv|thirdParties|http://repository.b-com.com/

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Download first the fbow vocabularies on https://github.com/SolarFramework/binaries/releases/download/fbow%2F0.0.1%2Fwin/fbow_voc.zip`
	`2`	`+Unzip this file in your working directory`