Skip to content
This repository has been archived by the owner on Aug 11, 2024. It is now read-only.

Feature/diagnostics system port #156

Merged
merged 25 commits into from
May 8, 2019
Merged

Feature/diagnostics system port #156

merged 25 commits into from
May 8, 2019

Conversation

FejZa
Copy link
Contributor

@FejZa FejZa commented May 4, 2019

XRTK - Mixed Reality Toolkit Change Request

Overview

Ported the latest implementation of the MRTK DiagnosticsSystem over and made necessary Adjustments. There is some open TODOs:

  • OnDiagnosticsChanged() in MixedRealityDiagnosticsSystem.cs is never executed and the event does not fire respectively. Implementing this will allow to do runtime changes to settings of the diagnostics system, since the Visual Profiler implements IMixedRealityDiagnosticsSystemHandler.

  • Support for all XRTK platforms Needs to be verified. E.g. while it works on Android mobile AR it actually Displays in 3D space. Probably for mobile s screen space overlay solution would be more appropriate. Also I could not verify Lumin support.

    • Supports UWP
    • Supports Android
    • Supports iOS
    • Supports Lumin

Target of the change:

  • Core (core framework, interfaces and definitions)

Changes:

  • Added new visual profiler component to visualize diagnostics data
  • Updated inspector
  • Updated profile settings

Hiding the field from the inspector makes it impossible to set the canvas in editor,
which is generally ok, but the Awake method is checking whether canvas is null before getting it.
Since it cannot be set in inspector this if will also be true.
Mainly adjusting namespaces and class names that have changed. Added the visual profile component
which replaces the DiagnosticsHandler that used to live in XRTK/SDK.
@FejZa
Copy link
Contributor Author

FejZa commented May 4, 2019

XRTK/SDK PR 28 is part of this: XRTK/com.xrtk.sdk#28

@SimonDarksideJ
Copy link
Contributor

SimonDarksideJ commented May 6, 2019

Can we review and update the outstanding tasks prior to merging?

Platforms must be tested prior to merge

  • Stephen can take care of ML
  • I can do HL (when my device returns this week)
  • Can you test iOS or do we need help with that?

Great work on this PR btw :D

@SimonDarksideJ
Copy link
Contributor

SimonDarksideJ commented May 6, 2019

You also need to refresh your submodules as they are showing out of date and could cause issue.

@FejZa
Copy link
Contributor Author

FejZa commented May 6, 2019

Thanks1 I can test iOS later today and check the submodules.

@StephenHodgson
Copy link
Contributor

Just a note, make sure the Submodule checkouts are always the latest development checkout sha.

@StephenHodgson
Copy link
Contributor

/azp run

@azure-pipelines
Copy link
Contributor

Pull request contains merge conflicts.

# Conflicts:
#	Submodules/SDK
#	Submodules/WindowsMixedReality
#	XRTK-Core/Packages/com.xrtk.core/Inspectors/Profiles/MixedRealityDiagnosticsSystemProfileInspector.cs
@FejZa
Copy link
Contributor Author

FejZa commented May 7, 2019

Tested on iOS. Behaves the same as on Android.

@StephenHodgson
Copy link
Contributor

I'll test it on Lumin soon.

Copy link
Contributor

@StephenHodgson StephenHodgson left a comment

Choose a reason for hiding this comment

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

I've got a PR incoming with some suggested changes.

@StephenHodgson
Copy link
Contributor

Getting this warning when building to device and running in the editor:

A shader supporting instancing could not be found for the VisualProfiler, falling back to traditional rendering. This may impact performance.

@StephenHodgson
Copy link
Contributor

@FejZa
Copy link
Contributor Author

FejZa commented May 8, 2019

@StephenHodgson thank you. I'll look into the shader warning. Pretty sure I know what's up.

@FejZa
Copy link
Contributor Author

FejZa commented May 8, 2019

@StephenHodgson Added missing shader to XRTK.Core/StandardAssets/Shaders. The warning is gone now.

@StephenHodgson
Copy link
Contributor

@FejZa just need to resolve the conflicts and we should be good to go.

@StephenHodgson StephenHodgson merged commit 160a310 into XRTK:development May 8, 2019
XRTK-Build-Bot pushed a commit that referenced this pull request May 12, 2019
* Remove [HideInInspector] attribute for CanvasUtility canvas field

Hiding the field from the inspector makes it impossible to set the canvas in editor,
which is generally ok, but the Awake method is checking whether canvas is null before getting it.
Since it cannot be set in inspector this if will also be true.

* Commit submodules

* Port latst DiagnosticsSystem updates from MRTK

Mainly adjusting namespaces and class names that have changed. Added the visual profile component
which replaces the DiagnosticsHandler that used to live in XRTK/SDK.

* Fix DiagnosticsService constructor params

* Fix asset menu path to create diagnostics profile

* Resolve PR review comments

* removed a bunch of stuff that wasn't used anymore.
cleaned up the system and visualizer classes a bit

* removed stray meta

* Update XRTK-Core/Packages/com.xrtk.core/Services/DiagnosticsSystem/MixedRealityDiagnosticsSystem.cs

* Add missing shader for visual profiler
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants