diff --git a/AR_PROJECT/Assets/MapboxAR/Examples/Scenes/TabletopAR.unity b/AR_PROJECT/Assets/MapboxAR/Examples/Scenes/TabletopAR.unity index 379c7fb..96c305d 100644 --- a/AR_PROJECT/Assets/MapboxAR/Examples/Scenes/TabletopAR.unity +++ b/AR_PROJECT/Assets/MapboxAR/Examples/Scenes/TabletopAR.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,6 +39,7 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 @@ -54,11 +55,10 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 10 m_Resolution: 1 m_BakeResolution: 50 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 1 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -90,7 +90,7 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_UseShadowmask: 0 --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -374,6 +374,31 @@ Prefab: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.locationPrefabList.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].materialOptions.materials.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].materialOptions.materials.Array.data[0].Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].materialOptions.materials.Array.data[1].Materials.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4580065472578918, guid: c0ce4c9dacbd84ff09f18011abded7e6, type: 2} propertyPath: m_LocalPosition.x value: 0 @@ -411,6 +436,163 @@ Prefab: propertyPath: _panSpeed value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _options.placementOptions.snapMapToZero + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _imagery._layerProperty.sourceType + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _imagery._layerProperty.sourceOptions.layerSource.Id + value: mapbox://styles/mapbox/streets-v10 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _terrain._layerProperty.elevationLayerType + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty._sourceType + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.sourceOptions.layerSource.Id + value: mapbox.mapbox-streets-v7 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.locationPrefabList.Array.data[0].coreOptions.isActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.locationPrefabList.Array.data[0].coreOptions.sublayerName + value: Buildings + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.locationPrefabList.Array.data[0].coreOptions.snapToTerrain + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.locationPrefabList.Array.data[0].categories + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.locationPrefabList.Array.data[0].density + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].coreOptions.isActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].coreOptions.sublayerName + value: Untitled + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].coreOptions.geometryType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].coreOptions.layerName + value: building + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].coreOptions.snapToTerrain + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].coreOptions.lineWidth + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].filterOptions._selectedLayerName + value: building + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].extrusionOptions._selectedLayerName + value: building + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].extrusionOptions.propertyName + value: height + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].extrusionOptions.propertyDescription + value: Number. Height of building or part of building. + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].extrusionOptions.extrusionScaleFactor + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].materialOptions.style + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].materialOptions.texturingType + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].materialOptions.materials.Array.data[0].Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: a1aa333e18c0640d7b428eecff9c4af7, type: 2} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].materialOptions.materials.Array.data[1].Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: c0653693b48614a139a124871d499679, type: 2} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].materialOptions.atlasInfo + value: + objectReference: {fileID: 11400000, guid: 414754d7155df47beb52ca117a774f21, + type: 2} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].materialOptions.colorPalette + value: + objectReference: {fileID: 11400000, guid: 57bdfa37edf7a4f7f999d19443497554, + type: 2} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].honorBuildingIdSetting + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[0].coreOptions.isActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + type: 2} + propertyPath: _options.locationOptions.latitudeLongitude + value: 19.182568, 72.969770 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: c0ce4c9dacbd84ff09f18011abded7e6, type: 2} m_IsPrefabParent: 0 diff --git a/AR_PROJECT/ProjectSettings/EditorBuildSettings.asset b/AR_PROJECT/ProjectSettings/EditorBuildSettings.asset index ea88784..a990570 100644 --- a/AR_PROJECT/ProjectSettings/EditorBuildSettings.asset +++ b/AR_PROJECT/ProjectSettings/EditorBuildSettings.asset @@ -8,4 +8,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/SampleScene.unity guid: 99c9720ab356a0642a771bea13969a05 + - enabled: 1 + path: Assets/MapboxAR/Examples/Scenes/TabletopAR.unity + guid: a455922b0e2954431922c9fb6c5377e4 m_configObjects: {} diff --git a/AR_PROJECT/ProjectSettings/GraphicsSettings.asset b/AR_PROJECT/ProjectSettings/GraphicsSettings.asset index 74d7b53..a9bbfb0 100644 --- a/AR_PROJECT/ProjectSettings/GraphicsSettings.asset +++ b/AR_PROJECT/ProjectSettings/GraphicsSettings.asset @@ -35,6 +35,9 @@ GraphicsSettings: - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/AR_PROJECT/ProjectSettings/ProjectSettings.asset b/AR_PROJECT/ProjectSettings/ProjectSettings.asset index 5e5b81d..6335999 100644 --- a/AR_PROJECT/ProjectSettings/ProjectSettings.asset +++ b/AR_PROJECT/ProjectSettings/ProjectSettings.asset @@ -12,7 +12,7 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany + companyName: Probug productName: AR_PROJECT defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} @@ -149,7 +149,8 @@ PlayerSettings: resolutionScalingMode: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} + applicationIdentifier: + Android: com.Probug.MapAR buildNumber: {} AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 16 @@ -241,8 +242,8 @@ PlayerSettings: androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: - AndroidTVCompatibility: 1 - AndroidIsGame: 1 + AndroidTVCompatibility: 0 + AndroidIsGame: 0 AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 @@ -583,7 +584,8 @@ PlayerSettings: allowUnsafeCode: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 0 - apiCompatibilityLevelPerPlatform: {} + apiCompatibilityLevelPerPlatform: + Android: 1 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: Template_3D @@ -663,9 +665,9 @@ PlayerSettings: UNet: 1 facebookSdkVersion: 7.9.4 apiCompatibilityLevel: 2 - cloudProjectId: f380a189-a7bd-450a-a8dc-bbba66b43218 - projectName: AR_PROJECT (1) - organizationId: unity_2javngvxowgsfw + cloudProjectId: 731d3f4a-2c6f-4da3-af9b-395db8ee3332 + projectName: AR_PROJECT + organizationId: vinayakk cloudEnabled: 0 enableNativePlatformBackendsForNewInputSystem: 0 disableOldInputManagerSupport: 0 diff --git a/AR_PROJECT/ProjectSettings/TagManager.asset b/AR_PROJECT/ProjectSettings/TagManager.asset index 17cb803..74f4a26 100644 --- a/AR_PROJECT/ProjectSettings/TagManager.asset +++ b/AR_PROJECT/ProjectSettings/TagManager.asset @@ -14,10 +14,10 @@ TagManager: - - - PostProcessing - - - - - - - - + - ARGameObject + - Map + - Path + - Both - - - diff --git a/AR_PROJECT/ProjectSettings/UnityConnectSettings.asset b/AR_PROJECT/ProjectSettings/UnityConnectSettings.asset index f327fe1..4593677 100644 --- a/AR_PROJECT/ProjectSettings/UnityConnectSettings.asset +++ b/AR_PROJECT/ProjectSettings/UnityConnectSettings.asset @@ -28,7 +28,9 @@ UnityConnectSettings: m_TestMode: 0 m_IosGameId: m_AndroidGameId: - m_GameIds: {} + m_GameIds: + AndroidPlayer: + iPhonePlayer: m_GameId: PerformanceReportingSettings: m_Enabled: 0