Skip to content
This repository was archived by the owner on Jun 9, 2023. It is now read-only.

Commit 130b730

Browse files
jim-bcomjim-bcom
committed
Add missing components to configuration files
Also: - change version to 0.9.1 - add more explicit parameters to remaken install
1 parent 2df26c3 commit 130b730

File tree

11 files changed

+3410
-3383
lines changed

11 files changed

+3410
-3383
lines changed

‎Assets/SolAR/Demos/Scenes/NoviceVersion.unity

Lines changed: 3357 additions & 3357 deletions
Large diffs are not rendered by default.

‎Assets/SolAR/Pipelines/PipelineFiducialMarker.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@
6969
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
7070
<interface uuid="b05f3dbb-f93d-465c-aee1-fb58e1480c42" name="IImageViewer" description="IImageViewer" />
7171
</component>
72+
<component uuid="ddae46ca-1657-4301-a87d-f2dcfa6265d0" name="SolARCornerRefinementOpencv" description="SolARCornerRefinementOpencv">
73+
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
74+
<interface uuid="6ed0413a-751e-4c33-b91b-97b3ea949bc2" name="ICornerRefinement" description="ICornerRefinement" />
75+
</component>
7276
</module>
7377
<module uuid="28b89d39-41bd-451d-b19e-d25a3d7c5797" name="SolARModuleTools" path="./Assets/Plugins" description="Module Tools">
7478
<component uuid="a2ef5542-029e-4fce-9974-0aea14b29d6f" name="SolARSBPatternReIndexer" description="SolARSBPatternReIndexer">

‎Assets/SolAR/Pipelines/PipelineSlam.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,14 @@
125125
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
126126
<interface uuid="62b8b0b5-9344-40e6-a288-e609eb3ff0f1" name="I2DOverlay" description="I2DOverlay" />
127127
</component>
128+
<component uuid="d926e249-8b7f-46e0-8cbd-f981ceb8f921" name="SolARUndistortPointsOpencv" description="SolARUndistortPointsOpencv">
129+
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect"/>
130+
<interface uuid="a345a1d2-c3f3-497f-948b-cd1a199e6657" name="IUndistortPoints" description="IUndistortPoints"/>
131+
</component>
132+
<component uuid="ddae46ca-1657-4301-a87d-f2dcfa6265d0" name="SolARCornerRefinementOpencv" description="SolARCornerRefinementOpencv">
133+
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
134+
<interface uuid="6ed0413a-751e-4c33-b91b-97b3ea949bc2" name="ICornerRefinement" description="ICornerRefinement" />
135+
</component>
128136
</module>
129137
<module uuid="6e960df6-9a36-11e8-9eb6-529269fb1459" name="SolARModuleOpenGL" path="./Assets/Plugins" description="SolARModuleOpenGL">
130138
<component uuid="afd38ea0-9a46-11e8-9eb6-529269fb1459" name="SolAR3DPointsViewerOpengl" description="SolAR3DPointsViewerOpengl">

