Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New Sample: AR Feature Layer #163

Draft
wants to merge 36 commits into
base: main
Choose a base branch
from
Draft

New Sample: AR Feature Layer #163

wants to merge 36 commits into from

Conversation

mmgaw113
Copy link
Collaborator

Sample

This sample aims to bring Real-World, Location-based AR along side use of the ArcGIS Maps SDK in order to show Feature Layer data in the real world.

Checklist

  • PR title follows convention - keyword: Short description of change
  • PR targets the correct branch
  • Self-review of changes
  • There are no warnings related to changes
  • A build was made and tested on all relevant platforms
  • No unrelated changes have been made to any other code or project files
  • No unnecessary includes or namespaces added
  • Code follows plugin coding style
  • New code and changed code has proper formatting
  • No unintentional formatting changes
  • Commits have descriptive titles

ArcGIS Maps SDK Version

Maps SDK 1.7 w/ Unity 6000.0 LTS

mmgaw113 and others added 30 commits October 4, 2024 07:42
@mmgaw113
Init
b2ad840
@mmgaw113
update logo
742e4a4
@mmgaw113
Revert package settings files
d3ca119
@mmgaw113
Fix Package Settings
75701e1
@mmgaw113
Update Sample
7cd4cf6
@mmgaw113
Update Sample
010dc56
@mmgaw113
Add button to spawn features
4420777
@mmgaw113
Update Sample
ad59402
@mmgaw113
Update Sample
1ccf3e6
@mmgaw113
update Gitignore to ignore android files.
8887cc3
@mmgaw113
Update XR Samples to Unity 6
5ca917c
@mmgaw113
Merge branch 'Release/1.7' of https://github.com/Esri/arcgis-maps-sdk…
5a9550d 
…-unity-samples into mas12517/Update-XR-Samples

# Conflicts:
#	sample_project/Assets/SampleViewer/Resources/InputActions/TouchControls.cs.meta
#	sample_project/Assets/SampleViewer/Resources/Prefabs/JoystickCanvas.prefab.meta
#	sample_project/Assets/SampleViewer/Samples/StreamLayer/Materials.meta
#	sample_project/Assets/SampleViewer/Samples/StreamLayer/Materials/BASE.mat.meta
#	xr_sample_project/Assets/DefaultVolumeProfile.asset.meta
#	xr_sample_project/Assets/SampleViewer/Resources/SampleGraphicSettings.meta
#	xr_sample_project/Assets/SampleViewer/Resources/SampleGraphicSettings/LightingManager.cs.meta
#	xr_sample_project/Assets/SampleViewer/Resources/SampleGraphicSettings/SampleHDRPipeline.asset.meta
#	xr_sample_project/Assets/SampleViewer/Resources/SampleGraphicSettings/URP.prefab.meta
#	xr_sample_project/Assets/SampleViewer/Resources/Settings/SampleURPipeline Renderer.asset
#	xr_sample_project/Assets/Samples/XR Hands/1.4.0.meta
#	xr_sample_project/Assets/Samples/XR Interaction Toolkit/3.0.5/Hands Interaction Demo/HandsDemoSceneAssets/Materials/MaterialPipelineHandler.asset.meta
#	xr_sample_project/Assets/Samples/XR Interaction Toolkit/3.0.5/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/AudioAffordance.prefab.meta
#	xr_sample_project/Assets/Samples/XR Interaction Toolkit/3.0.5/Hands Interaction Demo/Scripts/ReleaseThresholdButtonReader.cs.meta
#	xr_sample_project/Assets/Samples/XR Interaction Toolkit/3.0.5/Starter Assets/DemoSceneAssets/Prefabs/Climb/Multi Floor Ladder.prefab.meta
#	xr_sample_project/Assets/Samples/XR Interaction Toolkit/3.0.5/Starter Assets/DemoSceneAssets/Prefabs/Climb/Multi-Anchor Teleport Reticle.prefab.meta
@mmgaw113
Merge branch 'mas12517/Update-XR-Samples' of https://github.com/Esri/…
b9ce78d 
…arcgis-maps-sdk-unity-samples into mas12517/ARSample

# Conflicts:
#	xr_sample_project/Assets/XR/Settings/OpenXR Package Settings.asset
#	xr_sample_project/Packages/manifest.json
#	xr_sample_project/Packages/packages-lock.json
@mmgaw113
Add mini-map for precise location tracking
dfe78a4
@mmgaw113
Update Project Settings, Tag Manager,And Build Settings
a523539
@mmgaw113
Add UI animations
8d7c204
@mmgaw113
Updates to the Sample
5ed4c95
@mmgaw113
Add Map Expanding
22c1c85
@mmgaw113
Minor Updates
9d94ea3
@mmgaw113
Remove Samples
186371d
@mmgaw113
Merge branch 'mas12517/Update-XR-Samples' of https://github.com/Esri/…
22ae43d 
…arcgis-maps-sdk-unity-samples into mas12517/ARSample
@mmgaw113
Update UI
b182602
@mmgaw113
Merge branch 'main' of https://github.com/Esri/arcgis-maps-sdk-unity-…
36c4531 
…samples into mas12517/ARSample
@mmgaw113
Update Sample UI
0b2bacf
@mmgaw113
Merge branch 'Release/1.7' of https://github.com/Esri/arcgis-maps-sdk…
335e3e7 
…-unity-samples into mas12517/ARSample

