diff --git a/Assets/Resources.meta b/Assets/Resources.meta
new file mode 100644
index 0000000000000000000000000000000000000000..373a6da79c4f225bb45d1f382213570cc5954075
--- /dev/null
+++ b/Assets/Resources.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 65b2a81d1c4b9a34da53acd3e09bb82a
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/ARFImageTrackingPrefab.fbx b/Assets/Resources/ARFImageTrackingPrefab.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..7cab95629826114f63cdbccd76f83414265b4727
Binary files /dev/null and b/Assets/Resources/ARFImageTrackingPrefab.fbx differ
diff --git a/Assets/Resources/ARFImageTrackingPrefab.fbx.meta b/Assets/Resources/ARFImageTrackingPrefab.fbx.meta
new file mode 100644
index 0000000000000000000000000000000000000000..1b2f575ae576f029b2135ee5230989bcc95be528
--- /dev/null
+++ b/Assets/Resources/ARFImageTrackingPrefab.fbx.meta
@@ -0,0 +1,106 @@
+fileFormatVersion: 2
+guid: 0b0025a9e37fafc40b9fdcf76dc28181
+ModelImporter:
+ serializedVersion: 21300
+ internalIDToNameTable: []
+ externalObjects: {}
+ materials:
+ materialImportMode: 2
+ materialName: 0
+ materialSearch: 1
+ materialLocation: 1
+ animations:
+ legacyGenerateAnimations: 4
+ bakeSimulation: 0
+ resampleCurves: 1
+ optimizeGameObjects: 0
+ removeConstantScaleCurves: 1
+ motionNodeName:
+ rigImportErrors:
+ rigImportWarnings:
+ animationImportErrors:
+ animationImportWarnings:
+ animationRetargetingWarnings:
+ animationDoRetargetingWarnings: 0
+ importAnimatedCustomProperties: 0
+ importConstraints: 0
+ animationCompression: 1
+ animationRotationError: 0.5
+ animationPositionError: 0.5
+ animationScaleError: 0.5
+ animationWrapMode: 0
+ extraExposedTransformPaths: []
+ extraUserProperties: []
+ clipAnimations: []
+ isReadable: 0
+ meshes:
+ lODScreenPercentages: []
+ globalScale: 1
+ meshCompression: 0
+ addColliders: 0
+ useSRGBMaterialColor: 1
+ sortHierarchyByName: 1
+ importVisibility: 1
+ importBlendShapes: 1
+ importCameras: 1
+ importLights: 1
+ nodeNameCollisionStrategy: 1
+ fileIdsGeneration: 2
+ swapUVChannels: 0
+ generateSecondaryUV: 0
+ useFileUnits: 1
+ keepQuads: 0
+ weldVertices: 1
+ bakeAxisConversion: 0
+ preserveHierarchy: 0
+ skinWeightsMode: 0
+ maxBonesPerVertex: 4
+ minBoneWeight: 0.001
+ optimizeBones: 1
+ meshOptimizationFlags: -1
+ indexFormat: 0
+ secondaryUVAngleDistortion: 8
+ secondaryUVAreaDistortion: 15.000001
+ secondaryUVHardAngle: 88
+ secondaryUVMarginMethod: 1
+ secondaryUVMinLightmapResolution: 40
+ secondaryUVMinObjectScale: 1
+ secondaryUVPackMargin: 4
+ useFileScale: 1
+ tangentSpace:
+ normalSmoothAngle: 60
+ normalImportMode: 0
+ tangentImportMode: 3
+ normalCalculationMode: 4
+ legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+ blendShapeNormalImportMode: 1
+ normalSmoothingSource: 0
+ referencedClips: []
+ importAnimation: 1
+ humanDescription:
+ serializedVersion: 3
+ human: []
+ skeleton: []
+ armTwist: 0.5
+ foreArmTwist: 0.5
+ upperLegTwist: 0.5
+ legTwist: 0.5
+ armStretch: 0.05
+ legStretch: 0.05
+ feetSpacing: 0
+ globalScale: 1
+ rootMotionBoneName:
+ hasTranslationDoF: 0
+ hasExtraRoot: 0
+ skeletonHasParents: 1
+ lastHumanDescriptionAvatarSource: {instanceID: 0}
+ autoGenerateAvatarMappingIfUnspecified: 1
+ animationType: 2
+ humanoidOversampling: 1
+ avatarSetup: 0
+ addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+ remapMaterialsIfMaterialImportModeIsNone: 0
+ additionalBone: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/ARFWorldStorageServer.asset b/Assets/Resources/ARFWorldStorageServer.asset
new file mode 100644
index 0000000000000000000000000000000000000000..dd2266b7ea668ff707a15d28b7bf238ea1400200
--- /dev/null
+++ b/Assets/Resources/ARFWorldStorageServer.asset
@@ -0,0 +1,19 @@
+%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: e4b7be4c33f68d0418c3b4e1a7053d91, type: 3}
+ m_Name: ARFWorldStorageServer
+ m_EditorClassIdentifier:
+ serverName: 192.168.1.27
+ company: Orange
+ basePath: http://192.168.1.27
+ port: 8080
+ currentUser: {fileID: 11400000, guid: 220ed7f6ba8f6404e8bee0e9057e2ffd, type: 2}
diff --git a/Assets/Resources/ARFWorldStorageServer.asset.meta b/Assets/Resources/ARFWorldStorageServer.asset.meta
new file mode 100644
index 0000000000000000000000000000000000000000..33023dcd1a03633474751f95a0ff4075b036222e
--- /dev/null
+++ b/Assets/Resources/ARFWorldStorageServer.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cc5c5acfb44773a4ba9decc291b718d2
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/ARFWorldStorageUser.asset b/Assets/Resources/ARFWorldStorageUser.asset
new file mode 100644
index 0000000000000000000000000000000000000000..d3ab588e08f8d04eb3f9a22bd5c65586fbfef5f7
--- /dev/null
+++ b/Assets/Resources/ARFWorldStorageUser.asset
@@ -0,0 +1,17 @@
+%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: 8a1e3e7961eae84468e6ee20d5b09ffd, type: 3}
+ m_Name: ARFWorldStorageUser
+ m_EditorClassIdentifier:
+ userName: Sylvain
+ company: Orange
+ UUID: 85a7b6fe-3886-4fb1-8f7d-ae68c5cbf456
diff --git a/Assets/Resources/ARFWorldStorageUser.asset.meta b/Assets/Resources/ARFWorldStorageUser.asset.meta
new file mode 100644
index 0000000000000000000000000000000000000000..fb1af2b1d3b09da5224ad96ad59c143a6ff00793
--- /dev/null
+++ b/Assets/Resources/ARFWorldStorageUser.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 220ed7f6ba8f6404e8bee0e9057e2ffd
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity
index 53e902608f36d4a60ea85c046ae9b9b798160e96..57509ade522b5a8fd2e2cabb320fa53957c4ae25 100644
--- a/Assets/Scenes/MainScene.unity
+++ b/Assets/Scenes/MainScene.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+ m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -344,100 +344,6 @@ Camera:
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
---- !u!1 &184502760
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 184502762}
- - component: {fileID: 184502761}
- m_Layer: 0
- m_Name: Directional Light
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!108 &184502761
-Light:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 184502760}
- m_Enabled: 1
- serializedVersion: 10
- m_Type: 1
- m_Shape: 0
- m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
- m_Intensity: 1
- m_Range: 10
- m_SpotAngle: 30
- m_InnerSpotAngle: 21.80208
- m_CookieSize: 10
- m_Shadows:
- m_Type: 2
- m_Resolution: -1
- m_CustomResolution: -1
- m_Strength: 1
- m_Bias: 0.05
- m_NormalBias: 0.4
- m_NearPlane: 0.2
- m_CullingMatrixOverride:
- e00: 1
- e01: 0
- e02: 0
- e03: 0
- e10: 0
- e11: 1
- e12: 0
- e13: 0
- e20: 0
- e21: 0
- e22: 1
- e23: 0
- e30: 0
- e31: 0
- e32: 0
- e33: 1
- m_UseCullingMatrixOverride: 0
- m_Cookie: {fileID: 0}
- m_DrawHalo: 0
- m_Flare: {fileID: 0}
- m_RenderMode: 0
- m_CullingMask:
- serializedVersion: 2
- m_Bits: 4294967295
- m_RenderingLayerMask: 1
- m_Lightmapping: 4
- m_LightShadowCasterMode: 0
- m_AreaSize: {x: 1, y: 1}
- m_BounceIntensity: 1
- m_ColorTemperature: 6570
- m_UseColorTemperature: 0
- m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
- m_UseBoundingSphereOverride: 0
- m_UseViewFrustumForShadowCasterCull: 1
- m_ShadowRadius: 0
- m_ShadowAngle: 0
---- !u!4 &184502762
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 184502760}
- m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
- m_LocalPosition: {x: 0, y: 3, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &236535454
GameObject:
m_ObjectHideFlags: 0
@@ -467,7 +373,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 02da7adcc65f4694684d71e61d88070b, type: 3}
m_Name:
m_EditorClassIdentifier:
- worldStorageServer: {fileID: 0}
+ worldStorageServer: {fileID: 11400000, guid: cc5c5acfb44773a4ba9decc291b718d2, type: 2}
--- !u!4 &236535456
Transform:
m_ObjectHideFlags: 0
@@ -481,7 +387,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 5
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &334744955
GameObject:
@@ -531,7 +437,7 @@ Transform:
m_Children:
- {fileID: 789254998}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &789254997
GameObject:
@@ -609,7 +515,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1210990015
GameObject:
@@ -669,7 +575,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 1
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1405320275
GameObject:
@@ -747,5 +653,5 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Scripts/SceneManagementGLTF.cs b/Assets/Scripts/SceneManagementGLTF.cs
index 363100c2832c4410a373eb0026798008c6adac22..a958977f9e8d15b7d627a578fdaf209c621d1ed8 100644
--- a/Assets/Scripts/SceneManagementGLTF.cs
+++ b/Assets/Scripts/SceneManagementGLTF.cs
@@ -19,7 +19,7 @@ public class SceneManagementGLTF : MonoBehaviour
/// <summary>
/// List of trackables and anchors in the AR Scene
/// </summary>
- private Dictionary<string, Transform> m_trackablesAndAnchorsInARScene;
+ private Dictionary<Guid, Transform> m_trackablesAndAnchorsInARScene;
/// <summary>
/// Current world analysis
@@ -31,16 +31,16 @@ public class SceneManagementGLTF : MonoBehaviour
/// </summary>
protected async void Start()
{
- m_trackablesAndAnchorsInARScene = new Dictionary<string, Transform>();
+ m_trackablesAndAnchorsInARScene = new Dictionary<Guid, Transform>();
await LoadGltfBinaryFromMemory();
Transform loaded = this.transform.GetChild(0);
FindWorldStorageTransform(loaded);
m_worldAnalysis = WorldAnalysisFactory.CreateWorldAnalysis(_WorldAnalysisType, this.gameObject);
- //Subscribe
- foreach(KeyValuePair<string , Transform> toSubscribe in m_trackablesAndAnchorsInARScene)
+
+ foreach(KeyValuePair<Guid , Transform> toSubscribe in m_trackablesAndAnchorsInARScene)
{
int validity = 100000; //10s
- string subscriptionUUID;
+ Guid subscriptionUUID;
// TODO : if only one : subscribeToPose, if multiple subscribetoPoses
m_worldAnalysis.SubscribeToPose(null, toSubscribe.Key, ETSI.ARF.OpenAPI.WorldAnalysis.Mode_WorldAnalysis.DEVICE_TO_TRACKABLES, PoseCallback, ref validity, out subscriptionUUID); //TODO : find a value for the token parameter.
}
@@ -62,10 +62,10 @@ public class SceneManagementGLTF : MonoBehaviour
if (pose.Value.Type == ETSI.ARF.OpenAPI.WorldAnalysis.PoseValueType.VECTOR_QUATERNION)
{
ETSI.ARF.OpenAPI.WorldAnalysis.VectorQuaternionPoseValue value = (ETSI.ARF.OpenAPI.WorldAnalysis.VectorQuaternionPoseValue)pose.Value;
- if (m_trackablesAndAnchorsInARScene.ContainsKey(pose.Uuid.ToString()))
+ if (m_trackablesAndAnchorsInARScene.ContainsKey(pose.Uuid))
{
- m_trackablesAndAnchorsInARScene[pose.Uuid.ToString()].transform.position = WorldAnalysisUnityHelper.ConvertETSIVector3ToUnity(value.Position);
- m_trackablesAndAnchorsInARScene[pose.Uuid.ToString()].transform.rotation = WorldAnalysisUnityHelper.ConvertETSIARFQuaternionToUnity(value.Rotation);
+ m_trackablesAndAnchorsInARScene[pose.Uuid].transform.position = WorldAnalysisUnityHelper.ConvertETSIVector3ToUnity(value.Position);
+ m_trackablesAndAnchorsInARScene[pose.Uuid].transform.rotation = WorldAnalysisUnityHelper.ConvertETSIARFQuaternionToUnity(value.Rotation);
}
else
{
@@ -119,7 +119,7 @@ public class SceneManagementGLTF : MonoBehaviour
{
string id = trGLTF.name.Substring(3);
Debug.Log("Add " + id + " " + trGLTF.name);
- m_trackablesAndAnchorsInARScene.Add(id, trGLTF);
+ m_trackablesAndAnchorsInARScene.Add(new Guid(id), trGLTF);
}
foreach(Transform child in trGLTF)
{
diff --git a/Assets/XR/XRGeneralSettingsPerBuildTarget.asset b/Assets/XR/XRGeneralSettingsPerBuildTarget.asset
new file mode 100644
index 0000000000000000000000000000000000000000..a0e856a670f87ef050391e394be86eea62f67210
--- /dev/null
+++ b/Assets/XR/XRGeneralSettingsPerBuildTarget.asset
@@ -0,0 +1,48 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-8739186027427055784
+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: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
+ m_Name: Android Providers
+ m_EditorClassIdentifier:
+ m_RequiresSettingsUpdate: 0
+ m_AutomaticLoading: 0
+ m_AutomaticRunning: 0
+ m_Loaders:
+ - {fileID: 11400000, guid: f1a4b7bc1f6cd9e4b823c16c8860c0cd, type: 2}
+--- !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: d2dc886499c26824283350fa532d087d, type: 3}
+ m_Name: XRGeneralSettingsPerBuildTarget
+ m_EditorClassIdentifier:
+ Keys: 07000000
+ Values:
+ - {fileID: 5732245400625790027}
+--- !u!114 &5732245400625790027
+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: d236b7d11115f2143951f1e14045df39, type: 3}
+ m_Name: Android Settings
+ m_EditorClassIdentifier:
+ m_LoaderManagerInstance: {fileID: -8739186027427055784}
+ m_InitManagerOnStart: 1
diff --git a/Assets/XR/XRGeneralSettingsPerBuildTarget.asset.meta b/Assets/XR/XRGeneralSettingsPerBuildTarget.asset.meta
new file mode 100644
index 0000000000000000000000000000000000000000..1177ee7da5863026f9e220e51fc9aa77a226f5f5
--- /dev/null
+++ b/Assets/XR/XRGeneralSettingsPerBuildTarget.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8f63412dcece46d4d8ff48fb8fc6c31e
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Packages/manifest.json b/Packages/manifest.json
index ed432457da3936030300f4e9a04c3b2540d3ca74..edd778313f7c47eed557c847d272d44fb19290e4 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -5,6 +5,7 @@
"com.unity.ide.rider": "3.0.20",
"com.unity.ide.visualstudio": "2.0.18",
"com.unity.ide.vscode": "1.2.5",
+ "com.unity.mobile.android-logcat": "1.3.2",
"com.unity.test-framework": "1.1.31",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.6.4",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 8b19f0d8d409a6ff33e73005b84fdad4eb6b392a..c01c76c0f478b26674c8068f99e3b2b99e3fcf48 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -83,6 +83,13 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
+ "com.unity.mobile.android-logcat": {
+ "version": "1.3.2",
+ "depth": 0,
+ "source": "registry",
+ "dependencies": {},
+ "url": "https://packages.unity.com"
+ },
"com.unity.nuget.newtonsoft-json": {
"version": "3.1.0",
"depth": 1,
diff --git a/Packages/unity-world-analysis-arfoundation-wrapper-package b/Packages/unity-world-analysis-arfoundation-wrapper-package
index 93634c2f97e4624749f9b036c099f1db4aa8323a..1a50123932c3760560c3e8fd37d6317317a80ba1 160000
--- a/Packages/unity-world-analysis-arfoundation-wrapper-package
+++ b/Packages/unity-world-analysis-arfoundation-wrapper-package
@@ -1 +1 @@
-Subproject commit 93634c2f97e4624749f9b036c099f1db4aa8323a
+Subproject commit 1a50123932c3760560c3e8fd37d6317317a80ba1
diff --git a/Packages/unity-world-analysis-package b/Packages/unity-world-analysis-package
index 29a370a8c7bff3ab61e5b526fa0d297840e85ba1..f6d3879af8f5899a23fa67058eb0996bcab3f8fa 160000
--- a/Packages/unity-world-analysis-package
+++ b/Packages/unity-world-analysis-package
@@ -1 +1 @@
-Subproject commit 29a370a8c7bff3ab61e5b526fa0d297840e85ba1
+Subproject commit f6d3879af8f5899a23fa67058eb0996bcab3f8fa
diff --git a/Packages/unity-world-storage-package b/Packages/unity-world-storage-package
index a3c8391411e36ec40373cc5a8f4e78b0f181ea34..2ee773348b3e19392a4a92a88d98f86d7e8f98ac 160000
--- a/Packages/unity-world-storage-package
+++ b/Packages/unity-world-storage-package
@@ -1 +1 @@
-Subproject commit a3c8391411e36ec40373cc5a8f4e78b0f181ea34
+Subproject commit 2ee773348b3e19392a4a92a88d98f86d7e8f98ac
diff --git a/ProjectSettings/BurstAotSettings_Android.json b/ProjectSettings/BurstAotSettings_Android.json
new file mode 100644
index 0000000000000000000000000000000000000000..ce2d8aa9ef163a77828564994293ca533696babe
--- /dev/null
+++ b/ProjectSettings/BurstAotSettings_Android.json
@@ -0,0 +1,17 @@
+{
+ "MonoBehaviour": {
+ "Version": 4,
+ "EnableBurstCompilation": true,
+ "EnableOptimisations": true,
+ "EnableSafetyChecks": false,
+ "EnableDebugInAllBuilds": false,
+ "DebugDataKind": 1,
+ "EnableArmv9SecurityFeatures": false,
+ "CpuMinTargetX32": 0,
+ "CpuMaxTargetX32": 0,
+ "CpuMinTargetX64": 0,
+ "CpuMaxTargetX64": 0,
+ "CpuTargetsArm64": 512,
+ "OptimizeFor": 0
+ }
+}
diff --git a/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/ProjectSettings/BurstAotSettings_StandaloneWindows.json
new file mode 100644
index 0000000000000000000000000000000000000000..58cf25f24250dd3ca5b4dbb7e689b73c7e64ca5a
--- /dev/null
+++ b/ProjectSettings/BurstAotSettings_StandaloneWindows.json
@@ -0,0 +1,18 @@
+{
+ "MonoBehaviour": {
+ "Version": 4,
+ "EnableBurstCompilation": true,
+ "EnableOptimisations": true,
+ "EnableSafetyChecks": false,
+ "EnableDebugInAllBuilds": false,
+ "DebugDataKind": 1,
+ "EnableArmv9SecurityFeatures": false,
+ "CpuMinTargetX32": 0,
+ "CpuMaxTargetX32": 0,
+ "CpuMinTargetX64": 0,
+ "CpuMaxTargetX64": 0,
+ "CpuTargetsX32": 6,
+ "CpuTargetsX64": 72,
+ "OptimizeFor": 0
+ }
+}
diff --git a/ProjectSettings/CommonBurstAotSettings.json b/ProjectSettings/CommonBurstAotSettings.json
new file mode 100644
index 0000000000000000000000000000000000000000..0293dafc80668182e1f17b5a0ea013d2c4050df0
--- /dev/null
+++ b/ProjectSettings/CommonBurstAotSettings.json
@@ -0,0 +1,6 @@
+{
+ "MonoBehaviour": {
+ "Version": 4,
+ "DisabledWarnings": ""
+ }
+}
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index 41f1994c3715ff7096011f10085bfc0895f3ba60..69b798eba5f7e4f7131b85f7b266b425054d210e 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -4,8 +4,12 @@
EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
- m_Scenes: []
+ m_Scenes:
+ - enabled: 1
+ path: Assets/Scenes/MainScene.unity
+ guid: cfb9e37ec495d014eb9ed87251861a32
m_configObjects:
UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: 60b084f6889b3f643a06cde2d9b5dac6, type: 2}
UnityEditor.XR.ARKit.ARKitSettings: {fileID: 11400000, guid: 1d843ca70dbb1e947809e3f55a8d8831, type: 2}
com.unity.xr.arfoundation.simulation_settings: {fileID: 11400000, guid: 1ef61a6a59edbba4b81751378314e1d3, type: 2}
+ com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 8f63412dcece46d4d8ff48fb8fc6c31e, type: 2}
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
index b99e48c5c05ac0a26860259832994de95277872c..717552064ac5ad25da32493142af8c4d9fa393a1 100644
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@@ -36,7 +36,9 @@ GraphicsSettings:
- {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0}
+ - {fileID: 4800000, guid: 99fa998bbbed3408aafa652b466d261d, type: 3}
+ - {fileID: 4800000, guid: f853aafa0bc764a138f572608a37a73c, type: 3}
+ - {fileID: 4800000, guid: 4340a3cf1cde6416d957808a6ac79eed, type: 3}
m_PreloadedShaders: []
m_PreloadShadersBatchTimeLimit: -1
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index b715196e46307285dd8d868c800e5eb14649358f..08fd373ea9cc39ba0263b50e8bf11c3dfc96c4b5 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -125,7 +125,7 @@ PlayerSettings:
stadiaTargetFramerate: 0
vulkanNumSwapchainBuffers: 3
vulkanEnableSetSRGBWrite: 0
- vulkanEnablePreTransform: 0
+ vulkanEnablePreTransform: 1
vulkanEnableLateAcquireNextImage: 0
vulkanEnableCommandBufferRecycling: 1
m_SupportedAspectRatios:
@@ -135,7 +135,11 @@ PlayerSettings:
16:9: 1
Others: 1
bundleVersion: 1.0
- preloadedAssets: []
+ preloadedAssets:
+ - {fileID: 5732245400625790027, guid: 8f63412dcece46d4d8ff48fb8fc6c31e, type: 2}
+ - {fileID: 11400000, guid: 1ef61a6a59edbba4b81751378314e1d3, type: 2}
+ - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3}
+ - {fileID: 4800000, guid: 0945859e5a1034c2cb6dce53cb4fb899, type: 3}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
@@ -154,14 +158,15 @@ PlayerSettings:
resetResolutionOnWindowResize: 0
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
- applicationIdentifier: {}
+ applicationIdentifier:
+ Android: com.DefaultCompany.unityworldanalysisvalidation
buildNumber:
Standalone: 0
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 0
AndroidBundleVersionCode: 1
- AndroidMinSdkVersion: 22
+ AndroidMinSdkVersion: 24
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1
aotOptions:
@@ -244,7 +249,7 @@ PlayerSettings:
useCustomBaseGradleTemplate: 0
useCustomGradlePropertiesTemplate: 0
useCustomProguardFile: 0
- AndroidTargetArchitectures: 1
+ AndroidTargetArchitectures: 2
AndroidTargetDevices: 0
AndroidSplashScreenScale: 0
androidSplashScreen: {fileID: 0}
@@ -362,11 +367,17 @@ PlayerSettings:
m_Height: 36
m_Kind: 0
m_SubKind:
- m_BuildTargetBatching: []
+ m_BuildTargetBatching:
+ - m_BuildTarget: Android
+ m_StaticBatching: 1
+ m_DynamicBatching: 0
m_BuildTargetShaderSettings: []
m_BuildTargetGraphicsJobs: []
m_BuildTargetGraphicsJobMode: []
- m_BuildTargetGraphicsAPIs: []
+ m_BuildTargetGraphicsAPIs:
+ - m_BuildTarget: AndroidPlayer
+ m_APIs: 0b000000
+ m_Automatic: 0
m_BuildTargetVRSettings: []
m_DefaultShaderChunkSizeInMB: 16
m_DefaultShaderChunkCount: 0
@@ -378,10 +389,16 @@ PlayerSettings:
Android: 1
iPhone: 1
tvOS: 1
- m_BuildTargetGroupLightmapEncodingQuality: []
+ m_BuildTargetGroupLightmapEncodingQuality:
+ - m_BuildTarget: Android
+ m_EncodingQuality: 1
m_BuildTargetGroupLightmapSettings: []
- m_BuildTargetNormalMapEncoding: []
- m_BuildTargetDefaultTextureCompressionFormat: []
+ m_BuildTargetNormalMapEncoding:
+ - m_BuildTarget: Android
+ m_Encoding: 1
+ m_BuildTargetDefaultTextureCompressionFormat:
+ - m_BuildTarget: Android
+ m_Format: 3
playModeTestRunnerEnabled: 0
runPlayModeTestAsEditModeTest: 0
actionOnDotNetUnhandledException: 1
@@ -634,7 +651,8 @@ PlayerSettings:
scriptingDefineSymbols: {}
additionalCompilerArguments: {}
platformArchitecture: {}
- scriptingBackend: {}
+ scriptingBackend:
+ Android: 1
il2cppCompilerConfiguration: {}
managedStrippingLevel: {}
incrementalIl2cppBuild: {}
@@ -642,7 +660,7 @@ PlayerSettings:
allowUnsafeCode: 0
useDeterministicCompilation: 1
enableRoslynAnalyzers: 1
- selectedPlatform: 0
+ selectedPlatform: 2
additionalIl2CppArgs:
scriptingRuntimeVersion: 1
gcIncremental: 1