‎Assets/StreamingAssets/SolAR/Pipelines/PipelineFiducialMarker.xml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<xpcf-registry xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autoAlias="true">
3-
<module uuid="63b4282f-94cf-44d0-8ec0-9e8b0639fff6" name="SolARPipeline_FiducialMarker" path="./SolARDemo_Data/Plugins/x86_64" description="The module embedding a pipeline to estimate the pose based on a squared fiducial marker">
3+
<module uuid="63b4282f-94cf-44d0-8ec0-9e8b0639fff6" name="SolARPipeline_FiducialMarker" path="Plugins" description="The module embedding a pipeline to estimate the pose based on a squared fiducial marker">
44
<component uuid="3898cc3b-3986-4edc-b7c8-f4fba0f6c22a" name="PipelineFiducialMarker" description="A pipeline to estimate the pose based on a squared fiducial marker">
55
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
66
<interface uuid="b5a6225e-6a91-4050-b298-886f4c17d9d2" name="IPoseEstimationPipeline" description="The interface to define a video see-throuh pipeline" />
77
</component>
88
</module>
9-
<module uuid="15e1990b-86b2-445c-8194-0cbe80ede970" name="SolARModuleOpenCV" path="./SolARDemo_Data/Plugins/x86_64" description="OpenCV">
9+
<module uuid="15e1990b-86b2-445c-8194-0cbe80ede970" name="SolARModuleOpenCV" path="Plugins" description="OpenCV">
1010
<component uuid="5B7396F4-A804-4F3C-A0EB-FB1D56042BB4" name="SolARCameraOpencv" description="SolARCameraOpencv">
1111
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
1212
<interface uuid="5DDC7DF0-8377-437F-9C81-3643F7676A5B" name="ICamera" description="ICamera" />
@@ -69,8 +69,12 @@
6969
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
7070
<interface uuid="b05f3dbb-f93d-465c-aee1-fb58e1480c42" name="IImageViewer" description="IImageViewer" />
7171
</component>
72+
<component uuid="ddae46ca-1657-4301-a87d-f2dcfa6265d0" name="SolARCornerRefinementOpencv" description="SolARCornerRefinementOpencv">
73+
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
74+
<interface uuid="6ed0413a-751e-4c33-b91b-97b3ea949bc2" name="ICornerRefinement" description="ICornerRefinement" />
75+
</component>
7276
</module>
73-
<module uuid="28b89d39-41bd-451d-b19e-d25a3d7c5797" name="SolARModuleTools" path="./SolARDemo_Data/Plugins/x86_64" description="Module Tools">
77+
<module uuid="28b89d39-41bd-451d-b19e-d25a3d7c5797" name="SolARModuleTools" path="Plugins" description="Module Tools">
7478
<component uuid="a2ef5542-029e-4fce-9974-0aea14b29d6f" name="SolARSBPatternReIndexer" description="SolARSBPatternReIndexer">
7579
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
7680
<interface uuid="79c5b810-d557-11e7-9296-cec278b6b50a" name="ISBPatternReIndexer" description="ISBPatternReIndexer" />
@@ -102,11 +106,11 @@
102106
<property name="nbTestedThreshold" type="int" value="10" description="The number of thresholds for image binarization tested between minThreshold and maxThreshold" />
103107
</configure>
104108
<configure component="SolARCameraOpencv">
105-
<property name="calibrationFile" type="string" value="./SolARDemo_Data/StreamingAssets/SolAR/CameraCalibration/camera_calibration.yml" description="path of the .yml file describing the calibration parameter of the camera." />
109+
<property name="calibrationFile" type="string" value="/storage/emulated/0/Android/data/com.bcom.SolARDemo/files/StreamingAssets/SolAR/CameraCalibration/camera_calibration.yml" description="path of the .yml file describing the calibration parameter of the camera." />
106110
<property name="deviceID" type="uint" value="0" description="ID of the camera (default = 0)" />
107111
</configure>
108112
<configure component="SolARMarker2DSquaredBinaryOpencv">
109-
<property name="filePath" type="string" value="./SolARDemo_Data/StreamingAssets/SolAR/Markers/fiducialMarker.yml" description="Path of the .yml file describing the fiducial marker." />
113+
<property name="filePath" type="string" value="/storage/emulated/0/Android/data/com.bcom.SolARDemo/files/StreamingAssets/SolAR/Markers/fiducialMarker.yml" description="Path of the .yml file describing the fiducial marker." />
110114
</configure>
111115
<configure component="SolARImageFilterBinaryOpencv">
112116
<property name="min" type="int" value="-1" description="minimum threshold (-1 to automatically compute it on the global image" />