# Conflicts:
#	xr_sample_project/Assets/Images/LogoMenu.png.meta
#	xr_sample_project/Assets/Plugins/Android/proguard-user.txt.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Animations.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/GeoSpatialFeatureLayer.unity.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Images.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Images/Cancel_Icon.png.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Images/CircleMask.png.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Images/Handle.png.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Images/reset.png.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Input.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Input/ARTouchControls.cs.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Input/ARTouchControls.inputactions.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Materials.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Materials/HighLightMaterial.mat.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Materials/Shader Graphs_Outline.mat.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Materials/Shader Graphs_Transparent.mat.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Models.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Models/LocationMarker.fbx.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Models/LocationMarker.mat
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Models/LocationMarker.mat.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Prefabs.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Prefabs/FeatureData.prefab.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Prefabs/LocationMarker.prefab.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Scripts.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Scripts/ArcGISGeospatialController.cs.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Scripts/FeatureData.cs.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Scripts/FeatureLayerQuery.cs.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Settings/ARCoreExtensionsCameraConfigFilter.asset.meta
#	xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR Sample/Textures.meta
#	xr_sample_project/Assets/XR/Settings/ARCoreSettings.asset.meta
#	xr_sample_project/Assets/XR/Settings/ARKitSettings.asset.meta
#	xr_sample_project/Packages/manifest.json
#	xr_sample_project/Packages/packages-lock.json
@mmgaw113
Revert Changes to readme
048349c
@mmgaw113
Merge branch 'Release/1.7' of https://github.com/Esri/arcgis-maps-sdk…
0970abf 
…-unity-samples into mas12517/ARSample
@mmgaw113
Merge branch 'Release/1.7' of https://github.com/Esri/arcgis-maps-sdk…
87273c7 
…-unity-samples into mas12517/ARSample
@mmgaw113
Merge branch 'main' of https://github.com/Esri/arcgis-maps-sdk-unity-…
054e0d4 
…samples into mas12517/ARSample
@mmgaw113
Merge branch 'Release/1.7' of https://github.com/Esri/arcgis-maps-sdk…
bd009b6 
…-unity-samples into mas12517/ARSample
@mmgaw113 mmgaw113 requested a review from a team November 26, 2024 17:50
@mmgaw113 mmgaw113 self-assigned this Nov 26, 2024
@mmgaw113 mmgaw113 changed the base branch from Release/1.7 to main November 26, 2024 21:12
ZackAllen
ZackAllen reviewed Dec 2, 2024
View reviewed changes
Copy link
Collaborator

@ZackAllen ZackAllen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no consistency in the format of the image names.

...ample_project/Assets/SampleViewer/Samples/GeoSpatialAR/Scripts/ArcGISGeospatialController.cs Outdated Show resolved Hide resolved
...ample_project/Assets/SampleViewer/Samples/GeoSpatialAR/Scripts/ArcGISGeospatialController.cs Show resolved Hide resolved
...ample_project/Assets/SampleViewer/Samples/GeoSpatialAR/Scripts/ArcGISGeospatialController.cs
{
Debug.Log("Requesting the fine location permission.");
Permission.RequestUserPermission(Permission.FineLocation);
yield return new WaitForSeconds(3.0f);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this delay needed? Probably worth adding a comment explaining why.

...ample_project/Assets/SampleViewer/Samples/GeoSpatialAR/Scripts/ArcGISGeospatialController.cs
Debug.Log("Starting location service.");
Input.location.Start();

while (Input.location.status == LocationServiceStatus.Initializing)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have any event we can hook into for this status change? While loop here is dangerous with no timeout.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately no. Location Services is still under old input and isn't available in new input. So there aren't any events. A lot of this code is just safety precautions.

xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR/Scripts/FeatureData.cs Show resolved Hide resolved
xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR/Scripts/InputController.cs Show resolved Hide resolved
xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR/Scripts/InputController.cs Outdated
[SerializeField] private Material outlineMaterial;

[Header("Mini Map")]
private Button expandButton;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this button not serialized like the others?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It can be gotten in Awake(), The others can't

xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR/Scripts/InputController.cs Outdated
{
inputField.text = featureLayerQuery.WebLink.Link;
menuButton.image.sprite = upSprite;
menuButton.GetComponentInChildren<TextMeshProUGUI>().text = "Touch to Hide Menu";
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

private const string should be used to avoid repeatedly having this value.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this string is being dynamically changed based on the status of the menu. It goes back and forth between "Touch to Show Menu" and "Touch to Hide Menu".

xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR/Scripts/LocationMarker.cs Outdated
{
locationComponent.Position = new ArcGISPoint(cameraController.cameraGeospatialPose.Longitude,
cameraController.cameraGeospatialPose.Latitude, ArcGISSpatialReference.WGS84());
locationComponent.Rotation = new ArcGISRotation(cameraController.cameraGeospatialPose.EunRotation.eulerAngles.y + northOffset,180,0);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Formatting doesn't look correct with commas/spaces. Definitely run formatter here.

xr_sample_project/Assets/SampleViewer/Samples/GeoSpatialAR/readme.md
### Deployment

For deploying, please refer to this [document](https://developers.arcgis.com/unity/deployment/)
In order for the sample to run on Meta Headsets, the device must be placed in **Developer Mode**. Please refer to this [document](https://developer.android.com/studio/debug/dev-options) for how to perform such an action. This must be done for running the sample in the Unity Engine, making a build to run on Windows, or making a build directly to the headset (Meta Quest, Meta Quest 2, and Meta Quest Pro)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this valid for this sample?

@mmgaw113 mmgaw113 marked this pull request as draft January 7, 2025 16:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ZackAllen ZackAllen ZackAllen left review comments

At least 1 approving review is required to merge this pull request.

Assignees

@mmgaw113 mmgaw113

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mmgaw113 @ZackAllen