From a65c3e49470d137bdb0a926c097dd19666b16d04 Mon Sep 17 00:00:00 2001 From: cbrown Date: Wed, 17 Apr 2024 15:30:37 -0400 Subject: [PATCH] Updated courses sample scene to use the same 2 qr codes (just in a different reference library asset) Also added Unity.Logging package and a very simple controller script --- .gitignore | 3 + .../Atoms/Variables/TrackedImageParent.asset | 24 + .../Variables/TrackedImageParent.asset.meta | 8 + .../MAVRIC.GEEEKCup.Samples.QRCode.asmdef | 7 +- .../MAVRIC.GEEKCup/QRCode/Materials/Two.mat | 33 + .../QRCode/Materials/Two.mat.meta | 8 + .../QRCode/Prefabs/course-02.prefab | 228 +++++ .../QRCode/Prefabs/course-02.prefab.meta | 7 + .../ImageLibraries/CoursesImageLibrary.asset | 41 + .../CoursesImageLibrary.asset.meta | 8 + .../ReferenceImageLibrary.asset | 18 +- .../QRCode/Scenes/QRCodeLoading-Courses.unity | 121 ++- .../Scripts/GameObjectReferenceSetter.cs | 30 + .../Scripts/GameObjectReferenceSetter.cs.meta | 11 + .../QRCode/Scripts/TrackedImageChanged.cs | 18 +- .../XREnvironment/CourseImageTracking.prefab | 835 ++++++++++++++++++ .../CourseImageTracking.prefab.meta | 7 + .../QRCode/XREnvironment/ImageTracking.prefab | 154 ---- Assets/Scripts/Logging.meta | 8 + Assets/Scripts/Logging/GlobalLogConfig.cs | 40 + .../Scripts/Logging/GlobalLogConfig.cs.meta | 11 + .../SimulationEnvironmentAssetsManager.asset | 1 + Packages/manifest.json | 1 + Packages/packages-lock.json | 28 + ProjectSettings/EditorBuildSettings.asset | 5 +- ProjectSettings/ProjectSettings.asset | 2 +- 26 files changed, 1487 insertions(+), 170 deletions(-) create mode 100644 Assets/Atoms/Variables/TrackedImageParent.asset create mode 100644 Assets/Atoms/Variables/TrackedImageParent.asset.meta create mode 100644 Assets/Samples/MAVRIC.GEEKCup/QRCode/Materials/Two.mat create mode 100644 Assets/Samples/MAVRIC.GEEKCup/QRCode/Materials/Two.mat.meta create mode 100644 Assets/Samples/MAVRIC.GEEKCup/QRCode/Prefabs/course-02.prefab create mode 100644 Assets/Samples/MAVRIC.GEEKCup/QRCode/Prefabs/course-02.prefab.meta create mode 100644 Assets/Samples/MAVRIC.GEEKCup/QRCode/References/ImageLibraries/CoursesImageLibrary.asset create mode 100644 Assets/Samples/MAVRIC.GEEKCup/QRCode/References/ImageLibraries/CoursesImageLibrary.asset.meta create mode 100644 Assets/Samples/MAVRIC.GEEKCup/QRCode/Scripts/GameObjectReferenceSetter.cs create mode 100644 Assets/Samples/MAVRIC.GEEKCup/QRCode/Scripts/GameObjectReferenceSetter.cs.meta create mode 100644 Assets/Samples/MAVRIC.GEEKCup/QRCode/XREnvironment/CourseImageTracking.prefab create mode 100644 Assets/Samples/MAVRIC.GEEKCup/QRCode/XREnvironment/CourseImageTracking.prefab.meta create mode 100644 Assets/Scripts/Logging.meta create mode 100644 Assets/Scripts/Logging/GlobalLogConfig.cs create mode 100644 Assets/Scripts/Logging/GlobalLogConfig.cs.meta diff --git a/.gitignore b/.gitignore index cfe9ead8..d39258a9 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,6 @@ crashlytics-build.properties .DS_Store .vsconfig + +# Any log files +*.log diff --git a/Assets/Atoms/Variables/TrackedImageParent.asset b/Assets/Atoms/Variables/TrackedImageParent.asset new file mode 100644 index 00000000..6c03423a --- /dev/null +++ b/Assets/Atoms/Variables/TrackedImageParent.asset @@ -0,0 +1,24 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f75cf6a8ba520427cb126096cdb9eb5c, type: 3} + m_Name: TrackedImageParent + m_EditorClassIdentifier: + _developerDescription: + _id: + _value: {fileID: 0} + _changed: {fileID: 0} + _changedWithHistory: {fileID: 0} + _triggerChangedOnOnEnable: 0 + _triggerChangedWithHistoryOnOnEnable: 0 + _oldValue: {fileID: 0} + _initialValue: {fileID: 0} + _preChangeTransformers: [] diff --git a/Assets/Atoms/Variables/TrackedImageParent.asset.meta b/Assets/Atoms/Variables/TrackedImageParent.asset.meta new file mode 100644 index 00000000..6ea43eb4 --- /dev/null +++ b/Assets/Atoms/Variables/TrackedImageParent.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 03debcbab0da04aa1a802a4cbc116950 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/MAVRIC.GEEKCup/QRCode/MAVRIC.GEEEKCup.Samples.QRCode.asmdef b/Assets/Samples/MAVRIC.GEEKCup/QRCode/MAVRIC.GEEEKCup.Samples.QRCode.asmdef index 41cf7c50..e0f72ef8 100644 --- a/Assets/Samples/MAVRIC.GEEKCup/QRCode/MAVRIC.GEEEKCup.Samples.QRCode.asmdef +++ b/Assets/Samples/MAVRIC.GEEKCup/QRCode/MAVRIC.GEEEKCup.Samples.QRCode.asmdef @@ -4,7 +4,12 @@ "references": [ "GUID:d8b63aba1907145bea998dd612889d6b", "GUID:a9420e37d7990b54abdef6688edbe313", - "GUID:92703082f92b41ba80f0d6912de66115" + "GUID:92703082f92b41ba80f0d6912de66115", + "GUID:29492541a59d04a81b47a7f225e8a22d", + "GUID:14165214884ae4a619bfb290f28194a7", + "GUID:fd228c28e14f1a34cbe508676c914dd7", + "GUID:2665a8d13d1b3f18800f46e256720795", + "GUID:e0cd26848372d4e5c891c569017e11f1" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Samples/MAVRIC.GEEKCup/QRCode/Materials/Two.mat b/Assets/Samples/MAVRIC.GEEKCup/QRCode/Materials/Two.mat new file mode 100644 index 00000000..ce80d471 --- /dev/null +++ b/Assets/Samples/MAVRIC.GEEKCup/QRCode/Materials/Two.mat @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Two + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 2100000, guid: c50cd262589f0404496eed30657e58f2, type: 2} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 038b8a7b4862745aaadfd7c9f14e7bbd, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: [] + m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Assets/Samples/MAVRIC.GEEKCup/QRCode/Materials/Two.mat.meta b/Assets/Samples/MAVRIC.GEEKCup/QRCode/Materials/Two.mat.meta new file mode 100644 index 00000000..e4b90ab0 --- /dev/null +++ b/Assets/Samples/MAVRIC.GEEKCup/QRCode/Materials/Two.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8b1aec4fbefb943859e7a469aa897bed +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/MAVRIC.GEEKCup/QRCode/Prefabs/course-02.prefab b/Assets/Samples/MAVRIC.GEEKCup/QRCode/Prefabs/course-02.prefab new file mode 100644 index 00000000..be5f6145 --- /dev/null +++ b/Assets/Samples/MAVRIC.GEEKCup/QRCode/Prefabs/course-02.prefab @@ -0,0 +1,228 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1134376618909689890 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 497128392619825818} + m_Layer: 0 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &497128392619825818 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1134376618909689890} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 686390609811667278} + m_Father: {fileID: 5478542101379983518} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8130164210984699379 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5478542101379983518} + m_Layer: 0 + m_Name: course-02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5478542101379983518 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8130164210984699379} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 8384516764779859345} + - {fileID: 497128392619825818} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &8382404109628391109 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5478542101379983518} + m_Modifications: + - target: {fileID: 1273508384157506, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} + propertyPath: m_Name + value: TransformDebugAxes + objectReference: {fileID: 0} + - target: {fileID: 1273508384157506, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} + propertyPath: m_Layer + value: 29 + objectReference: {fileID: 0} + - target: {fileID: 1298767457708356, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} + propertyPath: m_Layer + value: 29 + objectReference: {fileID: 0} + - target: {fileID: 1312820055641268, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} + propertyPath: m_Layer + value: 29 + objectReference: {fileID: 0} + - target: {fileID: 1475385274619790, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} + propertyPath: m_Layer + value: 29 + objectReference: {fileID: 0} + - target: {fileID: 1642828159801702, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} + propertyPath: m_Layer + value: 29 + objectReference: {fileID: 0} + - target: {fileID: 4364731056812884, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4364731056812884, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4364731056812884, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4364731056812884, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4364731056812884, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4364731056812884, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4364731056812884, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4364731056812884, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4364731056812884, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4364731056812884, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4364731056812884, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} +--- !u!4 &8384516764779859345 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4364731056812884, guid: 22b5884c8772b654489e4ed1d6987802, + type: 3} + m_PrefabInstance: {fileID: 8382404109628391109} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &9092765588503150863 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 497128392619825818} + m_Modifications: + - target: {fileID: 2529697415610420776, guid: 23df27f8eab164f53a62e09b8b7c7325, + type: 3} + propertyPath: m_Name + value: Main_Room + objectReference: {fileID: 0} + - target: {fileID: 8622549130173790273, guid: 23df27f8eab164f53a62e09b8b7c7325, + type: 3} + propertyPath: m_LocalPosition.x + value: -10.1 + objectReference: {fileID: 0} + - target: {fileID: 8622549130173790273, guid: 23df27f8eab164f53a62e09b8b7c7325, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8622549130173790273, guid: 23df27f8eab164f53a62e09b8b7c7325, + type: 3} + propertyPath: m_LocalPosition.z + value: 6.5 + objectReference: {fileID: 0} + - target: {fileID: 8622549130173790273, guid: 23df27f8eab164f53a62e09b8b7c7325, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8622549130173790273, guid: 23df27f8eab164f53a62e09b8b7c7325, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 8622549130173790273, guid: 23df27f8eab164f53a62e09b8b7c7325, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8622549130173790273, guid: 23df27f8eab164f53a62e09b8b7c7325, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8622549130173790273, guid: 23df27f8eab164f53a62e09b8b7c7325, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 8622549130173790273, guid: 23df27f8eab164f53a62e09b8b7c7325, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8622549130173790273, guid: 23df27f8eab164f53a62e09b8b7c7325, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 23df27f8eab164f53a62e09b8b7c7325, type: 3} +--- !u!4 &686390609811667278 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8622549130173790273, guid: 23df27f8eab164f53a62e09b8b7c7325, + type: 3} + m_PrefabInstance: {fileID: 9092765588503150863} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Samples/MAVRIC.GEEKCup/QRCode/Prefabs/course-02.prefab.meta b/Assets/Samples/MAVRIC.GEEKCup/QRCode/Prefabs/course-02.prefab.meta new file mode 100644 index 00000000..c5f7a5a3 --- /dev/null +++ b/Assets/Samples/MAVRIC.GEEKCup/QRCode/Prefabs/course-02.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a857efe212a8a43f89a533de0e486b71 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/MAVRIC.GEEKCup/QRCode/References/ImageLibraries/CoursesImageLibrary.asset b/Assets/Samples/MAVRIC.GEEKCup/QRCode/References/ImageLibraries/CoursesImageLibrary.asset new file mode 100644 index 00000000..6aceca2c --- /dev/null +++ b/Assets/Samples/MAVRIC.GEEKCup/QRCode/References/ImageLibraries/CoursesImageLibrary.asset @@ -0,0 +1,41 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 848409ee8ba454f42a5ddff137688a27, type: 3} + m_Name: CoursesImageLibrary + m_EditorClassIdentifier: + m_GuidLow: 5321807167641304107 + m_GuidHigh: 5885720141521760440 + m_DataStore: + m_Storage: [] + m_Images: + - m_SerializedGuid: + m_GuidLow: 4776696836125083462 + m_GuidHigh: 18390638086387399054 + m_SerializedTextureGuid: + m_GuidLow: 9512191862091720473 + m_GuidHigh: 4777916657343582074 + m_Size: {x: 0.1, y: 0.1} + m_SpecifySize: 1 + m_Name: course-01 + m_Texture: {fileID: 6192944022281365145, guid: cf56a719181984027acf62a7e2914e42, + type: 3} + - m_SerializedGuid: + m_GuidLow: 5705175902399201308 + m_GuidHigh: 8849269614915151792 + m_SerializedTextureGuid: + m_GuidLow: 8415066286968600214 + m_GuidHigh: 355843442228713881 + m_Size: {x: 0.1, y: 0.1} + m_SpecifySize: 1 + m_Name: course-02 + m_Texture: {fileID: 6192944022281365145, guid: fc20f696523374c899d9b1b1b935f004, + type: 3} diff --git a/Assets/Samples/MAVRIC.GEEKCup/QRCode/References/ImageLibraries/CoursesImageLibrary.asset.meta b/Assets/Samples/MAVRIC.GEEKCup/QRCode/References/ImageLibraries/CoursesImageLibrary.asset.meta new file mode 100644 index 00000000..2f6a924a --- /dev/null +++ b/Assets/Samples/MAVRIC.GEEKCup/QRCode/References/ImageLibraries/CoursesImageLibrary.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 566278178fcf04566b14f73c97cab6ff +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/MAVRIC.GEEKCup/QRCode/References/ImageLibraries/ReferenceImageLibrary.asset b/Assets/Samples/MAVRIC.GEEKCup/QRCode/References/ImageLibraries/ReferenceImageLibrary.asset index b10717cf..3a8da819 100644 --- a/Assets/Samples/MAVRIC.GEEKCup/QRCode/References/ImageLibraries/ReferenceImageLibrary.asset +++ b/Assets/Samples/MAVRIC.GEEKCup/QRCode/References/ImageLibraries/ReferenceImageLibrary.asset @@ -43,9 +43,21 @@ MonoBehaviour: m_GuidLow: 4776696836125083462 m_GuidHigh: 18390638086387399054 m_SerializedTextureGuid: - m_GuidLow: 2643004529649882887 - m_GuidHigh: 10677130273123681019 + m_GuidLow: 9512191862091720473 + m_GuidHigh: 4777916657343582074 m_Size: {x: 0.1, y: 0.1} m_SpecifySize: 1 m_Name: course-01 - m_Texture: {fileID: 2800000, guid: d1879707d69d24adfb421bde69c92c94, type: 3} + m_Texture: {fileID: 6192944022281365145, guid: cf56a719181984027acf62a7e2914e42, + type: 3} + - m_SerializedGuid: + m_GuidLow: 5705175902399201308 + m_GuidHigh: 8849269614915151792 + m_SerializedTextureGuid: + m_GuidLow: 8415066286968600214 + m_GuidHigh: 355843442228713881 + m_Size: {x: 0.1, y: 0.1} + m_SpecifySize: 1 + m_Name: course-02 + m_Texture: {fileID: 6192944022281365145, guid: fc20f696523374c899d9b1b1b935f004, + type: 3} diff --git a/Assets/Samples/MAVRIC.GEEKCup/QRCode/Scenes/QRCodeLoading-Courses.unity b/Assets/Samples/MAVRIC.GEEKCup/QRCode/Scenes/QRCodeLoading-Courses.unity index 7833abeb..db271d4f 100644 --- a/Assets/Samples/MAVRIC.GEEKCup/QRCode/Scenes/QRCodeLoading-Courses.unity +++ b/Assets/Samples/MAVRIC.GEEKCup/QRCode/Scenes/QRCodeLoading-Courses.unity @@ -1073,7 +1073,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4dea56a9eaadd1c439095de4f9a371cb, type: 3} m_Name: m_EditorClassIdentifier: - m_SerializedLibrary: {fileID: 11400000, guid: 972e7c1c461804f6a9fe8cd6829d8f26, + m_SerializedLibrary: {fileID: 11400000, guid: 566278178fcf04566b14f73c97cab6ff, type: 2} m_MaxNumberOfMovingImages: 4 m_TrackedImagePrefab: {fileID: 0} @@ -1091,6 +1091,54 @@ MonoBehaviour: m_EditorClassIdentifier: target: {fileID: 0} output: {fileID: 1454802596} +--- !u!1 &815298830 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 815298831} + - component: {fileID: 815298832} + m_Layer: 0 + m_Name: LogManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &815298831 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 815298830} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &815298832 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 815298830} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 484dd2abce7e6493d83cb60a72aa8ca9, type: 3} + m_Name: + m_EditorClassIdentifier: + editorConsoleMinimalLogLevel: 1 + fileName: LogOutput.log + fileMinimalLogLevel: 0 + outputTemplate: '[{Level}] [{Timestamp}] {Message}' --- !u!1 &833688781 GameObject: m_ObjectHideFlags: 0 @@ -2075,7 +2123,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2125492266} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1114330155 @@ -2104,15 +2153,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ecb22d2c87e61499cbc8fdc37392f22e, type: 3} m_Name: m_EditorClassIdentifier: + logLevel: 2 trackedImageManager: {fileID: 741148541} + parentObject: + _usage: 2 + _value: {fileID: 0} + _constant: {fileID: 0} + _variable: {fileID: 11400000, guid: 03debcbab0da04aa1a802a4cbc116950, type: 2} + _variableInstancer: {fileID: 0} arPrefabs: - - {fileID: 7740556873076377330, guid: b73edfe639a9a4a47b6e79771966340e, type: 3} - - {fileID: 2334735618901841031, guid: 68c0123ace53447999be0bd00b55e09e, type: 3} - {fileID: 3226870177902982147, guid: 9f2d30a7454ef4eba9169d4c4b5da360, type: 3} + - {fileID: 8130164210984699379, guid: a857efe212a8a43f89a533de0e486b71, type: 3} scaleFactor: - x: 0.05 - y: 0.05 - z: 0.05 + x: 1 + y: 1 + z: 1 --- !u!1 &1454802594 GameObject: m_ObjectHideFlags: 0 @@ -2667,6 +2722,57 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 +--- !u!1 &2125492265 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2125492266} + - component: {fileID: 2125492267} + m_Layer: 0 + m_Name: NewParent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2125492266 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2125492265} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1114330154} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2125492267 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2125492265} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f01007818c86f4091a75abd5e28c20e6, type: 3} + m_Name: + m_EditorClassIdentifier: + reference: + _usage: 2 + _value: {fileID: 0} + _constant: {fileID: 0} + _variable: {fileID: 11400000, guid: 03debcbab0da04aa1a802a4cbc116950, type: 2} + _variableInstancer: {fileID: 0} + nullOnDisable: 1 --- !u!1 &2135227410 GameObject: m_ObjectHideFlags: 0 @@ -2973,3 +3079,4 @@ SceneRoots: - {fileID: 1114330154} - {fileID: 727433015} - {fileID: 1082902071} + - {fileID: 815298831} diff --git a/Assets/Samples/MAVRIC.GEEKCup/QRCode/Scripts/GameObjectReferenceSetter.cs b/Assets/Samples/MAVRIC.GEEKCup/QRCode/Scripts/GameObjectReferenceSetter.cs new file mode 100644 index 00000000..0dbcbb74 --- /dev/null +++ b/Assets/Samples/MAVRIC.GEEKCup/QRCode/Scripts/GameObjectReferenceSetter.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityAtoms.BaseAtoms; +using UnityEngine; + +namespace MAVRIC.GEEEKCup.Samples.QRCode +{ + public class GameObjectReferenceSetter : MonoBehaviour + { + [SerializeField] private GameObjectReference reference; + + [SerializeField] private bool nullOnDisable = true; + + private void OnEnable() + { + if (reference == null) return; + + reference.Value = gameObject; + } + + private void OnDisable() + { + if (reference == null) return; + if (!nullOnDisable) return; + + reference.Value = null; + } + } +} diff --git a/Assets/Samples/MAVRIC.GEEKCup/QRCode/Scripts/GameObjectReferenceSetter.cs.meta b/Assets/Samples/MAVRIC.GEEKCup/QRCode/Scripts/GameObjectReferenceSetter.cs.meta new file mode 100644 index 00000000..41df965b --- /dev/null +++ b/Assets/Samples/MAVRIC.GEEKCup/QRCode/Scripts/GameObjectReferenceSetter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f01007818c86f4091a75abd5e28c20e6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/MAVRIC.GEEKCup/QRCode/Scripts/TrackedImageChanged.cs b/Assets/Samples/MAVRIC.GEEKCup/QRCode/Scripts/TrackedImageChanged.cs index ee6ff367..6a422a9e 100644 --- a/Assets/Samples/MAVRIC.GEEKCup/QRCode/Scripts/TrackedImageChanged.cs +++ b/Assets/Samples/MAVRIC.GEEKCup/QRCode/Scripts/TrackedImageChanged.cs @@ -3,7 +3,9 @@ using System.Collections.Generic; using System.Linq; +using Unity.Logging; using Unity.Mathematics; +using UnityAtoms.BaseAtoms; using UnityEngine; using UnityEngine.XR.ARFoundation; @@ -11,7 +13,10 @@ namespace MAVRIC.GEEEKCup.Samples.QRCode { public class TrackedImageChanged : MonoBehaviour { + [SerializeField] private LogLevel logLevel = LogLevel.Warning; + [SerializeField] private ARTrackedImageManager trackedImageManager; + [SerializeField] private GameObjectReference parentObject; [SerializeField] private GameObject[] arPrefabs; [SerializeField] private float3 scaleFactor = new (0.1f, 0.1f, 0.1f); @@ -24,9 +29,14 @@ namespace MAVRIC.GEEEKCup.Samples.QRCode { if (!TryGetComponent(out trackedImageManager)) { - Debug.LogError("Failed to find ARTrackedImageManager", this.gameObject); + Log.Error("Failed to find ARTrackedImageManager...", this.gameObject); } } + + if (parentObject?.Value == null) + { + parentObject.Value = gameObject; + } } private void OnEnable() @@ -61,6 +71,7 @@ namespace MAVRIC.GEEEKCup.Samples.QRCode foreach (GameObject arObject in arPrefabs) { GameObject newARObject = Instantiate(arObject, Vector3.zero, Quaternion.identity); + newARObject.transform.SetParent(parentObject.Value.transform); newARObject.SetActive(false); newARObject.name = arObject.name; @@ -91,7 +102,7 @@ namespace MAVRIC.GEEEKCup.Samples.QRCode // Assign and Place Game Object AssignGameObject(trackedImage.referenceImage.name, trackedImage.transform.position, scaleFactor, trackedImage.transform.rotation); - Debug.Log($"trackedImage.referenceImage.name: {trackedImage.referenceImage.name}"); + Log.Verbose("trackedImage.referenceImage.name: {0}", trackedImage.referenceImage.name); } private void AssignGameObject(string name, Vector3 newPosition, Vector3 newScale, Quaternion newRotation) @@ -99,6 +110,7 @@ namespace MAVRIC.GEEEKCup.Samples.QRCode if (arPrefabs != null) { GameObject goARObject = arObjects[name]; + goARObject.transform.SetParent(parentObject.Value.transform); goARObject.SetActive(true); goARObject.transform.position = newPosition; @@ -107,7 +119,7 @@ namespace MAVRIC.GEEEKCup.Samples.QRCode foreach (GameObject go in arObjects.Values) { - Debug.Log($"Go in arObjects.Values: {go.name}"); + Log.Verbose("Go in arObjects.Values: {0}", go.name); if (go.name != name) { go.SetActive(false); diff --git a/Assets/Samples/MAVRIC.GEEKCup/QRCode/XREnvironment/CourseImageTracking.prefab b/Assets/Samples/MAVRIC.GEEKCup/QRCode/XREnvironment/CourseImageTracking.prefab new file mode 100644 index 00000000..b7439ee6 --- /dev/null +++ b/Assets/Samples/MAVRIC.GEEKCup/QRCode/XREnvironment/CourseImageTracking.prefab @@ -0,0 +1,835 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &342748909618538088 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5744276863582777252} + - component: {fileID: 8075758866833569770} + m_Layer: 0 + m_Name: SimulatedTrackedImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5744276863582777252 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 342748909618538088} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.5, y: 0.5, z: 0.75} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 422745570145090032} + m_Father: {fileID: 4365528357719543085} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8075758866833569770 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 342748909618538088} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c39bb24e2bd7a482ca08117fb44b8e44, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Image: {fileID: 2800000, guid: d1879707d69d24adfb421bde69c92c94, type: 3} + m_ImagePhysicalSizeMeters: {x: 1, y: 1} +--- !u!1 &1592653896867226846 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 422745570145090032} + - component: {fileID: 8498804776197117150} + - component: {fileID: 4507709234571126322} + - component: {fileID: 457633174857337667} + m_Layer: 0 + m_Name: course-01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &422745570145090032 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1592653896867226846} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 5744276863582777252} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8498804776197117150 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1592653896867226846} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &4507709234571126322 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1592653896867226846} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: c50cd262589f0404496eed30657e58f2, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &457633174857337667 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1592653896867226846} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &2302768567274108051 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5826819630825500921} + - component: {fileID: 3385707918674751561} + m_Layer: 0 + m_Name: SimulatedTrackedImage (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5826819630825500921 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2302768567274108051} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.25, y: 0.5, z: 0.75} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 147336343756639791} + m_Father: {fileID: 4365528357719543085} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3385707918674751561 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2302768567274108051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c39bb24e2bd7a482ca08117fb44b8e44, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Image: {fileID: 2800000, guid: 038b8a7b4862745aaadfd7c9f14e7bbd, type: 3} + m_ImagePhysicalSizeMeters: {x: 1, y: 1} +--- !u!1 &3475735057603037936 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3929527087209849353} + - component: {fileID: 3085510144260504064} + - component: {fileID: 1594118810536075580} + - component: {fileID: 1353384515693615784} + - component: {fileID: 5664617325222014234} + m_Layer: 31 + m_Name: Floor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3929527087209849353 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3475735057603037936} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2.5, y: 0.01, z: 2.5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4365528357719543085} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3085510144260504064 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3475735057603037936} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1594118810536075580 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3475735057603037936} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 950042044eb8b45cfb957653439b0be7, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &1353384515693615784 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3475735057603037936} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &5664617325222014234 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3475735057603037936} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b2ebc9df6fa8629499eec403b7e7e567, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ClassificationType: floor +--- !u!1 &5056272964426416779 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5911072156897761180} + - component: {fileID: 7226788024493583219} + - component: {fileID: 6530858046662263605} + - component: {fileID: 3215108384216239577} + - component: {fileID: 3067344686904770414} + m_Layer: 31 + m_Name: Wall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5911072156897761180 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5056272964426416779} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.25, y: 0.5, z: 0} + m_LocalScale: {x: 0.01, y: 1, z: 2.5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4365528357719543085} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7226788024493583219 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5056272964426416779} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6530858046662263605 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5056272964426416779} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 950042044eb8b45cfb957653439b0be7, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &3215108384216239577 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5056272964426416779} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &3067344686904770414 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5056272964426416779} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b2ebc9df6fa8629499eec403b7e7e567, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ClassificationType: wall +--- !u!1 &6169001076363174969 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 147336343756639791} + - component: {fileID: 8123487735680470988} + - component: {fileID: 8008533827829859112} + - component: {fileID: 5203998793579246576} + m_Layer: 0 + m_Name: course-02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &147336343756639791 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6169001076363174969} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 5826819630825500921} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8123487735680470988 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6169001076363174969} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &8008533827829859112 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6169001076363174969} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 8b1aec4fbefb943859e7a469aa897bed, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &5203998793579246576 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6169001076363174969} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &6586649302037701020 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2770449827095792652} + - component: {fileID: 7604074379993464214} + m_Layer: 31 + m_Name: GeneratedSimulatedPlane(Clone) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2770449827095792652 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6586649302037701020} + serializedVersion: 2 + m_LocalRotation: {x: -0.00000005960465, y: -0.00000005960465, z: -0.70710677, w: 0.70710677} + m_LocalPosition: {x: -1.2439998, y: 0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4744334345910528120} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7604074379993464214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6586649302037701020} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 29341e3cec688724c89620641473c512, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Center: {x: 0, y: 0} + m_Boundary: + - {x: 0.5, y: 1.25} + - {x: 0.5, y: -1.25} + - {x: -0.5, y: -1.25} + - {x: -0.5, y: 1.25} +--- !u!1 &6947057105547783868 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4270802234803236213} + - component: {fileID: 7711892851430715690} + m_Layer: 31 + m_Name: GeneratedSimulatedPlane(Clone) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4270802234803236213 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6947057105547783868} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0.0059999973, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4744334345910528120} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7711892851430715690 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6947057105547783868} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 29341e3cec688724c89620641473c512, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Center: {x: 0, y: 0} + m_Boundary: + - {x: 1.25, y: 1.25} + - {x: 1.25, y: -1.25} + - {x: -1.25, y: -1.25} + - {x: -1.25, y: 1.25} +--- !u!1 &7005675526510049406 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5283108358406351049} + - component: {fileID: 5314822872707058091} + m_Layer: 0 + m_Name: SimEnvironmentProbe + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5283108358406351049 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7005675526510049406} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4365528357719543085} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5314822872707058091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7005675526510049406} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1667cd4d181f4c38b2d409d10d3b341f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Cubemap: {fileID: 0} + m_Size: {x: 5, y: 5, z: 5} +--- !u!1 &7125998744172786985 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4744334345910528120} + m_Layer: 31 + m_Name: Generated Planes + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4744334345910528120 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7125998744172786985} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4270802234803236213} + - {fileID: 2770449827095792652} + m_Father: {fileID: 4365528357719543085} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7576867131100388943 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4365528357719543085} + - component: {fileID: 7618165371811446966} + m_Layer: 31 + m_Name: CourseImageTracking + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4365528357719543085 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7576867131100388943} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3929527087209849353} + - {fileID: 5911072156897761180} + - {fileID: 4744334345910528120} + - {fileID: 5283108358406351049} + - {fileID: 5744276863582777252} + - {fileID: 5826819630825500921} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7618165371811446966 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7576867131100388943} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba5a5f182b3f9a14fa153e9bee21a2c4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_CameraStartingPose: + position: {x: 0, y: 1.1176, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + m_CameraMovementBounds: + m_Center: {x: 0.044999838, y: 0.545, z: 0.00000011920929} + m_Extent: {x: 1.3000004, y: 1, z: 1.2500005} + m_DefaultViewPose: + position: {x: 0, y: 1.0609863, z: -1.5} + rotation: {x: -0.16100603, y: 0.1567927, z: -0.025916385, w: -0.97407466} + m_DefaultViewPivot: {x: 0, y: 0, z: 0} + m_DefaultViewSize: 2 + m_RenderSettings: + m_AmbientMode: 1 + m_AmbientSkyColor: {r: 0.77254903, g: 0.73333335, b: 0.7372549, a: 1} + m_AmbientEquatorColor: {r: 0.5372549, g: 0.53333336, b: 0.5254902, a: 1} + m_AmbientGroundColor: {r: 0.42352942, g: 0.42352942, b: 0.42352942, a: 1} + m_AmbientIntensity: 1 + m_AmbientLight: {r: 0.5568628, g: 0.5647059, b: 0.59607846, a: 1} + m_SubtractiveShadowColor: {r: 0.41960785, g: 0.47843137, b: 0.627451, a: 1} + m_ReflectionIntensity: 1 + m_ReflectionBounces: 1 + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_Skybox: {fileID: 0} + m_CustomReflection: {fileID: 0} + m_UseSceneSun: 0 + m_Sun: {fileID: 0} + m_AmbientProbe: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_PostProcessProfile: {fileID: 0} + m_ExcludeFromSelectionUI: 0 diff --git a/Assets/Samples/MAVRIC.GEEKCup/QRCode/XREnvironment/CourseImageTracking.prefab.meta b/Assets/Samples/MAVRIC.GEEKCup/QRCode/XREnvironment/CourseImageTracking.prefab.meta new file mode 100644 index 00000000..9ed27976 --- /dev/null +++ b/Assets/Samples/MAVRIC.GEEKCup/QRCode/XREnvironment/CourseImageTracking.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d7c4e8524dfe94b0b8252a5e85c5be86 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/MAVRIC.GEEKCup/QRCode/XREnvironment/ImageTracking.prefab b/Assets/Samples/MAVRIC.GEEKCup/QRCode/XREnvironment/ImageTracking.prefab index ecb81696..27bf3632 100644 --- a/Assets/Samples/MAVRIC.GEEKCup/QRCode/XREnvironment/ImageTracking.prefab +++ b/Assets/Samples/MAVRIC.GEEKCup/QRCode/XREnvironment/ImageTracking.prefab @@ -1,52 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &342748909618538088 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5744276863582777252} - - component: {fileID: 8075758866833569770} - m_Layer: 0 - m_Name: SimulatedTrackedImage (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5744276863582777252 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 342748909618538088} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.75, y: 0.5, z: 0.75} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 422745570145090032} - m_Father: {fileID: 4365528357719543085} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8075758866833569770 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 342748909618538088} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c39bb24e2bd7a482ca08117fb44b8e44, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Image: {fileID: 2800000, guid: d1879707d69d24adfb421bde69c92c94, type: 3} - m_ImagePhysicalSizeMeters: {x: 1, y: 1} --- !u!1 &630791235770037808 GameObject: m_ObjectHideFlags: 0 @@ -94,112 +47,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Image: {fileID: 6192944022281365145, guid: fc20f696523374c899d9b1b1b935f004, type: 3} m_ImagePhysicalSizeMeters: {x: 1, y: 1} ---- !u!1 &1592653896867226846 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 422745570145090032} - - component: {fileID: 8498804776197117150} - - component: {fileID: 4507709234571126322} - - component: {fileID: 457633174857337667} - m_Layer: 0 - m_Name: Quad - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &422745570145090032 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1592653896867226846} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 5744276863582777252} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &8498804776197117150 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1592653896867226846} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &4507709234571126322 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1592653896867226846} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: c50cd262589f0404496eed30657e58f2, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &457633174857337667 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1592653896867226846} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &3475735057603037936 GameObject: m_ObjectHideFlags: 0 @@ -700,7 +547,6 @@ Transform: - {fileID: 5283108358406351049} - {fileID: 4314574979937218225} - {fileID: 3754031847140804977} - - {fileID: 5744276863582777252} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7618165371811446966 diff --git a/Assets/Scripts/Logging.meta b/Assets/Scripts/Logging.meta new file mode 100644 index 00000000..78654bf0 --- /dev/null +++ b/Assets/Scripts/Logging.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8fb0fcac791e74f0b83bb42c57f876bb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Logging/GlobalLogConfig.cs b/Assets/Scripts/Logging/GlobalLogConfig.cs new file mode 100644 index 00000000..035f3850 --- /dev/null +++ b/Assets/Scripts/Logging/GlobalLogConfig.cs @@ -0,0 +1,40 @@ +using System.IO; +using Unity.Logging; +using Unity.Logging.Internal.Debug; +using Unity.Logging.Sinks; +using UnityEngine; +using Logger = Unity.Logging.Logger; + +namespace MAVRIC.GEEKCup.Logging +{ + [DefaultExecutionOrder(-1000)] + public class GlobalLogConfig : MonoBehaviour + { + [SerializeField] private LogLevel editorConsoleMinimalLogLevel = LogLevel.Verbose; + + [SerializeField] private string fileName = "LogOutput.log"; + [SerializeField] private LogLevel fileMinimalLogLevel = LogLevel.Verbose; + + [SerializeField] private string outputTemplate = "[{Level}] [{Timestamp}] {Message}"; + + + private void Awake() + { + var dataPath = Application.dataPath; + #if UNITY_EDITOR + dataPath = Path.Combine(dataPath, ".."); + #endif + var fullPath = Path.Join(dataPath, fileName); + + Log.Logger = new Logger(new LoggerConfig() + .MinimumLevel.Debug() + .WriteTo.UnityDebugLog(minLevel: editorConsoleMinimalLogLevel, outputTemplate: outputTemplate) + .WriteTo.File(fullPath, minLevel: fileMinimalLogLevel, formatter: LogFormatterJson.Formatter) + .WriteTo.StdOut(outputTemplate: outputTemplate)); + + SelfLog.SetMode(SelfLog.Mode.EnabledInUnityEngineDebugLogError); + + Log.Verbose("GlobalLogConfig Started...", gameObject); + } + } +} diff --git a/Assets/Scripts/Logging/GlobalLogConfig.cs.meta b/Assets/Scripts/Logging/GlobalLogConfig.cs.meta new file mode 100644 index 00000000..8b12d20b --- /dev/null +++ b/Assets/Scripts/Logging/GlobalLogConfig.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 484dd2abce7e6493d83cb60a72aa8ca9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XR/UserSimulationSettings/SimulationEnvironmentAssetsManager.asset b/Assets/XR/UserSimulationSettings/SimulationEnvironmentAssetsManager.asset index 98980809..46098b57 100644 --- a/Assets/XR/UserSimulationSettings/SimulationEnvironmentAssetsManager.asset +++ b/Assets/XR/UserSimulationSettings/SimulationEnvironmentAssetsManager.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: SimulationEnvironmentAssetsManager m_EditorClassIdentifier: m_EnvironmentPrefabPaths: + - Assets/Samples/MAVRIC.GEEKCup/QRCode/XREnvironment/CourseImageTracking.prefab - Assets/Samples/MAVRIC.GEEKCup/QRCode/XREnvironment/ImageTracking.prefab - Assets/UnityXRContent/ARFoundation/SimulationEnvironments/Backyard/Backyard_45ftx40ft.prefab - Assets/UnityXRContent/ARFoundation/SimulationEnvironments/Backyard/Backyard_55ftx40ft.prefab diff --git a/Packages/manifest.json b/Packages/manifest.json index 434973be..6ea7dce0 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -22,6 +22,7 @@ "com.unity.inputsystem": "1.7.0", "com.unity.learn.iet-framework": "3.1.3", "com.unity.learn.iet-framework.authoring": "1.2.2", + "com.unity.logging": "1.0.16", "com.unity.probuilder": "5.2.2", "com.unity.render-pipelines.universal": "14.0.10", "com.unity.test-framework": "1.1.33", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index d0412376..41fcaaab 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -77,6 +77,17 @@ }, "url": "https://packages.unity.com" }, + "com.unity.collections": { + "version": "2.1.4", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.4", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.nuget.mono-cecil": "1.11.4" + }, + "url": "https://packages.unity.com" + }, "com.unity.device-simulator.devices": { "version": "1.0.0", "depth": 0, @@ -151,6 +162,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.logging": { + "version": "1.0.16", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.8", + "com.unity.collections": "2.1.4" + }, + "url": "https://packages.unity.com" + }, "com.unity.mathematics": { "version": "1.2.6", "depth": 1, @@ -158,6 +179,13 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.nuget.mono-cecil": { + "version": "1.11.4", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.probuilder": { "version": "5.2.2", "depth": 0, diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 24c6664e..c3244019 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -11,9 +11,12 @@ EditorBuildSettings: - enabled: 0 path: Assets/Scenes/TestControls.unity guid: 158e3ae0499b94748afd3d0bea63cfec - - enabled: 1 + - enabled: 0 path: Assets/Samples/MAVRIC.GEEKCup/QRCode/Scenes/QRCodeLoading.unity guid: 73904ea13fff84c96a4386ddec7712f2 + - enabled: 1 + path: Assets/Samples/MAVRIC.GEEKCup/QRCode/Scenes/QRCodeLoading-Courses.unity + guid: 6530352416db24017ac352b24d187fbc m_configObjects: UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: 6ee72d15cf39dd748a13eac57397b9af, type: 2} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 900d4384..9995f338 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -17,7 +17,7 @@ PlayerSettings: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} - m_ShowUnitySplashScreen: 1 + m_ShowUnitySplashScreen: 0 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1