Skip to content
Snippets Groups Projects
Commit a9b58fac authored by Sylvain Buche's avatar Sylvain Buche
Browse files

Fix the "access building button" behavior in the server maintenance example.

parent 63bc11c2
No related branches found
No related tags found
1 merge request!2Move tracking prefab to package, add export assetbundle capabilities for...
...@@ -17,9 +17,10 @@ public class ValidateAccessToBuilding : MonoBehaviour ...@@ -17,9 +17,10 @@ public class ValidateAccessToBuilding : MonoBehaviour
} }
} }
public void OnClick() public void OnClick()
{ {
Debug.Log("Click");
foreach(GameObject a in arrows) foreach(GameObject a in arrows)
{ {
a.SetActive(true); a.SetActive(true);
......
...@@ -4,24 +4,8 @@ apply plugin: 'com.android.library' ...@@ -4,24 +4,8 @@ apply plugin: 'com.android.library'
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.google.android.gms:play-services-auth:16+' 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**} **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 { android {
ndkPath "**NDKPATH**" ndkPath "**NDKPATH**"
......
...@@ -16,10 +16,6 @@ dependencyResolutionManagement { ...@@ -16,10 +16,6 @@ dependencyResolutionManagement {
**ARTIFACTORYREPOSITORY** **ARTIFACTORYREPOSITORY**
google() google()
mavenCentral() mavenCentral()
// Android Resolver Repos Start
def unityProjectPath = $/file:///**DIR_UNITYPROJECT**/$.replace("\\", "/")
mavenLocal()
// Android Resolver Repos End
flatDir { flatDir {
dirs "${project(':unityLibrary').projectDir}/libs" dirs "${project(':unityLibrary').projectDir}/libs"
} }
......
...@@ -12,8 +12,8 @@ MonoBehaviour: ...@@ -12,8 +12,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e4b7be4c33f68d0418c3b4e1a7053d91, type: 3} m_Script: {fileID: 11500000, guid: e4b7be4c33f68d0418c3b4e1a7053d91, type: 3}
m_Name: ARFWorldStorageServer m_Name: ARFWorldStorageServer
m_EditorClassIdentifier: m_EditorClassIdentifier:
serverName: 192.168.1.44 serverName: 192.168.1.27
company: Orange company: Orange
basePath: http://192.168.1.44 basePath: http://192.168.1.27
port: 8080 port: 8080
currentUser: {fileID: 11400000, guid: 220ed7f6ba8f6404e8bee0e9057e2ffd, type: 2} currentUser: {fileID: 11400000, guid: 220ed7f6ba8f6404e8bee0e9057e2ffd, type: 2}
...@@ -594,6 +594,8 @@ MonoBehaviour: ...@@ -594,6 +594,8 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_ARFNodeUUID: be1f62b8-ff00-4f6c-9f5a-d48795494037 _ARFNodeUUID: be1f62b8-ff00-4f6c-9f5a-d48795494037
_ValiditySubscription: 1000000 _ValiditySubscription: 1000000
objectsToDeactivate:
- {fileID: 565174133}
--- !u!114 &170622172 stripped --- !u!114 &170622172 stripped
MonoBehaviour: MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7184359530916948220, guid: 986e9c7298a161a4c9b18e0d21d77ae1, type: 3} m_CorrespondingSourceObject: {fileID: 7184359530916948220, guid: 986e9c7298a161a4c9b18e0d21d77ae1, type: 3}
...@@ -1103,6 +1105,12 @@ MonoBehaviour: ...@@ -1103,6 +1105,12 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_ARFNodeUUID: 6ca20738-d1dd-4210-9983-eda9f150bea7 _ARFNodeUUID: 6ca20738-d1dd-4210-9983-eda9f150bea7
_ValiditySubscription: 100000 _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 --- !u!1 &588578785
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1667,6 +1675,7 @@ MonoBehaviour: ...@@ -1667,6 +1675,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_ARFNodeUUID: 5ca5bb36-0001-44e5-a338-608ca8e7e787 _ARFNodeUUID: 5ca5bb36-0001-44e5-a338-608ca8e7e787
_ValiditySubscription: 1000000 _ValiditySubscription: 1000000
objectsToDeactivate: []
--- !u!1 &1113207502 --- !u!1 &1113207502
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -2246,6 +2255,7 @@ MonoBehaviour: ...@@ -2246,6 +2255,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_ARFNodeUUID: 15dd32c9-ff00-428c-a4f2-95df6e9cb3c2 _ARFNodeUUID: 15dd32c9-ff00-428c-a4f2-95df6e9cb3c2
_ValiditySubscription: 1000000 _ValiditySubscription: 1000000
objectsToDeactivate: []
--- !u!1001 &1613199000 --- !u!1001 &1613199000
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -2325,6 +2335,7 @@ MonoBehaviour: ...@@ -2325,6 +2335,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_ARFNodeUUID: 269ae4e5-ff00-41f6-9eb3-011b8c87d158 _ARFNodeUUID: 269ae4e5-ff00-41f6-9eb3-011b8c87d158
_ValiditySubscription: 1000000 _ValiditySubscription: 1000000
objectsToDeactivate: []
--- !u!1 &1805087985 --- !u!1 &1805087985
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -2540,6 +2551,7 @@ MonoBehaviour: ...@@ -2540,6 +2551,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_ARFNodeUUID: 859d2682-ff00-420e-8601-362084de7a7e _ARFNodeUUID: 859d2682-ff00-420e-8601-362084de7a7e
_ValiditySubscription: 1000000 _ValiditySubscription: 1000000
objectsToDeactivate: []
--- !u!1 &1959103339 --- !u!1 &1959103339
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
using System.Collections; using System.Collections;
using System.Collections.Generic;
using UnityEngine; using UnityEngine;
public class AnchorTrackableReferenceNode : MonoBehaviour public class AnchorTrackableReferenceNode : MonoBehaviour
...@@ -12,6 +13,9 @@ public class AnchorTrackableReferenceNode : MonoBehaviour ...@@ -12,6 +13,9 @@ public class AnchorTrackableReferenceNode : MonoBehaviour
/// </summary> /// </summary>
public int _ValiditySubscription = 100000; public int _ValiditySubscription = 100000;
[SerializeField]
private List<GameObject> objectsToDeactivate;
// Start is called before the first frame update // Start is called before the first frame update
IEnumerator Start() IEnumerator Start()
{ {
...@@ -39,7 +43,10 @@ public class AnchorTrackableReferenceNode : MonoBehaviour ...@@ -39,7 +43,10 @@ public class AnchorTrackableReferenceNode : MonoBehaviour
{ {
foreach (Transform child in transform) 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) if (pose.Value.Type == ETSI.ARF.OpenAPI.WorldAnalysis.PoseValueType.VECTOR_QUATERNION)
......
Subproject commit c090e25c3e145337104e736a52ea24c329903a51 Subproject commit 02e1a1e9f05de709bde69921a9258485a7afac44
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment