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

Consolidate and clean up editor assembly #753

Merged
merged 11 commits into from
Jan 14, 2021

Conversation

FejZa
Copy link
Contributor

@FejZa FejZa commented Jan 13, 2021

XRTK - Mixed Reality Toolkit Pull Request

Overview

This is a housekeeping PR. It removes any editor only assemblies found in the Runtime/ path of the core module. Any editor specifics are now properly located in the Editor/ path / assembly of the core module.

This was a necessary step to set a proper foundation while we still can and align the package layout with the new standard.

Submodule Changes

All submodules had to be updated to adjust namespaces.

@FejZa FejZa self-assigned this Jan 13, 2021
@FejZa FejZa added the In Progress PR currently still being developed label Jan 13, 2021
@FejZa
Copy link
Contributor Author

FejZa commented Jan 13, 2021

Please hold of refviewing until I create all the submodule PRs and I also need to update a build script for this to pass.

@FejZa
Copy link
Contributor Author

FejZa commented Jan 13, 2021

All right. Everything is ready. We need the pipelines change in first so the Unity builds can complete.

@SimonDarksideJ
Copy link
Contributor

It might also be a good idea to put all the other Editor logic under the same pattern, using

XRTK.Editor.Utilities
XRTK.Editor.SDK
XRTK.Editor.Lumin

Instead of all the separate XRTK.XXX.Editor namespaces everywhre?

Thoughts @StephenHodgson / @FejZa

Wouldn't normally propose, but while we are doing this namespace reshuffle, it kinda makes sense

@FejZa
Copy link
Contributor Author

FejZa commented Jan 13, 2021

It might also be a good idea to put all the other Editor logic under the same pattern, using

XRTK.Editor.Utilities
XRTK.Editor.SDK
XRTK.Editor.Lumin

Instead of all the separate XRTK.XXX.Editor namespaces everywhre?

Thoughts @StephenHodgson / @FejZa

Wouldn't normally propose, but while we are doing this namespace reshuffle, it kinda makes sense

What do you mean? There is no more XRTK.XXX.Editor. That's what this PR resolved. There is only XRTK.Editor.XXX and each platform module has it's own e.g. XRTK.SDK.Editor, which is fine as XRTK.SDK is the modules root namespace. We don't want XRTK.Editor.SDK as that would conflict with the root namespace of the SDK package.

@FejZa
Copy link
Contributor Author

FejZa commented Jan 13, 2021

So the pattern is <root_namespace>.Editor everywhere now.

@SimonDarksideJ
Copy link
Contributor

That's my suggestion. As with the updates currently posted, we still have this inconsistency

image

@FejZa
Copy link
Contributor Author

FejZa commented Jan 13, 2021

That's my suggestion. As with the updates currently posted, we still have this inconsistency

image

Sorry still don't see what you mean? Can you make an example?

@SimonDarksideJ
Copy link
Contributor

You changed XRTK.Utilities.Editor to XRTK.Editor.Utilities

Yet right below it you still have XRTK.Lenovo.Editor

Simples :D

@StephenHodgson
Copy link
Contributor

/azp run

@azure-pipelines
Copy link
Contributor

Azure Pipelines failed to run 1 pipeline(s).

@StephenHodgson
Copy link
Contributor

/azp run

@azure-pipelines
Copy link
Contributor

Azure Pipelines failed to run 1 pipeline(s).

@StephenHodgson
Copy link
Contributor

/azp run

@azure-pipelines
Copy link
Contributor

Azure Pipelines successfully started running 1 pipeline(s).

@StephenHodgson
Copy link
Contributor

/azp run

@azure-pipelines
Copy link
Contributor

Azure Pipelines successfully started running 1 pipeline(s).

@FejZa
Copy link
Contributor Author

FejZa commented Jan 14, 2021

/azp run

@azure-pipelines
Copy link
Contributor

Azure Pipelines successfully started running 1 pipeline(s).

@StephenHodgson
Copy link
Contributor

/azp run

@azure-pipelines
Copy link
Contributor

Azure Pipelines successfully started running 1 pipeline(s).

@StephenHodgson StephenHodgson merged commit a6c5ec5 into development Jan 14, 2021
@StephenHodgson StephenHodgson deleted the dev/editor-assembly-cleanup branch January 14, 2021 18:13
XRTK-Build-Bot pushed a commit that referenced this pull request Jan 15, 2021
* Fix XRTK.Editor.Rendering namespace

* Move USB utilities to editor assembly

* Remove USB utilities from Runtime assembly hierarchy

* Remove editor utilities from Runtime assembly and move to editor assembly

* Remove redundanct license file in Tests folder

* Move check for axis mappings to editor utility

* Move build tools to editor assembly

* Fix namespaces

* Adds log for updated axis mappings

* Fix core path finder location in strings

* Update submodules
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Breaking Change Ready for review PR finished primary development, open for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants