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

Commit 79e0704

Browse files
committed
Latest configuration of Unity project
Set on Windows build
1 parent a2bfd96 commit 79e0704

File tree

7 files changed

+233
-28
lines changed

7 files changed

+233
-28
lines changed

Assets/SolAR/Demos/Materials/SolARImageEffect.mat

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: SolARImageEffect
1011
m_Shader: {fileID: 4800000, guid: c4c55970e9f9ad546bea2f47c5fbe7a1, type: 3}
1112
m_ShaderKeywords:
@@ -39,7 +40,7 @@ Material:
3940
m_Scale: {x: 1, y: 1}
4041
m_Offset: {x: 0, y: 0}
4142
- _MainTex:
42-
m_Texture: {fileID: 2800000, guid: bcf3c0671721fa54facba4127bdbc930, type: 3}
43+
m_Texture: {fileID: 0}
4344
m_Scale: {x: 1, y: 1}
4445
m_Offset: {x: 0, y: 0}
4546
- _MetallicGlossMap:

Assets/SolAR/Demos/Scenes/NoviceVersion.unity

Lines changed: 210 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ GameObject:
403403
m_Icon: {fileID: 0}
404404
m_NavMeshLayer: 0
405405
m_StaticEditorFlags: 0
406-
m_IsActive: 0
406+
m_IsActive: 1
407407
--- !u!4 &262081224
408408
Transform:
409409
m_ObjectHideFlags: 0
@@ -479,6 +479,191 @@ MeshFilter:
479479
m_PrefabAsset: {fileID: 0}
480480
m_GameObject: {fileID: 262081223}
481481
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
482+
--- !u!1 &456679641
483+
GameObject:
484+
m_ObjectHideFlags: 0
485+
m_CorrespondingSourceObject: {fileID: 0}
486+
m_PrefabInstance: {fileID: 0}
487+
m_PrefabAsset: {fileID: 0}
488+
serializedVersion: 6
489+
m_Component:
490+
- component: {fileID: 456679642}
491+
- component: {fileID: 456679645}
492+
- component: {fileID: 456679644}
493+
- component: {fileID: 456679643}
494+
m_Layer: 5
495+
m_Name: SolARVideoBackground
496+
m_TagString: Untagged
497+
m_Icon: {fileID: 0}
498+
m_NavMeshLayer: 0
499+
m_StaticEditorFlags: 0
500+
m_IsActive: 1
501+
--- !u!224 &456679642
502+
RectTransform:
503+
m_ObjectHideFlags: 0
504+
m_CorrespondingSourceObject: {fileID: 0}
505+
m_PrefabInstance: {fileID: 0}
506+
m_PrefabAsset: {fileID: 0}
507+
m_GameObject: {fileID: 456679641}
508+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
509+
m_LocalPosition: {x: 0, y: 0, z: 0}
510+
m_LocalScale: {x: 1, y: 1, z: 1}
511+
m_Children: []
512+
m_Father: {fileID: 543289336}
513+
m_RootOrder: 0
514+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
515+
m_AnchorMin: {x: 0, y: 0}
516+
m_AnchorMax: {x: 1, y: 1}
517+
m_AnchoredPosition: {x: 0, y: 0}
518+
m_SizeDelta: {x: 0, y: 1.2030029}
519+
m_Pivot: {x: 0.5, y: 0.5}
520+
--- !u!114 &456679643
521+
MonoBehaviour:
522+
m_ObjectHideFlags: 0
523+
m_CorrespondingSourceObject: {fileID: 0}
524+
m_PrefabInstance: {fileID: 0}
525+
m_PrefabAsset: {fileID: 0}
526+
m_GameObject: {fileID: 456679641}
527+
m_Enabled: 1
528+
m_EditorHideFlags: 0
529+
m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3}
530+
m_Name:
531+
m_EditorClassIdentifier:
532+
m_AspectMode: 4
533+
m_AspectRatio: 1.33
534+
--- !u!114 &456679644
535+
MonoBehaviour:
536+
m_ObjectHideFlags: 0
537+
m_CorrespondingSourceObject: {fileID: 0}
538+
m_PrefabInstance: {fileID: 0}
539+
m_PrefabAsset: {fileID: 0}
540+
m_GameObject: {fileID: 456679641}
541+
m_Enabled: 1
542+
m_EditorHideFlags: 0
543+
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
544+
m_Name:
545+
m_EditorClassIdentifier:
546+
m_Material: {fileID: 2100000, guid: 07c5c3b87c0157f45b4b19c06bce823c, type: 2}
547+
m_Color: {r: 1, g: 1, b: 1, a: 1}
548+
m_RaycastTarget: 1
549+
m_Maskable: 1
550+
m_OnCullStateChanged:
551+
m_PersistentCalls:
552+
m_Calls: []
553+
m_Texture: {fileID: 10309, guid: 0000000000000000f000000000000000, type: 0}
554+
m_UVRect:
555+
serializedVersion: 2
556+
x: 0
557+
y: 0
558+
width: 1
559+
height: 1
560+
--- !u!222 &456679645
561+
CanvasRenderer:
562+
m_ObjectHideFlags: 0
563+
m_CorrespondingSourceObject: {fileID: 0}
564+
m_PrefabInstance: {fileID: 0}
565+
m_PrefabAsset: {fileID: 0}
566+
m_GameObject: {fileID: 456679641}
567+
m_CullTransparentMesh: 0
568+
--- !u!1 &543289332
569+
GameObject:
570+
m_ObjectHideFlags: 0
571+
m_CorrespondingSourceObject: {fileID: 0}
572+
m_PrefabInstance: {fileID: 0}
573+
m_PrefabAsset: {fileID: 0}
574+
serializedVersion: 6
575+
m_Component:
576+
- component: {fileID: 543289336}
577+
- component: {fileID: 543289335}
578+
- component: {fileID: 543289334}
579+
- component: {fileID: 543289333}
580+
m_Layer: 5
581+
m_Name: SolARVideoCanvas
582+
m_TagString: Untagged
583+
m_Icon: {fileID: 0}
584+
m_NavMeshLayer: 0
585+
m_StaticEditorFlags: 0
586+
m_IsActive: 0
587+
--- !u!114 &543289333
588+
MonoBehaviour:
589+
m_ObjectHideFlags: 0
590+
m_CorrespondingSourceObject: {fileID: 0}
591+
m_PrefabInstance: {fileID: 0}
592+
m_PrefabAsset: {fileID: 0}
593+
m_GameObject: {fileID: 543289332}
594+
m_Enabled: 1
595+
m_EditorHideFlags: 0
596+
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
597+
m_Name:
598+
m_EditorClassIdentifier:
599+
m_IgnoreReversedGraphics: 1
600+
m_BlockingObjects: 0
601+
m_BlockingMask:
602+
serializedVersion: 2
603+
m_Bits: 4294967295
604+
--- !u!114 &543289334
605+
MonoBehaviour:
606+
m_ObjectHideFlags: 0
607+
m_CorrespondingSourceObject: {fileID: 0}
608+
m_PrefabInstance: {fileID: 0}
609+
m_PrefabAsset: {fileID: 0}
610+
m_GameObject: {fileID: 543289332}
611+
m_Enabled: 1
612+
m_EditorHideFlags: 0
613+
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
614+
m_Name:
615+
m_EditorClassIdentifier:
616+
m_UiScaleMode: 0
617+
m_ReferencePixelsPerUnit: 100
618+
m_ScaleFactor: 1
619+
m_ReferenceResolution: {x: 800, y: 600}
620+
m_ScreenMatchMode: 0
621+
m_MatchWidthOrHeight: 0
622+
m_PhysicalUnit: 3
623+
m_FallbackScreenDPI: 96
624+
m_DefaultSpriteDPI: 96
625+
m_DynamicPixelsPerUnit: 1
626+
--- !u!223 &543289335
627+
Canvas:
628+
m_ObjectHideFlags: 0
629+
m_CorrespondingSourceObject: {fileID: 0}
630+
m_PrefabInstance: {fileID: 0}
631+
m_PrefabAsset: {fileID: 0}
632+
m_GameObject: {fileID: 543289332}
633+
m_Enabled: 1
634+
serializedVersion: 3
635+
m_RenderMode: 1
636+
m_Camera: {fileID: 1558309007}
637+
m_PlaneDistance: 29
638+
m_PixelPerfect: 1
639+
m_ReceivesEvents: 1
640+
m_OverrideSorting: 0
641+
m_OverridePixelPerfect: 0
642+
m_SortingBucketNormalizedSize: 0
643+
m_AdditionalShaderChannelsFlag: 0
644+
m_SortingLayerID: 0
645+
m_SortingOrder: 0
646+
m_TargetDisplay: 0
647+
--- !u!224 &543289336
648+
RectTransform:
649+
m_ObjectHideFlags: 0
650+
m_CorrespondingSourceObject: {fileID: 0}
651+
m_PrefabInstance: {fileID: 0}
652+
m_PrefabAsset: {fileID: 0}
653+
m_GameObject: {fileID: 543289332}
654+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
655+
m_LocalPosition: {x: 0, y: 0, z: 0}
656+
m_LocalScale: {x: 0, y: 0, z: 0}
657+
m_Children:
658+
- {fileID: 456679642}
659+
m_Father: {fileID: 0}
660+
m_RootOrder: 7
661+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
662+
m_AnchorMin: {x: 0, y: 0}
663+
m_AnchorMax: {x: 0, y: 0}
664+
m_AnchoredPosition: {x: 0, y: 0}
665+
m_SizeDelta: {x: 0, y: 0}
666+
m_Pivot: {x: 0, y: 0}
482667
--- !u!1 &747340005
483668
GameObject:
484669
m_ObjectHideFlags: 0
@@ -9114,12 +9299,12 @@ PrefabInstance:
91149299
- target: {fileID: 8997161845923243914, guid: 37f082361edc9064ba18b144c5e661ce,
91159300
type: 3}
91169301
propertyPath: focalX
9117-
value: 507.35
9302+
value: 600
91189303
objectReference: {fileID: 0}
91199304
- target: {fileID: 8997161845923243914, guid: 37f082361edc9064ba18b144c5e661ce,
91209305
type: 3}
91219306
propertyPath: focalY
9122-
value: 508.56
9307+
value: 600
91239308
objectReference: {fileID: 0}
91249309
- target: {fileID: 8997161845923243914, guid: 37f082361edc9064ba18b144c5e661ce,
91259310
type: 3}
@@ -9134,13 +9319,33 @@ PrefabInstance:
91349319
- target: {fileID: 8997161845923243914, guid: 37f082361edc9064ba18b144c5e661ce,
91359320
type: 3}
91369321
propertyPath: centerX
9137-
value: 319.16
9322+
value: 320
91389323
objectReference: {fileID: 0}
91399324
- target: {fileID: 8997161845923243914, guid: 37f082361edc9064ba18b144c5e661ce,
91409325
type: 3}
91419326
propertyPath: centerY
9142-
value: 239.1
9327+
value: 240
91439328
objectReference: {fileID: 0}
9329+
- target: {fileID: 8997161845923243914, guid: 37f082361edc9064ba18b144c5e661ce,
9330+
type: 3}
9331+
propertyPath: hasCustomCanvas
9332+
value: 0
9333+
objectReference: {fileID: 0}
9334+
- target: {fileID: 8997161845923243914, guid: 37f082361edc9064ba18b144c5e661ce,
9335+
type: 3}
9336+
propertyPath: webcamIndex
9337+
value: 0
9338+
objectReference: {fileID: 0}
9339+
- target: {fileID: 8997161845923243914, guid: 37f082361edc9064ba18b144c5e661ce,
9340+
type: 3}
9341+
propertyPath: canvas
9342+
value:
9343+
objectReference: {fileID: 543289335}
9344+
- target: {fileID: 8997161845923243914, guid: 37f082361edc9064ba18b144c5e661ce,
9345+
type: 3}
9346+
propertyPath: material
9347+
value:
9348+
objectReference: {fileID: 2100000, guid: 07c5c3b87c0157f45b4b19c06bce823c, type: 2}
91449349
- target: {fileID: 8997161845923243915, guid: 37f082361edc9064ba18b144c5e661ce,
91459350
type: 3}
91469351
propertyPath: m_Name

