From a850d8925435f9e5e4a39d3d83d6f84def594aef Mon Sep 17 00:00:00 2001
From: Sylvain Buche <sylvain.buche@orange.com>
Date: Tue, 16 Jul 2024 16:03:55 +0200
Subject: [PATCH] Add Unity project modifications for Geospatial module
---
Assets/Materials/Purple.mat | 19 ++++++++++++-------
Assets/Plugins/Android/proguard-user.txt | 17 +++++++++++++++++
Assets/Resources/ARFWorldStorageServer.asset | 4 ++--
Assets/Scenes/ExampleGLTF.unity | 6 +++---
...orld-analysis-arfoundation-wrapper-package | 2 +-
.../ARCoreExtensionsProjectSettings.json | 2 +-
ProjectSettings/EditorBuildSettings.asset | 6 ++++++
ProjectSettings/GvhProjectSettings.xml | 2 ++
ProjectSettings/ProjectSettings.asset | 10 +++-------
9 files changed, 47 insertions(+), 21 deletions(-)
diff --git a/Assets/Materials/Purple.mat b/Assets/Materials/Purple.mat
index 019e779..bcca103 100644
--- a/Assets/Materials/Purple.mat
+++ b/Assets/Materials/Purple.mat
@@ -9,14 +9,19 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Purple
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- m_ValidKeywords: []
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords:
+ - _ALPHAPREMULTIPLY_ON
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
disabledShaderPasses: []
+ m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@@ -61,20 +66,20 @@ Material:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- - _DstBlend: 0
+ - _DstBlend: 10
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- - _Mode: 0
+ - _Mode: 3
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- - _ZWrite: 1
+ - _ZWrite: 0
m_Colors:
- - _Color: {r: 0.40046763, g: 0, b: 0.4716981, a: 1}
+ - _Color: {r: 1, g: 0.12549019, b: 0.96812713, a: 0.24705882}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Plugins/Android/proguard-user.txt b/Assets/Plugins/Android/proguard-user.txt
index 4ed074c..b0052b5 100644
--- a/Assets/Plugins/Android/proguard-user.txt
+++ b/Assets/Plugins/Android/proguard-user.txt
@@ -32,3 +32,20 @@
-keep class com.google.android.gms.tasks.** { *; }
### Module Progurad Rules ends ###
+
+### Module Progurad Rules starts ###
+
+## Default ##
+-keep class com.unity3d.plugin.* { *; }
+
+## LocationModule ##
+-keep class com.google.android.gms.common.** { *; }
+ -keep class com.google.android.gms.location.** { *; }
+ -keep class com.google.android.gms.tasks.** { *; }
+
+## AuthenticationModule ##
+-keep class com.google.android.gms.common.** { *; }
+ -keep class com.google.android.gms.auth.** { *; }
+ -keep class com.google.android.gms.tasks.** { *; }
+
+### Module Progurad Rules ends ###
diff --git a/Assets/Resources/ARFWorldStorageServer.asset b/Assets/Resources/ARFWorldStorageServer.asset
index dd2266b..84fa85c 100644
--- a/Assets/Resources/ARFWorldStorageServer.asset
+++ b/Assets/Resources/ARFWorldStorageServer.asset
@@ -12,8 +12,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e4b7be4c33f68d0418c3b4e1a7053d91, type: 3}
m_Name: ARFWorldStorageServer
m_EditorClassIdentifier:
- serverName: 192.168.1.27
+ serverName: 192.168.1.44
company: Orange
- basePath: http://192.168.1.27
+ basePath: http://192.168.1.44
port: 8080
currentUser: {fileID: 11400000, guid: 220ed7f6ba8f6404e8bee0e9057e2ffd, type: 2}
diff --git a/Assets/Scenes/ExampleGLTF.unity b/Assets/Scenes/ExampleGLTF.unity
index e0388d7..3c70b99 100644
--- a/Assets/Scenes/ExampleGLTF.unity
+++ b/Assets/Scenes/ExampleGLTF.unity
@@ -331,7 +331,7 @@ Camera:
width: 1
height: 1
near clip plane: 0.1
- far clip plane: 20
+ far clip plane: 250
field of view: 60
orthographic: 0
orthographic size: 5
@@ -424,7 +424,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 02da7adcc65f4694684d71e61d88070b, type: 3}
m_Name:
m_EditorClassIdentifier:
- worldStorageServer: {fileID: 11400000, guid: b9f1854d991254dd4ba5e0586e57af27, type: 2}
+ worldStorageServer: {fileID: 11400000, guid: cc5c5acfb44773a4ba9decc291b718d2, type: 2}
--- !u!4 &236535456
Transform:
m_ObjectHideFlags: 0
@@ -570,7 +570,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_PathToGLTF: ARSceneOneAnchor.glb
- _ValiditySubscription: 100000
+ _ValiditySubscription: 1000000
--- !u!4 &842320175
Transform:
m_ObjectHideFlags: 0
diff --git a/Packages/unity-world-analysis-arfoundation-wrapper-package b/Packages/unity-world-analysis-arfoundation-wrapper-package
index e68c91f..4c4c84e 160000
--- a/Packages/unity-world-analysis-arfoundation-wrapper-package
+++ b/Packages/unity-world-analysis-arfoundation-wrapper-package
@@ -1 +1 @@
-Subproject commit e68c91f304caf48e3221e71a06fd2fc834e4b19b
+Subproject commit 4c4c84e3662efe4cd7b16abfcf2f273286dcffcd
diff --git a/ProjectSettings/ARCoreExtensionsProjectSettings.json b/ProjectSettings/ARCoreExtensionsProjectSettings.json
index 2a3a485..82d05b3 100644
--- a/ProjectSettings/ARCoreExtensionsProjectSettings.json
+++ b/ProjectSettings/ARCoreExtensionsProjectSettings.json
@@ -1 +1 @@
-{"Version":"1.44.0","IsIOSSupportEnabled":false,"AndroidAuthenticationStrategySetting":1,"AndroidCloudServicesApiKey":"","IOSAuthenticationStrategySetting":0,"IOSCloudServicesApiKey":"","CloudAnchorEnabled":true,"GeospatialEnabled":false,"GeospatialEditorEnabled":false,"SemanticsIosEnabled":false}
\ No newline at end of file
+{"Version":"1.44.0","IsIOSSupportEnabled":false,"AndroidAuthenticationStrategySetting":1,"AndroidCloudServicesApiKey":"","IOSAuthenticationStrategySetting":0,"IOSCloudServicesApiKey":"","CloudAnchorEnabled":true,"GeospatialEnabled":true,"GeospatialEditorEnabled":false,"SemanticsIosEnabled":false}
\ No newline at end of file
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index 991cc04..d7aa45f 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -8,6 +8,12 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/ExampleGLTF.unity
guid: cfb9e37ec495d014eb9ed87251861a32
+ - enabled: 0
+ path: Assets/Scenes/ExampleServerMaintenance.unity
+ guid: 6600c765561a0ef449ebe496f2494941
+ - enabled: 0
+ path: Assets/Scenes/test.unity
+ guid: 2ae46b105e94bfd4180ed29ec5618253
m_configObjects:
UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: 60b084f6889b3f643a06cde2d9b5dac6, type: 2}
UnityEditor.XR.ARKit.ARKitSettings: {fileID: 11400000, guid: 1d843ca70dbb1e947809e3f55a8d8831, type: 2}
diff --git a/ProjectSettings/GvhProjectSettings.xml b/ProjectSettings/GvhProjectSettings.xml
index 6349bef..42602f6 100644
--- a/ProjectSettings/GvhProjectSettings.xml
+++ b/ProjectSettings/GvhProjectSettings.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<projectSettings>
+ <projectSetting name="Google.IOSResolver.VerboseLoggingEnabled" value="False" />
<projectSetting name="Google.PackageManagerResolver.VerboseLoggingEnabled" value="False" />
<projectSetting name="Google.VersionHandler.VerboseLoggingEnabled" value="False" />
+ <projectSetting name="GooglePlayServices.PromptBeforeAutoResolution" value="False" />
<projectSetting name="GooglePlayServices.UseJetifier" value="True" />
</projectSettings>
\ No newline at end of file
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 074986a..3d52b09 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -141,10 +141,6 @@ PlayerSettings:
tvOSBundleVersion: 1.0
bundleVersion: 1.0
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}
- {fileID: 11400000, guid: d990dc556983b2e47b9135ba8b6bc596, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
@@ -166,7 +162,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
- Android: com.DefaultCompany.unityworldanalysisvalidation
+ Android: com.DefaultCompanyDebug.unityworldanalysisvalidation
Standalone: com.DefaultCompany.unity-world-analysis-validation
iPhone: com.DefaultCompany.unity-world-analysis-validation
buildNumber:
@@ -174,7 +170,7 @@ PlayerSettings:
VisionOS: 0
iPhone: 0
tvOS: 0
- overrideDefaultApplicationIdentifier: 0
+ overrideDefaultApplicationIdentifier: 1
AndroidBundleVersionCode: 1
AndroidMinSdkVersion: 24
AndroidTargetSdkVersion: 0
@@ -867,7 +863,7 @@ PlayerSettings:
hmiLogStartupTiming: 0
hmiCpuConfiguration:
apiCompatibilityLevel: 6
- activeInputHandler: 2
+ activeInputHandler: 1
windowsGamepadBackendHint: 0
cloudProjectId:
framebufferDepthMemorylessMode: 0
--
GitLab