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

Commit 9ec007f

Browse files
tlesauniertlesaunier
committed
Package ready
1 parent de7a47f commit 9ec007f

File tree

7 files changed

+1588
-770
lines changed

7 files changed

+1588
-770
lines changed

‎Assets/SolAR/Editor/SolARPluginNovice/SolARPipeline.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ private void SelectPipeline(int num_pipeline)
4949
using (var stream = File.OpenRead(selectedPipelinePath))
5050
{
5151
target.conf = (ConfXml)serializer.Deserialize(stream);
52-
//target.m_uuid = target.m_pipelinesUUID.ElementAt(num_pipeline);
52+
target.m_uuid = target.m_pipelinesUUID.ElementAt(num_pipeline);
5353
target.m_configurationPath = target.m_pipelinesPath.ElementAt(num_pipeline);
5454
}
5555
serializedObject.Update();
@@ -60,7 +60,7 @@ private void LoadPipelines()
6060
serializedObject.ApplyModifiedProperties();
6161
string[] files = Directory.GetFiles(Application.dataPath + target.m_pipelineFolder, "*.xml");
6262
List<string> namesList = new List<string>();
63-
//List<string> uuidList = new List<string>();
63+
List<string> uuidList = new List<string>();
6464
List<string> pathList = new List<string>();
6565
foreach (var file in files)
6666
{
@@ -88,11 +88,11 @@ private void LoadPipelines()
8888
{
8989
XElement component = component_interface.Ancestors("component").First();
9090
string pipelineName = component.Attribute("name").Value;
91-
//string pipelineUuid = component.Attribute("uuid").Value;
91+
string pipelineUuid = component.Attribute("uuid").Value;
9292
if (!string.IsNullOrEmpty(pipelineName))
9393
{
9494
namesList.Add(pipelineName);
95-
//uuidList.Add(pipelineUuid);
95+
uuidList.Add(pipelineUuid);
9696
pathList.Add(relative_file_temp);
9797
}
9898
}
@@ -103,7 +103,7 @@ private void LoadPipelines()
103103
}
104104
target.m_pipelinesName = namesList.ToArray();
105105
target.m_pipelinesPath = pathList.ToArray();
106-
//target.m_pipelinesUUID = uuidList.ToArray();
106+
target.m_pipelinesUUID = uuidList.ToArray();
107107

108108
if (namesList.Count == 0)
109109
{
@@ -228,7 +228,7 @@ public override void OnInspectorGUI()
228228
}
229229
else
230230
{
231-
//target.m_uuid = "";
231+
target.m_uuid = "";
232232
target.m_configurationPath = "";
233233
target.conf = null;
234234
serializedObject.Update();

‎Assets/SolAR/Pipelines/PipelineFiducialMarker.xml

Lines changed: 47 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<xpcf-registry xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autoAlias="true">
2+
<xpcf-registry autoAlias="true" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
33
<module uuid="63b4282f-94cf-44d0-8ec0-9e8b0639fff6" name="PipelineFiducialMarker" path="./Assets/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" />
@@ -53,18 +53,18 @@
5353
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
5454
<interface uuid="77281cda-47c2-4bb7-bde6-5b0d02e75dae" name="I3DTransformFinder" description="I3DTransformFinder" />
5555
</component>
56-
<component uuid="65282fb3-6651-4e73-b532-5a64ade0ead0" name="SolARImageConvertorUnity" description="SolAR::MODULES::OPENCV::SolARImageConvertorUnity component">
57-
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
58-
<interface uuid="9c982719-6cb4-4831-aa88-9e01afacbd16" name="IImageConvertor" description="SolAR::api::image::IImageConvertor" />
59-
</component>
60-
<component uuid="2db01f59-9793-4cd5-8e13-b25d0ed5735b" name="SolAR3DOverlayOpencv" description="SolAR3DOverlayOpencv">
61-
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
62-
<interface uuid="81a20f52-6bf9-4949-b914-df2f614bc945" name="I3DOverlay" description="I3DOverlay" />
63-
</component>
64-
<component uuid="19ea4e13-7085-4e3f-92ca-93f200ffb01b" name="SolARImageViewerOpencv" description="SolARImageViewerOpencv">
65-
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
66-
<interface uuid="b05f3dbb-f93d-465c-aee1-fb58e1480c42" name="IImageViewer" description="IImageViewer" />
67-
</component>
56+
<component uuid="65282fb3-6651-4e73-b532-5a64ade0ead0" name="SolARImageConvertorUnity" description="SolAR::MODULES::OPENCV::SolARImageConvertorUnity component">
57+
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect"/>
58+
<interface uuid="9c982719-6cb4-4831-aa88-9e01afacbd16" name="IImageConvertor" description="SolAR::api::image::IImageConvertor"/>
59+
</component>
60+
<component uuid="2db01f59-9793-4cd5-8e13-b25d0ed5735b" name="SolAR3DOverlayOpencv" description="SolAR3DOverlayOpencv">
61+
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect"/>
62+
<interface uuid="81a20f52-6bf9-4949-b914-df2f614bc945" name="I3DOverlay" description="I3DOverlay"/>
63+
</component>
64+
<component uuid="19ea4e13-7085-4e3f-92ca-93f200ffb01b" name="SolARImageViewerOpencv" description="SolARImageViewerOpencv">
65+
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect"/>
66+
<interface uuid="b05f3dbb-f93d-465c-aee1-fb58e1480c42" name="IImageViewer" description="IImageViewer"/>
67+
</component>
6868
</module>
6969
<module uuid="28b89d39-41bd-451d-b19e-d25a3d7c5797" name="SolARModuleTools" path="./Assets/Plugins" description="Module Tools">
7070
<component uuid="a2ef5542-029e-4fce-9974-0aea14b29d6f" name="SolARSBPatternReIndexer" description="SolARSBPatternReIndexer">
@@ -75,19 +75,26 @@
7575
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
7676
<interface uuid="67bcd080-258d-4b16-b693-cd30c013eb05" name="IImage2WorldMapper" description="IImage2WorldMapper" />
7777
</component>
78-
<component uuid="85db2f25-4f1c-4e06-9011-e020284bfc4f" name="SolARBasicSink" description="A Sink component for a synchronized pose and image pair">
78+
<component uuid="85db2f25-4f1c-4e06-9011-e020284bfc4f" name="SolARBasicSink" description="A Sink component for a synchronized pose and image pair">
7979
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
8080
<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" />
8181
</component>
82-
<component uuid="1e43cda9-7850-4a8a-a32b-f3f31ea94902" name="SolARBasicSource" description="A source component for feeding the pipeline with external images">
82+
<component uuid="1e43cda9-7850-4a8a-a32b-f3f31ea94902" name="SolARBasicSource" description="A source component for feeding the pipeline with external images">
8383
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
8484
<interface uuid="06e2fc5d-39da-4486-b2a6-1d8bd788fa13" name="ISourceImage" description="An interface allowing to store an image from extern source to make it available to the pipeline" />
8585
</component>
8686
</module>
87+
<factory>
88+
<bindings>
89+
<bind interface="ICamera" to="SolARCameraOpencv" />
90+
<bind interface="IImageConvertor" to="SolARImageConvertorOpencv" />
91+
<bind interface="IImageConvertor" to="SolARImageConvertorUnity" name="imageConvertorUnity" />
92+
</bindings>
93+
</factory>
8794
<properties>
8895
<configure component="PipelineFiducialMarker">
8996
<property name="minThreshold" type="Integer" value="-1" description="the minimum tested threshold for image binarization" />
90-
<property name="maxThreshold" type="Integer" value="221" description="The maximum tested threshold for image binarization" />
97+
<property name="maxThreshold" type="Integer" value="220" description="The maximum tested threshold for image binarization" />
9198
<property name="nbTestedThreshold" type="Integer" value="10" description="The number of thresholds for image binarization tested between minThreshold and maxThreshold" />
9299
<!--PipelineFiducialMarker-->
93100
</configure>
@@ -120,30 +127,28 @@
120127
<property name="outputImageHeight" type="Integer" value="480" description="The width in pixels of the corrected image." />
121128
<!--SolARPerspectiveControllerOpencv-->
122129
</configure>
123-
<configure component="SolAR3DOverlayOpencv">
124-
<property name="position" type="Float">
125-
<value>0</value>
126-
<value>0</value>
127-
<value>0</value>
128-
</property>
129-
<property name="orientation" type="Float">
130-
<value>0.0</value>
131-
<value>0.0</value>
132-
<value>0.0</value>
133-
</property>
134-
<property name="size" type="Float">
135-
<value>0.157</value>
136-
<value>0.157</value>
137-
<value>0.1</value>
138-
</property>
139-
<!--SolAR3DOverlayOpencv-->
140-
</configure>
141-
<configure component="SolARImageViewerOpencv">
142-
<property name="title" type="string" value="Fiducial Image Marker" />
143-
<property name="exitKey" type="Integer" value="27" />
144-
<property name="width" type="Integer" value="0" />
145-
<property name="height" type="Integer" value="0" />
146-
<!--SolARImageViewerOpencv-->
147-
</configure>
130+
<configure component="SolAR3DOverlayOpencv"> <!-- SolAR3DOverlayBoxOpencv -->
131+
<property name="position" type="Float">
132+
<value>0</value>
133+
<value>0</value>
134+
<value>0</value>
135+
</property>
136+
<property name="orientation" type="Float">
137+
<value>0.0</value>
138+
<value>0.0</value>
139+
<value>0.0</value>
140+
</property>
141+
<property name="size" type="Float">
142+
<value>0.157</value>
143+
<value>0.157</value>
144+
<value>0.1</value>
145+
</property>
146+
</configure>
147+
<configure component="SolARImageViewerOpencv"> <!-- SolARImageViewerOpencv -->
148+
<property name="title" type="string" value="Fiducial Image Marker"/>
149+
<property name="exitKey" type="Integer" value="27"/>
150+
<property name="width" type="Integer" value="0"/>
151+
<property name="height" type="Integer" value="0"/>
152+
</configure>
148153
</properties>
149-
</xpcf-registry>
154+
</xpcf-registry>

‎Assets/SolAR/Pipelines/PipelineNaturalImageMarker.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@
135135
<property name="minNbInliers" type="Integer" value="50"/>
136136
<property name="reprojErrorThreshold" type="Float" value="0.1"/>
137137
</configure>
138+
<!-- ERROR : configuring SolARKeypointDetectorOpencv with SolAROpticalFlowPyrLKOpencv properties
139+
<configure component="e81c7e4e-7da6-476a-8eba-078b43071272"> -->
138140
<configure component="SolAROpticalFlowPyrLKOpencv"> <!-- SolAROpticalFlowPyrLKOpencv -->
139141
<property name="searchWinWidth" type="Integer" value="21"/>
140142
<property name="searchWinHeight" type="Integer" value="21"/>
@@ -167,4 +169,4 @@
167169
<property name="height" type="Integer" value="0"/>
168170
</configure>
169171
</properties>
170-
</xpcf-registry>
172+
</xpcf-registry>

0 commit comments

Comments
 (0)