Assets/StreamingAssets/SolAR/Pipelines/PipelineFiducialMarker.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="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">
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">
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="Plugins" description="OpenCV">
9+
<module uuid="15e1990b-86b2-445c-8194-0cbe80ede970" name="SolARModuleOpenCV" path="./SolARDemo_Data/Plugins/x86_64" 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" />
@@ -70,7 +70,7 @@
7070
<interface uuid="b05f3dbb-f93d-465c-aee1-fb58e1480c42" name="IImageViewer" description="IImageViewer" />
7171
</component>
7272
</module>
73-
<module uuid="28b89d39-41bd-451d-b19e-d25a3d7c5797" name="SolARModuleTools" path="Plugins" description="Module Tools">
73+
<module uuid="28b89d39-41bd-451d-b19e-d25a3d7c5797" name="SolARModuleTools" path="./SolARDemo_Data/Plugins/x86_64" 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" />
@@ -102,11 +102,11 @@
102102
<property name="nbTestedThreshold" type="int" value="10" description="The number of thresholds for image binarization tested between minThreshold and maxThreshold" />
103103
</configure>
104104
<configure component="SolARCameraOpencv">
105-
<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." />
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." />
106106
<property name="deviceID" type="uint" value="0" description="ID of the camera (default = 0)" />
107107
</configure>
108108
<configure component="SolARMarker2DSquaredBinaryOpencv">
109-
<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." />
109+
<property name="filePath" type="string" value="./SolARDemo_Data/StreamingAssets/SolAR/Markers/fiducialMarker.yml" description="Path of the .yml file describing the fiducial marker." />
110110
</configure>
111111
<configure component="SolARImageFilterBinaryOpencv">
112112
<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="Plugins" 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="./SolARDemo_Data/Plugins/x86_64" 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="Plugins" description="moduleOpenCV">
9+
<module uuid="15e1990b-86b2-445c-8194-0cbe80ede970" name="SolARModuleOpenCV" path="./SolARDemo_Data/Plugins/x86_64" 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="Plugins" description="Module Tools">
73+
<module uuid="28b89d39-41bd-451d-b19e-d25a3d7c5797" name="SolARModuleTools" path="./SolARDemo_Data/Plugins/x86_64" 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="/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." />
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." />
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="/storage/emulated/0/Android/data/com.bcom.SolARDemo/files/StreamingAssets/SolAR/Markers/NaturalImageMarker.yml" />
115+
<property name="filePath" type="string" value="./SolARDemo_Data/StreamingAssets/SolAR/Markers/NaturalImageMarker.yml" />
116116
</configure>
117117
<configure component="SolARKeypointDetectorOpencv">
118118
<property name="type" type="string" value="AKAZE2" />

0 commit comments

Comments
 (0)