From a9b58facd8a2c1994c060d25cd7787c75dc5f584 Mon Sep 17 00:00:00 2001
From: Sylvain Buche <sylvain.buche@orange.com>
Date: Thu, 1 Aug 2024 10:55:28 +0200
Subject: [PATCH] Fix the "access building button" behavior in the server
maintenance example.
---
.../ARScenePrefabs/ValidateAccessToBuilding.cs | 3 ++-
Assets/Plugins/Android/mainTemplate.gradle | 16 ----------------
Assets/Plugins/Android/settingsTemplate.gradle | 4 ----
Assets/Resources/ARFWorldStorageServer.asset | 4 ++--
Assets/Scenes/ExampleServerMaintenance.unity | 12 ++++++++++++
Assets/Scripts/AnchorTrackableReferenceNode.cs | 9 ++++++++-
...y-world-analysis-arfoundation-wrapper-package | 2 +-
7 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/Assets/ARContent/ARScenePrefabs/ValidateAccessToBuilding.cs b/Assets/ARContent/ARScenePrefabs/ValidateAccessToBuilding.cs
index 02a60d2..281bc3a 100644
--- a/Assets/ARContent/ARScenePrefabs/ValidateAccessToBuilding.cs
+++ b/Assets/ARContent/ARScenePrefabs/ValidateAccessToBuilding.cs
@@ -17,9 +17,10 @@ public class ValidateAccessToBuilding : MonoBehaviour
}
}
+
+
public void OnClick()
{
- Debug.Log("Click");
foreach(GameObject a in arrows)
{
a.SetActive(true);
diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle
index cfe1a11..91b28dc 100644
--- a/Assets/Plugins/Android/mainTemplate.gradle
+++ b/Assets/Plugins/Android/mainTemplate.gradle
@@ -4,24 +4,8 @@ apply plugin: 'com.android.library'
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.google.android.gms:play-services-auth:16+'
-// Android Resolver Dependencies Start
- implementation 'com.google.android.gms:play-services-auth-base:16+' // Google.XR.ARCoreExtensions.Editor.Internal.ExternalDependencyResolverHelper.RegisterAndroidDependencies
- implementation 'com.google.android.gms:play-services-location:17+' // Google.XR.ARCoreExtensions.Editor.Internal.ExternalDependencyResolverHelper.RegisterAndroidDependencies
-// Android Resolver Dependencies End
**DEPS**}
-// Android Resolver Exclusions Start
-android {
- packagingOptions {
- exclude ('/lib/armeabi/*' + '*')
- exclude ('/lib/armeabi-v7a/*' + '*')
- exclude ('/lib/mips/*' + '*')
- exclude ('/lib/mips64/*' + '*')
- exclude ('/lib/x86/*' + '*')
- exclude ('/lib/x86_64/*' + '*')
- }
-}
-// Android Resolver Exclusions End
android {
ndkPath "**NDKPATH**"
diff --git a/Assets/Plugins/Android/settingsTemplate.gradle b/Assets/Plugins/Android/settingsTemplate.gradle
index 0cc1dea..939fa3d 100644
--- a/Assets/Plugins/Android/settingsTemplate.gradle
+++ b/Assets/Plugins/Android/settingsTemplate.gradle
@@ -16,10 +16,6 @@ dependencyResolutionManagement {
**ARTIFACTORYREPOSITORY**
google()
mavenCentral()
-// Android Resolver Repos Start
- def unityProjectPath = $/file:///**DIR_UNITYPROJECT**/$.replace("\\", "/")
- mavenLocal()
-// Android Resolver Repos End
flatDir {
dirs "${project(':unityLibrary').projectDir}/libs"
}
diff --git a/Assets/Resources/ARFWorldStorageServer.asset b/Assets/Resources/ARFWorldStorageServer.asset
index 84fa85c..dd2266b 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.44
+ serverName: 192.168.1.27
company: Orange
- basePath: http://192.168.1.44
+ basePath: http://192.168.1.27
port: 8080
currentUser: {fileID: 11400000, guid: 220ed7f6ba8f6404e8bee0e9057e2ffd, type: 2}
diff --git a/Assets/Scenes/ExampleServerMaintenance.unity b/Assets/Scenes/ExampleServerMaintenance.unity
index b4cc489..99c712e 100644
--- a/Assets/Scenes/ExampleServerMaintenance.unity
+++ b/Assets/Scenes/ExampleServerMaintenance.unity
@@ -594,6 +594,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
_ARFNodeUUID: be1f62b8-ff00-4f6c-9f5a-d48795494037
_ValiditySubscription: 1000000
+ objectsToDeactivate:
+ - {fileID: 565174133}
--- !u!114 &170622172 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7184359530916948220, guid: 986e9c7298a161a4c9b18e0d21d77ae1, type: 3}
@@ -1103,6 +1105,12 @@ MonoBehaviour:
m_EditorClassIdentifier:
_ARFNodeUUID: 6ca20738-d1dd-4210-9983-eda9f150bea7
_ValiditySubscription: 100000
+ objectsToDeactivate: []
+--- !u!1 &565174133 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 6320743541515548736, guid: 986e9c7298a161a4c9b18e0d21d77ae1, type: 3}
+ m_PrefabInstance: {fileID: 170622168}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &588578785
GameObject:
m_ObjectHideFlags: 0
@@ -1667,6 +1675,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_ARFNodeUUID: 5ca5bb36-0001-44e5-a338-608ca8e7e787
_ValiditySubscription: 1000000
+ objectsToDeactivate: []
--- !u!1 &1113207502
GameObject:
m_ObjectHideFlags: 0
@@ -2246,6 +2255,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_ARFNodeUUID: 15dd32c9-ff00-428c-a4f2-95df6e9cb3c2
_ValiditySubscription: 1000000
+ objectsToDeactivate: []
--- !u!1001 &1613199000
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2325,6 +2335,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_ARFNodeUUID: 269ae4e5-ff00-41f6-9eb3-011b8c87d158
_ValiditySubscription: 1000000
+ objectsToDeactivate: []
--- !u!1 &1805087985
GameObject:
m_ObjectHideFlags: 0
@@ -2540,6 +2551,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_ARFNodeUUID: 859d2682-ff00-420e-8601-362084de7a7e
_ValiditySubscription: 1000000
+ objectsToDeactivate: []
--- !u!1 &1959103339
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/AnchorTrackableReferenceNode.cs b/Assets/Scripts/AnchorTrackableReferenceNode.cs
index a4c1604..969341c 100644
--- a/Assets/Scripts/AnchorTrackableReferenceNode.cs
+++ b/Assets/Scripts/AnchorTrackableReferenceNode.cs
@@ -1,4 +1,5 @@
using System.Collections;
+using System.Collections.Generic;
using UnityEngine;
public class AnchorTrackableReferenceNode : MonoBehaviour
@@ -12,6 +13,9 @@ public class AnchorTrackableReferenceNode : MonoBehaviour
/// </summary>
public int _ValiditySubscription = 100000;
+ [SerializeField]
+ private List<GameObject> objectsToDeactivate;
+
// Start is called before the first frame update
IEnumerator Start()
{
@@ -39,7 +43,10 @@ public class AnchorTrackableReferenceNode : MonoBehaviour
{
foreach (Transform child in transform)
{
- child.gameObject.SetActive(true);
+ if (!objectsToDeactivate.Contains(child.gameObject))
+ {
+ child.gameObject.SetActive(true);
+ }
}
if (pose.Value.Type == ETSI.ARF.OpenAPI.WorldAnalysis.PoseValueType.VECTOR_QUATERNION)
diff --git a/Packages/unity-world-analysis-arfoundation-wrapper-package b/Packages/unity-world-analysis-arfoundation-wrapper-package
index c090e25..02e1a1e 160000
--- a/Packages/unity-world-analysis-arfoundation-wrapper-package
+++ b/Packages/unity-world-analysis-arfoundation-wrapper-package
@@ -1 +1 @@
-Subproject commit c090e25c3e145337104e736a52ea24c329903a51
+Subproject commit 02e1a1e9f05de709bde69921a9258485a7afac44
--
GitLab