‎Assets/StreamingAssets/SolAR/Pipelines/PipelineNaturalImageMarker.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<xpcf-registry xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autoAlias="true">
3-
<module uuid="5bbc1452-8d7f-4512-83f1-7bf48453809f" name="SolARPipeline_NaturalImageMarker" path="./SolARDemo_Data/Plugins/x86_64" description="The module embedding a pipeline to estimate the pose based on a natural Image marker">
3+
<module uuid="5bbc1452-8d7f-4512-83f1-7bf48453809f" name="SolARPipeline_NaturalImageMarker" path="Plugins" description="The module embedding a pipeline to estimate the pose based on a natural Image marker">
44
<component uuid="6f6c7ae8-764c-49b3-a2fc-e9a4f539b9b1" name="PipelineNaturalImageMarker" description="A pipeline to estimate the pose based on a natural Image marker">
55
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
66
<interface uuid="b5a6225e-6a91-4050-b298-886f4c17d9d2" name="IPoseEstimationPipeline" description="The interface to define a video see-throuh pipeline" />
77
</component>
88
</module>
9-
<module uuid="15e1990b-86b2-445c-8194-0cbe80ede970" name="SolARModuleOpenCV" path="./SolARDemo_Data/Plugins/x86_64" description="moduleOpenCV">
9+
<module uuid="15e1990b-86b2-445c-8194-0cbe80ede970" name="SolARModuleOpenCV" path="Plugins" description="moduleOpenCV">
1010
<component uuid="5B7396F4-A804-4F3C-A0EB-FB1D56042BB4" name="SolARCameraOpencv" description="SolARCameraOpencv">
1111
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
1212
<interface uuid="5DDC7DF0-8377-437F-9C81-3643F7676A5B" name="ICamera" description="ICamera" />
@@ -70,7 +70,7 @@
7070
<interface uuid="81a20f52-6bf9-4949-b914-df2f614bc945" name="I3DOverlay" description="I3DOverlay" />
7171
</component>
7272
</module>
73-
<module uuid="28b89d39-41bd-451d-b19e-d25a3d7c5797" name="SolARModuleTools" path="./SolARDemo_Data/Plugins/x86_64" description="Module Tools">
73+
<module uuid="28b89d39-41bd-451d-b19e-d25a3d7c5797" name="SolARModuleTools" path="Plugins" description="Module Tools">
7474
<component uuid="a2ef5542-029e-4fce-9974-0aea14b29d6f" name="SolARSBPatternReIndexer" description="SolARSBPatternReIndexer">
7575
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
7676
<interface uuid="79c5b810-d557-11e7-9296-cec278b6b50a" name="ISBPatternReIndexer" description="ISBPatternReIndexer" />
@@ -108,11 +108,11 @@
108108
<property name="detectionMatchesNumberThreshold" type="int" value="10" description="If the number of matches during detection is less than this threshold, marker detection failed" />
109109
</configure>
110110
<configure component="SolARCameraOpencv">
111-
<property name="calibrationFile" type="string" value="./SolARDemo_Data/StreamingAssets/SolAR/CameraCalibration/camera_calibration.yml" description="path of the .yml file describing the calibration parameter of the camera." />
111+
<property name="calibrationFile" type="string" value="/storage/emulated/0/Android/data/com.bcom.SolARDemo/files/StreamingAssets/SolAR/CameraCalibration/camera_calibration.yml" description="path of the .yml file describing the calibration parameter of the camera." />
112112
<property name="deviceID" type="uint" value="0" description="ID of the camera (default = 0)" />
113113
</configure>
114114
<configure component="SolARMarker2DNaturalImageOpencv">
115-
<property name="filePath" type="string" value="./SolARDemo_Data/StreamingAssets/SolAR/Markers/NaturalImageMarker.yml" />
115+
<property name="filePath" type="string" value="/storage/emulated/0/Android/data/com.bcom.SolARDemo/files/StreamingAssets/SolAR/Markers/NaturalImageMarker.yml" />
116116
</configure>
117117
<configure component="SolARKeypointDetectorOpencv">
118118
<property name="type" type="string" value="AKAZE2" />

‎Assets/StreamingAssets/SolAR/Pipelines/PipelineSlam.xml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<xpcf-registry xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autoAlias="true">
3-
<module uuid="da89a6eb-3233-4dea-afdc-9d918be0bd74" name="SolARPipeline_SLAM" path="./SolARDemo_Data/Plugins/x86_64" description="The module embedding a pipeline to estimate the pose based on a multithreaded Slam">
3+
<module uuid="da89a6eb-3233-4dea-afdc-9d918be0bd74" name="SolARPipeline_SLAM" path="Plugins" description="The module embedding a pipeline to estimate the pose based on a multithreaded Slam">
44
<component uuid="577ccd2c-de1b-402a-8829-496747598588" name="PipelineSlam" description="A pipeline to estimate the pose based on a multithreaded Slam">
55
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
66
<interface uuid="b5a6225e-6a91-4050-b298-886f4c17d9d2" name="IPoseEstimationPipeline" description="The interface to define a video see-throuh pipeline" />
77
</component>
88
</module>
9-
<module uuid="15e1990b-86b2-445c-8194-0cbe80ede970" name="SolARModuleOpenCV" path="./SolARDemo_Data/Plugins/x86_64" description="SolARModuleOpenCV">
9+
<module uuid="15e1990b-86b2-445c-8194-0cbe80ede970" name="SolARModuleOpenCV" path="Plugins" description="SolARModuleOpenCV">
1010
<component uuid="5B7396F4-A804-4F3C-A0EB-FB1D56042BB4" name="SolARCameraOpencv" description="SolARCameraOpencv">
1111
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
1212
<interface uuid="5DDC7DF0-8377-437F-9C81-3643F7676A5B" name="ICamera" description="ICamera" />
@@ -125,14 +125,22 @@
125125
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
126126
<interface uuid="62b8b0b5-9344-40e6-a288-e609eb3ff0f1" name="I2DOverlay" description="I2DOverlay" />
127127
</component>
128+
<component uuid="d926e249-8b7f-46e0-8cbd-f981ceb8f921" name="SolARUndistortPointsOpencv" description="SolARUndistortPointsOpencv">
129+
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
130+
<interface uuid="a345a1d2-c3f3-497f-948b-cd1a199e6657" name="IUndistortPoints" description="IUndistortPoints" />
131+
</component>
132+
<component uuid="ddae46ca-1657-4301-a87d-f2dcfa6265d0" name="SolARCornerRefinementOpencv" description="SolARCornerRefinementOpencv">
133+
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
134+
<interface uuid="6ed0413a-751e-4c33-b91b-97b3ea949bc2" name="ICornerRefinement" description="ICornerRefinement" />
135+
</component>
128136
</module>
129-
<module uuid="6e960df6-9a36-11e8-9eb6-529269fb1459" name="SolARModuleOpenGL" path="./SolARDemo_Data/Plugins/x86_64" description="SolARModuleOpenGL">
137+
<module uuid="6e960df6-9a36-11e8-9eb6-529269fb1459" name="SolARModuleOpenGL" path="Plugins" description="SolARModuleOpenGL">
130138
<component uuid="afd38ea0-9a46-11e8-9eb6-529269fb1459" name="SolAR3DPointsViewerOpengl" description="SolAR3DPointsViewerOpengl">
131139
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
132140
<interface uuid="575d365a-9a27-11e8-9eb6-529269fb1459" name="I3DPointsViewer" description="I3DPointsViewer" />
133141
</component>
134142
</module>
135-
<module uuid="28b89d39-41bd-451d-b19e-d25a3d7c5797" name="SolARModuleTools" path="./SolARDemo_Data/Plugins/x86_64" description="SolARModuleTools">
143+
<module uuid="28b89d39-41bd-451d-b19e-d25a3d7c5797" name="SolARModuleTools" path="Plugins" description="SolARModuleTools">
136144
<component uuid="85db2f25-4f1c-4e06-9011-e020284bfc4f" name="SolARBasicSink" description="A Sink component for a synchronized pose and image pair">
137145
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
138146
<interface uuid="c0d9fee4-d7d7-4866-a6cd-3bacac23316a" name="ISinkPoseImage" description="An interface allowing to store a synchronized pose and image from the pipeline to make it available to a third party application" />
@@ -210,13 +218,13 @@
210218
<interface uuid="33db5a56-9be2-4e5a-8fdc-de25e1633cf6" name="IMapping" description="IMapping" />
211219
</component>
212220
</module>
213-
<module uuid="b81f0b90-bdbc-11e8-a355-529269fb1459" name="SolARModuleFBOW" path="./SolARDemo_Data/Plugins/x86_64" description="SolARModuleFBOW">
221+
<module uuid="b81f0b90-bdbc-11e8-a355-529269fb1459" name="SolARModuleFBOW" path="Plugins" description="SolARModuleFBOW">
214222
<component uuid="9d1b1afa-bdbc-11e8-a355-529269fb1459" name="SolARKeyframeRetrieverFBOW" description="SolARKeyframeRetrieverFBOW">
215223
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
216224
<interface uuid="f60980ce-bdbd-11e8-a355-529269fb1459" name="IKeyframeRetriever" description="IKeyframeRetriever" />
217225
</component>
218226
</module>
219-
<module uuid="8f94a3c5-79ed-4851-9502-98033eae3a3b" name="SolARModuleG2O" path="./SolARDemo_Data/Plugins/x86_64" description="SolARModuleG2O">
227+
<module uuid="8f94a3c5-79ed-4851-9502-98033eae3a3b" name="SolARModuleG2O" path="Plugins" description="SolARModuleG2O">
220228
<component uuid="870d89ba-bb5f-460a-a817-1fcb6473df70" name="SolAROptimizationG2O" description="SolAROptimizationG2O">
221229
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
222230
<interface uuid="35b9bdb7-d23c-4909-984f-ae7f9a292e6c" name="IBundler" description="IBundler" />
@@ -251,7 +259,7 @@
251259
</factory>
252260
<properties>
253261
<configure component="SolARCameraOpencv">
254-
<property name="calibrationFile" type="string" value="./SolARDemo_Data/StreamingAssets/SolAR/CameraCalibration/camera_calibration.yml" />
262+
<property name="calibrationFile" type="string" value="/storage/emulated/0/Android/data/com.bcom.SolARDemo/files/StreamingAssets/SolAR/CameraCalibration/camera_calibration.yml" />
255263
<property name="deviceID" type="uint" value="0" />
256264
</configure>
257265
<configure component="SolARImagesAsCameraOpencv">
@@ -280,7 +288,7 @@
280288
<property name="minTrackedPoints" type="int" value="100" />
281289
</configure>
282290
<configure component="SolARMapper">
283-
<property name="directory" type="string" value="./SolARDemo_Data/map" />
291+
<property name="directory" type="string" value="/storage/emulated/0/Android/data/com.bcom.SolARDemo/files/map" />
284292
<property name="identificationFileName" type="string" value="identification.bin" />
285293
<property name="coordinateFileName" type="string" value="coordinate.bin" />
286294
<property name="pointCloudManagerFileName" type="string" value="pointcloud.bin" />
@@ -347,7 +355,7 @@
347355
<property name="minMeanDistanceIsKeyframe" type="float" value="0.03" />
348356
</configure>
349357
<configure component="SolARKeyframeRetrieverFBOW">
350-
<property name="VOCpath" type="string" value="./SolARDemo_Data/StreamingAssets/SolAR/FBOW/akaze.fbow" />
358+
<property name="VOCpath" type="string" value="/storage/emulated/0/Android/data/com.bcom.SolARDemo/files/StreamingAssets/SolAR/FBOW/akaze.fbow" />
351359
<property name="threshold" type="float" value="0.02" />
352360
<property name="level" type="int" value="3" />
353361
<property name="matchingDistanceRatio" type="float" value="0.8" />
@@ -439,7 +447,7 @@
439447
<property name="exitKey" type="int" value="27" />
440448
</configure>
441449
<configure component="SolARMarker2DSquaredBinaryOpencv">
442-
<property name="filePath" type="string" value="./SolARDemo_Data/StreamingAssets/SolAR/Markers/fiducialMarker.yml" description="Path of the .yml file describing the fiducial marker." />
450+
<property name="filePath" type="string" value="/storage/emulated/0/Android/data/com.bcom.SolARDemo/files/StreamingAssets/SolAR/Markers/fiducialMarker.yml" description="Path of the .yml file describing the fiducial marker." />
443451
</configure>
444452
<configure component="SolARFiducialMarkerPoseEstimator">
445453
<property name="nbThreshold" type="int" value="3" />

‎Bundle.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ECHO Bundle third parties : %bconfig%
1313
:: Bunlde all third parties in the ./Assets/plugins folder based on the packagedependencies.txt file. More information on remaken is available on https://github.com/b-com-software-basis/remaken
1414

1515
::bundle for windows
16-
remaken bundle -d ./Assets/Plugins -c %bconfig% --cpp-std 17 -b cl-14.1 packagedependencies.txt
16+
remaken bundle -d ./Assets/Plugins -c %bconfig% --cpp-std 17 -b cl-14.1 -o win -a x86_64 packagedependencies.txt
1717

1818
::bundle for Android
1919
conan profile update settings.os="Android" default

0 commit comments

Comments
 (0)