From 0ee00267f89cb1e740b3d96c38136c5184574616 Mon Sep 17 00:00:00 2001 From: Matt Schoen Date: Fri, 31 Jul 2020 00:07:58 -0700 Subject: [PATCH] Remove Labs from namespaces and package names --- .yamato/template-config.yml | 2 +- Editor/ButtonEditor.cs | 2 +- Editor/InputFieldEditor.cs | 2 +- Editor/KeyboardButtonEditor.cs | 2 +- Editor/KeyboardMalletEditor.cs | 2 +- Editor/KeyboardUIEditor.cs | 2 +- Editor/LockableHierarchyGUI.cs | 2 +- Editor/MainMenuEditor.cs | 6 ++--- Editor/NumericInputFieldEditor.cs | 2 +- Editor/PolyToolkitHelper.cs | 2 +- Editor/RaySliderEditor.cs | 2 +- Editor/SeedXRInputBindings.cs | 2 +- .../EditorXRSettingsProvider.cs | 2 +- .../HapticPulsesSettingsProvider.cs | 6 ++--- .../ProxyFeedbackSettingsProvider.cs | 6 ++--- .../TooltipsSettingsProvider.cs | 6 ++--- Editor/StandardInputFieldEditor.cs | 2 +- Editor/ToolsMenuEditor.cs | 4 ++-- Editor/TouchProxyEditor.cs | 4 ++-- Editor/Unity.Labs.EditorXR.Editor.asmdef | 12 +++++----- Editor/ViveProxyEditor.cs | 4 ++-- Interfaces/Capability/IGrabObjects.cs | 2 +- Interfaces/Capability/ITooltipPlacement.cs | 2 +- Interfaces/Capability/IVacuumable.cs | 2 +- Interfaces/Data/AxisFlags.cs | 2 +- Interfaces/Data/DirectSelectionData.cs | 2 +- Interfaces/Data/FeedbackRequest.cs | 2 +- Interfaces/Data/HapticPulse.cs | 2 +- Interfaces/Data/MenuHideFlags.cs | 2 +- Interfaces/Data/Node.cs | 2 +- Interfaces/Data/PivotMode.cs | 2 +- Interfaces/Data/SpatialHintState.cs | 2 +- Interfaces/Entity/IMenu.cs | 2 +- Interfaces/Entity/ITooltip.cs | 2 +- Interfaces/Entity/IWorkspace.cs | 2 +- Interfaces/Input/ICustomActionMap.cs | 2 +- Interfaces/Input/IProcessInput.cs | 2 +- Interfaces/Input/IStandardActionMap.cs | 2 +- .../Providers/IProvidesBlockUIInteraction.cs | 4 ++-- .../Providers/IProvidesCanGrabObject.cs | 4 ++-- Interfaces/Providers/IProvidesCheckBounds.cs | 4 ++-- Interfaces/Providers/IProvidesCheckSphere.cs | 4 ++-- .../Providers/IProvidesConnectInterfaces.cs | 4 ++-- .../IProvidesContainsVRPlayerCompletely.cs | 4 ++-- .../Providers/IProvidesControlHaptics.cs | 6 ++--- .../IProvidesControlInputIntersection.cs | 4 ++-- .../IProvidesControlSpatialHinting.cs | 4 ++-- .../Providers/IProvidesCreateWorkspace.cs | 4 ++-- .../Providers/IProvidesCustomHighlight.cs | 4 ++-- .../Providers/IProvidesDeleteSceneObject.cs | 4 ++-- .../IProvidesDetectGazeDivergence.cs | 4 ++-- .../Providers/IProvidesDirectSelection.cs | 4 ++-- .../Providers/IProvidesGameObjectLocking.cs | 4 ++-- .../Providers/IProvidesGetDefaultRayColor.cs | 4 ++-- .../Providers/IProvidesGetFieldGrabOrigin.cs | 4 ++-- .../IProvidesGetManipulatorDragState.cs | 4 ++-- .../Providers/IProvidesGetPreviewOrigin.cs | 4 ++-- .../Providers/IProvidesGetRayVisibility.cs | 4 ++-- .../Providers/IProvidesGetVRPlayerObjects.cs | 4 ++-- Interfaces/Providers/IProvidesGrouping.cs | 4 ++-- .../Providers/IProvidesIsHoveringOverUI.cs | 4 ++-- .../Providers/IProvidesIsInMiniWorld.cs | 4 ++-- .../Providers/IProvidesIsMainMenuVisible.cs | 4 ++-- .../Providers/IProvidesMoveCameraRig.cs | 4 ++-- .../Providers/IProvidesPlaceSceneObject.cs | 4 ++-- .../Providers/IProvidesPlaceSceneObjects.cs | 4 ++-- .../IProvidesPreviewInToolMenuButton.cs | 4 ++-- .../IProvidesRayVisibilitySettings.cs | 4 ++-- .../Providers/IProvidesRaycastResults.cs | 4 ++-- .../Providers/IProvidesRequestFeedback.cs | 4 ++-- .../Providers/IProvidesRequestStencilRef.cs | 4 ++-- .../Providers/IProvidesResetWorkspaces.cs | 4 ++-- Interfaces/Providers/IProvidesSceneRaycast.cs | 4 ++-- Interfaces/Providers/IProvidesSelectObject.cs | 4 ++-- Interfaces/Providers/IProvidesSelectTool.cs | 4 ++-- .../Providers/IProvidesSetDefaultRayColor.cs | 4 ++-- Interfaces/Providers/IProvidesSetHighlight.cs | 4 ++-- .../IProvidesSetManipulatorsVisible.cs | 4 ++-- .../IProvidesSetTooltipVisibility.cs | 4 ++-- Interfaces/Providers/IProvidesSnapping.cs | 4 ++-- Interfaces/Providers/IProvidesViewerBody.cs | 4 ++-- Interfaces/Providers/IProvidesViewerScale.cs | 4 ++-- Interfaces/Providers/IProvidesWeb.cs | 4 ++-- .../Subscribers/IUsesBlockUIInteraction.cs | 4 ++-- Interfaces/Subscribers/IUsesCanGrabObject.cs | 4 ++-- Interfaces/Subscribers/IUsesCheckBounds.cs | 4 ++-- Interfaces/Subscribers/IUsesCheckSphere.cs | 4 ++-- .../Subscribers/IUsesConnectInterfaces.cs | 4 ++-- .../IUsesContainsVRPlayerCompletely.cs | 4 ++-- Interfaces/Subscribers/IUsesControlHaptics.cs | 6 ++--- .../IUsesControlInputIntersection.cs | 4 ++-- .../Subscribers/IUsesControlSpatialHinting.cs | 4 ++-- .../Subscribers/IUsesCreateWorkspace.cs | 4 ++-- .../Subscribers/IUsesCustomHighlight.cs | 4 ++-- .../Subscribers/IUsesDeleteSceneObject.cs | 4 ++-- .../Subscribers/IUsesDetectGazeDivergence.cs | 4 ++-- .../Subscribers/IUsesDirectSelection.cs | 4 ++-- .../Subscribers/IUsesGameObjectLocking.cs | 4 ++-- .../Subscribers/IUsesGetDefaultRayColor.cs | 4 ++-- .../Subscribers/IUsesGetFieldGrabOrigin.cs | 4 ++-- .../IUsesGetManipulatorDragState.cs | 4 ++-- .../Subscribers/IUsesGetPreviewOrigin.cs | 4 ++-- .../Subscribers/IUsesGetRayVisibility.cs | 4 ++-- .../Subscribers/IUsesGetVRPlayerObjects.cs | 4 ++-- Interfaces/Subscribers/IUsesGrouping.cs | 4 ++-- .../Subscribers/IUsesIsHoveringOverUI.cs | 4 ++-- Interfaces/Subscribers/IUsesIsInMiniWorld.cs | 4 ++-- .../Subscribers/IUsesIsMainMenuVisible.cs | 4 ++-- Interfaces/Subscribers/IUsesMoveCameraRig.cs | 4 ++-- .../Subscribers/IUsesPlaceSceneObject.cs | 4 ++-- .../Subscribers/IUsesPlaceSceneObjects.cs | 4 ++-- .../IUsesPreviewInToolsMenuButton.cs | 4 ++-- .../Subscribers/IUsesRayVisibilitySettings.cs | 4 ++-- Interfaces/Subscribers/IUsesRaycastResults.cs | 4 ++-- .../Subscribers/IUsesRequestFeedback.cs | 4 ++-- .../Subscribers/IUsesRequestStencilRef.cs | 4 ++-- .../Subscribers/IUsesResetWorkspaces.cs | 4 ++-- Interfaces/Subscribers/IUsesSceneRaycast.cs | 4 ++-- Interfaces/Subscribers/IUsesSelectObject.cs | 4 ++-- Interfaces/Subscribers/IUsesSelectTool.cs | 4 ++-- .../Subscribers/IUsesSetDefaultRayColor.cs | 4 ++-- Interfaces/Subscribers/IUsesSetHighlight.cs | 4 ++-- .../IUsesSetManipulatorsVisible.cs | 4 ++-- .../Subscribers/IUsesSetTooltipVisibility.cs | 4 ++-- Interfaces/Subscribers/IUsesSnapping.cs | 4 ++-- Interfaces/Subscribers/IUsesViewerBody.cs | 4 ++-- Interfaces/Subscribers/IUsesViewerScale.cs | 4 ++-- Interfaces/Subscribers/IUsesWeb.cs | 4 ++-- .../Unity.Labs.EditorXR.Interfaces.asmdef | 4 ++-- Runtime/Actions/BaseAction.cs | 2 +- Runtime/Actions/Copy.cs | 2 +- Runtime/Actions/Cut.cs | 2 +- Runtime/Actions/Delete.cs | 6 ++--- Runtime/Actions/Duplicate.cs | 12 +++++----- Runtime/Actions/OpenScene.cs | 2 +- Runtime/Actions/Paste.cs | 14 +++++------ Runtime/Actions/Play.cs | 2 +- Runtime/Actions/Redo.cs | 2 +- Runtime/Actions/SaveScene.cs | 2 +- Runtime/Actions/SelectParent.cs | 2 +- Runtime/Actions/Undo.cs | 2 +- Runtime/AssemblyInfo.cs | 4 ++-- Runtime/Manipulators/BaseManipulator.cs | 10 ++++---- Runtime/Manipulators/DirectManipulator.cs | 6 ++--- Runtime/Manipulators/ScaleManipulator.cs | 4 ++-- Runtime/Manipulators/StandardManipulator.cs | 8 +++---- Runtime/Menus/MainMenu/MainMenu.cs | 18 +++++++------- .../MainMenu/Scripts/MainMenuActionButton.cs | 2 +- .../Menus/MainMenu/Scripts/MainMenuButton.cs | 6 ++--- .../Menus/MainMenu/Scripts/MainMenuFace.cs | 10 ++++---- .../MainMenu/Scripts/MainMenuItemAttribute.cs | 4 ++-- .../MainMenu/Scripts/MainMenuSelectable.cs | 2 +- .../Menus/MainMenu/Scripts/MainMenuToggle.cs | 4 ++-- Runtime/Menus/MainMenu/Scripts/MainMenuUI.cs | 14 +++++------ Runtime/Menus/RadialMenu/RadialMenu.cs | 12 +++++----- .../RadialMenu/Scripts/RadialMenuSlot.cs | 14 +++++------ .../Menus/RadialMenu/Scripts/RadialMenuUI.cs | 12 +++++----- .../Menus/SpatialMainMenu/SpatialMainMenu.cs | 12 +++++----- .../SpatialUI/Scripts/SpatialUIController.cs | 6 ++--- .../Menus/SpatialUI/Scripts/SpatialUIView.cs | 8 +++---- .../Scripts/SpatialMenuBackButton.cs | 12 +++++----- .../SpatialMenu/Scripts/SpatialMenuElement.cs | 8 +++---- .../Scripts/SpatialMenuItemAttribute.cs | 2 +- .../Scripts/SpatialMenuSectionTitleElement.cs | 12 +++++----- .../Scripts/SpatialMenuSubMenuElement.cs | 12 +++++----- .../SpatialMenu/Scripts/SpatialMenuUI.cs | 12 +++++----- .../SpatialUI/SpatialMenu/SpatialMenu.cs | 16 ++++++------- Runtime/Menus/ToolsMenu/Scripts/HintIcon.cs | 6 ++--- Runtime/Menus/ToolsMenu/Scripts/HintLine.cs | 10 ++++---- .../Menus/ToolsMenu/Scripts/ToolsMenuUI.cs | 12 +++++----- Runtime/Menus/ToolsMenu/ToolsMenu.cs | 16 ++++++------- .../ToolsMenuButton/ToolsMenuButton.cs | 16 ++++++------- Runtime/Menus/UndoMenu/Scripts/UndoMenuUI.cs | 12 +++++----- Runtime/Menus/UndoMenu/UndoMenu.cs | 14 +++++------ .../Actions/ActionMenuItemAttribute.cs | 4 ++-- Runtime/Scripts/Analysis/EditorXRAnalytics.cs | 2 +- .../Analysis/EditorXRAnalyticsEvents.cs | 2 +- .../Core/Contexts/EditingContextManager.cs | 8 +++---- .../Contexts/EditingContextManagerSettings.cs | 2 +- Runtime/Scripts/Core/Contexts/EditorXR.asset | 14 +++++------ .../Scripts/Core/Contexts/EditorXRContext.cs | 8 +++---- Runtime/Scripts/Core/Contexts/Minimal.asset | 24 +++++++++---------- Runtime/Scripts/Core/EditorXR.cs | 16 ++++++------- .../Core/EditorXRDirectSelectionModule.cs | 12 +++++----- .../Scripts/Core/EditorXRInterfacesModule.cs | 6 ++--- Runtime/Scripts/Core/EditorXRMenuModule.cs | 14 +++++------ .../Scripts/Core/EditorXRMiniWorldModule.cs | 18 +++++++------- Runtime/Scripts/Core/EditorXRRayModule.cs | 20 ++++++++-------- Runtime/Scripts/Core/EditorXRToolModule.cs | 18 +++++++------- .../Scripts/Core/EditorXRToolsMenuModule.cs | 6 ++--- Runtime/Scripts/Core/EditorXRUIModule.cs | 14 +++++------ .../Scripts/Core/EditorXRVacuumableModule.cs | 8 +++---- Runtime/Scripts/Core/EditorXRViewerModule.cs | 16 ++++++------- .../Core/Interfaces/IAxisConstraints.cs | 4 ++-- .../IDelayedInitializationModule.cs | 4 ++-- .../Core/Interfaces/IForEachRayOrigin.cs | 2 +- .../Core/Interfaces/IInspectorWorkspace.cs | 2 +- .../Core/Interfaces/IInterfaceConnector.cs | 2 +- Runtime/Scripts/Core/Interfaces/IMiniWorld.cs | 2 +- Runtime/Scripts/Core/Interfaces/INodeToRay.cs | 4 ++-- Runtime/Scripts/Core/Interfaces/IRayToNode.cs | 4 ++-- .../Core/Interfaces/ISerializePreferences.cs | 2 +- .../Core/Interfaces/IUsesHierarchyData.cs | 2 +- .../Scripts/Core/Interfaces/IUsesPointer.cs | 2 +- .../Core/Interfaces/IUsesProjectFolderData.cs | 4 ++-- Runtime/Scripts/Core/ModuleOrders.cs | 2 +- Runtime/Scripts/Core/VRView.cs | 8 +++---- Runtime/Scripts/Data/ActionMenuData.cs | 4 ++-- Runtime/Scripts/Data/AssetData.cs | 4 ++-- .../Scripts/Data/DefaultScriptReferences.cs | 8 +++---- Runtime/Scripts/Data/FolderData.cs | 4 ++-- Runtime/Scripts/Data/HandleEventData.cs | 2 +- Runtime/Scripts/Data/HierarchyData.cs | 4 ++-- Runtime/Scripts/Data/InspectorData.cs | 4 ++-- Runtime/Scripts/Data/PropertyData.cs | 2 +- Runtime/Scripts/Data/RayEventData.cs | 4 ++-- Runtime/Scripts/Data/SelectionFlags.cs | 2 +- .../Extensions/MonoBehaviourExtensions.cs | 2 +- .../Scripts/Extensions/TransformExtensions.cs | 2 +- Runtime/Scripts/Handles/BaseHandle.cs | 10 ++++---- Runtime/Scripts/Handles/LinearHandle.cs | 12 +++++----- Runtime/Scripts/Handles/PlaneHandle.cs | 12 +++++----- Runtime/Scripts/Handles/RadialHandle.cs | 6 ++--- Runtime/Scripts/Handles/SphereHandle.cs | 10 ++++---- Runtime/Scripts/Handles/UI/DropDown.cs | 8 +++---- Runtime/Scripts/Handles/UI/KeyboardButton.cs | 14 +++++------ .../Helpers/EditorOnlyWorkspaceAttribute.cs | 2 +- .../Scripts/Helpers/EditorWindowCapture.cs | 2 +- .../Helpers/EditorWindowCaptureUpdater.cs | 6 ++--- Runtime/Scripts/Helpers/GradientPair.cs | 2 +- Runtime/Scripts/Helpers/PlayerBody.cs | 2 +- Runtime/Scripts/Helpers/PlayerFloor.cs | 12 +++++----- .../Scripts/Helpers/ProcessInputAttribute.cs | 2 +- Runtime/Scripts/Helpers/SmoothFloat.cs | 2 +- Runtime/Scripts/Helpers/SmoothMotion.cs | 6 ++--- Runtime/Scripts/Helpers/VRSmoothCamera.cs | 6 ++--- Runtime/Scripts/Input/BaseInputToEvents.cs | 2 +- Runtime/Scripts/Input/BaseVRInputToEvents.cs | 2 +- Runtime/Scripts/Input/IInputToEvents.cs | 2 +- .../ExecuteRayEvents.cs | 2 +- .../Interfaces/IRayBeginDragHandler.cs | 2 +- .../Interfaces/IRayClickHandler.cs | 2 +- .../Interfaces/IRayDragHandler.cs | 2 +- .../Interfaces/IRayEndDragHandler.cs | 2 +- .../Interfaces/IRayEnterHandler.cs | 2 +- .../Interfaces/IRayExitHandler.cs | 2 +- .../Interfaces/IRayHoverHandler.cs | 2 +- .../Interfaces/IWillRender.cs | 2 +- .../MultipleRayInputModule.cs | 10 ++++---- .../MultipleRayInputModuleSettings.cs | 4 ++-- .../MultipleRayInputModule/RayInputModule.cs | 10 ++++---- .../VisibilityDetector.cs | 4 ++-- .../Scripts/Input/OVRTouchInputToEvents.cs | 2 +- Runtime/Scripts/Input/ViveInputToEvents.cs | 2 +- .../Interfaces/Capability/IDropReceiver.cs | 2 +- .../Interfaces/Capability/IDroppable.cs | 2 +- .../Capability/IFeedbackReceiver.cs | 4 ++-- .../Capability/IManipulatorController.cs | 2 +- .../Capability/ISelectionChanged.cs | 2 +- .../Capability/ISerializeWorkspace.cs | 2 +- .../Capability/ISettingsMenuProvider.cs | 2 +- .../Capability/ISpatialMenuProvider.cs | 2 +- .../Interfaces/Capability/ITwoHandedScaler.cs | 2 +- .../Capability/IUpdateInspectors.cs | 2 +- Runtime/Scripts/Interfaces/Entity/IAction.cs | 2 +- .../Interfaces/Entity/IAlternateMenu.cs | 4 ++-- .../Interfaces/Entity/IEditingContext.cs | 2 +- Runtime/Scripts/Interfaces/Entity/IEditor.cs | 2 +- .../Scripts/Interfaces/Entity/ILocomotor.cs | 2 +- .../Scripts/Interfaces/Entity/IMainMenu.cs | 4 ++-- .../Scripts/Interfaces/Entity/IManipulator.cs | 4 ++-- .../Scripts/Interfaces/Entity/IMenuIcon.cs | 2 +- .../Interfaces/Entity/IMultiDeviceTool.cs | 2 +- .../Interfaces/Entity/IPreviewCamera.cs | 2 +- Runtime/Scripts/Interfaces/Entity/IProxy.cs | 4 ++-- .../Interfaces/Entity/IRaycastSource.cs | 4 ++-- .../Interfaces/Entity/IScriptReference.cs | 2 +- Runtime/Scripts/Interfaces/Entity/ITool.cs | 2 +- .../Scripts/Interfaces/Entity/IToolsMenu.cs | 4 ++-- .../Interfaces/Entity/IToolsMenuButton.cs | 2 +- .../Scripts/Interfaces/Entity/ITransformer.cs | 2 +- .../FunctionalityInjection/IActions.cs | 2 +- .../FunctionalityInjection/IActionsMenu.cs | 4 ++-- .../FunctionalityInjection/IAdaptPosition.cs | 2 +- .../FunctionalityInjection/IAllWorkspaces.cs | 4 ++-- .../IControlSpatialScrolling.cs | 6 ++--- .../FunctionalityInjection/IExclusiveMode.cs | 2 +- .../FunctionalityInjection/IFilterUI.cs | 2 +- .../FunctionalityInjection/IInstantiateUI.cs | 2 +- .../FunctionalityInjection/ILinkedObject.cs | 2 +- .../ISetEditingContext.cs | 2 +- .../IStandardIgnoreList.cs | 2 +- .../ITrackedObjectActionMap.cs | 2 +- .../FunctionalityInjection/IUsesCameraRig.cs | 2 +- .../FunctionalityInjection/IUsesDeviceType.cs | 2 +- .../IUsesHandedRayOrigin.cs | 2 +- .../IUsesMenuOrigins.cs | 2 +- .../FunctionalityInjection/IUsesNode.cs | 4 ++-- .../FunctionalityInjection/IUsesRayOrigin.cs | 2 +- .../FunctionalityInjection/IUsesStencilRef.cs | 2 +- .../Interfaces/ISettingsMenuItemProvider.cs | 2 +- .../Interfaces/IUsesCustomMenuOrigins.cs | 2 +- Runtime/Scripts/Interfaces/IUsesRayOrigins.cs | 2 +- .../Providers/IProvidesAddRaycastSource.cs | 6 ++--- .../Providers/IProvidesGetRayEventData.cs | 6 ++--- .../Providers/IProvidesInstantiateMenuUI.cs | 4 ++-- .../Interfaces/Providers/IProvidesPoly.cs | 6 ++--- .../Interfaces/Providers/IProvidesUIEvents.cs | 6 ++--- .../Subscribers/IUsesAddRaycastSource.cs | 4 ++-- .../Subscribers/IUsesGetRayEventData.cs | 6 ++--- .../Subscribers/IUsesInstantiateMenuUI.cs | 4 ++-- .../Interfaces/Subscribers/IUsesPoly.cs | 6 ++--- .../Interfaces/Subscribers/IUsesUIEvents.cs | 6 ++--- .../ListView/EditorXRListViewController.cs | 10 ++++---- .../Scripts/ListView/EditorXRListViewItem.cs | 6 ++--- .../EditorXRNestedListViewController.cs | 10 ++++---- .../ListView/EditorXRNestedListViewItem.cs | 4 ++-- Runtime/Scripts/Modules/ActionsModule.cs | 12 +++++----- .../AdaptivePositionModule.cs | 14 +++++------ Runtime/Scripts/Modules/DeviceInputModule.cs | 12 +++++----- Runtime/Scripts/Modules/DragAndDropModule.cs | 8 +++---- .../Modules/FeedbackModule/FeedbackModule.cs | 12 +++++----- .../GazeDivergenceModule.cs | 8 +++---- .../Modules/HapticsModule/HapticsModule.cs | 10 ++++---- Runtime/Scripts/Modules/HierarchyModule.cs | 8 +++---- .../HighlightModule/HighlightModule.cs | 12 +++++----- .../IntersectionModule/IntersectionModule.cs | 12 +++++----- .../IntersectionModule/IntersectionTester.cs | 2 +- .../IntersectionModule/IntersectionUtils.cs | 6 ++--- Runtime/Scripts/Modules/KeyboardModule.cs | 16 ++++++------- .../Scripts/Modules/LockModule/LockModule.cs | 10 ++++---- .../Scripts/Modules/ProjectFolderModule.cs | 8 +++---- Runtime/Scripts/Modules/SceneObjectModule.cs | 14 +++++------ .../SelectionModule/SelectionModule.cs | 10 ++++---- .../Modules/SerializedPreferencesModule.cs | 4 ++-- .../Modules/SnappingModule/SnappingModule.cs | 18 +++++++------- .../SnappingModuleSettingsUI.cs | 2 +- .../SpatialHintModule/SpatialHintModule.cs | 12 +++++----- .../SpatialHintModule/SpatialHintUI.cs | 12 +++++----- .../SpatialScrollModule.cs | 10 ++++---- .../Scripts/Modules/TooltipModule/Tooltip.cs | 4 ++-- .../Modules/TooltipModule/TooltipModule.cs | 10 ++++---- .../Modules/TooltipModule/TooltipUI.cs | 2 +- Runtime/Scripts/Modules/WebModule.cs | 6 ++--- Runtime/Scripts/Modules/WorkspaceModule.cs | 14 +++++------ Runtime/Scripts/Proxies/AffordanceTooltip.cs | 4 ++-- .../Proxies/AffordanceTooltipPlacement.cs | 6 ++--- Runtime/Scripts/Proxies/Data/Affordance.cs | 2 +- .../Data/AffordanceAnimationDefinition.cs | 6 ++--- .../Proxies/Data/AffordanceDefinition.cs | 2 +- .../Data/AffordanceVisibilityDefinition.cs | 2 +- .../Proxies/Data/ProxyAffordanceMap.cs | 2 +- Runtime/Scripts/Proxies/Data/ProxyExtras.cs | 4 ++-- .../Proxies/Data/ProxyFeedbackRequest.cs | 4 ++-- .../Proxies/Data/SerializedProxyFeedback.cs | 2 +- Runtime/Scripts/Proxies/DefaultProxyRay.cs | 14 +++++------ Runtime/Scripts/Proxies/ProxyAnimator.cs | 10 ++++---- Runtime/Scripts/Proxies/ProxyNode.cs | 12 +++++----- .../Scripts/Proxies/ShakeVelocityTracker.cs | 2 +- Runtime/Scripts/Proxies/Touch/TouchProxy.cs | 6 ++--- Runtime/Scripts/Proxies/TwoHandedProxyBase.cs | 14 +++++------ Runtime/Scripts/Proxies/Vive/ViveProxy.cs | 8 +++---- Runtime/Scripts/Proxies/ViveProxyHelper.cs | 2 +- Runtime/Scripts/Runtime/EditorPrefs.cs | 2 +- Runtime/Scripts/Runtime/Selection.cs | 2 +- Runtime/Scripts/Runtime/SerializedObject.cs | 2 +- .../Scripts/Runtime/SerializedPropertyType.cs | 2 +- Runtime/Scripts/UI/Button.cs | 8 +++---- Runtime/Scripts/UI/ClipText.cs | 2 +- Runtime/Scripts/UI/CuboidLayout.cs | 6 ++--- Runtime/Scripts/UI/DefaultToggleGroup.cs | 2 +- Runtime/Scripts/UI/GradientButton.cs | 10 ++++---- Runtime/Scripts/UI/GridCellSizeAdjuster.cs | 2 +- Runtime/Scripts/UI/InputField.cs | 12 +++++----- .../Scripts/UI/Interfaces/ISelectionFlags.cs | 2 +- Runtime/Scripts/UI/KeyboardMallet.cs | 4 ++-- Runtime/Scripts/UI/KeyboardUI.cs | 14 +++++------ Runtime/Scripts/UI/NumericInputField.cs | 4 ++-- Runtime/Scripts/UI/RaySlider.cs | 8 +++---- Runtime/Scripts/UI/StandardInputField.cs | 2 +- Runtime/Scripts/UI/SubmenuFace.cs | 10 ++++---- Runtime/Scripts/UI/TooltipData.cs | 4 ++-- Runtime/Scripts/UI/UITransformCopy.cs | 4 ++-- Runtime/Scripts/Utilities/AssetDropUtils.cs | 6 ++--- Runtime/Scripts/Utilities/CameraUtils.cs | 4 ++-- Runtime/Scripts/Utilities/EditorXRUtils.cs | 4 ++-- Runtime/Scripts/Utilities/InputUtils.cs | 2 +- Runtime/Scripts/Utilities/MathUtilsExt.cs | 4 ++-- Runtime/Scripts/Utilities/TransformCopy.cs | 2 +- Runtime/Scripts/Utilities/TransitionUtils.cs | 2 +- Runtime/Scripts/Utilities/UIUtils.cs | 6 ++--- .../Utilities/UnityBrandColorScheme.cs | 6 ++--- .../Tools/AnnotationTool/AnnotationTool.cs | 20 ++++++++-------- .../UserInterface/AnnotationContextMenu.cs | 6 ++--- .../UserInterface/AnnotationPointer.cs | 2 +- .../UserInterface/BrushSizeUI.cs | 6 ++--- .../UserInterface/ColorPickerActivator.cs | 6 ++--- .../UserInterface/ColorPickerSquareUI.cs | 2 +- .../UserInterface/ColorPickerUI.cs | 4 ++-- .../CreatePrimitiveMenu.cs | 14 +++++------ .../CreatePrimitiveMenuButtonUI.cs | 2 +- .../CreatePrimitiveTool.cs | 14 +++++------ .../Tools/LocomotionTool/LocomotionTool.cs | 16 ++++++------- .../LocomotionTool/Scripts/BlinkVisuals.cs | 12 +++++----- .../Scripts/MouseLocomotionRing.cs | 6 ++--- .../Scripts/ViewerScaleVisuals.cs | 10 ++++---- .../MoveWorkspacesTool/MoveWorkspacesTool.cs | 12 +++++----- Runtime/Tools/SelectionTool/SelectionTool.cs | 16 ++++++------- Runtime/Tools/TransformTool/TransformTool.cs | 16 ++++++------- Runtime/Tools/VacuumTool/VacuumTool.cs | 12 +++++----- Runtime/Unity.Labs.EditorXR.asmdef | 18 +++++++------- Runtime/Workspaces/Base/Workspace.cs | 14 +++++------ Runtime/Workspaces/Base/WorkspaceUI.cs | 18 +++++++------- .../Common/Scripts/DraggableListItem.cs | 14 +++++------ .../Common/Scripts/EditorWindowWorkspace.cs | 6 ++--- .../Common/Scripts/FilterButtonUI.cs | 6 ++--- Runtime/Workspaces/Common/Scripts/FilterUI.cs | 8 +++---- .../Common/Scripts/NestedDraggableListItem.cs | 4 ++-- .../Common/Scripts/WorkspaceButton.cs | 12 +++++----- .../Common/Scripts/WorkspaceHighlight.cs | 8 +++---- .../Workspaces/Common/Scripts/ZoomSliderUI.cs | 2 +- .../ConsoleWorkspace/ConsoleWorkspace.cs | 2 +- .../HierarchyWorkspace/HierarchyWorkspace.cs | 14 +++++------ .../Scripts/HierarchyListItem.cs | 12 +++++----- .../Scripts/HierarchyListViewController.cs | 14 +++++------ .../HierarchyWorkspace/Scripts/HierarchyUI.cs | 4 ++-- .../InspectorWorkspace/InspectorWorkspace.cs | 12 +++++----- .../Prefabs/Components/NumericField.prefab | 2 +- .../Prefabs/InspectorBoundsItem.prefab | 12 +++++----- .../Prefabs/InspectorColorItem.prefab | 8 +++---- .../Prefabs/InspectorHeaderItem.prefab | 2 +- .../Prefabs/InspectorNumberItem.prefab | 2 +- .../Prefabs/InspectorRectItem.prefab | 8 +++---- .../Prefabs/InspectorStringItem.prefab | 2 +- .../Prefabs/InspectorVectorItem.prefab | 8 +++---- .../Scripts/InspectorListViewController.cs | 14 +++++------ .../InspectorWorkspace/Scripts/InspectorUI.cs | 4 ++-- .../ListItems/InspectorArrayHeaderItem.cs | 4 ++-- .../Scripts/ListItems/InspectorBoolItem.cs | 4 ++-- .../Scripts/ListItems/InspectorBoundsItem.cs | 6 ++--- .../Scripts/ListItems/InspectorColorItem.cs | 6 ++--- .../ListItems/InspectorComponentItem.cs | 8 +++---- .../ListItems/InspectorDropDownItem.cs | 6 ++--- .../Scripts/ListItems/InspectorHeaderItem.cs | 8 +++---- .../Scripts/ListItems/InspectorListItem.cs | 18 +++++++------- .../Scripts/ListItems/InspectorNumberItem.cs | 8 +++---- .../ListItems/InspectorObjectFieldItem.cs | 6 ++--- .../ListItems/InspectorPropertyItem.cs | 6 ++--- .../Scripts/ListItems/InspectorRectItem.cs | 6 ++--- .../Scripts/ListItems/InspectorStringItem.cs | 6 ++--- .../ListItems/InspectorUnimplementedItem.cs | 6 ++--- .../Scripts/ListItems/InspectorVectorItem.cs | 6 ++--- .../InspectorWorkspace/Scripts/LockUI.cs | 2 +- .../LockedObjectsWorkspace.cs | 8 +++---- .../MiniWorldWorkspace/MiniWorldWorkspace.cs | 18 +++++++------- .../MiniWorldWorkspace/Scripts/MiniWorld.cs | 10 ++++---- .../Scripts/MiniWorldRenderer.cs | 8 +++---- .../MiniWorldWorkspace/Scripts/MiniWorldUI.cs | 2 +- .../MiniWorldWorkspace/Scripts/ResetUI.cs | 2 +- .../Workspaces/PolyWorkspace/PolyWorkspace.cs | 16 ++++++------- .../PolyWorkspace/Scripts/PolyGridAsset.cs | 8 +++---- .../PolyWorkspace/Scripts/PolyGridItem.cs | 22 ++++++++--------- .../Scripts/PolyGridViewController.cs | 6 ++--- .../PolyWorkspace/Scripts/PolyModule.cs | 12 +++++----- .../PolyWorkspace/Scripts/PolyUI.cs | 4 ++-- .../ProfilerWorkspace/ProfilerWorkspace.cs | 6 ++--- .../ProjectWorkspace/ProjectWorkspace.cs | 14 +++++------ .../ProjectWorkspace/Scripts/AssetGridItem.cs | 24 +++++++++---------- .../Scripts/AssetGridViewController.cs | 6 ++--- .../Scripts/FolderListItem.cs | 8 +++---- .../Scripts/FolderListViewController.cs | 10 ++++---- .../ProjectWorkspace/Scripts/ProjectUI.cs | 4 ++-- Runtime/libs/input-prototype | 2 +- Tests/Editor/EditorXRTestInitializer.cs | 4 ++-- .../Unit/Core/EditingContextManagerTests.cs | 8 +++---- .../MonoBehaviourExtensionsTests.cs | 6 ++--- .../TransformExtensionsTests.cs | 4 ++-- .../Unit/Utilities/EditorXRUtilsTests.cs | 6 ++--- .../Unit/Utilities/GradientPairTests.cs | 4 ++-- .../Unit/Utilities/MathUtilsExtTests.cs | 4 ++-- .../Unity.Labs.EditorXR.EditorTests.asmdef | 12 +++++----- package.json | 12 +++++----- 482 files changed, 1393 insertions(+), 1393 deletions(-) diff --git a/.yamato/template-config.yml b/.yamato/template-config.yml index d12f664c8..327ffc3d6 100644 --- a/.yamato/template-config.yml +++ b/.yamato/template-config.yml @@ -49,7 +49,7 @@ testables: # type: package or project # publish_source: indicates if this testable should be included in publishing # standalone: true/false for if this testable contains runtime code or if it's only editor code - - name: com.unity.labs.editorxr + - name: com.unity.editorxr path: . type: package publish_source: true diff --git a/Editor/ButtonEditor.cs b/Editor/ButtonEditor.cs index fa032a0dd..e43554549 100644 --- a/Editor/ButtonEditor.cs +++ b/Editor/ButtonEditor.cs @@ -1,6 +1,6 @@ using UnityEditor; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { // Because Button already has a custom editor, and we need to expose SelectionFlags, we need a custom inspector [CustomEditor(typeof(Button))] diff --git a/Editor/InputFieldEditor.cs b/Editor/InputFieldEditor.cs index 3dc1c2148..9d7720103 100644 --- a/Editor/InputFieldEditor.cs +++ b/Editor/InputFieldEditor.cs @@ -1,7 +1,7 @@ using UnityEditor; using UnityEditor.UI; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { [CustomEditor(typeof(InputField))] [CanEditMultipleObjects] diff --git a/Editor/KeyboardButtonEditor.cs b/Editor/KeyboardButtonEditor.cs index 040a65cfb..897afbca7 100644 --- a/Editor/KeyboardButtonEditor.cs +++ b/Editor/KeyboardButtonEditor.cs @@ -3,7 +3,7 @@ using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { [CustomEditor(typeof(KeyboardButton))] sealed class KeyboardButtonEditor : Editor diff --git a/Editor/KeyboardMalletEditor.cs b/Editor/KeyboardMalletEditor.cs index a6f43fd52..26dcaeef9 100644 --- a/Editor/KeyboardMalletEditor.cs +++ b/Editor/KeyboardMalletEditor.cs @@ -1,6 +1,6 @@ using UnityEditor; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { [CanEditMultipleObjects] [CustomEditor(typeof(KeyboardMallet))] diff --git a/Editor/KeyboardUIEditor.cs b/Editor/KeyboardUIEditor.cs index 584621673..8df69df9d 100644 --- a/Editor/KeyboardUIEditor.cs +++ b/Editor/KeyboardUIEditor.cs @@ -1,7 +1,7 @@ using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { [CustomEditor(typeof(KeyboardUI))] sealed class KeyboardUIEditor : Editor diff --git a/Editor/LockableHierarchyGUI.cs b/Editor/LockableHierarchyGUI.cs index 505584374..20dc11152 100644 --- a/Editor/LockableHierarchyGUI.cs +++ b/Editor/LockableHierarchyGUI.cs @@ -1,7 +1,7 @@ using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { [InitializeOnLoad] class LockableHierarchyGUI : ScriptableSingleton diff --git a/Editor/MainMenuEditor.cs b/Editor/MainMenuEditor.cs index 4c9cbaee0..7f7173a45 100644 --- a/Editor/MainMenuEditor.cs +++ b/Editor/MainMenuEditor.cs @@ -1,9 +1,9 @@ -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Menus; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Menus; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { [CustomEditor(typeof(MainMenu))] class MainMenuEditor : Editor diff --git a/Editor/NumericInputFieldEditor.cs b/Editor/NumericInputFieldEditor.cs index 686df3b3f..b72e14ffd 100644 --- a/Editor/NumericInputFieldEditor.cs +++ b/Editor/NumericInputFieldEditor.cs @@ -1,6 +1,6 @@ using UnityEditor; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { [CustomEditor(typeof(NumericInputField))] [CanEditMultipleObjects] diff --git a/Editor/PolyToolkitHelper.cs b/Editor/PolyToolkitHelper.cs index b7d153e9d..68f7f8282 100644 --- a/Editor/PolyToolkitHelper.cs +++ b/Editor/PolyToolkitHelper.cs @@ -5,7 +5,7 @@ using UnityEditor.Compilation; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { [InitializeOnLoad] static class PolyToolkitHelper diff --git a/Editor/RaySliderEditor.cs b/Editor/RaySliderEditor.cs index 4285c74c2..8a9699eb8 100644 --- a/Editor/RaySliderEditor.cs +++ b/Editor/RaySliderEditor.cs @@ -1,7 +1,7 @@ using UnityEditor; using UnityEditor.UI; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { // Because Slider already has a custom editor, and we need to expose SelectionFlags, we need a custom inspector [CustomEditor(typeof(RaySlider))] diff --git a/Editor/SeedXRInputBindings.cs b/Editor/SeedXRInputBindings.cs index def53d65e..883242e16 100644 --- a/Editor/SeedXRInputBindings.cs +++ b/Editor/SeedXRInputBindings.cs @@ -2,7 +2,7 @@ using UnityEditor; // Copied from UnityEditor.XR.LegacyInputHelpers -namespace Unity.Labs.EditorXR.LegacyInputHelpers +namespace Unity.EditorXR.LegacyInputHelpers { /// /// The SeedXRInputBindings class is used to populate the Input Asset with the cross platform bindings published by Unity for most XR Devices. diff --git a/Editor/SettingsProviders/EditorXRSettingsProvider.cs b/Editor/SettingsProviders/EditorXRSettingsProvider.cs index 6087f024c..94fcacdb2 100644 --- a/Editor/SettingsProviders/EditorXRSettingsProvider.cs +++ b/Editor/SettingsProviders/EditorXRSettingsProvider.cs @@ -1,6 +1,6 @@ using UnityEditor; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { class EditorXRSettingsProvider : SettingsProvider { diff --git a/Editor/SettingsProviders/HapticPulsesSettingsProvider.cs b/Editor/SettingsProviders/HapticPulsesSettingsProvider.cs index 4930adf8f..0bccca68f 100644 --- a/Editor/SettingsProviders/HapticPulsesSettingsProvider.cs +++ b/Editor/SettingsProviders/HapticPulsesSettingsProvider.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Modules; +using Unity.EditorXR.Core; +using Unity.EditorXR.Modules; using UnityEditor; using UnityEngine; @@ -10,7 +10,7 @@ using UnityEngine.Experimental.UIElements; #endif -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { class HapticPulsesSettingsProvider : EditorXRSettingsProvider { diff --git a/Editor/SettingsProviders/ProxyFeedbackSettingsProvider.cs b/Editor/SettingsProviders/ProxyFeedbackSettingsProvider.cs index 830b91be2..0d525000c 100644 --- a/Editor/SettingsProviders/ProxyFeedbackSettingsProvider.cs +++ b/Editor/SettingsProviders/ProxyFeedbackSettingsProvider.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.Proxies; +using Unity.EditorXR.Modules; +using Unity.EditorXR.Proxies; using UnityEditor; using UnityEngine; @@ -11,7 +11,7 @@ using UnityEngine.Experimental.UIElements; #endif -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { class ProxyFeedbackSettingsProvider : EditorXRSettingsProvider { diff --git a/Editor/SettingsProviders/TooltipsSettingsProvider.cs b/Editor/SettingsProviders/TooltipsSettingsProvider.cs index 84081bf8e..99200c134 100644 --- a/Editor/SettingsProviders/TooltipsSettingsProvider.cs +++ b/Editor/SettingsProviders/TooltipsSettingsProvider.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Reflection; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.Utils; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; @@ -12,7 +12,7 @@ using UnityEngine.Experimental.UIElements; #endif -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { class TooltipsSettingsProvider : EditorXRSettingsProvider { diff --git a/Editor/StandardInputFieldEditor.cs b/Editor/StandardInputFieldEditor.cs index d45af8691..2ae665063 100644 --- a/Editor/StandardInputFieldEditor.cs +++ b/Editor/StandardInputFieldEditor.cs @@ -1,6 +1,6 @@ using UnityEditor; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { [CustomEditor(typeof(StandardInputField))] sealed class StandardInputFieldEditor : InputFieldEditor diff --git a/Editor/ToolsMenuEditor.cs b/Editor/ToolsMenuEditor.cs index 5a70766bc..d677995b2 100644 --- a/Editor/ToolsMenuEditor.cs +++ b/Editor/ToolsMenuEditor.cs @@ -1,8 +1,8 @@ -using Unity.Labs.EditorXR.Menus; +using Unity.EditorXR.Menus; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { [CustomEditor(typeof(ToolsMenu))] class ToolsMenuEditor : Editor diff --git a/Editor/TouchProxyEditor.cs b/Editor/TouchProxyEditor.cs index c92138f26..89bdef9be 100644 --- a/Editor/TouchProxyEditor.cs +++ b/Editor/TouchProxyEditor.cs @@ -1,8 +1,8 @@ -using Unity.Labs.EditorXR.Proxies; +using Unity.EditorXR.Proxies; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { [CustomEditor(typeof(TouchProxy))] class TouchProxyEditor : Editor diff --git a/Editor/Unity.Labs.EditorXR.Editor.asmdef b/Editor/Unity.Labs.EditorXR.Editor.asmdef index fa65e4e69..d87dfeabc 100644 --- a/Editor/Unity.Labs.EditorXR.Editor.asmdef +++ b/Editor/Unity.Labs.EditorXR.Editor.asmdef @@ -1,12 +1,12 @@ { - "name": "Unity.Labs.EditorXR.Editor", + "name": "Unity.EditorXR.Editor", "references": [ - "Unity.Labs.EditorXR", + "Unity.EditorXR", "Unity.TextMeshPro", - "Unity.Labs.Utils", - "Unity.Labs.EditorXR.Interfaces", - "Unity.Labs.ModuleLoader.Interfaces", - "Unity.Labs.ModuleLoader" + "Unity.XRTools.Utils", + "Unity.EditorXR.Interfaces", + "Unity.XRTools.ModuleLoader.Interfaces", + "Unity.XRTools.ModuleLoader" ], "optionalUnityReferences": [], "includePlatforms": [ diff --git a/Editor/ViveProxyEditor.cs b/Editor/ViveProxyEditor.cs index 96d48a212..fd25015a3 100644 --- a/Editor/ViveProxyEditor.cs +++ b/Editor/ViveProxyEditor.cs @@ -1,8 +1,8 @@ -using Unity.Labs.EditorXR.Proxies; +using Unity.EditorXR.Proxies; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { [CustomEditor(typeof(ViveProxy))] class ViveProxyEditor : Editor diff --git a/Interfaces/Capability/IGrabObjects.cs b/Interfaces/Capability/IGrabObjects.cs index eb92d9f99..4347eea29 100644 --- a/Interfaces/Capability/IGrabObjects.cs +++ b/Interfaces/Capability/IGrabObjects.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provides methods and delegates used to directly select and grab scene objects diff --git a/Interfaces/Capability/ITooltipPlacement.cs b/Interfaces/Capability/ITooltipPlacement.cs index 6dc66e353..10e6a55bc 100644 --- a/Interfaces/Capability/ITooltipPlacement.cs +++ b/Interfaces/Capability/ITooltipPlacement.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Decorates classes that provide positioning information for tooltips diff --git a/Interfaces/Capability/IVacuumable.cs b/Interfaces/Capability/IVacuumable.cs index 7860ae6db..4196edb00 100644 --- a/Interfaces/Capability/IVacuumable.cs +++ b/Interfaces/Capability/IVacuumable.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Declares a class as something that can be vacuumed diff --git a/Interfaces/Data/AxisFlags.cs b/Interfaces/Data/AxisFlags.cs index 6502bf6ad..970ac2d29 100644 --- a/Interfaces/Data/AxisFlags.cs +++ b/Interfaces/Data/AxisFlags.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Used to specify a combination of 3D axes diff --git a/Interfaces/Data/DirectSelectionData.cs b/Interfaces/Data/DirectSelectionData.cs index 6d8fee671..8f7384a7b 100644 --- a/Interfaces/Data/DirectSelectionData.cs +++ b/Interfaces/Data/DirectSelectionData.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Stores the state of a direct selection diff --git a/Interfaces/Data/FeedbackRequest.cs b/Interfaces/Data/FeedbackRequest.cs index 1c5b84a49..f72fa93a2 100644 --- a/Interfaces/Data/FeedbackRequest.cs +++ b/Interfaces/Data/FeedbackRequest.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Base class for feedback requests diff --git a/Interfaces/Data/HapticPulse.cs b/Interfaces/Data/HapticPulse.cs index 41955e810..b6bad58ca 100644 --- a/Interfaces/Data/HapticPulse.cs +++ b/Interfaces/Data/HapticPulse.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { /// /// Serialized data to describe a haptic pulse diff --git a/Interfaces/Data/MenuHideFlags.cs b/Interfaces/Data/MenuHideFlags.cs index c0dcbd64d..2034caf64 100644 --- a/Interfaces/Data/MenuHideFlags.cs +++ b/Interfaces/Data/MenuHideFlags.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Flags to describe why a menu is hidden. Anything > 0 is hidden diff --git a/Interfaces/Data/Node.cs b/Interfaces/Data/Node.cs index 59f3f15e0..8a4820d00 100644 --- a/Interfaces/Data/Node.cs +++ b/Interfaces/Data/Node.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// A tracked node within the system diff --git a/Interfaces/Data/PivotMode.cs b/Interfaces/Data/PivotMode.cs index 640d975fa..20aab1c8d 100644 --- a/Interfaces/Data/PivotMode.cs +++ b/Interfaces/Data/PivotMode.cs @@ -1,5 +1,5 @@ #if !UNITY_EDITOR -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Where is the tool handle placed. diff --git a/Interfaces/Data/SpatialHintState.cs b/Interfaces/Data/SpatialHintState.cs index ecb05f81e..4132d4d05 100644 --- a/Interfaces/Data/SpatialHintState.cs +++ b/Interfaces/Data/SpatialHintState.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Possible states for a spatial hint diff --git a/Interfaces/Entity/IMenu.cs b/Interfaces/Entity/IMenu.cs index 769959762..6179184ce 100644 --- a/Interfaces/Entity/IMenu.cs +++ b/Interfaces/Entity/IMenu.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Declares a class as a system-level menu diff --git a/Interfaces/Entity/ITooltip.cs b/Interfaces/Entity/ITooltip.cs index 39df0c28a..1e36a2e83 100644 --- a/Interfaces/Entity/ITooltip.cs +++ b/Interfaces/Entity/ITooltip.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Decorates classes which can specify tool tip information diff --git a/Interfaces/Entity/IWorkspace.cs b/Interfaces/Entity/IWorkspace.cs index 5417c7f58..83a45ed1b 100644 --- a/Interfaces/Entity/IWorkspace.cs +++ b/Interfaces/Entity/IWorkspace.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Declares a class as a Workspace within the system diff --git a/Interfaces/Input/ICustomActionMap.cs b/Interfaces/Input/ICustomActionMap.cs index f77332a0c..ae4a0e709 100644 --- a/Interfaces/Input/ICustomActionMap.cs +++ b/Interfaces/Input/ICustomActionMap.cs @@ -1,6 +1,6 @@ using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Decorates tools which supply their own (singular) ActionMap diff --git a/Interfaces/Input/IProcessInput.cs b/Interfaces/Input/IProcessInput.cs index f790325fd..8594ea512 100644 --- a/Interfaces/Input/IProcessInput.cs +++ b/Interfaces/Input/IProcessInput.cs @@ -1,6 +1,6 @@ using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Method signature for consuming an input control diff --git a/Interfaces/Input/IStandardActionMap.cs b/Interfaces/Input/IStandardActionMap.cs index a85f14531..4327f2921 100644 --- a/Interfaces/Input/IStandardActionMap.cs +++ b/Interfaces/Input/IStandardActionMap.cs @@ -1,6 +1,6 @@ using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Receive the default action map from the system diff --git a/Interfaces/Providers/IProvidesBlockUIInteraction.cs b/Interfaces/Providers/IProvidesBlockUIInteraction.cs index 251285765..f4da80466 100644 --- a/Interfaces/Providers/IProvidesBlockUIInteraction.cs +++ b/Interfaces/Providers/IProvidesBlockUIInteraction.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provides the ability block all UI interaction for a given rayOrigin diff --git a/Interfaces/Providers/IProvidesCanGrabObject.cs b/Interfaces/Providers/IProvidesCanGrabObject.cs index 891871ab1..5ccd18fac 100644 --- a/Interfaces/Providers/IProvidesCanGrabObject.cs +++ b/Interfaces/Providers/IProvidesCanGrabObject.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide the ability to check if an object can be grabbed diff --git a/Interfaces/Providers/IProvidesCheckBounds.cs b/Interfaces/Providers/IProvidesCheckBounds.cs index f08d70e45..6ea7fe8dc 100644 --- a/Interfaces/Providers/IProvidesCheckBounds.cs +++ b/Interfaces/Providers/IProvidesCheckBounds.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provides the ability to check if scene objects are contained within a given Bounds diff --git a/Interfaces/Providers/IProvidesCheckSphere.cs b/Interfaces/Providers/IProvidesCheckSphere.cs index 3bf40b8c5..57fc61b5a 100644 --- a/Interfaces/Providers/IProvidesCheckSphere.cs +++ b/Interfaces/Providers/IProvidesCheckSphere.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provides the ability to check if scene objects are contained within a sphere diff --git a/Interfaces/Providers/IProvidesConnectInterfaces.cs b/Interfaces/Providers/IProvidesConnectInterfaces.cs index 2a77a31e9..d9e6fe01c 100644 --- a/Interfaces/Providers/IProvidesConnectInterfaces.cs +++ b/Interfaces/Providers/IProvidesConnectInterfaces.cs @@ -1,6 +1,6 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provides the ability to connect interfaces for spawned objects diff --git a/Interfaces/Providers/IProvidesContainsVRPlayerCompletely.cs b/Interfaces/Providers/IProvidesContainsVRPlayerCompletely.cs index 3bbc4ebd9..c11618038 100644 --- a/Interfaces/Providers/IProvidesContainsVRPlayerCompletely.cs +++ b/Interfaces/Providers/IProvidesContainsVRPlayerCompletely.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide the ability to check whether objects contain the VR Player objects completely diff --git a/Interfaces/Providers/IProvidesControlHaptics.cs b/Interfaces/Providers/IProvidesControlHaptics.cs index e6b1bd01e..9fd7c3ab9 100644 --- a/Interfaces/Providers/IProvidesControlHaptics.cs +++ b/Interfaces/Providers/IProvidesControlHaptics.cs @@ -1,7 +1,7 @@ -using Unity.Labs.EditorXR.Core; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Core; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provides the ability to control haptic feedback diff --git a/Interfaces/Providers/IProvidesControlInputIntersection.cs b/Interfaces/Providers/IProvidesControlInputIntersection.cs index 2664ecb13..2c30881a7 100644 --- a/Interfaces/Providers/IProvidesControlInputIntersection.cs +++ b/Interfaces/Providers/IProvidesControlInputIntersection.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provides the ability to Enable/disable a given diff --git a/Interfaces/Providers/IProvidesControlSpatialHinting.cs b/Interfaces/Providers/IProvidesControlSpatialHinting.cs index 8126b52ff..fb52a05d4 100644 --- a/Interfaces/Providers/IProvidesControlSpatialHinting.cs +++ b/Interfaces/Providers/IProvidesControlSpatialHinting.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provides the ability to control spatial-hinting visuals. diff --git a/Interfaces/Providers/IProvidesCreateWorkspace.cs b/Interfaces/Providers/IProvidesCreateWorkspace.cs index d79df53e7..75cd36c5c 100644 --- a/Interfaces/Providers/IProvidesCreateWorkspace.cs +++ b/Interfaces/Providers/IProvidesCreateWorkspace.cs @@ -1,7 +1,7 @@ using System; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide the ability to create workspaces diff --git a/Interfaces/Providers/IProvidesCustomHighlight.cs b/Interfaces/Providers/IProvidesCustomHighlight.cs index f97abf6d0..020944479 100644 --- a/Interfaces/Providers/IProvidesCustomHighlight.cs +++ b/Interfaces/Providers/IProvidesCustomHighlight.cs @@ -1,6 +1,6 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to scene raycast functionality diff --git a/Interfaces/Providers/IProvidesDeleteSceneObject.cs b/Interfaces/Providers/IProvidesDeleteSceneObject.cs index aefa2d99b..d4c5c7e20 100644 --- a/Interfaces/Providers/IProvidesDeleteSceneObject.cs +++ b/Interfaces/Providers/IProvidesDeleteSceneObject.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to delete functionality diff --git a/Interfaces/Providers/IProvidesDetectGazeDivergence.cs b/Interfaces/Providers/IProvidesDetectGazeDivergence.cs index 70cf427af..8b0f1e8a3 100644 --- a/Interfaces/Providers/IProvidesDetectGazeDivergence.cs +++ b/Interfaces/Providers/IProvidesDetectGazeDivergence.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class ability to detect gaze divergence above a defined threshold, for a given transform's forward vector diff --git a/Interfaces/Providers/IProvidesDirectSelection.cs b/Interfaces/Providers/IProvidesDirectSelection.cs index 1e70040f3..3b4b50d27 100644 --- a/Interfaces/Providers/IProvidesDirectSelection.cs +++ b/Interfaces/Providers/IProvidesDirectSelection.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to direct selection diff --git a/Interfaces/Providers/IProvidesGameObjectLocking.cs b/Interfaces/Providers/IProvidesGameObjectLocking.cs index 97dd4b873..a3a2fdc55 100644 --- a/Interfaces/Providers/IProvidesGameObjectLocking.cs +++ b/Interfaces/Providers/IProvidesGameObjectLocking.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to grouping diff --git a/Interfaces/Providers/IProvidesGetDefaultRayColor.cs b/Interfaces/Providers/IProvidesGetDefaultRayColor.cs index 7ce74c37e..5c678dd44 100644 --- a/Interfaces/Providers/IProvidesGetDefaultRayColor.cs +++ b/Interfaces/Providers/IProvidesGetDefaultRayColor.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to the default ray color diff --git a/Interfaces/Providers/IProvidesGetFieldGrabOrigin.cs b/Interfaces/Providers/IProvidesGetFieldGrabOrigin.cs index 5b3d1589a..04bdb3740 100644 --- a/Interfaces/Providers/IProvidesGetFieldGrabOrigin.cs +++ b/Interfaces/Providers/IProvidesGetFieldGrabOrigin.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide the ability to get preview origins diff --git a/Interfaces/Providers/IProvidesGetManipulatorDragState.cs b/Interfaces/Providers/IProvidesGetManipulatorDragState.cs index ea121124f..87eee9a8d 100644 --- a/Interfaces/Providers/IProvidesGetManipulatorDragState.cs +++ b/Interfaces/Providers/IProvidesGetManipulatorDragState.cs @@ -1,6 +1,6 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide the ability to get the current manipulator drag state diff --git a/Interfaces/Providers/IProvidesGetPreviewOrigin.cs b/Interfaces/Providers/IProvidesGetPreviewOrigin.cs index 317d80e83..3396dca52 100644 --- a/Interfaces/Providers/IProvidesGetPreviewOrigin.cs +++ b/Interfaces/Providers/IProvidesGetPreviewOrigin.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide the ability to get preview origins diff --git a/Interfaces/Providers/IProvidesGetRayVisibility.cs b/Interfaces/Providers/IProvidesGetRayVisibility.cs index 450137b8c..6cd0b9304 100644 --- a/Interfaces/Providers/IProvidesGetRayVisibility.cs +++ b/Interfaces/Providers/IProvidesGetRayVisibility.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide the ability to get the visibility of rays diff --git a/Interfaces/Providers/IProvidesGetVRPlayerObjects.cs b/Interfaces/Providers/IProvidesGetVRPlayerObjects.cs index 4f81e80ce..4b4424f58 100644 --- a/Interfaces/Providers/IProvidesGetVRPlayerObjects.cs +++ b/Interfaces/Providers/IProvidesGetVRPlayerObjects.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to the VR Player objects diff --git a/Interfaces/Providers/IProvidesGrouping.cs b/Interfaces/Providers/IProvidesGrouping.cs index 02f852dd1..9319b9233 100644 --- a/Interfaces/Providers/IProvidesGrouping.cs +++ b/Interfaces/Providers/IProvidesGrouping.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to grouping diff --git a/Interfaces/Providers/IProvidesIsHoveringOverUI.cs b/Interfaces/Providers/IProvidesIsHoveringOverUI.cs index 9c83f2cc6..6ac1eb2fa 100644 --- a/Interfaces/Providers/IProvidesIsHoveringOverUI.cs +++ b/Interfaces/Providers/IProvidesIsHoveringOverUI.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide the ability to check if a ray is hovering over UI diff --git a/Interfaces/Providers/IProvidesIsInMiniWorld.cs b/Interfaces/Providers/IProvidesIsInMiniWorld.cs index 21d4a21dc..ab8b7383d 100644 --- a/Interfaces/Providers/IProvidesIsInMiniWorld.cs +++ b/Interfaces/Providers/IProvidesIsInMiniWorld.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide the ability to check if a RayOrigin is in a MiniWorld diff --git a/Interfaces/Providers/IProvidesIsMainMenuVisible.cs b/Interfaces/Providers/IProvidesIsMainMenuVisible.cs index d2dbcd418..0e60d058b 100644 --- a/Interfaces/Providers/IProvidesIsMainMenuVisible.cs +++ b/Interfaces/Providers/IProvidesIsMainMenuVisible.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide the ability to check if the main menu is visible diff --git a/Interfaces/Providers/IProvidesMoveCameraRig.cs b/Interfaces/Providers/IProvidesMoveCameraRig.cs index c22d88ae1..be711fbc6 100644 --- a/Interfaces/Providers/IProvidesMoveCameraRig.cs +++ b/Interfaces/Providers/IProvidesMoveCameraRig.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide the ability to move the camera rig diff --git a/Interfaces/Providers/IProvidesPlaceSceneObject.cs b/Interfaces/Providers/IProvidesPlaceSceneObject.cs index 3e37d86dd..969f9b22e 100644 --- a/Interfaces/Providers/IProvidesPlaceSceneObject.cs +++ b/Interfaces/Providers/IProvidesPlaceSceneObject.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to scene placement functionality diff --git a/Interfaces/Providers/IProvidesPlaceSceneObjects.cs b/Interfaces/Providers/IProvidesPlaceSceneObjects.cs index e1156e35e..d5224ee0a 100644 --- a/Interfaces/Providers/IProvidesPlaceSceneObjects.cs +++ b/Interfaces/Providers/IProvidesPlaceSceneObjects.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to scene placement functionality diff --git a/Interfaces/Providers/IProvidesPreviewInToolMenuButton.cs b/Interfaces/Providers/IProvidesPreviewInToolMenuButton.cs index 6fcb722fa..96c056ad2 100644 --- a/Interfaces/Providers/IProvidesPreviewInToolMenuButton.cs +++ b/Interfaces/Providers/IProvidesPreviewInToolMenuButton.cs @@ -1,8 +1,8 @@ using System; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide the ability control the tool preview diff --git a/Interfaces/Providers/IProvidesRayVisibilitySettings.cs b/Interfaces/Providers/IProvidesRayVisibilitySettings.cs index 2fe8dc3d3..95d1e9e66 100644 --- a/Interfaces/Providers/IProvidesRayVisibilitySettings.cs +++ b/Interfaces/Providers/IProvidesRayVisibilitySettings.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide the ability to control ray visibility diff --git a/Interfaces/Providers/IProvidesRaycastResults.cs b/Interfaces/Providers/IProvidesRaycastResults.cs index 37dc83447..2f490902e 100644 --- a/Interfaces/Providers/IProvidesRaycastResults.cs +++ b/Interfaces/Providers/IProvidesRaycastResults.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to the spatial hash diff --git a/Interfaces/Providers/IProvidesRequestFeedback.cs b/Interfaces/Providers/IProvidesRequestFeedback.cs index 2f6eedea2..d963d9ae6 100644 --- a/Interfaces/Providers/IProvidesRequestFeedback.cs +++ b/Interfaces/Providers/IProvidesRequestFeedback.cs @@ -1,6 +1,6 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide the ability to request feedback diff --git a/Interfaces/Providers/IProvidesRequestStencilRef.cs b/Interfaces/Providers/IProvidesRequestStencilRef.cs index 9d201fd26..bddbe4ed2 100644 --- a/Interfaces/Providers/IProvidesRequestStencilRef.cs +++ b/Interfaces/Providers/IProvidesRequestStencilRef.cs @@ -1,6 +1,6 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide the ability to request a stencil reference diff --git a/Interfaces/Providers/IProvidesResetWorkspaces.cs b/Interfaces/Providers/IProvidesResetWorkspaces.cs index 40775dd5a..c72bfab35 100644 --- a/Interfaces/Providers/IProvidesResetWorkspaces.cs +++ b/Interfaces/Providers/IProvidesResetWorkspaces.cs @@ -1,6 +1,6 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to the ability to reset workspaces diff --git a/Interfaces/Providers/IProvidesSceneRaycast.cs b/Interfaces/Providers/IProvidesSceneRaycast.cs index 1749d80d6..24ceeedd1 100644 --- a/Interfaces/Providers/IProvidesSceneRaycast.cs +++ b/Interfaces/Providers/IProvidesSceneRaycast.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to scene raycast functionality diff --git a/Interfaces/Providers/IProvidesSelectObject.cs b/Interfaces/Providers/IProvidesSelectObject.cs index 5426406f8..3f88304cb 100644 --- a/Interfaces/Providers/IProvidesSelectObject.cs +++ b/Interfaces/Providers/IProvidesSelectObject.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to scene object selection diff --git a/Interfaces/Providers/IProvidesSelectTool.cs b/Interfaces/Providers/IProvidesSelectTool.cs index 60fed63be..909af37c0 100644 --- a/Interfaces/Providers/IProvidesSelectTool.cs +++ b/Interfaces/Providers/IProvidesSelectTool.cs @@ -1,8 +1,8 @@ using System; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to tool selection diff --git a/Interfaces/Providers/IProvidesSetDefaultRayColor.cs b/Interfaces/Providers/IProvidesSetDefaultRayColor.cs index ea371ab33..3b6c2edec 100644 --- a/Interfaces/Providers/IProvidesSetDefaultRayColor.cs +++ b/Interfaces/Providers/IProvidesSetDefaultRayColor.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide the ability to set the color of the default ray diff --git a/Interfaces/Providers/IProvidesSetHighlight.cs b/Interfaces/Providers/IProvidesSetHighlight.cs index 67bf5dc00..c41e10076 100644 --- a/Interfaces/Providers/IProvidesSetHighlight.cs +++ b/Interfaces/Providers/IProvidesSetHighlight.cs @@ -1,8 +1,8 @@ using System.Collections; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide control of scene object highlighting diff --git a/Interfaces/Providers/IProvidesSetManipulatorsVisible.cs b/Interfaces/Providers/IProvidesSetManipulatorsVisible.cs index 409097520..5b0b94479 100644 --- a/Interfaces/Providers/IProvidesSetManipulatorsVisible.cs +++ b/Interfaces/Providers/IProvidesSetManipulatorsVisible.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to the spatial hash diff --git a/Interfaces/Providers/IProvidesSetTooltipVisibility.cs b/Interfaces/Providers/IProvidesSetTooltipVisibility.cs index f90bea8f9..d8625a281 100644 --- a/Interfaces/Providers/IProvidesSetTooltipVisibility.cs +++ b/Interfaces/Providers/IProvidesSetTooltipVisibility.cs @@ -1,7 +1,7 @@ using System; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to tooltip visibility diff --git a/Interfaces/Providers/IProvidesSnapping.cs b/Interfaces/Providers/IProvidesSnapping.cs index cc889dec7..463b6771f 100644 --- a/Interfaces/Providers/IProvidesSnapping.cs +++ b/Interfaces/Providers/IProvidesSnapping.cs @@ -1,11 +1,11 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; #if UNITY_EDITOR using UnityEditor; #endif -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to the spatial hash diff --git a/Interfaces/Providers/IProvidesViewerBody.cs b/Interfaces/Providers/IProvidesViewerBody.cs index 0fa2f6f6c..c59c4005d 100644 --- a/Interfaces/Providers/IProvidesViewerBody.cs +++ b/Interfaces/Providers/IProvidesViewerBody.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to checks that can test against the viewer's body diff --git a/Interfaces/Providers/IProvidesViewerScale.cs b/Interfaces/Providers/IProvidesViewerScale.cs index 3d32a1a42..dad6415dd 100644 --- a/Interfaces/Providers/IProvidesViewerScale.cs +++ b/Interfaces/Providers/IProvidesViewerScale.cs @@ -1,6 +1,6 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to scene raycast functionality diff --git a/Interfaces/Providers/IProvidesWeb.cs b/Interfaces/Providers/IProvidesWeb.cs index d25e853e8..6549b3615 100644 --- a/Interfaces/Providers/IProvidesWeb.cs +++ b/Interfaces/Providers/IProvidesWeb.cs @@ -1,8 +1,8 @@ using System; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine.Networking; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to web functionality diff --git a/Interfaces/Subscribers/IUsesBlockUIInteraction.cs b/Interfaces/Subscribers/IUsesBlockUIInteraction.cs index 476a9de85..b8b071138 100644 --- a/Interfaces/Subscribers/IUsesBlockUIInteraction.cs +++ b/Interfaces/Subscribers/IUsesBlockUIInteraction.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability block all UI interaction for a given rayOrigin diff --git a/Interfaces/Subscribers/IUsesCanGrabObject.cs b/Interfaces/Subscribers/IUsesCanGrabObject.cs index b76174afc..04e649345 100644 --- a/Interfaces/Subscribers/IUsesCanGrabObject.cs +++ b/Interfaces/Subscribers/IUsesCanGrabObject.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to check if an object can be grabbed diff --git a/Interfaces/Subscribers/IUsesCheckBounds.cs b/Interfaces/Subscribers/IUsesCheckBounds.cs index 4a9149a8f..3dec8d372 100644 --- a/Interfaces/Subscribers/IUsesCheckBounds.cs +++ b/Interfaces/Subscribers/IUsesCheckBounds.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to check if scene objects are contained within a given Bounds diff --git a/Interfaces/Subscribers/IUsesCheckSphere.cs b/Interfaces/Subscribers/IUsesCheckSphere.cs index 2f9c9c8bc..8491bec7f 100644 --- a/Interfaces/Subscribers/IUsesCheckSphere.cs +++ b/Interfaces/Subscribers/IUsesCheckSphere.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to check if scene objects are contained within a sphere diff --git a/Interfaces/Subscribers/IUsesConnectInterfaces.cs b/Interfaces/Subscribers/IUsesConnectInterfaces.cs index 048653727..f47bbf1f9 100644 --- a/Interfaces/Subscribers/IUsesConnectInterfaces.cs +++ b/Interfaces/Subscribers/IUsesConnectInterfaces.cs @@ -1,6 +1,6 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Decorates types that need to connect interfaces for spawned objects diff --git a/Interfaces/Subscribers/IUsesContainsVRPlayerCompletely.cs b/Interfaces/Subscribers/IUsesContainsVRPlayerCompletely.cs index 83aa32f27..a8665dc9d 100644 --- a/Interfaces/Subscribers/IUsesContainsVRPlayerCompletely.cs +++ b/Interfaces/Subscribers/IUsesContainsVRPlayerCompletely.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to check whether objects contain the VR Player objects completely diff --git a/Interfaces/Subscribers/IUsesControlHaptics.cs b/Interfaces/Subscribers/IUsesControlHaptics.cs index 95729aad4..9664abb0d 100644 --- a/Interfaces/Subscribers/IUsesControlHaptics.cs +++ b/Interfaces/Subscribers/IUsesControlHaptics.cs @@ -1,7 +1,7 @@ -using Unity.Labs.EditorXR.Core; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Core; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class ability to control haptic feedback diff --git a/Interfaces/Subscribers/IUsesControlInputIntersection.cs b/Interfaces/Subscribers/IUsesControlInputIntersection.cs index b17f90786..3a20028ec 100644 --- a/Interfaces/Subscribers/IUsesControlInputIntersection.cs +++ b/Interfaces/Subscribers/IUsesControlInputIntersection.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to Enable/disable a given diff --git a/Interfaces/Subscribers/IUsesControlSpatialHinting.cs b/Interfaces/Subscribers/IUsesControlSpatialHinting.cs index c597dda5c..92d03ba50 100644 --- a/Interfaces/Subscribers/IUsesControlSpatialHinting.cs +++ b/Interfaces/Subscribers/IUsesControlSpatialHinting.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class ability to control spatial-hinting visuals. diff --git a/Interfaces/Subscribers/IUsesCreateWorkspace.cs b/Interfaces/Subscribers/IUsesCreateWorkspace.cs index d68da22b8..74c18f3bf 100644 --- a/Interfaces/Subscribers/IUsesCreateWorkspace.cs +++ b/Interfaces/Subscribers/IUsesCreateWorkspace.cs @@ -1,8 +1,8 @@ using System; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to create workspaces diff --git a/Interfaces/Subscribers/IUsesCustomHighlight.cs b/Interfaces/Subscribers/IUsesCustomHighlight.cs index 29693ab7e..cbc4630b8 100644 --- a/Interfaces/Subscribers/IUsesCustomHighlight.cs +++ b/Interfaces/Subscribers/IUsesCustomHighlight.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to provide a custom highlight callback diff --git a/Interfaces/Subscribers/IUsesDeleteSceneObject.cs b/Interfaces/Subscribers/IUsesDeleteSceneObject.cs index 38e874491..f3e140a8b 100644 --- a/Interfaces/Subscribers/IUsesDeleteSceneObject.cs +++ b/Interfaces/Subscribers/IUsesDeleteSceneObject.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to delete diff --git a/Interfaces/Subscribers/IUsesDetectGazeDivergence.cs b/Interfaces/Subscribers/IUsesDetectGazeDivergence.cs index dea1d55e5..fdbaa6792 100644 --- a/Interfaces/Subscribers/IUsesDetectGazeDivergence.cs +++ b/Interfaces/Subscribers/IUsesDetectGazeDivergence.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class ability to detect gaze divergence above a defined threshold, for a given transform's forward vector diff --git a/Interfaces/Subscribers/IUsesDirectSelection.cs b/Interfaces/Subscribers/IUsesDirectSelection.cs index d17a7a766..bc12151db 100644 --- a/Interfaces/Subscribers/IUsesDirectSelection.cs +++ b/Interfaces/Subscribers/IUsesDirectSelection.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to direct selection diff --git a/Interfaces/Subscribers/IUsesGameObjectLocking.cs b/Interfaces/Subscribers/IUsesGameObjectLocking.cs index 5dda5305e..785e212cc 100644 --- a/Interfaces/Subscribers/IUsesGameObjectLocking.cs +++ b/Interfaces/Subscribers/IUsesGameObjectLocking.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to grouping diff --git a/Interfaces/Subscribers/IUsesGetDefaultRayColor.cs b/Interfaces/Subscribers/IUsesGetDefaultRayColor.cs index 87e074568..6400dc96b 100644 --- a/Interfaces/Subscribers/IUsesGetDefaultRayColor.cs +++ b/Interfaces/Subscribers/IUsesGetDefaultRayColor.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to the default ray color diff --git a/Interfaces/Subscribers/IUsesGetFieldGrabOrigin.cs b/Interfaces/Subscribers/IUsesGetFieldGrabOrigin.cs index 155b8dfce..b0b19da6a 100644 --- a/Interfaces/Subscribers/IUsesGetFieldGrabOrigin.cs +++ b/Interfaces/Subscribers/IUsesGetFieldGrabOrigin.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to get the preview origins diff --git a/Interfaces/Subscribers/IUsesGetManipulatorDragState.cs b/Interfaces/Subscribers/IUsesGetManipulatorDragState.cs index ce6b424c4..f2ef3609f 100644 --- a/Interfaces/Subscribers/IUsesGetManipulatorDragState.cs +++ b/Interfaces/Subscribers/IUsesGetManipulatorDragState.cs @@ -1,6 +1,6 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to get the current manipulator drag state diff --git a/Interfaces/Subscribers/IUsesGetPreviewOrigin.cs b/Interfaces/Subscribers/IUsesGetPreviewOrigin.cs index e780fd8d9..486df477b 100644 --- a/Interfaces/Subscribers/IUsesGetPreviewOrigin.cs +++ b/Interfaces/Subscribers/IUsesGetPreviewOrigin.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to get the preview origins diff --git a/Interfaces/Subscribers/IUsesGetRayVisibility.cs b/Interfaces/Subscribers/IUsesGetRayVisibility.cs index 2120efb8d..758c4ef1b 100644 --- a/Interfaces/Subscribers/IUsesGetRayVisibility.cs +++ b/Interfaces/Subscribers/IUsesGetRayVisibility.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to get the visibility of rays diff --git a/Interfaces/Subscribers/IUsesGetVRPlayerObjects.cs b/Interfaces/Subscribers/IUsesGetVRPlayerObjects.cs index a7c4d3f25..cc7917563 100644 --- a/Interfaces/Subscribers/IUsesGetVRPlayerObjects.cs +++ b/Interfaces/Subscribers/IUsesGetVRPlayerObjects.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to the VR Player objects diff --git a/Interfaces/Subscribers/IUsesGrouping.cs b/Interfaces/Subscribers/IUsesGrouping.cs index 37c6077be..829fd57a5 100644 --- a/Interfaces/Subscribers/IUsesGrouping.cs +++ b/Interfaces/Subscribers/IUsesGrouping.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to grouping diff --git a/Interfaces/Subscribers/IUsesIsHoveringOverUI.cs b/Interfaces/Subscribers/IUsesIsHoveringOverUI.cs index 5603105f0..6c8554b84 100644 --- a/Interfaces/Subscribers/IUsesIsHoveringOverUI.cs +++ b/Interfaces/Subscribers/IUsesIsHoveringOverUI.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to check if a ray is hovering over UI diff --git a/Interfaces/Subscribers/IUsesIsInMiniWorld.cs b/Interfaces/Subscribers/IUsesIsInMiniWorld.cs index 6ea316734..fe5cd3042 100644 --- a/Interfaces/Subscribers/IUsesIsInMiniWorld.cs +++ b/Interfaces/Subscribers/IUsesIsInMiniWorld.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to check if a RayOrigin is in a MiniWorld diff --git a/Interfaces/Subscribers/IUsesIsMainMenuVisible.cs b/Interfaces/Subscribers/IUsesIsMainMenuVisible.cs index 8d9776716..93ea9da96 100644 --- a/Interfaces/Subscribers/IUsesIsMainMenuVisible.cs +++ b/Interfaces/Subscribers/IUsesIsMainMenuVisible.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to check if the main menu is visible diff --git a/Interfaces/Subscribers/IUsesMoveCameraRig.cs b/Interfaces/Subscribers/IUsesMoveCameraRig.cs index cd4a58ede..b5ccd6be3 100644 --- a/Interfaces/Subscribers/IUsesMoveCameraRig.cs +++ b/Interfaces/Subscribers/IUsesMoveCameraRig.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to move the camera rig diff --git a/Interfaces/Subscribers/IUsesPlaceSceneObject.cs b/Interfaces/Subscribers/IUsesPlaceSceneObject.cs index fe7c7c4a6..d6cfe682a 100644 --- a/Interfaces/Subscribers/IUsesPlaceSceneObject.cs +++ b/Interfaces/Subscribers/IUsesPlaceSceneObject.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to scene placement diff --git a/Interfaces/Subscribers/IUsesPlaceSceneObjects.cs b/Interfaces/Subscribers/IUsesPlaceSceneObjects.cs index 5161470bb..03f101e0f 100644 --- a/Interfaces/Subscribers/IUsesPlaceSceneObjects.cs +++ b/Interfaces/Subscribers/IUsesPlaceSceneObjects.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to scene placement functionality diff --git a/Interfaces/Subscribers/IUsesPreviewInToolsMenuButton.cs b/Interfaces/Subscribers/IUsesPreviewInToolsMenuButton.cs index 1a47b4154..2e5b21e8d 100644 --- a/Interfaces/Subscribers/IUsesPreviewInToolsMenuButton.cs +++ b/Interfaces/Subscribers/IUsesPreviewInToolsMenuButton.cs @@ -1,8 +1,8 @@ using System; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability control the tool preview diff --git a/Interfaces/Subscribers/IUsesRayVisibilitySettings.cs b/Interfaces/Subscribers/IUsesRayVisibilitySettings.cs index ec1227bd9..6876ae47e 100644 --- a/Interfaces/Subscribers/IUsesRayVisibilitySettings.cs +++ b/Interfaces/Subscribers/IUsesRayVisibilitySettings.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to control ray visibility diff --git a/Interfaces/Subscribers/IUsesRaycastResults.cs b/Interfaces/Subscribers/IUsesRaycastResults.cs index a4405f7ee..68bc9c0a4 100644 --- a/Interfaces/Subscribers/IUsesRaycastResults.cs +++ b/Interfaces/Subscribers/IUsesRaycastResults.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to viewer scale diff --git a/Interfaces/Subscribers/IUsesRequestFeedback.cs b/Interfaces/Subscribers/IUsesRequestFeedback.cs index cb41091df..793aa1952 100644 --- a/Interfaces/Subscribers/IUsesRequestFeedback.cs +++ b/Interfaces/Subscribers/IUsesRequestFeedback.cs @@ -1,6 +1,6 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to request feedback diff --git a/Interfaces/Subscribers/IUsesRequestStencilRef.cs b/Interfaces/Subscribers/IUsesRequestStencilRef.cs index 95eff935b..1c386ef6b 100644 --- a/Interfaces/Subscribers/IUsesRequestStencilRef.cs +++ b/Interfaces/Subscribers/IUsesRequestStencilRef.cs @@ -1,6 +1,6 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to request a stencil reference diff --git a/Interfaces/Subscribers/IUsesResetWorkspaces.cs b/Interfaces/Subscribers/IUsesResetWorkspaces.cs index ba18e76da..5e04243d9 100644 --- a/Interfaces/Subscribers/IUsesResetWorkspaces.cs +++ b/Interfaces/Subscribers/IUsesResetWorkspaces.cs @@ -1,6 +1,6 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to the ability to reset workspaces diff --git a/Interfaces/Subscribers/IUsesSceneRaycast.cs b/Interfaces/Subscribers/IUsesSceneRaycast.cs index 062dc7b6b..7849f5c7e 100644 --- a/Interfaces/Subscribers/IUsesSceneRaycast.cs +++ b/Interfaces/Subscribers/IUsesSceneRaycast.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to IntersectionModule.Raycast diff --git a/Interfaces/Subscribers/IUsesSelectObject.cs b/Interfaces/Subscribers/IUsesSelectObject.cs index c30af8c20..3e9937474 100644 --- a/Interfaces/Subscribers/IUsesSelectObject.cs +++ b/Interfaces/Subscribers/IUsesSelectObject.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to scene object selection diff --git a/Interfaces/Subscribers/IUsesSelectTool.cs b/Interfaces/Subscribers/IUsesSelectTool.cs index 5bcb1aecb..079a44b50 100644 --- a/Interfaces/Subscribers/IUsesSelectTool.cs +++ b/Interfaces/Subscribers/IUsesSelectTool.cs @@ -1,8 +1,8 @@ using System; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to tool selection diff --git a/Interfaces/Subscribers/IUsesSetDefaultRayColor.cs b/Interfaces/Subscribers/IUsesSetDefaultRayColor.cs index bb1f06bfe..470f158a0 100644 --- a/Interfaces/Subscribers/IUsesSetDefaultRayColor.cs +++ b/Interfaces/Subscribers/IUsesSetDefaultRayColor.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to set the color of the default ray diff --git a/Interfaces/Subscribers/IUsesSetHighlight.cs b/Interfaces/Subscribers/IUsesSetHighlight.cs index d6bde0a4c..7f2b72937 100644 --- a/Interfaces/Subscribers/IUsesSetHighlight.cs +++ b/Interfaces/Subscribers/IUsesSetHighlight.cs @@ -1,8 +1,8 @@ using System.Collections; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to control of scene object highlighting diff --git a/Interfaces/Subscribers/IUsesSetManipulatorsVisible.cs b/Interfaces/Subscribers/IUsesSetManipulatorsVisible.cs index 658e6d49d..3b1f03424 100644 --- a/Interfaces/Subscribers/IUsesSetManipulatorsVisible.cs +++ b/Interfaces/Subscribers/IUsesSetManipulatorsVisible.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to viewer scale diff --git a/Interfaces/Subscribers/IUsesSetTooltipVisibility.cs b/Interfaces/Subscribers/IUsesSetTooltipVisibility.cs index e3f37e775..bd8c0d5ce 100644 --- a/Interfaces/Subscribers/IUsesSetTooltipVisibility.cs +++ b/Interfaces/Subscribers/IUsesSetTooltipVisibility.cs @@ -1,7 +1,7 @@ using System; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class control of tooltip visibility diff --git a/Interfaces/Subscribers/IUsesSnapping.cs b/Interfaces/Subscribers/IUsesSnapping.cs index fe42c401b..d61cf52d1 100644 --- a/Interfaces/Subscribers/IUsesSnapping.cs +++ b/Interfaces/Subscribers/IUsesSnapping.cs @@ -1,11 +1,11 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; #if UNITY_EDITOR using UnityEditor; #endif -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to viewer scale diff --git a/Interfaces/Subscribers/IUsesViewerBody.cs b/Interfaces/Subscribers/IUsesViewerBody.cs index c3dc84490..f7a07e052 100644 --- a/Interfaces/Subscribers/IUsesViewerBody.cs +++ b/Interfaces/Subscribers/IUsesViewerBody.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to viewer scale diff --git a/Interfaces/Subscribers/IUsesViewerScale.cs b/Interfaces/Subscribers/IUsesViewerScale.cs index fb53962e6..b728e2d48 100644 --- a/Interfaces/Subscribers/IUsesViewerScale.cs +++ b/Interfaces/Subscribers/IUsesViewerScale.cs @@ -1,6 +1,6 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to viewer scale diff --git a/Interfaces/Subscribers/IUsesWeb.cs b/Interfaces/Subscribers/IUsesWeb.cs index e779411e6..9c6f79a12 100644 --- a/Interfaces/Subscribers/IUsesWeb.cs +++ b/Interfaces/Subscribers/IUsesWeb.cs @@ -1,8 +1,8 @@ using System; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine.Networking; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to web requests diff --git a/Interfaces/Unity.Labs.EditorXR.Interfaces.asmdef b/Interfaces/Unity.Labs.EditorXR.Interfaces.asmdef index d712d46b9..237a6ff4b 100644 --- a/Interfaces/Unity.Labs.EditorXR.Interfaces.asmdef +++ b/Interfaces/Unity.Labs.EditorXR.Interfaces.asmdef @@ -1,7 +1,7 @@ { - "name": "Unity.Labs.EditorXR.Interfaces", + "name": "Unity.EditorXR.Interfaces", "references": [ - "Unity.Labs.ModuleLoader.Interfaces", + "Unity.XRTools.ModuleLoader.Interfaces", "input-prototype" ], "optionalUnityReferences": [], diff --git a/Runtime/Actions/BaseAction.cs b/Runtime/Actions/BaseAction.cs index 43fbdd246..b37c765e6 100644 --- a/Runtime/Actions/BaseAction.cs +++ b/Runtime/Actions/BaseAction.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// A convenience class for simple action implementations diff --git a/Runtime/Actions/Copy.cs b/Runtime/Actions/Copy.cs index 48b294506..350a0fa57 100644 --- a/Runtime/Actions/Copy.cs +++ b/Runtime/Actions/Copy.cs @@ -1,6 +1,6 @@ using UnityEditor; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { [ActionMenuItem("Copy", ActionMenuItemAttribute.DefaultActionSectionName, 5)] [SpatialMenuItem("Copy", "Actions", "Copy the selected object")] diff --git a/Runtime/Actions/Cut.cs b/Runtime/Actions/Cut.cs index f7c8d16a6..00d23332f 100644 --- a/Runtime/Actions/Cut.cs +++ b/Runtime/Actions/Cut.cs @@ -1,7 +1,7 @@ using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { [ActionMenuItem("Cut", ActionMenuItemAttribute.DefaultActionSectionName, 4)] [SpatialMenuItem("Cut", "Actions", "Cut the selected object")] diff --git a/Runtime/Actions/Delete.cs b/Runtime/Actions/Delete.cs index 301045301..782847b3e 100644 --- a/Runtime/Actions/Delete.cs +++ b/Runtime/Actions/Delete.cs @@ -1,10 +1,10 @@ using System; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.ModuleLoader; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { [ActionMenuItem("Delete", ActionMenuItemAttribute.DefaultActionSectionName, 7)] [SpatialMenuItem("Delete", "Actions", "Delete the selected object")] diff --git a/Runtime/Actions/Duplicate.cs b/Runtime/Actions/Duplicate.cs index f007b63de..725dddada 100644 --- a/Runtime/Actions/Duplicate.cs +++ b/Runtime/Actions/Duplicate.cs @@ -1,12 +1,12 @@ -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.SpatialHash; -using Unity.Labs.Utils; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.SpatialHash; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { [ActionMenuItem("Duplicate", ActionMenuItemAttribute.DefaultActionSectionName, 3)] [SpatialMenuItem("Duplicate", "Actions", "Duplicate the selected object at the currently focused position")] diff --git a/Runtime/Actions/OpenScene.cs b/Runtime/Actions/OpenScene.cs index 3bcdfc1f4..9b47f1dd5 100644 --- a/Runtime/Actions/OpenScene.cs +++ b/Runtime/Actions/OpenScene.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { [ActionMenuItem("OpenScene", "Scene")] sealed class OpenScene : BaseAction diff --git a/Runtime/Actions/Paste.cs b/Runtime/Actions/Paste.cs index 620bab99f..75d25f0ca 100644 --- a/Runtime/Actions/Paste.cs +++ b/Runtime/Actions/Paste.cs @@ -1,13 +1,13 @@ -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.SpatialHash; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.SpatialHash; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { [ActionMenuItem("Paste", ActionMenuItemAttribute.DefaultActionSectionName, 6)] [SpatialMenuItem("Paste", "Actions", "Paste a copied object")] diff --git a/Runtime/Actions/Play.cs b/Runtime/Actions/Play.cs index e64f268d4..431e20821 100644 --- a/Runtime/Actions/Play.cs +++ b/Runtime/Actions/Play.cs @@ -1,6 +1,6 @@ using UnityEditor; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { [ActionMenuItem("Play")] [SpatialMenuItem("Play", "Actions", "Enter Play-Mode")] diff --git a/Runtime/Actions/Redo.cs b/Runtime/Actions/Redo.cs index 14dc88904..22148b915 100644 --- a/Runtime/Actions/Redo.cs +++ b/Runtime/Actions/Redo.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { [ActionMenuItem("Redo", ActionMenuItemAttribute.DefaultActionSectionName, 1)] [SpatialMenuItem("Redo", "Actions", "Redo the previously undone action")] diff --git a/Runtime/Actions/SaveScene.cs b/Runtime/Actions/SaveScene.cs index aae645927..19d1fa41d 100644 --- a/Runtime/Actions/SaveScene.cs +++ b/Runtime/Actions/SaveScene.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { [ActionMenuItem("SaveScene", "Scene")] sealed class SaveScene : BaseAction diff --git a/Runtime/Actions/SelectParent.cs b/Runtime/Actions/SelectParent.cs index 62eef6394..27dbdfb8c 100644 --- a/Runtime/Actions/SelectParent.cs +++ b/Runtime/Actions/SelectParent.cs @@ -1,6 +1,6 @@ using UnityEditor; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { [ActionMenuItem("SelectParent", ActionMenuItemAttribute.DefaultActionSectionName, 8)] [SpatialMenuItem("Select Parent", "Actions", "Select the parent of the currently selected object")] diff --git a/Runtime/Actions/Undo.cs b/Runtime/Actions/Undo.cs index 14dd7c2c7..4ee03ed80 100644 --- a/Runtime/Actions/Undo.cs +++ b/Runtime/Actions/Undo.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { [ActionMenuItem("Undo", ActionMenuItemAttribute.DefaultActionSectionName, 2)] [SpatialMenuItem("Undo", "Actions", "Undo the previous action")] diff --git a/Runtime/AssemblyInfo.cs b/Runtime/AssemblyInfo.cs index 8eaf6a2ff..fb00ea183 100644 --- a/Runtime/AssemblyInfo.cs +++ b/Runtime/AssemblyInfo.cs @@ -1,4 +1,4 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Unity.Labs.EditorXR.Editor")] -[assembly: InternalsVisibleTo("Unity.Labs.EditorXR.EditorTests")] +[assembly: InternalsVisibleTo("Unity.EditorXR.Editor")] +[assembly: InternalsVisibleTo("Unity.EditorXR.EditorTests")] diff --git a/Runtime/Manipulators/BaseManipulator.cs b/Runtime/Manipulators/BaseManipulator.cs index 52f2983d4..6e3d9aaa6 100644 --- a/Runtime/Manipulators/BaseManipulator.cs +++ b/Runtime/Manipulators/BaseManipulator.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.Utils; +using Unity.EditorXR.Handles; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Manipulators +namespace Unity.EditorXR.Manipulators { class BaseManipulator : MonoBehaviour, IManipulator { diff --git a/Runtime/Manipulators/DirectManipulator.cs b/Runtime/Manipulators/DirectManipulator.cs index ac909e4a1..d45f031ab 100644 --- a/Runtime/Manipulators/DirectManipulator.cs +++ b/Runtime/Manipulators/DirectManipulator.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Handles; +using Unity.EditorXR.Interfaces; using UnityEngine; -namespace Unity.Labs.EditorXR.Manipulators +namespace Unity.EditorXR.Manipulators { sealed class DirectManipulator : MonoBehaviour, IManipulator { diff --git a/Runtime/Manipulators/ScaleManipulator.cs b/Runtime/Manipulators/ScaleManipulator.cs index 7f090bb46..8085d5a57 100644 --- a/Runtime/Manipulators/ScaleManipulator.cs +++ b/Runtime/Manipulators/ScaleManipulator.cs @@ -1,7 +1,7 @@ -using Unity.Labs.EditorXR.Handles; +using Unity.EditorXR.Handles; using UnityEngine; -namespace Unity.Labs.EditorXR.Manipulators +namespace Unity.EditorXR.Manipulators { sealed class ScaleManipulator : BaseManipulator { diff --git a/Runtime/Manipulators/StandardManipulator.cs b/Runtime/Manipulators/StandardManipulator.cs index fdbf4d6c3..7cc954bf4 100644 --- a/Runtime/Manipulators/StandardManipulator.cs +++ b/Runtime/Manipulators/StandardManipulator.cs @@ -1,9 +1,9 @@ -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; +using Unity.EditorXR.Handles; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; using UnityEngine; -namespace Unity.Labs.EditorXR.Manipulators +namespace Unity.EditorXR.Manipulators { sealed class StandardManipulator : BaseManipulator { diff --git a/Runtime/Menus/MainMenu/MainMenu.cs b/Runtime/Menus/MainMenu/MainMenu.cs index c9fe36cad..0198738d4 100644 --- a/Runtime/Menus/MainMenu/MainMenu.cs +++ b/Runtime/Menus/MainMenu/MainMenu.cs @@ -1,18 +1,18 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Proxies; -using Unity.Labs.EditorXR.Tools; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.EditorXR.Workspaces; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Proxies; +using Unity.EditorXR.Tools; +using Unity.EditorXR.Utilities; +using Unity.EditorXR.Workspaces; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { sealed class MainMenu : MonoBehaviour, IMainMenu, IInstantiateUI, IUsesCreateWorkspace, ICustomActionMap, IUsesMenuOrigins, IUsesDeviceType, IUsesControlHaptics, IUsesNode, IRayToNode, IUsesRayOrigin, diff --git a/Runtime/Menus/MainMenu/Scripts/MainMenuActionButton.cs b/Runtime/Menus/MainMenu/Scripts/MainMenuActionButton.cs index f71e67e56..5aa2ac5cb 100644 --- a/Runtime/Menus/MainMenu/Scripts/MainMenuActionButton.cs +++ b/Runtime/Menus/MainMenu/Scripts/MainMenuActionButton.cs @@ -3,7 +3,7 @@ using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { class MainMenuActionButton : MonoBehaviour { diff --git a/Runtime/Menus/MainMenu/Scripts/MainMenuButton.cs b/Runtime/Menus/MainMenu/Scripts/MainMenuButton.cs index 7f2a17c4f..58e2ae675 100644 --- a/Runtime/Menus/MainMenu/Scripts/MainMenuButton.cs +++ b/Runtime/Menus/MainMenu/Scripts/MainMenuButton.cs @@ -1,12 +1,12 @@ using System; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Modules; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Modules; using UnityEngine; using UnityEngine.Events; using UnityEngine.EventSystems; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { sealed class MainMenuButton : MainMenuSelectable, ITooltip, IRayEnterHandler, IRayExitHandler, IPointerClickHandler { diff --git a/Runtime/Menus/MainMenu/Scripts/MainMenuFace.cs b/Runtime/Menus/MainMenu/Scripts/MainMenuFace.cs index a5cc3a345..ae0b4d031 100644 --- a/Runtime/Menus/MainMenu/Scripts/MainMenuFace.cs +++ b/Runtime/Menus/MainMenu/Scripts/MainMenuFace.cs @@ -2,14 +2,14 @@ using System.Collections.Generic; using System.Linq; using TMPro; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Helpers; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.Utils; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Helpers; +using Unity.EditorXR.Utilities; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { sealed class MainMenuFace : MonoBehaviour { diff --git a/Runtime/Menus/MainMenu/Scripts/MainMenuItemAttribute.cs b/Runtime/Menus/MainMenu/Scripts/MainMenuItemAttribute.cs index 5bd307312..801706f97 100644 --- a/Runtime/Menus/MainMenu/Scripts/MainMenuItemAttribute.cs +++ b/Runtime/Menus/MainMenu/Scripts/MainMenuItemAttribute.cs @@ -1,7 +1,7 @@ using System; -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Attribute used to tag items (tools, actions, etc) that can be added to VR menus diff --git a/Runtime/Menus/MainMenu/Scripts/MainMenuSelectable.cs b/Runtime/Menus/MainMenu/Scripts/MainMenuSelectable.cs index 138760642..7862b1586 100644 --- a/Runtime/Menus/MainMenu/Scripts/MainMenuSelectable.cs +++ b/Runtime/Menus/MainMenu/Scripts/MainMenuSelectable.cs @@ -3,7 +3,7 @@ using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { abstract class MainMenuSelectable : MonoBehaviour { diff --git a/Runtime/Menus/MainMenu/Scripts/MainMenuToggle.cs b/Runtime/Menus/MainMenu/Scripts/MainMenuToggle.cs index 03d871e82..851c16d24 100644 --- a/Runtime/Menus/MainMenu/Scripts/MainMenuToggle.cs +++ b/Runtime/Menus/MainMenu/Scripts/MainMenuToggle.cs @@ -1,10 +1,10 @@ using System; -using Unity.Labs.EditorXR.Modules; +using Unity.EditorXR.Modules; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { sealed class MainMenuToggle : MainMenuSelectable, IRayEnterHandler, IRayExitHandler, IPointerClickHandler { diff --git a/Runtime/Menus/MainMenu/Scripts/MainMenuUI.cs b/Runtime/Menus/MainMenu/Scripts/MainMenuUI.cs index 664aa6a3d..412034ae9 100644 --- a/Runtime/Menus/MainMenu/Scripts/MainMenuUI.cs +++ b/Runtime/Menus/MainMenu/Scripts/MainMenuUI.cs @@ -1,15 +1,15 @@ using System.Collections; using System.Collections.Generic; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Modules; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { sealed class MainMenuUI : MonoBehaviour, IInstantiateUI, IUsesConnectInterfaces, IRayEnterHandler, IRayExitHandler { diff --git a/Runtime/Menus/RadialMenu/RadialMenu.cs b/Runtime/Menus/RadialMenu/RadialMenu.cs index 2bdb84f18..c42cb5ae4 100644 --- a/Runtime/Menus/RadialMenu/RadialMenu.cs +++ b/Runtime/Menus/RadialMenu/RadialMenu.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Proxies; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Proxies; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { sealed class RadialMenu : MonoBehaviour, IInstantiateUI, IAlternateMenu, IUsesMenuOrigins, ICustomActionMap, IUsesControlHaptics, IUsesNode, IUsesConnectInterfaces, IUsesRequestFeedback, IActionsMenu diff --git a/Runtime/Menus/RadialMenu/Scripts/RadialMenuSlot.cs b/Runtime/Menus/RadialMenu/Scripts/RadialMenuSlot.cs index bbeb7c7f5..39ffb5823 100644 --- a/Runtime/Menus/RadialMenu/Scripts/RadialMenuSlot.cs +++ b/Runtime/Menus/RadialMenu/Scripts/RadialMenuSlot.cs @@ -1,15 +1,15 @@ using System; using System.Collections; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Helpers; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Helpers; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Modules; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { sealed class RadialMenuSlot : MonoBehaviour, IUsesSetTooltipVisibility, ITooltip, ITooltipPlacement, IRayEnterHandler, IRayExitHandler { diff --git a/Runtime/Menus/RadialMenu/Scripts/RadialMenuUI.cs b/Runtime/Menus/RadialMenu/Scripts/RadialMenuUI.cs index 3596104f0..63ce71de8 100644 --- a/Runtime/Menus/RadialMenu/Scripts/RadialMenuUI.cs +++ b/Runtime/Menus/RadialMenu/Scripts/RadialMenuUI.cs @@ -2,15 +2,15 @@ using System.Collections; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Menus; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Menus; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { sealed class RadialMenuUI : MonoBehaviour, IUsesConnectInterfaces, IUsesRequestStencilRef, IUsesFunctionalityInjection { diff --git a/Runtime/Menus/SpatialMainMenu/SpatialMainMenu.cs b/Runtime/Menus/SpatialMainMenu/SpatialMainMenu.cs index 141c73999..6c3e62025 100644 --- a/Runtime/Menus/SpatialMainMenu/SpatialMainMenu.cs +++ b/Runtime/Menus/SpatialMainMenu/SpatialMainMenu.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Tools; -using Unity.Labs.EditorXR.Workspaces; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Tools; +using Unity.EditorXR.Workspaces; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { sealed class SpatialMainMenu : MonoBehaviour, IMainMenu, ISpatialMenuProvider, INodeToRay, IUsesCreateWorkspace { diff --git a/Runtime/Menus/SpatialUI/Scripts/SpatialUIController.cs b/Runtime/Menus/SpatialUI/Scripts/SpatialUIController.cs index 7ff310f98..9da54f06b 100644 --- a/Runtime/Menus/SpatialUI/Scripts/SpatialUIController.cs +++ b/Runtime/Menus/SpatialUI/Scripts/SpatialUIController.cs @@ -1,12 +1,12 @@ using System; using System.Reflection; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; using UnityEditor; using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { /// /// Mandates that derived classes implement core required SpatialUI controller functionality diff --git a/Runtime/Menus/SpatialUI/Scripts/SpatialUIView.cs b/Runtime/Menus/SpatialUI/Scripts/SpatialUIView.cs index bc8bc7093..2cbc90d69 100644 --- a/Runtime/Menus/SpatialUI/Scripts/SpatialUIView.cs +++ b/Runtime/Menus/SpatialUI/Scripts/SpatialUIView.cs @@ -1,9 +1,9 @@ -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { /// /// Mandates that derived classes implement core SpatialUI implementation diff --git a/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuBackButton.cs b/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuBackButton.cs index 2e46f8b67..8c54393f3 100644 --- a/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuBackButton.cs +++ b/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuBackButton.cs @@ -1,14 +1,14 @@ using System; using System.Collections; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Modules; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { class SpatialMenuBackButton : MonoBehaviour, IUsesControlHaptics, IRayEnterHandler, IRayExitHandler { diff --git a/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuElement.cs b/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuElement.cs index 41b9cc125..d2cb10946 100644 --- a/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuElement.cs +++ b/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuElement.cs @@ -1,12 +1,12 @@ using System; using TMPro; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Modules; +using Unity.XRTools.ModuleLoader; using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Abstract class housing common SpatialMenu element functionality diff --git a/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuItemAttribute.cs b/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuItemAttribute.cs index 582a6960b..62abb7c0a 100644 --- a/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuItemAttribute.cs +++ b/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuItemAttribute.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Attribute used to tag items (tools, actions, etc) that can be added to a "spatial menu" diff --git a/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuSectionTitleElement.cs b/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuSectionTitleElement.cs index 1529bebc3..a65cc061d 100644 --- a/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuSectionTitleElement.cs +++ b/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuSectionTitleElement.cs @@ -1,13 +1,13 @@ using System; using System.Collections; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { sealed class SpatialMenuSectionTitleElement : SpatialMenuElement { diff --git a/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuSubMenuElement.cs b/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuSubMenuElement.cs index 0f11087da..8d80164e3 100644 --- a/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuSubMenuElement.cs +++ b/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuSubMenuElement.cs @@ -1,15 +1,15 @@ using System; using System.Collections; using TMPro; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { sealed class SpatialMenuSubMenuElement : SpatialMenuElement { diff --git a/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuUI.cs b/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuUI.cs index 3503eddc6..191a48df0 100644 --- a/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuUI.cs +++ b/Runtime/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuUI.cs @@ -3,16 +3,16 @@ using System.Collections.Generic; using System.Linq; using TMPro; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.Playables; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { /// /// The SpatialMenu's UI/View-controller diff --git a/Runtime/Menus/SpatialUI/SpatialMenu/SpatialMenu.cs b/Runtime/Menus/SpatialUI/SpatialMenu/SpatialMenu.cs index 856d1d87b..088c97c27 100644 --- a/Runtime/Menus/SpatialUI/SpatialMenu/SpatialMenu.cs +++ b/Runtime/Menus/SpatialUI/SpatialMenu/SpatialMenu.cs @@ -2,17 +2,17 @@ using System.Collections; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Menus; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Menus; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// The SpatialMenu controller diff --git a/Runtime/Menus/ToolsMenu/Scripts/HintIcon.cs b/Runtime/Menus/ToolsMenu/Scripts/HintIcon.cs index 27738f146..26a25b97d 100644 --- a/Runtime/Menus/ToolsMenu/Scripts/HintIcon.cs +++ b/Runtime/Menus/ToolsMenu/Scripts/HintIcon.cs @@ -1,11 +1,11 @@ using System.Collections; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Utilities; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Utilities; using UnityEngine; using UnityEngine.UI; using Random = UnityEngine.Random; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { class HintIcon : MonoBehaviour { diff --git a/Runtime/Menus/ToolsMenu/Scripts/HintLine.cs b/Runtime/Menus/ToolsMenu/Scripts/HintLine.cs index b600dd08a..51a22be2c 100644 --- a/Runtime/Menus/ToolsMenu/Scripts/HintLine.cs +++ b/Runtime/Menus/ToolsMenu/Scripts/HintLine.cs @@ -1,11 +1,11 @@ using System.Collections; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.Utils; -using Unity.Labs.XR; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Utilities; +using Unity.XRTools.Rendering; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { class HintLine : MonoBehaviour { diff --git a/Runtime/Menus/ToolsMenu/Scripts/ToolsMenuUI.cs b/Runtime/Menus/ToolsMenu/Scripts/ToolsMenuUI.cs index ee35ef66e..c04db826c 100644 --- a/Runtime/Menus/ToolsMenu/Scripts/ToolsMenuUI.cs +++ b/Runtime/Menus/ToolsMenu/Scripts/ToolsMenuUI.cs @@ -2,14 +2,14 @@ using System.Collections; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Tools; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Tools; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { sealed class ToolsMenuUI : MonoBehaviour, IUsesViewerScale, IInstantiateUI, IUsesConnectInterfaces, IUsesControlSpatialHinting, IUsesRayOrigin, IUsesStencilRef diff --git a/Runtime/Menus/ToolsMenu/ToolsMenu.cs b/Runtime/Menus/ToolsMenu/ToolsMenu.cs index c693552c2..ee2ac7233 100644 --- a/Runtime/Menus/ToolsMenu/ToolsMenu.cs +++ b/Runtime/Menus/ToolsMenu/ToolsMenu.cs @@ -1,17 +1,17 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.Proxies; -using Unity.Labs.EditorXR.Tools; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Modules; +using Unity.EditorXR.Proxies; +using Unity.EditorXR.Tools; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { sealed class ToolsMenu : MonoBehaviour, IToolsMenu, IUsesConnectInterfaces, IInstantiateUI, IUsesControlHaptics, IUsesViewerScale, IControlSpatialScrolling, IUsesControlSpatialHinting, IUsesRayVisibilitySettings, IUsesRayOrigin, diff --git a/Runtime/Menus/ToolsMenu/ToolsMenuButton/ToolsMenuButton.cs b/Runtime/Menus/ToolsMenu/ToolsMenuButton/ToolsMenuButton.cs index 70fb9c058..78cf000fc 100644 --- a/Runtime/Menus/ToolsMenu/ToolsMenuButton/ToolsMenuButton.cs +++ b/Runtime/Menus/ToolsMenu/ToolsMenuButton/ToolsMenuButton.cs @@ -1,17 +1,17 @@ using System; using System.Collections; using System.Text; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Helpers; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.UI; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Helpers; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.UI; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { sealed class ToolsMenuButton : MonoBehaviour, IToolsMenuButton, ITooltip, ITooltipPlacement, IUsesSetTooltipVisibility, IUsesFunctionalityInjection diff --git a/Runtime/Menus/UndoMenu/Scripts/UndoMenuUI.cs b/Runtime/Menus/UndoMenu/Scripts/UndoMenuUI.cs index 100964988..37d988b86 100644 --- a/Runtime/Menus/UndoMenu/Scripts/UndoMenuUI.cs +++ b/Runtime/Menus/UndoMenu/Scripts/UndoMenuUI.cs @@ -1,12 +1,12 @@ using System.Collections; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { sealed class UndoMenuUI : MonoBehaviour, IUsesConnectInterfaces { diff --git a/Runtime/Menus/UndoMenu/UndoMenu.cs b/Runtime/Menus/UndoMenu/UndoMenu.cs index eedd8bc65..2dd9560c3 100644 --- a/Runtime/Menus/UndoMenu/UndoMenu.cs +++ b/Runtime/Menus/UndoMenu/UndoMenu.cs @@ -1,15 +1,15 @@ using System.Collections; using System.Collections.Generic; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Proxies; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Core; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Proxies; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { sealed class UndoMenu : MonoBehaviour, IInstantiateUI, IUsesMenuOrigins, ICustomActionMap, IUsesControlHaptics, IUsesNode, IUsesConnectInterfaces, IUsesRequestFeedback, IUsesDeviceType, IAlternateMenu diff --git a/Runtime/Scripts/Actions/ActionMenuItemAttribute.cs b/Runtime/Scripts/Actions/ActionMenuItemAttribute.cs index b28ee99c4..f908c0b33 100644 --- a/Runtime/Scripts/Actions/ActionMenuItemAttribute.cs +++ b/Runtime/Scripts/Actions/ActionMenuItemAttribute.cs @@ -1,7 +1,7 @@ using System; -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Attribute used to tag Action classes in order to be added to VR menus diff --git a/Runtime/Scripts/Analysis/EditorXRAnalytics.cs b/Runtime/Scripts/Analysis/EditorXRAnalytics.cs index fc044eb81..73932162d 100644 --- a/Runtime/Scripts/Analysis/EditorXRAnalytics.cs +++ b/Runtime/Scripts/Analysis/EditorXRAnalytics.cs @@ -2,7 +2,7 @@ using UnityEditor; using UnityEngine.Analytics; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { abstract class EditorXREvent { diff --git a/Runtime/Scripts/Analysis/EditorXRAnalyticsEvents.cs b/Runtime/Scripts/Analysis/EditorXRAnalyticsEvents.cs index 684fe76eb..e2fe5576e 100644 --- a/Runtime/Scripts/Analysis/EditorXRAnalyticsEvents.cs +++ b/Runtime/Scripts/Analysis/EditorXRAnalyticsEvents.cs @@ -2,7 +2,7 @@ using System; // ReSharper disable InconsistentNaming -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { [Serializable] abstract class EditorEventArgs diff --git a/Runtime/Scripts/Core/Contexts/EditingContextManager.cs b/Runtime/Scripts/Core/Contexts/EditingContextManager.cs index c343f664e..5d196fd04 100644 --- a/Runtime/Scripts/Core/Contexts/EditingContextManager.cs +++ b/Runtime/Scripts/Core/Contexts/EditingContextManager.cs @@ -3,9 +3,9 @@ using System.IO; using System.Linq; using System.Reflection; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; using UnityEngine.Assertions; @@ -13,7 +13,7 @@ using UnityEngine.XR; using UnityObject = UnityEngine.Object; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { #if UNITY_EDITOR [InitializeOnLoad] diff --git a/Runtime/Scripts/Core/Contexts/EditingContextManagerSettings.cs b/Runtime/Scripts/Core/Contexts/EditingContextManagerSettings.cs index e1deb3cd8..872d2fb16 100644 --- a/Runtime/Scripts/Core/Contexts/EditingContextManagerSettings.cs +++ b/Runtime/Scripts/Core/Contexts/EditingContextManagerSettings.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { class EditingContextManagerSettings : ScriptableObject { diff --git a/Runtime/Scripts/Core/Contexts/EditorXR.asset b/Runtime/Scripts/Core/Contexts/EditorXR.asset index 6f76a0fa0..f4c7c9470 100644 --- a/Runtime/Scripts/Core/Contexts/EditorXR.asset +++ b/Runtime/Scripts/Core/Contexts/EditorXR.asset @@ -26,19 +26,19 @@ MonoBehaviour: - {fileID: 11500000, guid: 49e533569ecea994c856e43af713e5be, type: 3} - {fileID: 11500000, guid: 403957a6dcd8bfe4a905881513f309b0, type: 3} m_HiddenTypes: [] - m_DefaultMainMenuName: Unity.Labs.EditorXR.Menus.MainMenu, Unity.Labs.EditorXR, + m_DefaultMainMenuName: Unity.EditorXR.Menus.MainMenu, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_DefaultAlternateMenuName: Unity.Labs.EditorXR.RadialMenu, Unity.Labs.EditorXR, + m_DefaultAlternateMenuName: Unity.EditorXR.RadialMenu, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_DefaultToolStackNames: - - Unity.Labs.EditorXR.Tools.TransformTool, Unity.Labs.EditorXR, Version=0.0.0.0, + - Unity.EditorXR.Tools.TransformTool, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Unity.Labs.EditorXR.Tools.SelectionTool, Unity.Labs.EditorXR, Version=0.0.0.0, + - Unity.EditorXR.Tools.SelectionTool, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Unity.Labs.EditorXR.Tools.VacuumTool, Unity.Labs.EditorXR, Version=0.0.0.0, Culture=neutral, + - Unity.EditorXR.Tools.VacuumTool, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Unity.Labs.EditorXR.Tools.MoveWorkspacesTool, Unity.Labs.EditorXR, Version=0.0.0.0, + - Unity.EditorXR.Tools.MoveWorkspacesTool, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Unity.Labs.EditorXR.Tools.LocomotionTool, Unity.Labs.EditorXR, Version=0.0.0.0, + - Unity.EditorXR.Tools.LocomotionTool, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_HiddenTypeNames: [] diff --git a/Runtime/Scripts/Core/Contexts/EditorXRContext.cs b/Runtime/Scripts/Core/Contexts/EditorXRContext.cs index b37c7c620..0225715c4 100644 --- a/Runtime/Scripts/Core/Contexts/EditorXRContext.cs +++ b/Runtime/Scripts/Core/Contexts/EditorXRContext.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; using UnityEngine.XR; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { [CreateAssetMenu(menuName = "EditorXR/Editing Context")] class EditorXRContext : ScriptableObject, IEditingContext diff --git a/Runtime/Scripts/Core/Contexts/Minimal.asset b/Runtime/Scripts/Core/Contexts/Minimal.asset index 3f90e49bb..9677e0174 100644 --- a/Runtime/Scripts/Core/Contexts/Minimal.asset +++ b/Runtime/Scripts/Core/Contexts/Minimal.asset @@ -31,30 +31,30 @@ MonoBehaviour: - {fileID: 11500000, guid: abb8ac7663774794da12f7c749f66d2a, type: 3} - {fileID: 11500000, guid: aab2ab33b5d370b4889c8004fceb7843, type: 3} - {fileID: 11500000, guid: 80defa433e2f1ba4b8c5cbf97051b13e, type: 3} - m_DefaultMainMenuName: Unity.Labs.EditorXR.Menus.SpatialMainMenu, Unity.Labs.EditorXR, + m_DefaultMainMenuName: Unity.EditorXR.Menus.SpatialMainMenu, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_DefaultAlternateMenuName: m_DefaultToolStackNames: - - Unity.Labs.EditorXR.Tools.TransformTool, Unity.Labs.EditorXR, Version=0.0.0.0, + - Unity.EditorXR.Tools.TransformTool, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Unity.Labs.EditorXR.Tools.SelectionTool, Unity.Labs.EditorXR, Version=0.0.0.0, + - Unity.EditorXR.Tools.SelectionTool, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Unity.Labs.EditorXR.Tools.VacuumTool, Unity.Labs.EditorXR, Version=0.0.0.0, Culture=neutral, + - Unity.EditorXR.Tools.VacuumTool, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Unity.Labs.EditorXR.Tools.MoveWorkspacesTool, Unity.Labs.EditorXR, Version=0.0.0.0, + - Unity.EditorXR.Tools.MoveWorkspacesTool, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Unity.Labs.EditorXR.Tools.LocomotionTool, Unity.Labs.EditorXR, Version=0.0.0.0, + - Unity.EditorXR.Tools.LocomotionTool, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_HiddenTypeNames: - - Unity.Labs.EditorXR.Workspaces.ConsoleWorkspace, Unity.Labs.EditorXR, Version=0.0.0.0, + - Unity.EditorXR.Workspaces.ConsoleWorkspace, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Unity.Labs.EditorXR.Workspaces.HierarchyWorkspace, Unity.Labs.EditorXR, Version=0.0.0.0, + - Unity.EditorXR.Workspaces.HierarchyWorkspace, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Unity.Labs.EditorXR.Workspaces.LockedObjectsWorkspace, Unity.Labs.EditorXR, Version=0.0.0.0, + - Unity.EditorXR.Workspaces.LockedObjectsWorkspace, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Unity.Labs.EditorXR.Workspaces.ProfilerWorkspace, Unity.Labs.EditorXR, Version=0.0.0.0, + - Unity.EditorXR.Workspaces.ProfilerWorkspace, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Unity.Labs.EditorXR.Workspaces.MiniWorldWorkspace, Unity.Labs.EditorXR, Version=0.0.0.0, + - Unity.EditorXR.Workspaces.MiniWorldWorkspace, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Unity.Labs.EditorXR.Workspaces.InspectorWorkspace, Unity.Labs.EditorXR, Version=0.0.0.0, + - Unity.EditorXR.Workspaces.InspectorWorkspace, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null diff --git a/Runtime/Scripts/Core/EditorXR.cs b/Runtime/Scripts/Core/EditorXR.cs index 4c1cc016c..be06b8730 100644 --- a/Runtime/Scripts/Core/EditorXR.cs +++ b/Runtime/Scripts/Core/EditorXR.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Modules; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; #if UNITY_EDITOR @@ -14,7 +14,7 @@ using UnityEditor.Build; #endif -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { #if UNITY_EDITOR [RequiresTag(VRPlayerTag)] @@ -27,8 +27,8 @@ class AssemblyFilter : IFilterBuildAssemblies { static readonly string[] k_EditorXRAssemblies = { - "Library/ScriptAssemblies/Unity.Labs.EditorXR.dll", - "Library/ScriptAssemblies/Unity.Labs.EditorXR.Interfaces.dll", + "Library/ScriptAssemblies/Unity.EditorXR.dll", + "Library/ScriptAssemblies/Unity.EditorXR.Interfaces.dll", "Library/ScriptAssemblies/input-prototype.dll" }; diff --git a/Runtime/Scripts/Core/EditorXRDirectSelectionModule.cs b/Runtime/Scripts/Core/EditorXRDirectSelectionModule.cs index 5b9aa8ee4..25a28b8dd 100644 --- a/Runtime/Scripts/Core/EditorXRDirectSelectionModule.cs +++ b/Runtime/Scripts/Core/EditorXRDirectSelectionModule.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.Proxies; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Modules; +using Unity.EditorXR.Proxies; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { [ModuleBehaviorCallbackOrder(ModuleOrders.DirectSelectionModuleBehaviorOrder)] class EditorXRDirectSelectionModule : IDelayedInitializationModule, diff --git a/Runtime/Scripts/Core/EditorXRInterfacesModule.cs b/Runtime/Scripts/Core/EditorXRInterfacesModule.cs index e7e0a6ab8..56cde7a3c 100644 --- a/Runtime/Scripts/Core/EditorXRInterfacesModule.cs +++ b/Runtime/Scripts/Core/EditorXRInterfacesModule.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { [ImmortalModule] [ModuleOrder(ModuleOrders.InterfaceModule)] diff --git a/Runtime/Scripts/Core/EditorXRMenuModule.cs b/Runtime/Scripts/Core/EditorXRMenuModule.cs index 31a045938..b3735bf8b 100644 --- a/Runtime/Scripts/Core/EditorXRMenuModule.cs +++ b/Runtime/Scripts/Core/EditorXRMenuModule.cs @@ -1,16 +1,16 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Menus; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.UI; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Menus; +using Unity.EditorXR.Modules; +using Unity.EditorXR.UI; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { class MenuHideData { diff --git a/Runtime/Scripts/Core/EditorXRMiniWorldModule.cs b/Runtime/Scripts/Core/EditorXRMiniWorldModule.cs index c93e56afd..f6ad96a62 100644 --- a/Runtime/Scripts/Core/EditorXRMiniWorldModule.cs +++ b/Runtime/Scripts/Core/EditorXRMiniWorldModule.cs @@ -1,17 +1,17 @@ using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.Proxies; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.EditorXR.Workspaces; -using Unity.Labs.ModuleLoader; -using Unity.Labs.SpatialHash; -using Unity.Labs.Utils; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Modules; +using Unity.EditorXR.Proxies; +using Unity.EditorXR.Utilities; +using Unity.EditorXR.Workspaces; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.SpatialHash; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { class EditorXRMiniWorldModule : IModuleDependency, IModuleDependency, IModuleDependency, IModuleDependency, IModuleDependency, diff --git a/Runtime/Scripts/Core/EditorXRRayModule.cs b/Runtime/Scripts/Core/EditorXRRayModule.cs index ed6c62432..ef82b4cc4 100644 --- a/Runtime/Scripts/Core/EditorXRRayModule.cs +++ b/Runtime/Scripts/Core/EditorXRRayModule.cs @@ -1,19 +1,19 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Helpers; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Manipulators; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.Proxies; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.SpatialHash; -using Unity.Labs.Utils; +using Unity.EditorXR.Helpers; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Manipulators; +using Unity.EditorXR.Modules; +using Unity.EditorXR.Proxies; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.SpatialHash; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { class EditorXRRayModule : ScriptableSettings, IModuleDependency, IInterfaceConnector, IForEachRayOrigin, diff --git a/Runtime/Scripts/Core/EditorXRToolModule.cs b/Runtime/Scripts/Core/EditorXRToolModule.cs index 173389133..d797401b1 100644 --- a/Runtime/Scripts/Core/EditorXRToolModule.cs +++ b/Runtime/Scripts/Core/EditorXRToolModule.cs @@ -1,19 +1,19 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Menus; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.Tools; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Menus; +using Unity.EditorXR.Modules; +using Unity.EditorXR.Tools; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { class ToolData { diff --git a/Runtime/Scripts/Core/EditorXRToolsMenuModule.cs b/Runtime/Scripts/Core/EditorXRToolsMenuModule.cs index 79cbf4327..340803928 100644 --- a/Runtime/Scripts/Core/EditorXRToolsMenuModule.cs +++ b/Runtime/Scripts/Core/EditorXRToolsMenuModule.cs @@ -1,10 +1,10 @@ using System; using System.Linq; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { class EditorXRToolsMenuModule : IModuleDependency, IModuleDependency, IModuleDependency, IProvidesPreviewInToolMenuButton diff --git a/Runtime/Scripts/Core/EditorXRUIModule.cs b/Runtime/Scripts/Core/EditorXRUIModule.cs index 57d275e05..acffdce72 100644 --- a/Runtime/Scripts/Core/EditorXRUIModule.cs +++ b/Runtime/Scripts/Core/EditorXRUIModule.cs @@ -1,14 +1,14 @@ using System.Collections.Generic; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.UI; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Modules; +using Unity.EditorXR.UI; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.EventSystems; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { [ModuleBehaviorCallbackOrder(ModuleOrders.UIModuleBehaviorOrder)] class EditorXRUIModule : ScriptableSettings, IModuleDependency, diff --git a/Runtime/Scripts/Core/EditorXRVacuumableModule.cs b/Runtime/Scripts/Core/EditorXRVacuumableModule.cs index e83cabca7..5d973abdd 100644 --- a/Runtime/Scripts/Core/EditorXRVacuumableModule.cs +++ b/Runtime/Scripts/Core/EditorXRVacuumableModule.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Modules; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { class EditorXRVacuumableModule : IModuleDependency { diff --git a/Runtime/Scripts/Core/EditorXRViewerModule.cs b/Runtime/Scripts/Core/EditorXRViewerModule.cs index 0b2346986..f7849e2fe 100644 --- a/Runtime/Scripts/Core/EditorXRViewerModule.cs +++ b/Runtime/Scripts/Core/EditorXRViewerModule.cs @@ -1,17 +1,17 @@ using System; using System.Collections; using System.Collections.Generic; -using Unity.Labs.EditorXR.Helpers; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.SpatialHash; -using Unity.Labs.Utils; +using Unity.EditorXR.Helpers; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Modules; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.SpatialHash; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.XR; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { class EditorXRViewerModule : ScriptableSettings, IModuleDependency, IInterfaceConnector, diff --git a/Runtime/Scripts/Core/Interfaces/IAxisConstraints.cs b/Runtime/Scripts/Core/Interfaces/IAxisConstraints.cs index 0ef588ec4..6c918ba83 100644 --- a/Runtime/Scripts/Core/Interfaces/IAxisConstraints.cs +++ b/Runtime/Scripts/Core/Interfaces/IAxisConstraints.cs @@ -1,6 +1,6 @@ -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { interface IAxisConstraints { diff --git a/Runtime/Scripts/Core/Interfaces/IDelayedInitializationModule.cs b/Runtime/Scripts/Core/Interfaces/IDelayedInitializationModule.cs index 5da5794f9..e70cbb362 100644 --- a/Runtime/Scripts/Core/Interfaces/IDelayedInitializationModule.cs +++ b/Runtime/Scripts/Core/Interfaces/IDelayedInitializationModule.cs @@ -1,6 +1,6 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Adds Initialize and Shutdown methods to modules for when editing starts and stops diff --git a/Runtime/Scripts/Core/Interfaces/IForEachRayOrigin.cs b/Runtime/Scripts/Core/Interfaces/IForEachRayOrigin.cs index f74fdb17c..2817ff740 100644 --- a/Runtime/Scripts/Core/Interfaces/IForEachRayOrigin.cs +++ b/Runtime/Scripts/Core/Interfaces/IForEachRayOrigin.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { delegate void ForEachRayOriginCallback(Transform rayOrigin); diff --git a/Runtime/Scripts/Core/Interfaces/IInspectorWorkspace.cs b/Runtime/Scripts/Core/Interfaces/IInspectorWorkspace.cs index c5eb7f67e..8e85c2dfd 100644 --- a/Runtime/Scripts/Core/Interfaces/IInspectorWorkspace.cs +++ b/Runtime/Scripts/Core/Interfaces/IInspectorWorkspace.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { interface IInspectorWorkspace { diff --git a/Runtime/Scripts/Core/Interfaces/IInterfaceConnector.cs b/Runtime/Scripts/Core/Interfaces/IInterfaceConnector.cs index 29d2250f9..ddca6a33b 100644 --- a/Runtime/Scripts/Core/Interfaces/IInterfaceConnector.cs +++ b/Runtime/Scripts/Core/Interfaces/IInterfaceConnector.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { interface IInterfaceConnector { diff --git a/Runtime/Scripts/Core/Interfaces/IMiniWorld.cs b/Runtime/Scripts/Core/Interfaces/IMiniWorld.cs index 60fa5c233..6b2c66664 100644 --- a/Runtime/Scripts/Core/Interfaces/IMiniWorld.cs +++ b/Runtime/Scripts/Core/Interfaces/IMiniWorld.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// For the purpose of interacting with MiniWorlds diff --git a/Runtime/Scripts/Core/Interfaces/INodeToRay.cs b/Runtime/Scripts/Core/Interfaces/INodeToRay.cs index 2d3de1d89..6894bedde 100644 --- a/Runtime/Scripts/Core/Interfaces/INodeToRay.cs +++ b/Runtime/Scripts/Core/Interfaces/INodeToRay.cs @@ -1,8 +1,8 @@ using System; -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; using UnityEngine; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { /// /// Provide the ability to request a corresponding ray origin for a node diff --git a/Runtime/Scripts/Core/Interfaces/IRayToNode.cs b/Runtime/Scripts/Core/Interfaces/IRayToNode.cs index d7af911ed..1ab892939 100644 --- a/Runtime/Scripts/Core/Interfaces/IRayToNode.cs +++ b/Runtime/Scripts/Core/Interfaces/IRayToNode.cs @@ -1,8 +1,8 @@ using System; -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; using UnityEngine; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { /// /// Provide the ability to request a corresponding node for a ray origin diff --git a/Runtime/Scripts/Core/Interfaces/ISerializePreferences.cs b/Runtime/Scripts/Core/Interfaces/ISerializePreferences.cs index a41c742a4..0f5f514bf 100644 --- a/Runtime/Scripts/Core/Interfaces/ISerializePreferences.cs +++ b/Runtime/Scripts/Core/Interfaces/ISerializePreferences.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { interface ISerializePreferences { diff --git a/Runtime/Scripts/Core/Interfaces/IUsesHierarchyData.cs b/Runtime/Scripts/Core/Interfaces/IUsesHierarchyData.cs index 848b5f96e..6b333f5c1 100644 --- a/Runtime/Scripts/Core/Interfaces/IUsesHierarchyData.cs +++ b/Runtime/Scripts/Core/Interfaces/IUsesHierarchyData.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Exposes a property used to provide a hierarchy of scene objects to the object diff --git a/Runtime/Scripts/Core/Interfaces/IUsesPointer.cs b/Runtime/Scripts/Core/Interfaces/IUsesPointer.cs index 3e888a5a7..cef23e35a 100644 --- a/Runtime/Scripts/Core/Interfaces/IUsesPointer.cs +++ b/Runtime/Scripts/Core/Interfaces/IUsesPointer.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Provides access to information about the 3D pointer diff --git a/Runtime/Scripts/Core/Interfaces/IUsesProjectFolderData.cs b/Runtime/Scripts/Core/Interfaces/IUsesProjectFolderData.cs index 35bbd9692..262899f3c 100644 --- a/Runtime/Scripts/Core/Interfaces/IUsesProjectFolderData.cs +++ b/Runtime/Scripts/Core/Interfaces/IUsesProjectFolderData.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Unity.Labs.EditorXR.Data; +using Unity.EditorXR.Data; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Exposes a property used to provide a hierarchy of project folders and assets to the object diff --git a/Runtime/Scripts/Core/ModuleOrders.cs b/Runtime/Scripts/Core/ModuleOrders.cs index 4c8f5041f..6b13a1e08 100644 --- a/Runtime/Scripts/Core/ModuleOrders.cs +++ b/Runtime/Scripts/Core/ModuleOrders.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { static class ModuleOrders { diff --git a/Runtime/Scripts/Core/VRView.cs b/Runtime/Scripts/Core/VRView.cs index 8eb013ee8..91e3f506a 100644 --- a/Runtime/Scripts/Core/VRView.cs +++ b/Runtime/Scripts/Core/VRView.cs @@ -1,9 +1,9 @@ using System; using System.Linq; using System.Reflection; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; using UnityEngine.Assertions; @@ -12,7 +12,7 @@ using InputTracking = UnityEngine.XR.InputTracking; using TrackingSpaceType = UnityEngine.XR.TrackingSpaceType; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { sealed class VRView #if UNITY_EDITOR diff --git a/Runtime/Scripts/Data/ActionMenuData.cs b/Runtime/Scripts/Data/ActionMenuData.cs index c0275467f..03483792a 100644 --- a/Runtime/Scripts/Data/ActionMenuData.cs +++ b/Runtime/Scripts/Data/ActionMenuData.cs @@ -1,6 +1,6 @@ -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Used for passing action data for menu purposes diff --git a/Runtime/Scripts/Data/AssetData.cs b/Runtime/Scripts/Data/AssetData.cs index fff33d41b..c46d066eb 100644 --- a/Runtime/Scripts/Data/AssetData.cs +++ b/Runtime/Scripts/Data/AssetData.cs @@ -1,9 +1,9 @@ -using Unity.Labs.ListView; +using Unity.ListViewFramework; using UnityEditor; using UnityEngine; using Object = UnityEngine.Object; -namespace Unity.Labs.EditorXR.Data +namespace Unity.EditorXR.Data { sealed class AssetData : IListViewItemData { diff --git a/Runtime/Scripts/Data/DefaultScriptReferences.cs b/Runtime/Scripts/Data/DefaultScriptReferences.cs index 6d8d796e1..b4120592d 100644 --- a/Runtime/Scripts/Data/DefaultScriptReferences.cs +++ b/Runtime/Scripts/Data/DefaultScriptReferences.cs @@ -3,13 +3,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Utilities +namespace Unity.EditorXR.Utilities { class DefaultScriptReferences : ScriptableObject { diff --git a/Runtime/Scripts/Data/FolderData.cs b/Runtime/Scripts/Data/FolderData.cs index ba451e57a..a243e484f 100644 --- a/Runtime/Scripts/Data/FolderData.cs +++ b/Runtime/Scripts/Data/FolderData.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Unity.Labs.ListView; +using Unity.ListViewFramework; -namespace Unity.Labs.EditorXR.Data +namespace Unity.EditorXR.Data { sealed class FolderData : NestedListViewItemData { diff --git a/Runtime/Scripts/Data/HandleEventData.cs b/Runtime/Scripts/Data/HandleEventData.cs index a35380048..875871449 100644 --- a/Runtime/Scripts/Data/HandleEventData.cs +++ b/Runtime/Scripts/Data/HandleEventData.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR.Handles +namespace Unity.EditorXR.Handles { /// /// Event data for BaseHandle.DragEventCallback diff --git a/Runtime/Scripts/Data/HierarchyData.cs b/Runtime/Scripts/Data/HierarchyData.cs index 57be8b5c1..e0552fc99 100644 --- a/Runtime/Scripts/Data/HierarchyData.cs +++ b/Runtime/Scripts/Data/HierarchyData.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Unity.Labs.ListView; +using Unity.ListViewFramework; using UnityEditor; using UnityEngine; @@ -38,7 +38,7 @@ public void Next() { } } #endif -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { sealed class HierarchyData : NestedListViewItemData { diff --git a/Runtime/Scripts/Data/InspectorData.cs b/Runtime/Scripts/Data/InspectorData.cs index 90aa443af..eb5ca2003 100644 --- a/Runtime/Scripts/Data/InspectorData.cs +++ b/Runtime/Scripts/Data/InspectorData.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Unity.Labs.ListView; +using Unity.ListViewFramework; using UnityEditor; -namespace Unity.Labs.EditorXR.Data +namespace Unity.EditorXR.Data { class InspectorData : NestedListViewItemData { diff --git a/Runtime/Scripts/Data/PropertyData.cs b/Runtime/Scripts/Data/PropertyData.cs index 9bb9dabec..eb6b68760 100644 --- a/Runtime/Scripts/Data/PropertyData.cs +++ b/Runtime/Scripts/Data/PropertyData.cs @@ -7,7 +7,7 @@ class SerializedProperty } #endif -namespace Unity.Labs.EditorXR.Data +namespace Unity.EditorXR.Data { sealed class PropertyData : InspectorData { diff --git a/Runtime/Scripts/Data/RayEventData.cs b/Runtime/Scripts/Data/RayEventData.cs index 717feebe5..72d33399d 100644 --- a/Runtime/Scripts/Data/RayEventData.cs +++ b/Runtime/Scripts/Data/RayEventData.cs @@ -1,8 +1,8 @@ -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; using UnityEngine; using UnityEngine.EventSystems; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { sealed class RayEventData : PointerEventData { diff --git a/Runtime/Scripts/Data/SelectionFlags.cs b/Runtime/Scripts/Data/SelectionFlags.cs index 827fe71ef..c3f117294 100644 --- a/Runtime/Scripts/Data/SelectionFlags.cs +++ b/Runtime/Scripts/Data/SelectionFlags.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { /// /// What type of interaction is considered a selection: diff --git a/Runtime/Scripts/Extensions/MonoBehaviourExtensions.cs b/Runtime/Scripts/Extensions/MonoBehaviourExtensions.cs index f49adb5e0..d4176cb6d 100644 --- a/Runtime/Scripts/Extensions/MonoBehaviourExtensions.cs +++ b/Runtime/Scripts/Extensions/MonoBehaviourExtensions.cs @@ -1,7 +1,7 @@ using System.Collections; using UnityEngine; -namespace Unity.Labs.EditorXR.Extensions +namespace Unity.EditorXR.Extensions { static class MonoBehaviourExtensions { diff --git a/Runtime/Scripts/Extensions/TransformExtensions.cs b/Runtime/Scripts/Extensions/TransformExtensions.cs index eed0b2064..e1580b86a 100644 --- a/Runtime/Scripts/Extensions/TransformExtensions.cs +++ b/Runtime/Scripts/Extensions/TransformExtensions.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR.Extensions +namespace Unity.EditorXR.Extensions { static class TransformExtensions { diff --git a/Runtime/Scripts/Handles/BaseHandle.cs b/Runtime/Scripts/Handles/BaseHandle.cs index f01f8d12f..9a6400d16 100644 --- a/Runtime/Scripts/Handles/BaseHandle.cs +++ b/Runtime/Scripts/Handles/BaseHandle.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.UI; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.Utils.GUI; +using Unity.EditorXR.Modules; +using Unity.EditorXR.UI; +using Unity.EditorXR.Utilities; +using Unity.XRTools.Utils.GUI; using UnityEngine; using UnityEngine.EventSystems; -namespace Unity.Labs.EditorXR.Handles +namespace Unity.EditorXR.Handles { /// /// Base class for providing draggable handles in 3D (requires PhysicsRaycaster) diff --git a/Runtime/Scripts/Handles/LinearHandle.cs b/Runtime/Scripts/Handles/LinearHandle.cs index 52457e03b..4467cc39b 100644 --- a/Runtime/Scripts/Handles/LinearHandle.cs +++ b/Runtime/Scripts/Handles/LinearHandle.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils.GUI; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Modules; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils.GUI; using UnityEngine; -namespace Unity.Labs.EditorXR.Handles +namespace Unity.EditorXR.Handles { sealed class LinearHandle : BaseHandle, IAxisConstraints, IUsesViewerScale { diff --git a/Runtime/Scripts/Handles/PlaneHandle.cs b/Runtime/Scripts/Handles/PlaneHandle.cs index ef2b1544e..8b1d26fbe 100644 --- a/Runtime/Scripts/Handles/PlaneHandle.cs +++ b/Runtime/Scripts/Handles/PlaneHandle.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils.GUI; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Modules; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils.GUI; using UnityEngine; -namespace Unity.Labs.EditorXR.Handles +namespace Unity.EditorXR.Handles { sealed class PlaneHandle : BaseHandle, IAxisConstraints, IUsesViewerScale { diff --git a/Runtime/Scripts/Handles/RadialHandle.cs b/Runtime/Scripts/Handles/RadialHandle.cs index 05887ff20..884b91c38 100644 --- a/Runtime/Scripts/Handles/RadialHandle.cs +++ b/Runtime/Scripts/Handles/RadialHandle.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.Utilities; +using Unity.EditorXR.Modules; +using Unity.EditorXR.Utilities; using UnityEngine; -namespace Unity.Labs.EditorXR.Handles +namespace Unity.EditorXR.Handles { sealed class RadialHandle : BaseHandle { diff --git a/Runtime/Scripts/Handles/SphereHandle.cs b/Runtime/Scripts/Handles/SphereHandle.cs index 8968e18d7..1c1d633fd 100644 --- a/Runtime/Scripts/Handles/SphereHandle.cs +++ b/Runtime/Scripts/Handles/SphereHandle.cs @@ -1,11 +1,11 @@ -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Modules; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; using UnityEngine; using UnityEngine.EventSystems; -namespace Unity.Labs.EditorXR.Handles +namespace Unity.EditorXR.Handles { sealed class SphereHandle : BaseHandle, IScrollHandler, IUsesViewerScale { diff --git a/Runtime/Scripts/Handles/UI/DropDown.cs b/Runtime/Scripts/Handles/UI/DropDown.cs index 59bb072cd..6d1f9b0e2 100644 --- a/Runtime/Scripts/Handles/UI/DropDown.cs +++ b/Runtime/Scripts/Handles/UI/DropDown.cs @@ -3,13 +3,13 @@ using System.Collections.Generic; using System.Linq; using TMPro; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.Utils; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Utilities; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { sealed class DropDown : MonoBehaviour { diff --git a/Runtime/Scripts/Handles/UI/KeyboardButton.cs b/Runtime/Scripts/Handles/UI/KeyboardButton.cs index 4d356b9c9..21f939530 100644 --- a/Runtime/Scripts/Handles/UI/KeyboardButton.cs +++ b/Runtime/Scripts/Handles/UI/KeyboardButton.cs @@ -1,15 +1,15 @@ using System; using System.Collections; using TMPro; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.Helpers; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.EditorXR.Workspaces; -using Unity.Labs.Utils; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Handles; +using Unity.EditorXR.Helpers; +using Unity.EditorXR.Utilities; +using Unity.EditorXR.Workspaces; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { sealed class KeyboardButton : BaseHandle { diff --git a/Runtime/Scripts/Helpers/EditorOnlyWorkspaceAttribute.cs b/Runtime/Scripts/Helpers/EditorOnlyWorkspaceAttribute.cs index 93a46f891..94c02524c 100644 --- a/Runtime/Scripts/Helpers/EditorOnlyWorkspaceAttribute.cs +++ b/Runtime/Scripts/Helpers/EditorOnlyWorkspaceAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { [AttributeUsage(AttributeTargets.Class)] sealed class EditorOnlyWorkspaceAttribute : Attribute diff --git a/Runtime/Scripts/Helpers/EditorWindowCapture.cs b/Runtime/Scripts/Helpers/EditorWindowCapture.cs index c5a822e4f..efb2ffe6c 100644 --- a/Runtime/Scripts/Helpers/EditorWindowCapture.cs +++ b/Runtime/Scripts/Helpers/EditorWindowCapture.cs @@ -8,7 +8,7 @@ using System.Threading; #endif -namespace Unity.Labs.EditorXR.Helpers +namespace Unity.EditorXR.Helpers { #if UNITY_EDITOR /// diff --git a/Runtime/Scripts/Helpers/EditorWindowCaptureUpdater.cs b/Runtime/Scripts/Helpers/EditorWindowCaptureUpdater.cs index 9e75176cb..e544b04ad 100644 --- a/Runtime/Scripts/Helpers/EditorWindowCaptureUpdater.cs +++ b/Runtime/Scripts/Helpers/EditorWindowCaptureUpdater.cs @@ -1,9 +1,9 @@ -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.Utils; +using Unity.EditorXR.Utilities; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Helpers +namespace Unity.EditorXR.Helpers { #if UNITY_EDITOR /// diff --git a/Runtime/Scripts/Helpers/GradientPair.cs b/Runtime/Scripts/Helpers/GradientPair.cs index 7c0a660c9..15a4d16ea 100644 --- a/Runtime/Scripts/Helpers/GradientPair.cs +++ b/Runtime/Scripts/Helpers/GradientPair.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Labs.EditorXR.Helpers +namespace Unity.EditorXR.Helpers { /// /// Gradient pair container class diff --git a/Runtime/Scripts/Helpers/PlayerBody.cs b/Runtime/Scripts/Helpers/PlayerBody.cs index 463c0ae88..fd7e55e79 100644 --- a/Runtime/Scripts/Helpers/PlayerBody.cs +++ b/Runtime/Scripts/Helpers/PlayerBody.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR.Helpers +namespace Unity.EditorXR.Helpers { class PlayerBody : MonoBehaviour { diff --git a/Runtime/Scripts/Helpers/PlayerFloor.cs b/Runtime/Scripts/Helpers/PlayerFloor.cs index e3612aa1a..77aa73a0d 100644 --- a/Runtime/Scripts/Helpers/PlayerFloor.cs +++ b/Runtime/Scripts/Helpers/PlayerFloor.cs @@ -1,13 +1,13 @@ using System.Collections; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Core; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Helpers +namespace Unity.EditorXR.Helpers { class PlayerFloor : MonoBehaviour, IUsesViewerScale, IUsesDetectGazeDivergence { diff --git a/Runtime/Scripts/Helpers/ProcessInputAttribute.cs b/Runtime/Scripts/Helpers/ProcessInputAttribute.cs index 930269795..7df4d9a60 100644 --- a/Runtime/Scripts/Helpers/ProcessInputAttribute.cs +++ b/Runtime/Scripts/Helpers/ProcessInputAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { [AttributeUsage(AttributeTargets.Class)] sealed class ProcessInputAttribute : Attribute diff --git a/Runtime/Scripts/Helpers/SmoothFloat.cs b/Runtime/Scripts/Helpers/SmoothFloat.cs index 9717a7940..94fa6a24f 100644 --- a/Runtime/Scripts/Helpers/SmoothFloat.cs +++ b/Runtime/Scripts/Helpers/SmoothFloat.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR.Helpers +namespace Unity.EditorXR.Helpers { /// /// Calculates a 'smooth' values of a float based on history. diff --git a/Runtime/Scripts/Helpers/SmoothMotion.cs b/Runtime/Scripts/Helpers/SmoothMotion.cs index f2547e5dc..4a34a9651 100644 --- a/Runtime/Scripts/Helpers/SmoothMotion.cs +++ b/Runtime/Scripts/Helpers/SmoothMotion.cs @@ -1,8 +1,8 @@ -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Helpers +namespace Unity.EditorXR.Helpers { /// /// Provides for smooth translation and/or rotation of an object diff --git a/Runtime/Scripts/Helpers/VRSmoothCamera.cs b/Runtime/Scripts/Helpers/VRSmoothCamera.cs index 0c2893243..3af87737c 100644 --- a/Runtime/Scripts/Helpers/VRSmoothCamera.cs +++ b/Runtime/Scripts/Helpers/VRSmoothCamera.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Helpers +namespace Unity.EditorXR.Helpers { #if UNITY_EDITOR /// diff --git a/Runtime/Scripts/Input/BaseInputToEvents.cs b/Runtime/Scripts/Input/BaseInputToEvents.cs index 494e0fce0..f43980d10 100644 --- a/Runtime/Scripts/Input/BaseInputToEvents.cs +++ b/Runtime/Scripts/Input/BaseInputToEvents.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Labs.EditorXR.Input +namespace Unity.EditorXR.Input { abstract class BaseInputToEvents : MonoBehaviour, IInputToEvents { diff --git a/Runtime/Scripts/Input/BaseVRInputToEvents.cs b/Runtime/Scripts/Input/BaseVRInputToEvents.cs index 65da11654..7dc8f30ee 100644 --- a/Runtime/Scripts/Input/BaseVRInputToEvents.cs +++ b/Runtime/Scripts/Input/BaseVRInputToEvents.cs @@ -3,7 +3,7 @@ using UnityEngine.InputNew; using UnityEngine.XR; -namespace Unity.Labs.EditorXR.Input +namespace Unity.EditorXR.Input { abstract class BaseVRInputToEvents : BaseInputToEvents { diff --git a/Runtime/Scripts/Input/IInputToEvents.cs b/Runtime/Scripts/Input/IInputToEvents.cs index 8704cebfc..8bd094b7b 100644 --- a/Runtime/Scripts/Input/IInputToEvents.cs +++ b/Runtime/Scripts/Input/IInputToEvents.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Labs.EditorXR.Input +namespace Unity.EditorXR.Input { interface IInputToEvents { diff --git a/Runtime/Scripts/Input/MultipleRayInputModule/ExecuteRayEvents.cs b/Runtime/Scripts/Input/MultipleRayInputModule/ExecuteRayEvents.cs index e3c6c9ddc..5dd256eab 100644 --- a/Runtime/Scripts/Input/MultipleRayInputModule/ExecuteRayEvents.cs +++ b/Runtime/Scripts/Input/MultipleRayInputModule/ExecuteRayEvents.cs @@ -1,6 +1,6 @@ using UnityEngine.EventSystems; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { static class ExecuteRayEvents { diff --git a/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayBeginDragHandler.cs b/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayBeginDragHandler.cs index 375beb676..eec4bc2a4 100644 --- a/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayBeginDragHandler.cs +++ b/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayBeginDragHandler.cs @@ -1,6 +1,6 @@ using UnityEngine.EventSystems; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { /// /// Decorates objects with functionality to detect RayBeginDrag events diff --git a/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayClickHandler.cs b/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayClickHandler.cs index 27e1b60e0..6b3d7002e 100644 --- a/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayClickHandler.cs +++ b/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayClickHandler.cs @@ -1,6 +1,6 @@ using UnityEngine.EventSystems; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { /// /// Decorates objects with functionality to detect RayClick events diff --git a/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayDragHandler.cs b/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayDragHandler.cs index df415e12d..ca37eea4e 100644 --- a/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayDragHandler.cs +++ b/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayDragHandler.cs @@ -1,6 +1,6 @@ using UnityEngine.EventSystems; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { /// /// Decorates objects with functionality to detect RayDrag events diff --git a/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayEndDragHandler.cs b/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayEndDragHandler.cs index a58968f04..56302e266 100644 --- a/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayEndDragHandler.cs +++ b/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayEndDragHandler.cs @@ -1,6 +1,6 @@ using UnityEngine.EventSystems; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { /// /// Decorates objects with functionality to detect RayEndDrag events diff --git a/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayEnterHandler.cs b/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayEnterHandler.cs index fac7b2436..49334feb4 100644 --- a/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayEnterHandler.cs +++ b/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayEnterHandler.cs @@ -1,6 +1,6 @@ using UnityEngine.EventSystems; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { /// /// Decorates objects with functionality to detect RayEnter events diff --git a/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayExitHandler.cs b/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayExitHandler.cs index b5e7b1949..1442ccdbd 100644 --- a/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayExitHandler.cs +++ b/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayExitHandler.cs @@ -1,6 +1,6 @@ using UnityEngine.EventSystems; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { /// /// Decorates objects with functionality to detect RayExit events diff --git a/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayHoverHandler.cs b/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayHoverHandler.cs index 8aa533b28..55bcb14cc 100644 --- a/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayHoverHandler.cs +++ b/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IRayHoverHandler.cs @@ -1,6 +1,6 @@ using UnityEngine.EventSystems; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { /// /// Decorates objects with functionality to detect RayHover events diff --git a/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IWillRender.cs b/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IWillRender.cs index 56b2dea2f..ce439b5bd 100644 --- a/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IWillRender.cs +++ b/Runtime/Scripts/Input/MultipleRayInputModule/Interfaces/IWillRender.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { /// /// Implementors can expose visibility callbacks to UI components when they are added to the same GameObject diff --git a/Runtime/Scripts/Input/MultipleRayInputModule/MultipleRayInputModule.cs b/Runtime/Scripts/Input/MultipleRayInputModule/MultipleRayInputModule.cs index ad0d8cd2d..7ba95682a 100644 --- a/Runtime/Scripts/Input/MultipleRayInputModule/MultipleRayInputModule.cs +++ b/Runtime/Scripts/Input/MultipleRayInputModule/MultipleRayInputModule.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Proxies; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Proxies; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { /// /// A BaseInputModule designed for mouse / keyboard / controller input. diff --git a/Runtime/Scripts/Input/MultipleRayInputModule/MultipleRayInputModuleSettings.cs b/Runtime/Scripts/Input/MultipleRayInputModule/MultipleRayInputModuleSettings.cs index 5d9b4200d..48040c875 100644 --- a/Runtime/Scripts/Input/MultipleRayInputModule/MultipleRayInputModuleSettings.cs +++ b/Runtime/Scripts/Input/MultipleRayInputModule/MultipleRayInputModuleSettings.cs @@ -1,8 +1,8 @@ -using Unity.Labs.Utils; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { sealed class MultipleRayInputModuleSettings : ScriptableSettings { diff --git a/Runtime/Scripts/Input/MultipleRayInputModule/RayInputModule.cs b/Runtime/Scripts/Input/MultipleRayInputModule/RayInputModule.cs index e6c64ddff..9c52ec743 100644 --- a/Runtime/Scripts/Input/MultipleRayInputModule/RayInputModule.cs +++ b/Runtime/Scripts/Input/MultipleRayInputModule/RayInputModule.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; using System.Text; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Modules; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; using UnityEngine; using UnityEngine.EventSystems; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { /// /// A BaseInputModule for ray-based input, based on PointerInputModule diff --git a/Runtime/Scripts/Input/MultipleRayInputModule/VisibilityDetector.cs b/Runtime/Scripts/Input/MultipleRayInputModule/VisibilityDetector.cs index fcc754861..29e5572dc 100644 --- a/Runtime/Scripts/Input/MultipleRayInputModule/VisibilityDetector.cs +++ b/Runtime/Scripts/Input/MultipleRayInputModule/VisibilityDetector.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Unity.Labs.EditorXR.Utilities; +using Unity.EditorXR.Utilities; using UnityEngine; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { class VisibilityDetector : MonoBehaviour { diff --git a/Runtime/Scripts/Input/OVRTouchInputToEvents.cs b/Runtime/Scripts/Input/OVRTouchInputToEvents.cs index 76a505ed4..c7685750a 100644 --- a/Runtime/Scripts/Input/OVRTouchInputToEvents.cs +++ b/Runtime/Scripts/Input/OVRTouchInputToEvents.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR.Input +namespace Unity.EditorXR.Input { sealed class OVRTouchInputToEvents : BaseVRInputToEvents { diff --git a/Runtime/Scripts/Input/ViveInputToEvents.cs b/Runtime/Scripts/Input/ViveInputToEvents.cs index fbe4047c7..7b6abee31 100644 --- a/Runtime/Scripts/Input/ViveInputToEvents.cs +++ b/Runtime/Scripts/Input/ViveInputToEvents.cs @@ -1,6 +1,6 @@ using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Input +namespace Unity.EditorXR.Input { sealed class ViveInputToEvents : BaseVRInputToEvents { diff --git a/Runtime/Scripts/Interfaces/Capability/IDropReceiver.cs b/Runtime/Scripts/Interfaces/Capability/IDropReceiver.cs index f953f5ade..452466e6d 100644 --- a/Runtime/Scripts/Interfaces/Capability/IDropReceiver.cs +++ b/Runtime/Scripts/Interfaces/Capability/IDropReceiver.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Implementors can receive IDroppables diff --git a/Runtime/Scripts/Interfaces/Capability/IDroppable.cs b/Runtime/Scripts/Interfaces/Capability/IDroppable.cs index ee12fa9cb..8375534a6 100644 --- a/Runtime/Scripts/Interfaces/Capability/IDroppable.cs +++ b/Runtime/Scripts/Interfaces/Capability/IDroppable.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Implementors can be dropped on IDropReceivers diff --git a/Runtime/Scripts/Interfaces/Capability/IFeedbackReceiver.cs b/Runtime/Scripts/Interfaces/Capability/IFeedbackReceiver.cs index b2d030f5a..681900057 100644 --- a/Runtime/Scripts/Interfaces/Capability/IFeedbackReceiver.cs +++ b/Runtime/Scripts/Interfaces/Capability/IFeedbackReceiver.cs @@ -1,6 +1,6 @@ -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Implementors can receive Feedback Requests diff --git a/Runtime/Scripts/Interfaces/Capability/IManipulatorController.cs b/Runtime/Scripts/Interfaces/Capability/IManipulatorController.cs index 389ead3b2..be92429b4 100644 --- a/Runtime/Scripts/Interfaces/Capability/IManipulatorController.cs +++ b/Runtime/Scripts/Interfaces/Capability/IManipulatorController.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Provide access to the system to show/hide and check drag state of manipulators on this tool / workspace / etc. diff --git a/Runtime/Scripts/Interfaces/Capability/ISelectionChanged.cs b/Runtime/Scripts/Interfaces/Capability/ISelectionChanged.cs index 08d061756..5e7fb48db 100644 --- a/Runtime/Scripts/Interfaces/Capability/ISelectionChanged.cs +++ b/Runtime/Scripts/Interfaces/Capability/ISelectionChanged.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Decorates types that need to respond to a change in selection diff --git a/Runtime/Scripts/Interfaces/Capability/ISerializeWorkspace.cs b/Runtime/Scripts/Interfaces/Capability/ISerializeWorkspace.cs index dd4b249da..4ddf7c97d 100644 --- a/Runtime/Scripts/Interfaces/Capability/ISerializeWorkspace.cs +++ b/Runtime/Scripts/Interfaces/Capability/ISerializeWorkspace.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { interface ISerializeWorkspace { diff --git a/Runtime/Scripts/Interfaces/Capability/ISettingsMenuProvider.cs b/Runtime/Scripts/Interfaces/Capability/ISettingsMenuProvider.cs index 4c0bf6e8b..8aa0eede4 100644 --- a/Runtime/Scripts/Interfaces/Capability/ISettingsMenuProvider.cs +++ b/Runtime/Scripts/Interfaces/Capability/ISettingsMenuProvider.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Decorates types that can provide a sub-menu on the Settings menu. The class should also use a MainMenuItemAttribute diff --git a/Runtime/Scripts/Interfaces/Capability/ISpatialMenuProvider.cs b/Runtime/Scripts/Interfaces/Capability/ISpatialMenuProvider.cs index c2469a8d5..e1a22ab95 100644 --- a/Runtime/Scripts/Interfaces/Capability/ISpatialMenuProvider.cs +++ b/Runtime/Scripts/Interfaces/Capability/ISpatialMenuProvider.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Decorates types that can provide a sub-menu in the SpatialUI diff --git a/Runtime/Scripts/Interfaces/Capability/ITwoHandedScaler.cs b/Runtime/Scripts/Interfaces/Capability/ITwoHandedScaler.cs index 3ca7aa1a8..3ed9ff32b 100644 --- a/Runtime/Scripts/Interfaces/Capability/ITwoHandedScaler.cs +++ b/Runtime/Scripts/Interfaces/Capability/ITwoHandedScaler.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Provides a method used to check the status of two-handed scaling diff --git a/Runtime/Scripts/Interfaces/Capability/IUpdateInspectors.cs b/Runtime/Scripts/Interfaces/Capability/IUpdateInspectors.cs index e13f71304..236540713 100644 --- a/Runtime/Scripts/Interfaces/Capability/IUpdateInspectors.cs +++ b/Runtime/Scripts/Interfaces/Capability/IUpdateInspectors.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { /// /// Provides UpdateInspectors method used to update inspectors when their content has changed diff --git a/Runtime/Scripts/Interfaces/Entity/IAction.cs b/Runtime/Scripts/Interfaces/Entity/IAction.cs index 16e92ac37..ca74c3f0a 100644 --- a/Runtime/Scripts/Interfaces/Entity/IAction.cs +++ b/Runtime/Scripts/Interfaces/Entity/IAction.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Declares a class as an action that can be executed within the system diff --git a/Runtime/Scripts/Interfaces/Entity/IAlternateMenu.cs b/Runtime/Scripts/Interfaces/Entity/IAlternateMenu.cs index 5d78a77b2..a660ab842 100644 --- a/Runtime/Scripts/Interfaces/Entity/IAlternateMenu.cs +++ b/Runtime/Scripts/Interfaces/Entity/IAlternateMenu.cs @@ -1,6 +1,6 @@ -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// An alternate menu that shows on device proxies diff --git a/Runtime/Scripts/Interfaces/Entity/IEditingContext.cs b/Runtime/Scripts/Interfaces/Entity/IEditingContext.cs index a5b09d24f..bc6fb2a27 100644 --- a/Runtime/Scripts/Interfaces/Entity/IEditingContext.cs +++ b/Runtime/Scripts/Interfaces/Entity/IEditingContext.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Implement this interface to create an editing context. You can also specify your own custom diff --git a/Runtime/Scripts/Interfaces/Entity/IEditor.cs b/Runtime/Scripts/Interfaces/Entity/IEditor.cs index ee53510e0..80ad5e4d7 100644 --- a/Runtime/Scripts/Interfaces/Entity/IEditor.cs +++ b/Runtime/Scripts/Interfaces/Entity/IEditor.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Implement this interface to create an editor (e.g. EditorXR) to be used in conjunction with an editing context. diff --git a/Runtime/Scripts/Interfaces/Entity/ILocomotor.cs b/Runtime/Scripts/Interfaces/Entity/ILocomotor.cs index d5c68a056..6b5ebc448 100644 --- a/Runtime/Scripts/Interfaces/Entity/ILocomotor.cs +++ b/Runtime/Scripts/Interfaces/Entity/ILocomotor.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Decorates a class as a locomotion implementer that uses the camera rig diff --git a/Runtime/Scripts/Interfaces/Entity/IMainMenu.cs b/Runtime/Scripts/Interfaces/Entity/IMainMenu.cs index d30761ca0..5b15af66e 100644 --- a/Runtime/Scripts/Interfaces/Entity/IMainMenu.cs +++ b/Runtime/Scripts/Interfaces/Entity/IMainMenu.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// The main menu that can be shown on device proxies diff --git a/Runtime/Scripts/Interfaces/Entity/IManipulator.cs b/Runtime/Scripts/Interfaces/Entity/IManipulator.cs index a15300592..d97f23030 100644 --- a/Runtime/Scripts/Interfaces/Entity/IManipulator.cs +++ b/Runtime/Scripts/Interfaces/Entity/IManipulator.cs @@ -1,8 +1,8 @@ using System; -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Gives decorated class access to the GameObject over which a particular ray is hovering diff --git a/Runtime/Scripts/Interfaces/Entity/IMenuIcon.cs b/Runtime/Scripts/Interfaces/Entity/IMenuIcon.cs index 36d48340a..5cdbb52d4 100644 --- a/Runtime/Scripts/Interfaces/Entity/IMenuIcon.cs +++ b/Runtime/Scripts/Interfaces/Entity/IMenuIcon.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Provides an icon/sprite to display on a menu item which represents this class diff --git a/Runtime/Scripts/Interfaces/Entity/IMultiDeviceTool.cs b/Runtime/Scripts/Interfaces/Entity/IMultiDeviceTool.cs index f135a48fb..8b80daf9a 100644 --- a/Runtime/Scripts/Interfaces/Entity/IMultiDeviceTool.cs +++ b/Runtime/Scripts/Interfaces/Entity/IMultiDeviceTool.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Declares a tool as one that should be spawned on all devices at once diff --git a/Runtime/Scripts/Interfaces/Entity/IPreviewCamera.cs b/Runtime/Scripts/Interfaces/Entity/IPreviewCamera.cs index 674518f96..ec0da46cc 100644 --- a/Runtime/Scripts/Interfaces/Entity/IPreviewCamera.cs +++ b/Runtime/Scripts/Interfaces/Entity/IPreviewCamera.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// For specifying an alternate preview camera diff --git a/Runtime/Scripts/Interfaces/Entity/IProxy.cs b/Runtime/Scripts/Interfaces/Entity/IProxy.cs index 1c50570dd..61ff28af4 100644 --- a/Runtime/Scripts/Interfaces/Entity/IProxy.cs +++ b/Runtime/Scripts/Interfaces/Entity/IProxy.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Declares a class as being a proxy for an input device diff --git a/Runtime/Scripts/Interfaces/Entity/IRaycastSource.cs b/Runtime/Scripts/Interfaces/Entity/IRaycastSource.cs index ab60c4cc6..3d1ed977c 100644 --- a/Runtime/Scripts/Interfaces/Entity/IRaycastSource.cs +++ b/Runtime/Scripts/Interfaces/Entity/IRaycastSource.cs @@ -1,7 +1,7 @@ -using Unity.Labs.EditorXR.Modules; +using Unity.EditorXR.Modules; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Declares a class as being a source for the MultipleRayInputModule diff --git a/Runtime/Scripts/Interfaces/Entity/IScriptReference.cs b/Runtime/Scripts/Interfaces/Entity/IScriptReference.cs index 7fab94e3c..07b91e51c 100644 --- a/Runtime/Scripts/Interfaces/Entity/IScriptReference.cs +++ b/Runtime/Scripts/Interfaces/Entity/IScriptReference.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Implement this interface to add this class's default script importer references to the DefaultScriptReferences prefab diff --git a/Runtime/Scripts/Interfaces/Entity/ITool.cs b/Runtime/Scripts/Interfaces/Entity/ITool.cs index 73908e493..22be61d4c 100644 --- a/Runtime/Scripts/Interfaces/Entity/ITool.cs +++ b/Runtime/Scripts/Interfaces/Entity/ITool.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Declares a class as a tool within the system diff --git a/Runtime/Scripts/Interfaces/Entity/IToolsMenu.cs b/Runtime/Scripts/Interfaces/Entity/IToolsMenu.cs index 7ec3339bf..1ef851577 100644 --- a/Runtime/Scripts/Interfaces/Entity/IToolsMenu.cs +++ b/Runtime/Scripts/Interfaces/Entity/IToolsMenu.cs @@ -1,8 +1,8 @@ using System; -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Gives decorated class Tools Menu functionality diff --git a/Runtime/Scripts/Interfaces/Entity/IToolsMenuButton.cs b/Runtime/Scripts/Interfaces/Entity/IToolsMenuButton.cs index 8f5b2f98e..637b7ed01 100644 --- a/Runtime/Scripts/Interfaces/Entity/IToolsMenuButton.cs +++ b/Runtime/Scripts/Interfaces/Entity/IToolsMenuButton.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Provides an interface for handling Tools Menu Button functionality diff --git a/Runtime/Scripts/Interfaces/Entity/ITransformer.cs b/Runtime/Scripts/Interfaces/Entity/ITransformer.cs index 327fdfa36..10677b30e 100644 --- a/Runtime/Scripts/Interfaces/Entity/ITransformer.cs +++ b/Runtime/Scripts/Interfaces/Entity/ITransformer.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Designates a tool as a Transform tool diff --git a/Runtime/Scripts/Interfaces/FunctionalityInjection/IActions.cs b/Runtime/Scripts/Interfaces/FunctionalityInjection/IActions.cs index 6c1e6913f..d84929d54 100644 --- a/Runtime/Scripts/Interfaces/FunctionalityInjection/IActions.cs +++ b/Runtime/Scripts/Interfaces/FunctionalityInjection/IActions.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Declares that a class has tool actions that should be picked up by the system diff --git a/Runtime/Scripts/Interfaces/FunctionalityInjection/IActionsMenu.cs b/Runtime/Scripts/Interfaces/FunctionalityInjection/IActionsMenu.cs index 84ea7fde5..5e8da267e 100644 --- a/Runtime/Scripts/Interfaces/FunctionalityInjection/IActionsMenu.cs +++ b/Runtime/Scripts/Interfaces/FunctionalityInjection/IActionsMenu.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Decorates a class that wants to receive menu actions diff --git a/Runtime/Scripts/Interfaces/FunctionalityInjection/IAdaptPosition.cs b/Runtime/Scripts/Interfaces/FunctionalityInjection/IAdaptPosition.cs index 36b97f0b5..3b9b208b2 100644 --- a/Runtime/Scripts/Interfaces/FunctionalityInjection/IAdaptPosition.cs +++ b/Runtime/Scripts/Interfaces/FunctionalityInjection/IAdaptPosition.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Gives decorated class ability to be automatically positioned by the AdaptivePositionModule diff --git a/Runtime/Scripts/Interfaces/FunctionalityInjection/IAllWorkspaces.cs b/Runtime/Scripts/Interfaces/FunctionalityInjection/IAllWorkspaces.cs index bc840923f..e0063d6f7 100644 --- a/Runtime/Scripts/Interfaces/FunctionalityInjection/IAllWorkspaces.cs +++ b/Runtime/Scripts/Interfaces/FunctionalityInjection/IAllWorkspaces.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Get all open workspaces diff --git a/Runtime/Scripts/Interfaces/FunctionalityInjection/IControlSpatialScrolling.cs b/Runtime/Scripts/Interfaces/FunctionalityInjection/IControlSpatialScrolling.cs index 32e1b9062..86e9d384d 100644 --- a/Runtime/Scripts/Interfaces/FunctionalityInjection/IControlSpatialScrolling.cs +++ b/Runtime/Scripts/Interfaces/FunctionalityInjection/IControlSpatialScrolling.cs @@ -1,9 +1,9 @@ using System; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Modules; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Modules; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Gives decorated class ability to control/perform spatial-scrolling diff --git a/Runtime/Scripts/Interfaces/FunctionalityInjection/IExclusiveMode.cs b/Runtime/Scripts/Interfaces/FunctionalityInjection/IExclusiveMode.cs index 04984e274..8b144e7fe 100644 --- a/Runtime/Scripts/Interfaces/FunctionalityInjection/IExclusiveMode.cs +++ b/Runtime/Scripts/Interfaces/FunctionalityInjection/IExclusiveMode.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Make use of exclusive mode, which turns off any other tools (e.g. TransformTool, SelectionTool, etc.) diff --git a/Runtime/Scripts/Interfaces/FunctionalityInjection/IFilterUI.cs b/Runtime/Scripts/Interfaces/FunctionalityInjection/IFilterUI.cs index 797f35154..065700a56 100644 --- a/Runtime/Scripts/Interfaces/FunctionalityInjection/IFilterUI.cs +++ b/Runtime/Scripts/Interfaces/FunctionalityInjection/IFilterUI.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Implementors receive a filtered list of types found diff --git a/Runtime/Scripts/Interfaces/FunctionalityInjection/IInstantiateUI.cs b/Runtime/Scripts/Interfaces/FunctionalityInjection/IInstantiateUI.cs index 4c89d7cab..db910cd06 100644 --- a/Runtime/Scripts/Interfaces/FunctionalityInjection/IInstantiateUI.cs +++ b/Runtime/Scripts/Interfaces/FunctionalityInjection/IInstantiateUI.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Decorates types that need to connect interfaces for spawned objects diff --git a/Runtime/Scripts/Interfaces/FunctionalityInjection/ILinkedObject.cs b/Runtime/Scripts/Interfaces/FunctionalityInjection/ILinkedObject.cs index 8b07b011d..78804d42b 100644 --- a/Runtime/Scripts/Interfaces/FunctionalityInjection/ILinkedObject.cs +++ b/Runtime/Scripts/Interfaces/FunctionalityInjection/ILinkedObject.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Provides access to other tools of the same type diff --git a/Runtime/Scripts/Interfaces/FunctionalityInjection/ISetEditingContext.cs b/Runtime/Scripts/Interfaces/FunctionalityInjection/ISetEditingContext.cs index af429c416..7a8bb0516 100644 --- a/Runtime/Scripts/Interfaces/FunctionalityInjection/ISetEditingContext.cs +++ b/Runtime/Scripts/Interfaces/FunctionalityInjection/ISetEditingContext.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { interface ISetEditingContext { diff --git a/Runtime/Scripts/Interfaces/FunctionalityInjection/IStandardIgnoreList.cs b/Runtime/Scripts/Interfaces/FunctionalityInjection/IStandardIgnoreList.cs index e8e0690be..0c7e2c1a5 100644 --- a/Runtime/Scripts/Interfaces/FunctionalityInjection/IStandardIgnoreList.cs +++ b/Runtime/Scripts/Interfaces/FunctionalityInjection/IStandardIgnoreList.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Receive the default list of ignored objects from the system for intersection purposes diff --git a/Runtime/Scripts/Interfaces/FunctionalityInjection/ITrackedObjectActionMap.cs b/Runtime/Scripts/Interfaces/FunctionalityInjection/ITrackedObjectActionMap.cs index b4c105097..673bce82e 100644 --- a/Runtime/Scripts/Interfaces/FunctionalityInjection/ITrackedObjectActionMap.cs +++ b/Runtime/Scripts/Interfaces/FunctionalityInjection/ITrackedObjectActionMap.cs @@ -1,6 +1,6 @@ using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Provided to a tool for device input (e.g. position / rotation) diff --git a/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesCameraRig.cs b/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesCameraRig.cs index 65e4b7aed..5841cc145 100644 --- a/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesCameraRig.cs +++ b/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesCameraRig.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Gives decorated class access to the camera rig diff --git a/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesDeviceType.cs b/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesDeviceType.cs index aa678dfd1..171f108d3 100644 --- a/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesDeviceType.cs +++ b/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesDeviceType.cs @@ -1,7 +1,7 @@ using System; using UnityEngine.XR; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { enum DeviceType { diff --git a/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesHandedRayOrigin.cs b/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesHandedRayOrigin.cs index 67a4e4d6a..cd180b77e 100644 --- a/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesHandedRayOrigin.cs +++ b/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesHandedRayOrigin.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Adds Node information to IUsesRayOrigin to determine which hand the tool is attached to diff --git a/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesMenuOrigins.cs b/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesMenuOrigins.cs index 3874e1318..eb0419ec1 100644 --- a/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesMenuOrigins.cs +++ b/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesMenuOrigins.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// The transforms for various menu origins provided by device proxies diff --git a/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesNode.cs b/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesNode.cs index 8c65ca136..d9d1b19f6 100644 --- a/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesNode.cs +++ b/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesNode.cs @@ -1,6 +1,6 @@ -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Adds Node information to determine which hand the tool is attached to diff --git a/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesRayOrigin.cs b/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesRayOrigin.cs index 08229a244..664f33c4e 100644 --- a/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesRayOrigin.cs +++ b/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesRayOrigin.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// A proxy can have a single ray origin or multiple ray origins depending on the input device diff --git a/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesStencilRef.cs b/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesStencilRef.cs index 4c2c70a46..46892c1db 100644 --- a/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesStencilRef.cs +++ b/Runtime/Scripts/Interfaces/FunctionalityInjection/IUsesStencilRef.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Deliver a stencil ref value for use in materials (useful for masks) diff --git a/Runtime/Scripts/Interfaces/ISettingsMenuItemProvider.cs b/Runtime/Scripts/Interfaces/ISettingsMenuItemProvider.cs index 2681f4d3c..c8589b54d 100644 --- a/Runtime/Scripts/Interfaces/ISettingsMenuItemProvider.cs +++ b/Runtime/Scripts/Interfaces/ISettingsMenuItemProvider.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Decorates types that can provide an item on the Settings menu diff --git a/Runtime/Scripts/Interfaces/IUsesCustomMenuOrigins.cs b/Runtime/Scripts/Interfaces/IUsesCustomMenuOrigins.cs index a945fdedd..4615afe7a 100644 --- a/Runtime/Scripts/Interfaces/IUsesCustomMenuOrigins.cs +++ b/Runtime/Scripts/Interfaces/IUsesCustomMenuOrigins.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Provides access to transform roots for custom menus diff --git a/Runtime/Scripts/Interfaces/IUsesRayOrigins.cs b/Runtime/Scripts/Interfaces/IUsesRayOrigins.cs index 09891e69b..30422a53a 100644 --- a/Runtime/Scripts/Interfaces/IUsesRayOrigins.cs +++ b/Runtime/Scripts/Interfaces/IUsesRayOrigins.cs @@ -1,7 +1,7 @@ using UnityEngine; using System.Collections.Generic; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Provides access to all ray origins in the system diff --git a/Runtime/Scripts/Interfaces/Providers/IProvidesAddRaycastSource.cs b/Runtime/Scripts/Interfaces/Providers/IProvidesAddRaycastSource.cs index 6e94f02bd..c6f18e71f 100644 --- a/Runtime/Scripts/Interfaces/Providers/IProvidesAddRaycastSource.cs +++ b/Runtime/Scripts/Interfaces/Providers/IProvidesAddRaycastSource.cs @@ -1,9 +1,9 @@ using System; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Provide the ability to add RaycastSources to the system diff --git a/Runtime/Scripts/Interfaces/Providers/IProvidesGetRayEventData.cs b/Runtime/Scripts/Interfaces/Providers/IProvidesGetRayEventData.cs index 9515d8b7d..fc2019ca1 100644 --- a/Runtime/Scripts/Interfaces/Providers/IProvidesGetRayEventData.cs +++ b/Runtime/Scripts/Interfaces/Providers/IProvidesGetRayEventData.cs @@ -1,8 +1,8 @@ -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Modules; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { /// /// Provide access to pointer event data diff --git a/Runtime/Scripts/Interfaces/Providers/IProvidesInstantiateMenuUI.cs b/Runtime/Scripts/Interfaces/Providers/IProvidesInstantiateMenuUI.cs index a61e5ba50..fcb30adc3 100644 --- a/Runtime/Scripts/Interfaces/Providers/IProvidesInstantiateMenuUI.cs +++ b/Runtime/Scripts/Interfaces/Providers/IProvidesInstantiateMenuUI.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to the spatial hash diff --git a/Runtime/Scripts/Interfaces/Providers/IProvidesPoly.cs b/Runtime/Scripts/Interfaces/Providers/IProvidesPoly.cs index 587bf137e..49de5c17b 100644 --- a/Runtime/Scripts/Interfaces/Providers/IProvidesPoly.cs +++ b/Runtime/Scripts/Interfaces/Providers/IProvidesPoly.cs @@ -1,5 +1,5 @@ -using Unity.Labs.EditorXR.Workspaces; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Workspaces; +using Unity.XRTools.ModuleLoader; #if INCLUDE_POLY_TOOLKIT using System; @@ -7,7 +7,7 @@ using PolyToolkit; #endif -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to the spatial hash diff --git a/Runtime/Scripts/Interfaces/Providers/IProvidesUIEvents.cs b/Runtime/Scripts/Interfaces/Providers/IProvidesUIEvents.cs index 2cd229dae..e7a262f36 100644 --- a/Runtime/Scripts/Interfaces/Providers/IProvidesUIEvents.cs +++ b/Runtime/Scripts/Interfaces/Providers/IProvidesUIEvents.cs @@ -1,9 +1,9 @@ using System; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Modules; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Provide access to UI events diff --git a/Runtime/Scripts/Interfaces/Subscribers/IUsesAddRaycastSource.cs b/Runtime/Scripts/Interfaces/Subscribers/IUsesAddRaycastSource.cs index d7a64616f..b8ff81aa5 100644 --- a/Runtime/Scripts/Interfaces/Subscribers/IUsesAddRaycastSource.cs +++ b/Runtime/Scripts/Interfaces/Subscribers/IUsesAddRaycastSource.cs @@ -1,8 +1,8 @@ using System; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to add raycast sources to the system diff --git a/Runtime/Scripts/Interfaces/Subscribers/IUsesGetRayEventData.cs b/Runtime/Scripts/Interfaces/Subscribers/IUsesGetRayEventData.cs index c6cf90393..0b0480b22 100644 --- a/Runtime/Scripts/Interfaces/Subscribers/IUsesGetRayEventData.cs +++ b/Runtime/Scripts/Interfaces/Subscribers/IUsesGetRayEventData.cs @@ -1,8 +1,8 @@ -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Modules; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class the ability to add get pointer event data from the system diff --git a/Runtime/Scripts/Interfaces/Subscribers/IUsesInstantiateMenuUI.cs b/Runtime/Scripts/Interfaces/Subscribers/IUsesInstantiateMenuUI.cs index b492e1fcd..310963e17 100644 --- a/Runtime/Scripts/Interfaces/Subscribers/IUsesInstantiateMenuUI.cs +++ b/Runtime/Scripts/Interfaces/Subscribers/IUsesInstantiateMenuUI.cs @@ -1,7 +1,7 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to viewer scale diff --git a/Runtime/Scripts/Interfaces/Subscribers/IUsesPoly.cs b/Runtime/Scripts/Interfaces/Subscribers/IUsesPoly.cs index f53790111..33048706d 100644 --- a/Runtime/Scripts/Interfaces/Subscribers/IUsesPoly.cs +++ b/Runtime/Scripts/Interfaces/Subscribers/IUsesPoly.cs @@ -1,13 +1,13 @@ -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; #if INCLUDE_POLY_TOOLKIT using PolyToolkit; using System; using System.Collections.Generic; -using Unity.Labs.EditorXR.Workspaces; +using Unity.EditorXR.Workspaces; #endif -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to viewer scale diff --git a/Runtime/Scripts/Interfaces/Subscribers/IUsesUIEvents.cs b/Runtime/Scripts/Interfaces/Subscribers/IUsesUIEvents.cs index d5bb51923..2835d113d 100644 --- a/Runtime/Scripts/Interfaces/Subscribers/IUsesUIEvents.cs +++ b/Runtime/Scripts/Interfaces/Subscribers/IUsesUIEvents.cs @@ -1,9 +1,9 @@ using System; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Modules; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Interfaces +namespace Unity.EditorXR.Interfaces { /// /// Gives decorated class access to UI events diff --git a/Runtime/Scripts/ListView/EditorXRListViewController.cs b/Runtime/Scripts/ListView/EditorXRListViewController.cs index 01ffdbbb8..4739d558b 100644 --- a/Runtime/Scripts/ListView/EditorXRListViewController.cs +++ b/Runtime/Scripts/ListView/EditorXRListViewController.cs @@ -1,10 +1,10 @@ -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ListView; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.ListViewFramework; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { abstract class EditorXRListViewController : ListViewController, IInstantiateUI, IUsesConnectInterfaces, IUsesControlHaptics, IRayToNode, IUsesFunctionalityInjection diff --git a/Runtime/Scripts/ListView/EditorXRListViewItem.cs b/Runtime/Scripts/ListView/EditorXRListViewItem.cs index aee3203c5..1991f9240 100644 --- a/Runtime/Scripts/ListView/EditorXRListViewItem.cs +++ b/Runtime/Scripts/ListView/EditorXRListViewItem.cs @@ -1,8 +1,8 @@ using System; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ListView; +using Unity.EditorXR.Interfaces; +using Unity.ListViewFramework; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { class EditorXRListViewItem : ListViewItem where TData : IListViewItemData { diff --git a/Runtime/Scripts/ListView/EditorXRNestedListViewController.cs b/Runtime/Scripts/ListView/EditorXRNestedListViewController.cs index a51ad07a5..0a2a384a0 100644 --- a/Runtime/Scripts/ListView/EditorXRNestedListViewController.cs +++ b/Runtime/Scripts/ListView/EditorXRNestedListViewController.cs @@ -1,10 +1,10 @@ -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ListView; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.ListViewFramework; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { abstract class EditorXRNestedListViewController : NestedListViewController, IInstantiateUI, IUsesConnectInterfaces, IUsesControlHaptics, IRayToNode diff --git a/Runtime/Scripts/ListView/EditorXRNestedListViewItem.cs b/Runtime/Scripts/ListView/EditorXRNestedListViewItem.cs index 2c1967a43..0f917df32 100644 --- a/Runtime/Scripts/ListView/EditorXRNestedListViewItem.cs +++ b/Runtime/Scripts/ListView/EditorXRNestedListViewItem.cs @@ -1,7 +1,7 @@ using System; -using Unity.Labs.ListView; +using Unity.ListViewFramework; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { abstract class EditorXRNestedListViewItem : EditorXRListViewItem, INestedListViewItem where TData : INestedListViewItemData diff --git a/Runtime/Scripts/Modules/ActionsModule.cs b/Runtime/Scripts/Modules/ActionsModule.cs index 17ab8e5cf..3971ba770 100644 --- a/Runtime/Scripts/Modules/ActionsModule.cs +++ b/Runtime/Scripts/Modules/ActionsModule.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { sealed class ActionsModule : MonoBehaviour, IModule, IUsesConnectInterfaces, ISpatialMenuProvider, IInterfaceConnector, IUsesFunctionalityInjection { diff --git a/Runtime/Scripts/Modules/AdaptivePositionModule/AdaptivePositionModule.cs b/Runtime/Scripts/Modules/AdaptivePositionModule/AdaptivePositionModule.cs index f00a40cdb..3885e646f 100644 --- a/Runtime/Scripts/Modules/AdaptivePositionModule/AdaptivePositionModule.cs +++ b/Runtime/Scripts/Modules/AdaptivePositionModule/AdaptivePositionModule.cs @@ -1,15 +1,15 @@ using System; using System.Collections; using System.Collections.Generic; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { sealed class AdaptivePositionModule : ScriptableSettings, IDelayedInitializationModule, IModuleBehaviorCallbacks, IUsesDetectGazeDivergence, IUsesViewerScale, IUsesControlHaptics, IInterfaceConnector diff --git a/Runtime/Scripts/Modules/DeviceInputModule.cs b/Runtime/Scripts/Modules/DeviceInputModule.cs index 1366be051..2cc0962c3 100644 --- a/Runtime/Scripts/Modules/DeviceInputModule.cs +++ b/Runtime/Scripts/Modules/DeviceInputModule.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { [ModuleOrder(ModuleOrders.DeviceInputModuleOrder)] [ModuleBehaviorCallbackOrder(ModuleOrders.DeviceInputModuleBehaviorOrder)] diff --git a/Runtime/Scripts/Modules/DragAndDropModule.cs b/Runtime/Scripts/Modules/DragAndDropModule.cs index 118085ec9..976281734 100644 --- a/Runtime/Scripts/Modules/DragAndDropModule.cs +++ b/Runtime/Scripts/Modules/DragAndDropModule.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { sealed class DragAndDropModule : IDelayedInitializationModule, IUsesUIEvents { diff --git a/Runtime/Scripts/Modules/FeedbackModule/FeedbackModule.cs b/Runtime/Scripts/Modules/FeedbackModule/FeedbackModule.cs index e4d7bce94..4c35a40d4 100644 --- a/Runtime/Scripts/Modules/FeedbackModule/FeedbackModule.cs +++ b/Runtime/Scripts/Modules/FeedbackModule/FeedbackModule.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; using TMPro; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Handles; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.UI; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.ModuleLoader; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { class FeedbackModule : ScriptableSettings, IDelayedInitializationModule, ISettingsMenuItemProvider, ISerializePreferences, IInterfaceConnector, IProvidesRequestFeedback diff --git a/Runtime/Scripts/Modules/GazeDivergenceModule/GazeDivergenceModule.cs b/Runtime/Scripts/Modules/GazeDivergenceModule/GazeDivergenceModule.cs index 292bb9d04..c12a9dba4 100644 --- a/Runtime/Scripts/Modules/GazeDivergenceModule/GazeDivergenceModule.cs +++ b/Runtime/Scripts/Modules/GazeDivergenceModule/GazeDivergenceModule.cs @@ -1,9 +1,9 @@ -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { /// /// Allows an implementer to test for a given transforms' diff --git a/Runtime/Scripts/Modules/HapticsModule/HapticsModule.cs b/Runtime/Scripts/Modules/HapticsModule/HapticsModule.cs index 781869928..2581b1f0c 100644 --- a/Runtime/Scripts/Modules/HapticsModule/HapticsModule.cs +++ b/Runtime/Scripts/Modules/HapticsModule/HapticsModule.cs @@ -1,13 +1,13 @@ using System; using System.IO; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.XR; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { sealed class HapticsModule : ScriptableSettings, IDelayedInitializationModule, IProvidesControlHaptics { diff --git a/Runtime/Scripts/Modules/HierarchyModule.cs b/Runtime/Scripts/Modules/HierarchyModule.cs index b1afd892b..7189ff25c 100644 --- a/Runtime/Scripts/Modules/HierarchyModule.cs +++ b/Runtime/Scripts/Modules/HierarchyModule.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.ModuleLoader; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { #if UNITY_EDITOR sealed class HierarchyModule : IDelayedInitializationModule, ISelectionChanged, IInterfaceConnector diff --git a/Runtime/Scripts/Modules/HighlightModule/HighlightModule.cs b/Runtime/Scripts/Modules/HighlightModule/HighlightModule.cs index f31d83a9a..792c7a679 100644 --- a/Runtime/Scripts/Modules/HighlightModule/HighlightModule.cs +++ b/Runtime/Scripts/Modules/HighlightModule/HighlightModule.cs @@ -1,15 +1,15 @@ using System; using System.Collections; using System.Collections.Generic; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { [ModuleBehaviorCallbackOrder(ModuleOrders.HighlightModuleBehaviorOrder)] sealed class HighlightModule : ScriptableSettings, IModuleBehaviorCallbacks, IUsesGameObjectLocking, diff --git a/Runtime/Scripts/Modules/IntersectionModule/IntersectionModule.cs b/Runtime/Scripts/Modules/IntersectionModule/IntersectionModule.cs index c4520a856..d2646597a 100644 --- a/Runtime/Scripts/Modules/IntersectionModule/IntersectionModule.cs +++ b/Runtime/Scripts/Modules/IntersectionModule/IntersectionModule.cs @@ -1,14 +1,14 @@ using System; using System.Collections; using System.Collections.Generic; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.SpatialHash; -using Unity.Labs.Utils; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.SpatialHash; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { sealed class IntersectionModule : ScriptableSettings, IDelayedInitializationModule, IModuleBehaviorCallbacks, IUsesGameObjectLocking, IUsesGetVRPlayerObjects, IProvidesSceneRaycast, IProvidesControlInputIntersection, diff --git a/Runtime/Scripts/Modules/IntersectionModule/IntersectionTester.cs b/Runtime/Scripts/Modules/IntersectionModule/IntersectionTester.cs index d34d4b658..9c27f5f40 100644 --- a/Runtime/Scripts/Modules/IntersectionModule/IntersectionTester.cs +++ b/Runtime/Scripts/Modules/IntersectionModule/IntersectionTester.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { sealed class IntersectionTester : MonoBehaviour { diff --git a/Runtime/Scripts/Modules/IntersectionModule/IntersectionUtils.cs b/Runtime/Scripts/Modules/IntersectionModule/IntersectionUtils.cs index fa60cb80f..f30b3e5e0 100644 --- a/Runtime/Scripts/Modules/IntersectionModule/IntersectionUtils.cs +++ b/Runtime/Scripts/Modules/IntersectionModule/IntersectionUtils.cs @@ -1,8 +1,8 @@ -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.Utils; +using Unity.EditorXR.Modules; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Utilities +namespace Unity.EditorXR.Utilities { static class IntersectionUtils { diff --git a/Runtime/Scripts/Modules/KeyboardModule.cs b/Runtime/Scripts/Modules/KeyboardModule.cs index 6faeb8e03..acfe64b66 100644 --- a/Runtime/Scripts/Modules/KeyboardModule.cs +++ b/Runtime/Scripts/Modules/KeyboardModule.cs @@ -1,14 +1,14 @@ using System.Collections.Generic; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Helpers; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.UI; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Helpers; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.UI; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { sealed class KeyboardModule : ScriptableSettings, IModuleBehaviorCallbacks, IUsesRayVisibilitySettings, IForEachRayOrigin, IUsesConnectInterfaces diff --git a/Runtime/Scripts/Modules/LockModule/LockModule.cs b/Runtime/Scripts/Modules/LockModule/LockModule.cs index db1016493..8aee0b600 100644 --- a/Runtime/Scripts/Modules/LockModule/LockModule.cs +++ b/Runtime/Scripts/Modules/LockModule/LockModule.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { sealed class LockModule : ScriptableSettings, IModuleDependency, IActions, ISelectionChanged, IProvidesGameObjectLocking diff --git a/Runtime/Scripts/Modules/ProjectFolderModule.cs b/Runtime/Scripts/Modules/ProjectFolderModule.cs index fa294dc97..44aeca342 100644 --- a/Runtime/Scripts/Modules/ProjectFolderModule.cs +++ b/Runtime/Scripts/Modules/ProjectFolderModule.cs @@ -3,13 +3,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Core; +using Unity.EditorXR.Data; +using Unity.XRTools.ModuleLoader; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { #if UNITY_EDITOR sealed class ProjectFolderModule : MonoBehaviour, IDelayedInitializationModule, IInterfaceConnector diff --git a/Runtime/Scripts/Modules/SceneObjectModule.cs b/Runtime/Scripts/Modules/SceneObjectModule.cs index c22b0e4c1..61154cbb7 100644 --- a/Runtime/Scripts/Modules/SceneObjectModule.cs +++ b/Runtime/Scripts/Modules/SceneObjectModule.cs @@ -1,14 +1,14 @@ using System.Collections; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.SpatialHash; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.SpatialHash; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { sealed class SceneObjectModule : IModule, IProvidesPlaceSceneObject, IProvidesPlaceSceneObjects, IProvidesDeleteSceneObject, IUsesSpatialHash diff --git a/Runtime/Scripts/Modules/SelectionModule/SelectionModule.cs b/Runtime/Scripts/Modules/SelectionModule/SelectionModule.cs index 19450193a..00c7c3b2f 100644 --- a/Runtime/Scripts/Modules/SelectionModule/SelectionModule.cs +++ b/Runtime/Scripts/Modules/SelectionModule/SelectionModule.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; using Object = UnityEngine.Object; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { sealed class SelectionModule : ScriptableSettings, IDelayedInitializationModule, IUsesGameObjectLocking, IUsesControlHaptics, IRayToNode, IUsesContainsVRPlayerCompletely, diff --git a/Runtime/Scripts/Modules/SerializedPreferencesModule.cs b/Runtime/Scripts/Modules/SerializedPreferencesModule.cs index a8c33a712..39b199a1e 100644 --- a/Runtime/Scripts/Modules/SerializedPreferencesModule.cs +++ b/Runtime/Scripts/Modules/SerializedPreferencesModule.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Core; +using Unity.EditorXR.Core; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { sealed class SerializedPreferencesModule : IDelayedInitializationModule, IInterfaceConnector { diff --git a/Runtime/Scripts/Modules/SnappingModule/SnappingModule.cs b/Runtime/Scripts/Modules/SnappingModule/SnappingModule.cs index 9f0da9f29..5365f6e44 100644 --- a/Runtime/Scripts/Modules/SnappingModule/SnappingModule.cs +++ b/Runtime/Scripts/Modules/SnappingModule/SnappingModule.cs @@ -1,19 +1,19 @@ using System; using System.Collections.Generic; using TMPro; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.Helpers; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Menus; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Handles; +using Unity.EditorXR.Helpers; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Menus; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { [MainMenuItem("Snapping", "Settings", "Select snapping modes")] sealed class SnappingModule : ScriptableSettings, IDelayedInitializationModule, IModuleBehaviorCallbacks, diff --git a/Runtime/Scripts/Modules/SnappingModule/SnappingModuleSettingsUI.cs b/Runtime/Scripts/Modules/SnappingModule/SnappingModuleSettingsUI.cs index b88e73a5e..869f811b9 100644 --- a/Runtime/Scripts/Modules/SnappingModule/SnappingModuleSettingsUI.cs +++ b/Runtime/Scripts/Modules/SnappingModule/SnappingModuleSettingsUI.cs @@ -1,7 +1,7 @@ using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { class SnappingModuleSettingsUI : MonoBehaviour { diff --git a/Runtime/Scripts/Modules/SpatialHintModule/SpatialHintModule.cs b/Runtime/Scripts/Modules/SpatialHintModule/SpatialHintModule.cs index 09aae26e4..1c82c78d5 100644 --- a/Runtime/Scripts/Modules/SpatialHintModule/SpatialHintModule.cs +++ b/Runtime/Scripts/Modules/SpatialHintModule/SpatialHintModule.cs @@ -1,11 +1,11 @@ -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Menus; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Menus; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { // TODO: Remove load order when switching to non-static FI [ModuleOrder(ModuleOrders.SpatialHintModuleLoadOrder)] diff --git a/Runtime/Scripts/Modules/SpatialHintModule/SpatialHintUI.cs b/Runtime/Scripts/Modules/SpatialHintModule/SpatialHintUI.cs index 28b0a2e7a..9cb0eef38 100644 --- a/Runtime/Scripts/Modules/SpatialHintModule/SpatialHintUI.cs +++ b/Runtime/Scripts/Modules/SpatialHintModule/SpatialHintUI.cs @@ -1,12 +1,12 @@ using System.Collections; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Core; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { class SpatialHintUI : MonoBehaviour, IUsesViewerScale, IUsesControlHaptics, IRayToNode { diff --git a/Runtime/Scripts/Modules/SpatialScrollModule/SpatialScrollModule.cs b/Runtime/Scripts/Modules/SpatialScrollModule/SpatialScrollModule.cs index 1ea25a59e..a6910ca68 100644 --- a/Runtime/Scripts/Modules/SpatialScrollModule/SpatialScrollModule.cs +++ b/Runtime/Scripts/Modules/SpatialScrollModule/SpatialScrollModule.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { sealed class SpatialScrollModule : ScriptableSettings, IModule, IUsesViewerScale, IUsesControlHaptics, IUsesControlSpatialHinting, IUsesRayVisibilitySettings, INodeToRay diff --git a/Runtime/Scripts/Modules/TooltipModule/Tooltip.cs b/Runtime/Scripts/Modules/TooltipModule/Tooltip.cs index badaa96e4..978114a49 100644 --- a/Runtime/Scripts/Modules/TooltipModule/Tooltip.cs +++ b/Runtime/Scripts/Modules/TooltipModule/Tooltip.cs @@ -1,7 +1,7 @@ -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; using UnityEngine; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { internal sealed class Tooltip : MonoBehaviour, ITooltip, ITooltipPlacement { diff --git a/Runtime/Scripts/Modules/TooltipModule/TooltipModule.cs b/Runtime/Scripts/Modules/TooltipModule/TooltipModule.cs index 72286a24f..37fd6a465 100644 --- a/Runtime/Scripts/Modules/TooltipModule/TooltipModule.cs +++ b/Runtime/Scripts/Modules/TooltipModule/TooltipModule.cs @@ -1,13 +1,13 @@ using System; using System.Collections; using System.Collections.Generic; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { sealed class TooltipModule : ScriptableSettings, IDelayedInitializationModule, IModuleBehaviorCallbacks, IUsesViewerScale, IProvidesSetTooltipVisibility, IUsesUIEvents diff --git a/Runtime/Scripts/Modules/TooltipModule/TooltipUI.cs b/Runtime/Scripts/Modules/TooltipModule/TooltipUI.cs index 979d0df91..5829bc3d8 100644 --- a/Runtime/Scripts/Modules/TooltipModule/TooltipUI.cs +++ b/Runtime/Scripts/Modules/TooltipModule/TooltipUI.cs @@ -3,7 +3,7 @@ using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { sealed class TooltipUI : MonoBehaviour, IWillRender { diff --git a/Runtime/Scripts/Modules/WebModule.cs b/Runtime/Scripts/Modules/WebModule.cs index ac21729ad..a1d576e08 100644 --- a/Runtime/Scripts/Modules/WebModule.cs +++ b/Runtime/Scripts/Modules/WebModule.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.IO; using System.Threading; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.ModuleLoader; using UnityEngine; using UnityEngine.Networking; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { class WebModule : IModuleBehaviorCallbacks, IProvidesWeb { diff --git a/Runtime/Scripts/Modules/WorkspaceModule.cs b/Runtime/Scripts/Modules/WorkspaceModule.cs index 6499f0a87..775f3a087 100644 --- a/Runtime/Scripts/Modules/WorkspaceModule.cs +++ b/Runtime/Scripts/Modules/WorkspaceModule.cs @@ -1,16 +1,16 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.EditorXR.Workspaces; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.EditorXR.Workspaces; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { sealed class WorkspaceModule : IModuleDependency, IUsesConnectInterfaces, ISerializePreferences, IInterfaceConnector, IUsesFunctionalityInjection, IProvidesResetWorkspaces, IProvidesCreateWorkspace diff --git a/Runtime/Scripts/Proxies/AffordanceTooltip.cs b/Runtime/Scripts/Proxies/AffordanceTooltip.cs index 3fc31a7ee..a970e7bde 100644 --- a/Runtime/Scripts/Proxies/AffordanceTooltip.cs +++ b/Runtime/Scripts/Proxies/AffordanceTooltip.cs @@ -1,7 +1,7 @@ -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; using UnityEngine; -namespace Unity.Labs.EditorXR.Proxies +namespace Unity.EditorXR.Proxies { sealed class AffordanceTooltip : MonoBehaviour, ITooltip, ITooltipPlacement { diff --git a/Runtime/Scripts/Proxies/AffordanceTooltipPlacement.cs b/Runtime/Scripts/Proxies/AffordanceTooltipPlacement.cs index f2fa86cdd..3bae48662 100644 --- a/Runtime/Scripts/Proxies/AffordanceTooltipPlacement.cs +++ b/Runtime/Scripts/Proxies/AffordanceTooltipPlacement.cs @@ -1,8 +1,8 @@ -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.Utils.GUI; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.Utils.GUI; using UnityEngine; -namespace Unity.Labs.EditorXR.Proxies +namespace Unity.EditorXR.Proxies { sealed class AffordanceTooltipPlacement : MonoBehaviour, ITooltipPlacement { diff --git a/Runtime/Scripts/Proxies/Data/Affordance.cs b/Runtime/Scripts/Proxies/Data/Affordance.cs index be26ba7b7..f5d3ceb86 100644 --- a/Runtime/Scripts/Proxies/Data/Affordance.cs +++ b/Runtime/Scripts/Proxies/Data/Affordance.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Proxies +namespace Unity.EditorXR.Proxies { /// /// Affordance model; data defining a proxy affordance (button/analog/etc) diff --git a/Runtime/Scripts/Proxies/Data/AffordanceAnimationDefinition.cs b/Runtime/Scripts/Proxies/Data/AffordanceAnimationDefinition.cs index 36e01de28..b389fffbd 100644 --- a/Runtime/Scripts/Proxies/Data/AffordanceAnimationDefinition.cs +++ b/Runtime/Scripts/Proxies/Data/AffordanceAnimationDefinition.cs @@ -1,9 +1,9 @@ using System; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.Utils.GUI; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.Utils.GUI; using UnityEngine; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { /// /// Definition containing data utilized to change the translation/rotation of an affordance diff --git a/Runtime/Scripts/Proxies/Data/AffordanceDefinition.cs b/Runtime/Scripts/Proxies/Data/AffordanceDefinition.cs index 7fdfc8920..501c367c0 100644 --- a/Runtime/Scripts/Proxies/Data/AffordanceDefinition.cs +++ b/Runtime/Scripts/Proxies/Data/AffordanceDefinition.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { /// /// Definition containing data that represents this affordance diff --git a/Runtime/Scripts/Proxies/Data/AffordanceVisibilityDefinition.cs b/Runtime/Scripts/Proxies/Data/AffordanceVisibilityDefinition.cs index 0510b5725..b21152979 100644 --- a/Runtime/Scripts/Proxies/Data/AffordanceVisibilityDefinition.cs +++ b/Runtime/Scripts/Proxies/Data/AffordanceVisibilityDefinition.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { /// /// Definition containing data utilized to change the visual appearance of an affordance for various actions diff --git a/Runtime/Scripts/Proxies/Data/ProxyAffordanceMap.cs b/Runtime/Scripts/Proxies/Data/ProxyAffordanceMap.cs index 4befaa8b4..cae66ed13 100644 --- a/Runtime/Scripts/Proxies/Data/ProxyAffordanceMap.cs +++ b/Runtime/Scripts/Proxies/Data/ProxyAffordanceMap.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR.Core +namespace Unity.EditorXR.Core { [CreateAssetMenu(menuName = "EditorXR/Proxy Affordance Map", fileName = "NewProxyAffordanceMap.asset")] class ProxyAffordanceMap : ScriptableObject diff --git a/Runtime/Scripts/Proxies/Data/ProxyExtras.cs b/Runtime/Scripts/Proxies/Data/ProxyExtras.cs index e289d48b6..97b6b7827 100644 --- a/Runtime/Scripts/Proxies/Data/ProxyExtras.cs +++ b/Runtime/Scripts/Proxies/Data/ProxyExtras.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; using UnityEngine; -namespace Unity.Labs.EditorXR.Helpers +namespace Unity.EditorXR.Helpers { /// /// Spawn additional objects around a proxy node diff --git a/Runtime/Scripts/Proxies/Data/ProxyFeedbackRequest.cs b/Runtime/Scripts/Proxies/Data/ProxyFeedbackRequest.cs index bb282a9d1..683439008 100644 --- a/Runtime/Scripts/Proxies/Data/ProxyFeedbackRequest.cs +++ b/Runtime/Scripts/Proxies/Data/ProxyFeedbackRequest.cs @@ -1,8 +1,8 @@ using System; -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Proxies +namespace Unity.EditorXR.Proxies { using VRControl = VRInputDevice.VRControl; diff --git a/Runtime/Scripts/Proxies/Data/SerializedProxyFeedback.cs b/Runtime/Scripts/Proxies/Data/SerializedProxyFeedback.cs index b6d9f969d..b36dd90c5 100644 --- a/Runtime/Scripts/Proxies/Data/SerializedProxyFeedback.cs +++ b/Runtime/Scripts/Proxies/Data/SerializedProxyFeedback.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Proxies +namespace Unity.EditorXR.Proxies { [Serializable] class SerializedProxyFeedback diff --git a/Runtime/Scripts/Proxies/DefaultProxyRay.cs b/Runtime/Scripts/Proxies/DefaultProxyRay.cs index 38ce4bcd1..c2d715da0 100644 --- a/Runtime/Scripts/Proxies/DefaultProxyRay.cs +++ b/Runtime/Scripts/Proxies/DefaultProxyRay.cs @@ -1,14 +1,14 @@ using System.Collections; using System.Collections.Generic; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; -using Unity.Labs.XR; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Rendering; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Proxies +namespace Unity.EditorXR.Proxies { sealed class DefaultProxyRay : MonoBehaviour, IUsesViewerScale { diff --git a/Runtime/Scripts/Proxies/ProxyAnimator.cs b/Runtime/Scripts/Proxies/ProxyAnimator.cs index b72c4eb40..041ce58dd 100644 --- a/Runtime/Scripts/Proxies/ProxyAnimator.cs +++ b/Runtime/Scripts/Proxies/ProxyAnimator.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Proxies +namespace Unity.EditorXR.Proxies { using FeedbackDictionary = Dictionary; diff --git a/Runtime/Scripts/Proxies/ProxyNode.cs b/Runtime/Scripts/Proxies/ProxyNode.cs index 57c5c4aee..d93e1b0ed 100644 --- a/Runtime/Scripts/Proxies/ProxyNode.cs +++ b/Runtime/Scripts/Proxies/ProxyNode.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Proxies +namespace Unity.EditorXR.Proxies { using VisibilityControlType = ProxyAffordanceMap.VisibilityControlType; using VRControl = VRInputDevice.VRControl; diff --git a/Runtime/Scripts/Proxies/ShakeVelocityTracker.cs b/Runtime/Scripts/Proxies/ShakeVelocityTracker.cs index cb1b0b6a0..465d8cb01 100644 --- a/Runtime/Scripts/Proxies/ShakeVelocityTracker.cs +++ b/Runtime/Scripts/Proxies/ShakeVelocityTracker.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Labs.EditorXR.Helpers +namespace Unity.EditorXR.Helpers { /// /// Helper class that tracks an object's shaking velocity over a period of time diff --git a/Runtime/Scripts/Proxies/Touch/TouchProxy.cs b/Runtime/Scripts/Proxies/Touch/TouchProxy.cs index 4a48377e7..3c4b91670 100644 --- a/Runtime/Scripts/Proxies/Touch/TouchProxy.cs +++ b/Runtime/Scripts/Proxies/Touch/TouchProxy.cs @@ -1,10 +1,10 @@ using System.Collections; -using Unity.Labs.EditorXR.Input; -using Unity.Labs.EditorXR.Utilities; +using Unity.EditorXR.Input; +using Unity.EditorXR.Utilities; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Proxies +namespace Unity.EditorXR.Proxies { sealed class TouchProxy : TwoHandedProxyBase { diff --git a/Runtime/Scripts/Proxies/TwoHandedProxyBase.cs b/Runtime/Scripts/Proxies/TwoHandedProxyBase.cs index eb634fe00..220ee8c28 100644 --- a/Runtime/Scripts/Proxies/TwoHandedProxyBase.cs +++ b/Runtime/Scripts/Proxies/TwoHandedProxyBase.cs @@ -1,16 +1,16 @@ using System; using System.Collections; using System.Collections.Generic; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Helpers; -using Unity.Labs.EditorXR.Input; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Core; +using Unity.EditorXR.Helpers; +using Unity.EditorXR.Input; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Proxies +namespace Unity.EditorXR.Proxies { /// /// Which cardinal direction a proxy node is facing diff --git a/Runtime/Scripts/Proxies/Vive/ViveProxy.cs b/Runtime/Scripts/Proxies/Vive/ViveProxy.cs index 4551b2eed..7519fdc27 100644 --- a/Runtime/Scripts/Proxies/Vive/ViveProxy.cs +++ b/Runtime/Scripts/Proxies/Vive/ViveProxy.cs @@ -1,14 +1,14 @@ using System; using System.Collections; using System.Collections.Generic; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Input; -using Unity.Labs.EditorXR.Utilities; +using Unity.EditorXR.Core; +using Unity.EditorXR.Input; +using Unity.EditorXR.Utilities; using UnityEngine; using UnityEngine.InputNew; using UnityEngine.XR; -namespace Unity.Labs.EditorXR.Proxies +namespace Unity.EditorXR.Proxies { sealed class ViveProxy : TwoHandedProxyBase { diff --git a/Runtime/Scripts/Proxies/ViveProxyHelper.cs b/Runtime/Scripts/Proxies/ViveProxyHelper.cs index 478dd5b60..fd833a432 100644 --- a/Runtime/Scripts/Proxies/ViveProxyHelper.cs +++ b/Runtime/Scripts/Proxies/ViveProxyHelper.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Labs.EditorXR.Proxies +namespace Unity.EditorXR.Proxies { class ViveProxyHelper : MonoBehaviour { diff --git a/Runtime/Scripts/Runtime/EditorPrefs.cs b/Runtime/Scripts/Runtime/EditorPrefs.cs index f6b17f357..a01f285a9 100644 --- a/Runtime/Scripts/Runtime/EditorPrefs.cs +++ b/Runtime/Scripts/Runtime/EditorPrefs.cs @@ -1,7 +1,7 @@ #if !UNITY_EDITOR using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { class EditorPrefs { diff --git a/Runtime/Scripts/Runtime/Selection.cs b/Runtime/Scripts/Runtime/Selection.cs index a480cc089..0092830fa 100644 --- a/Runtime/Scripts/Runtime/Selection.cs +++ b/Runtime/Scripts/Runtime/Selection.cs @@ -4,7 +4,7 @@ using UnityEngine; using Object = UnityEngine.Object; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { static class Selection { diff --git a/Runtime/Scripts/Runtime/SerializedObject.cs b/Runtime/Scripts/Runtime/SerializedObject.cs index 62ae8f148..917e354ce 100644 --- a/Runtime/Scripts/Runtime/SerializedObject.cs +++ b/Runtime/Scripts/Runtime/SerializedObject.cs @@ -1,7 +1,7 @@ #if !UNITY_EDITOR using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { class SerializedObject { diff --git a/Runtime/Scripts/Runtime/SerializedPropertyType.cs b/Runtime/Scripts/Runtime/SerializedPropertyType.cs index 28694bd80..2aa58374b 100644 --- a/Runtime/Scripts/Runtime/SerializedPropertyType.cs +++ b/Runtime/Scripts/Runtime/SerializedPropertyType.cs @@ -1,5 +1,5 @@ #if !UNITY_EDITOR -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { enum SerializedPropertyType { diff --git a/Runtime/Scripts/UI/Button.cs b/Runtime/Scripts/UI/Button.cs index 2759a238e..52b82c6c1 100644 --- a/Runtime/Scripts/UI/Button.cs +++ b/Runtime/Scripts/UI/Button.cs @@ -1,11 +1,11 @@ -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.Utils.GUI; +using Unity.EditorXR.Modules; +using Unity.EditorXR.Utilities; +using Unity.XRTools.Utils.GUI; using UnityEngine; using UnityEngine.Events; using UnityEngine.EventSystems; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { /// /// Extension of UI.Button includes SelectionFlags to check for direct selection diff --git a/Runtime/Scripts/UI/ClipText.cs b/Runtime/Scripts/UI/ClipText.cs index 0101afbe1..1a2d4ed29 100644 --- a/Runtime/Scripts/UI/ClipText.cs +++ b/Runtime/Scripts/UI/ClipText.cs @@ -1,7 +1,7 @@ using TMPro; using UnityEngine; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { /// /// Extension of TextMeshProUGUI allows the use of a custom clipping material by providing GetModifiedMaterial override diff --git a/Runtime/Scripts/UI/CuboidLayout.cs b/Runtime/Scripts/UI/CuboidLayout.cs index 6e8dce59d..4329bf9c5 100644 --- a/Runtime/Scripts/UI/CuboidLayout.cs +++ b/Runtime/Scripts/UI/CuboidLayout.cs @@ -1,9 +1,9 @@ -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.Utils; +using Unity.EditorXR.Utilities; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.EventSystems; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { sealed class CuboidLayout : UIBehaviour { diff --git a/Runtime/Scripts/UI/DefaultToggleGroup.cs b/Runtime/Scripts/UI/DefaultToggleGroup.cs index 78180c8c3..04576c850 100644 --- a/Runtime/Scripts/UI/DefaultToggleGroup.cs +++ b/Runtime/Scripts/UI/DefaultToggleGroup.cs @@ -1,7 +1,7 @@ using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { sealed class DefaultToggleGroup : MonoBehaviour { diff --git a/Runtime/Scripts/UI/GradientButton.cs b/Runtime/Scripts/UI/GradientButton.cs index 1c5098f1f..1f6faaa7d 100644 --- a/Runtime/Scripts/UI/GradientButton.cs +++ b/Runtime/Scripts/UI/GradientButton.cs @@ -1,15 +1,15 @@ using System; using System.Collections; using TMPro; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Helpers; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.Utils; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Helpers; +using Unity.EditorXR.Utilities; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { sealed class GradientButton : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, IPointerClickHandler { diff --git a/Runtime/Scripts/UI/GridCellSizeAdjuster.cs b/Runtime/Scripts/UI/GridCellSizeAdjuster.cs index 42809986c..1a9e9ae9b 100644 --- a/Runtime/Scripts/UI/GridCellSizeAdjuster.cs +++ b/Runtime/Scripts/UI/GridCellSizeAdjuster.cs @@ -1,7 +1,7 @@ using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Helpers +namespace Unity.EditorXR.Helpers { sealed class GridCellSizeAdjuster : MonoBehaviour { diff --git a/Runtime/Scripts/UI/InputField.cs b/Runtime/Scripts/UI/InputField.cs index 5a46b8f51..ac7611035 100644 --- a/Runtime/Scripts/UI/InputField.cs +++ b/Runtime/Scripts/UI/InputField.cs @@ -2,18 +2,18 @@ using System.Collections; using System.Collections.Generic; using TMPro; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils.GUI; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils.GUI; using UnityEditor; using UnityEngine; using UnityEngine.Events; using UnityEngine.EventSystems; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { abstract class InputField : Selectable, ISelectionFlags, IUsesViewerScale, IAllWorkspaces { diff --git a/Runtime/Scripts/UI/Interfaces/ISelectionFlags.cs b/Runtime/Scripts/UI/Interfaces/ISelectionFlags.cs index 2bc6871f5..d029cf27a 100644 --- a/Runtime/Scripts/UI/Interfaces/ISelectionFlags.cs +++ b/Runtime/Scripts/UI/Interfaces/ISelectionFlags.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { /// /// Allows fine-grained control of what constitutes a selection diff --git a/Runtime/Scripts/UI/KeyboardMallet.cs b/Runtime/Scripts/UI/KeyboardMallet.cs index 872afafa2..d03f4ecb2 100644 --- a/Runtime/Scripts/UI/KeyboardMallet.cs +++ b/Runtime/Scripts/UI/KeyboardMallet.cs @@ -1,8 +1,8 @@ using System.Collections; -using Unity.Labs.EditorXR.Utilities; +using Unity.EditorXR.Utilities; using UnityEngine; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { sealed class KeyboardMallet : MonoBehaviour { diff --git a/Runtime/Scripts/UI/KeyboardUI.cs b/Runtime/Scripts/UI/KeyboardUI.cs index 3ad26caf6..86a5dd3cb 100644 --- a/Runtime/Scripts/UI/KeyboardUI.cs +++ b/Runtime/Scripts/UI/KeyboardUI.cs @@ -1,15 +1,15 @@ using System; using System.Collections; using System.Collections.Generic; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.Helpers; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Manipulators; -using Unity.Labs.EditorXR.Utilities; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Handles; +using Unity.EditorXR.Helpers; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Manipulators; +using Unity.EditorXR.Utilities; using UnityEngine; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { sealed class KeyboardUI : MonoBehaviour { diff --git a/Runtime/Scripts/UI/NumericInputField.cs b/Runtime/Scripts/UI/NumericInputField.cs index cf6d58b26..b1b89bcad 100644 --- a/Runtime/Scripts/UI/NumericInputField.cs +++ b/Runtime/Scripts/UI/NumericInputField.cs @@ -1,8 +1,8 @@ -using Unity.Labs.EditorXR.Utilities; +using Unity.EditorXR.Utilities; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { sealed class NumericInputField : InputField { diff --git a/Runtime/Scripts/UI/RaySlider.cs b/Runtime/Scripts/UI/RaySlider.cs index e3f4ae3a3..e8c87211b 100644 --- a/Runtime/Scripts/UI/RaySlider.cs +++ b/Runtime/Scripts/UI/RaySlider.cs @@ -1,11 +1,11 @@ -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.Utils.GUI; +using Unity.EditorXR.Modules; +using Unity.EditorXR.Utilities; +using Unity.XRTools.Utils.GUI; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { sealed class RaySlider : Slider, ISelectionFlags { diff --git a/Runtime/Scripts/UI/StandardInputField.cs b/Runtime/Scripts/UI/StandardInputField.cs index b6f81e18f..42112cbd7 100644 --- a/Runtime/Scripts/UI/StandardInputField.cs +++ b/Runtime/Scripts/UI/StandardInputField.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { sealed class StandardInputField : InputField { diff --git a/Runtime/Scripts/UI/SubmenuFace.cs b/Runtime/Scripts/UI/SubmenuFace.cs index 12fc7f0ce..8c1080b05 100644 --- a/Runtime/Scripts/UI/SubmenuFace.cs +++ b/Runtime/Scripts/UI/SubmenuFace.cs @@ -1,11 +1,11 @@ using System; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Helpers; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Core; +using Unity.EditorXR.Helpers; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Menus +namespace Unity.EditorXR.Menus { class SubmenuFace : MonoBehaviour, IUsesControlHaptics, IRayToNode { diff --git a/Runtime/Scripts/UI/TooltipData.cs b/Runtime/Scripts/UI/TooltipData.cs index b2666b5af..69e42d3a5 100644 --- a/Runtime/Scripts/UI/TooltipData.cs +++ b/Runtime/Scripts/UI/TooltipData.cs @@ -1,7 +1,7 @@ -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; using UnityEngine; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { /// /// Place on an object that receives UI events to set a tooltip on it diff --git a/Runtime/Scripts/UI/UITransformCopy.cs b/Runtime/Scripts/UI/UITransformCopy.cs index 07a940905..5bdf6998b 100644 --- a/Runtime/Scripts/UI/UITransformCopy.cs +++ b/Runtime/Scripts/UI/UITransformCopy.cs @@ -1,7 +1,7 @@ -using Unity.Labs.Utils; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Helpers +namespace Unity.EditorXR.Helpers { sealed class UITransformCopy : MonoBehaviour { diff --git a/Runtime/Scripts/Utilities/AssetDropUtils.cs b/Runtime/Scripts/Utilities/AssetDropUtils.cs index 267cf21ca..779141987 100644 --- a/Runtime/Scripts/Utilities/AssetDropUtils.cs +++ b/Runtime/Scripts/Utilities/AssetDropUtils.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.Utils; +using Unity.EditorXR.Data; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.Video; @@ -9,7 +9,7 @@ using UnityEditor; #endif -namespace Unity.Labs.EditorXR.Utilities +namespace Unity.EditorXR.Utilities { static class AssetDropUtils { diff --git a/Runtime/Scripts/Utilities/CameraUtils.cs b/Runtime/Scripts/Utilities/CameraUtils.cs index de10a1f4b..b57316693 100644 --- a/Runtime/Scripts/Utilities/CameraUtils.cs +++ b/Runtime/Scripts/Utilities/CameraUtils.cs @@ -1,8 +1,8 @@ -using Unity.Labs.EditorXR.Core; +using Unity.EditorXR.Core; using UnityEngine; using UnityObject = UnityEngine.Object; -namespace Unity.Labs.EditorXR.Utilities +namespace Unity.EditorXR.Utilities { /// /// Camera related EditorXR utilities diff --git a/Runtime/Scripts/Utilities/EditorXRUtils.cs b/Runtime/Scripts/Utilities/EditorXRUtils.cs index 10a676724..ec1617d15 100644 --- a/Runtime/Scripts/Utilities/EditorXRUtils.cs +++ b/Runtime/Scripts/Utilities/EditorXRUtils.cs @@ -1,10 +1,10 @@ using System; -using Unity.Labs.Utils; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; using UnityObject = UnityEngine.Object; -namespace Unity.Labs.EditorXR.Utilities +namespace Unity.EditorXR.Utilities { static class EditorXRUtils { diff --git a/Runtime/Scripts/Utilities/InputUtils.cs b/Runtime/Scripts/Utilities/InputUtils.cs index 17e53e375..b3911f9e4 100644 --- a/Runtime/Scripts/Utilities/InputUtils.cs +++ b/Runtime/Scripts/Utilities/InputUtils.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Utilities +namespace Unity.EditorXR.Utilities { class BindingDictionary : Dictionary> { diff --git a/Runtime/Scripts/Utilities/MathUtilsExt.cs b/Runtime/Scripts/Utilities/MathUtilsExt.cs index 7beb300e9..8198e3619 100644 --- a/Runtime/Scripts/Utilities/MathUtilsExt.cs +++ b/Runtime/Scripts/Utilities/MathUtilsExt.cs @@ -1,7 +1,7 @@ -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; using UnityEngine; -namespace Unity.Labs.EditorXR.Utilities +namespace Unity.EditorXR.Utilities { /// /// Extended math related utilities (named MathUtilsExt to not collide with MathUtils) diff --git a/Runtime/Scripts/Utilities/TransformCopy.cs b/Runtime/Scripts/Utilities/TransformCopy.cs index f3ebce85d..65cca9dd5 100644 --- a/Runtime/Scripts/Utilities/TransformCopy.cs +++ b/Runtime/Scripts/Utilities/TransformCopy.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR.Helpers +namespace Unity.EditorXR.Helpers { sealed class TransformCopy : MonoBehaviour { diff --git a/Runtime/Scripts/Utilities/TransitionUtils.cs b/Runtime/Scripts/Utilities/TransitionUtils.cs index d8a2a25b5..c538a3cea 100644 --- a/Runtime/Scripts/Utilities/TransitionUtils.cs +++ b/Runtime/Scripts/Utilities/TransitionUtils.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Labs.EditorXR.Utilities +namespace Unity.EditorXR.Utilities { /// /// Transition utilities diff --git a/Runtime/Scripts/Utilities/UIUtils.cs b/Runtime/Scripts/Utilities/UIUtils.cs index 9ad946f57..2fdd77202 100644 --- a/Runtime/Scripts/Utilities/UIUtils.cs +++ b/Runtime/Scripts/Utilities/UIUtils.cs @@ -1,7 +1,7 @@ -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.UI; +using Unity.EditorXR.Modules; +using Unity.EditorXR.UI; -namespace Unity.Labs.EditorXR.Utilities +namespace Unity.EditorXR.Utilities { /// /// UI related utilities diff --git a/Runtime/Scripts/Utilities/UnityBrandColorScheme.cs b/Runtime/Scripts/Utilities/UnityBrandColorScheme.cs index f196428ad..c5c7137ab 100644 --- a/Runtime/Scripts/Utilities/UnityBrandColorScheme.cs +++ b/Runtime/Scripts/Utilities/UnityBrandColorScheme.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using Unity.Labs.EditorXR.Helpers; -using Unity.Labs.Utils; +using Unity.EditorXR.Helpers; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Utilities +namespace Unity.EditorXR.Utilities { /// /// Class defining the Unity brand color swatches & gradients diff --git a/Runtime/Tools/AnnotationTool/AnnotationTool.cs b/Runtime/Tools/AnnotationTool/AnnotationTool.cs index 1dc7f637c..a00704688 100644 --- a/Runtime/Tools/AnnotationTool/AnnotationTool.cs +++ b/Runtime/Tools/AnnotationTool/AnnotationTool.cs @@ -2,20 +2,20 @@ using System.Collections; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Helpers; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Proxies; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.SpatialHash; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Helpers; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Proxies; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.SpatialHash; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Tools +namespace Unity.EditorXR.Tools { [MainMenuItem("Annotation", "Create", "Draw in 3D")] [SpatialMenuItem("Annotation", "Tools", "Draw in 3D")] diff --git a/Runtime/Tools/AnnotationTool/UserInterface/AnnotationContextMenu.cs b/Runtime/Tools/AnnotationTool/UserInterface/AnnotationContextMenu.cs index c09c462a6..6a36d1a64 100644 --- a/Runtime/Tools/AnnotationTool/UserInterface/AnnotationContextMenu.cs +++ b/Runtime/Tools/AnnotationTool/UserInterface/AnnotationContextMenu.cs @@ -1,10 +1,10 @@ using System; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.Utils; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Tools +namespace Unity.EditorXR.Tools { sealed class AnnotationContextMenu : MonoBehaviour, IMenu { diff --git a/Runtime/Tools/AnnotationTool/UserInterface/AnnotationPointer.cs b/Runtime/Tools/AnnotationTool/UserInterface/AnnotationPointer.cs index b962089a2..8450ee729 100644 --- a/Runtime/Tools/AnnotationTool/UserInterface/AnnotationPointer.cs +++ b/Runtime/Tools/AnnotationTool/UserInterface/AnnotationPointer.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Unity.Labs.EditorXR.Tools +namespace Unity.EditorXR.Tools { class AnnotationPointer : MonoBehaviour { diff --git a/Runtime/Tools/AnnotationTool/UserInterface/BrushSizeUI.cs b/Runtime/Tools/AnnotationTool/UserInterface/BrushSizeUI.cs index 8b3de8054..496d5ad09 100644 --- a/Runtime/Tools/AnnotationTool/UserInterface/BrushSizeUI.cs +++ b/Runtime/Tools/AnnotationTool/UserInterface/BrushSizeUI.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.Utils; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Tools +namespace Unity.EditorXR.Tools { class BrushSizeUI : MonoBehaviour, IAlternateMenu { diff --git a/Runtime/Tools/AnnotationTool/UserInterface/ColorPickerActivator.cs b/Runtime/Tools/AnnotationTool/UserInterface/ColorPickerActivator.cs index 0ec673a31..132c03e74 100644 --- a/Runtime/Tools/AnnotationTool/UserInterface/ColorPickerActivator.cs +++ b/Runtime/Tools/AnnotationTool/UserInterface/ColorPickerActivator.cs @@ -1,11 +1,11 @@ using System; using System.Collections; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; using UnityEngine; using UnityEngine.EventSystems; -namespace Unity.Labs.EditorXR.Tools +namespace Unity.EditorXR.Tools { class ColorPickerActivator : MonoBehaviour, IPointerClickHandler, IPointerEnterHandler, IPointerExitHandler { diff --git a/Runtime/Tools/AnnotationTool/UserInterface/ColorPickerSquareUI.cs b/Runtime/Tools/AnnotationTool/UserInterface/ColorPickerSquareUI.cs index d14af4e7c..161b6ce6e 100644 --- a/Runtime/Tools/AnnotationTool/UserInterface/ColorPickerSquareUI.cs +++ b/Runtime/Tools/AnnotationTool/UserInterface/ColorPickerSquareUI.cs @@ -2,7 +2,7 @@ using UnityEngine.EventSystems; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Tools +namespace Unity.EditorXR.Tools { class ColorPickerSquareUI : Selectable, IDragHandler, IBeginDragHandler, IEndDragHandler { diff --git a/Runtime/Tools/AnnotationTool/UserInterface/ColorPickerUI.cs b/Runtime/Tools/AnnotationTool/UserInterface/ColorPickerUI.cs index 8b265a0e6..6b2f166df 100644 --- a/Runtime/Tools/AnnotationTool/UserInterface/ColorPickerUI.cs +++ b/Runtime/Tools/AnnotationTool/UserInterface/ColorPickerUI.cs @@ -2,10 +2,10 @@ using System.Collections; using UnityEngine.UI; using System; -using Unity.Labs.EditorXR.Extensions; +using Unity.EditorXR.Extensions; using UnityEngine.EventSystems; -namespace Unity.Labs.EditorXR.Tools +namespace Unity.EditorXR.Tools { class ColorPickerUI : MonoBehaviour, IPointerExitHandler { diff --git a/Runtime/Tools/CreatePrimitiveTool/CreatePrimitiveMenu.cs b/Runtime/Tools/CreatePrimitiveTool/CreatePrimitiveMenu.cs index 29197ce61..7feae021d 100644 --- a/Runtime/Tools/CreatePrimitiveTool/CreatePrimitiveMenu.cs +++ b/Runtime/Tools/CreatePrimitiveTool/CreatePrimitiveMenu.cs @@ -1,13 +1,13 @@ using System; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Menus; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Menus; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Tools +namespace Unity.EditorXR.Tools { sealed class CreatePrimitiveMenu : MonoBehaviour, IMenu, IUsesControlHaptics, IRayToNode { diff --git a/Runtime/Tools/CreatePrimitiveTool/CreatePrimitiveMenuButtonUI.cs b/Runtime/Tools/CreatePrimitiveTool/CreatePrimitiveMenuButtonUI.cs index ac4be1132..a26c1a663 100644 --- a/Runtime/Tools/CreatePrimitiveTool/CreatePrimitiveMenuButtonUI.cs +++ b/Runtime/Tools/CreatePrimitiveTool/CreatePrimitiveMenuButtonUI.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR.Tools +namespace Unity.EditorXR.Tools { sealed class CreatePrimitiveMenuButtonUI : MonoBehaviour { diff --git a/Runtime/Tools/CreatePrimitiveTool/CreatePrimitiveTool.cs b/Runtime/Tools/CreatePrimitiveTool/CreatePrimitiveTool.cs index 2f0116e34..d5558c708 100644 --- a/Runtime/Tools/CreatePrimitiveTool/CreatePrimitiveTool.cs +++ b/Runtime/Tools/CreatePrimitiveTool/CreatePrimitiveTool.cs @@ -1,14 +1,14 @@ -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Proxies; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.SpatialHash; -using Unity.Labs.Utils; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Proxies; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.SpatialHash; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Tools +namespace Unity.EditorXR.Tools { [MainMenuItem("Primitive", "Create", "Create primitives in the scene")] [SpatialMenuItem("Primitives", "Tools", "Create primitives in the scene")] diff --git a/Runtime/Tools/LocomotionTool/LocomotionTool.cs b/Runtime/Tools/LocomotionTool/LocomotionTool.cs index 14e220eac..c0dc36cb7 100644 --- a/Runtime/Tools/LocomotionTool/LocomotionTool.cs +++ b/Runtime/Tools/LocomotionTool/LocomotionTool.cs @@ -1,18 +1,18 @@ using System; using System.Collections; using System.Collections.Generic; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Proxies; -using Unity.Labs.EditorXR.UI; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Proxies; +using Unity.EditorXR.UI; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.InputNew; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Tools +namespace Unity.EditorXR.Tools { sealed class LocomotionTool : MonoBehaviour, ITool, ILocomotor, IUsesRayOrigin, IUsesRayVisibilitySettings, ICustomActionMap, ILinkedObject, IUsesViewerScale, ISettingsMenuItemProvider, ISerializePreferences, diff --git a/Runtime/Tools/LocomotionTool/Scripts/BlinkVisuals.cs b/Runtime/Tools/LocomotionTool/Scripts/BlinkVisuals.cs index 6d8afa8da..a05b3bf0c 100644 --- a/Runtime/Tools/LocomotionTool/Scripts/BlinkVisuals.cs +++ b/Runtime/Tools/LocomotionTool/Scripts/BlinkVisuals.cs @@ -1,13 +1,13 @@ using System.Collections; using System.Collections.Generic; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; -using Unity.Labs.XR; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Rendering; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { class BlinkVisuals : MonoBehaviour, IUsesViewerScale, IUsesSceneRaycast { diff --git a/Runtime/Tools/LocomotionTool/Scripts/MouseLocomotionRing.cs b/Runtime/Tools/LocomotionTool/Scripts/MouseLocomotionRing.cs index ab247e4aa..9d2a6eb8e 100644 --- a/Runtime/Tools/LocomotionTool/Scripts/MouseLocomotionRing.cs +++ b/Runtime/Tools/LocomotionTool/Scripts/MouseLocomotionRing.cs @@ -1,9 +1,9 @@ using TMPro; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR +namespace Unity.EditorXR { class MouseLocomotionRing : MonoBehaviour { diff --git a/Runtime/Tools/LocomotionTool/Scripts/ViewerScaleVisuals.cs b/Runtime/Tools/LocomotionTool/Scripts/ViewerScaleVisuals.cs index e20e41970..066f903fd 100644 --- a/Runtime/Tools/LocomotionTool/Scripts/ViewerScaleVisuals.cs +++ b/Runtime/Tools/LocomotionTool/Scripts/ViewerScaleVisuals.cs @@ -1,12 +1,12 @@ using TMPro; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.XR; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Rendering; using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Tools +namespace Unity.EditorXR.Tools { sealed class ViewerScaleVisuals : MonoBehaviour, IUsesViewerScale { diff --git a/Runtime/Tools/MoveWorkspacesTool/MoveWorkspacesTool.cs b/Runtime/Tools/MoveWorkspacesTool/MoveWorkspacesTool.cs index e4465c8c5..60d5e70a0 100644 --- a/Runtime/Tools/MoveWorkspacesTool/MoveWorkspacesTool.cs +++ b/Runtime/Tools/MoveWorkspacesTool/MoveWorkspacesTool.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.EditorXR.Workspaces; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.EditorXR.Workspaces; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Tools +namespace Unity.EditorXR.Tools { [ExecuteInEditMode] class MoveWorkspacesTool : MonoBehaviour, ITool, IStandardActionMap, IUsesRayOrigin, IUsesViewerBody, diff --git a/Runtime/Tools/SelectionTool/SelectionTool.cs b/Runtime/Tools/SelectionTool/SelectionTool.cs index ef14dc057..1468c0b65 100644 --- a/Runtime/Tools/SelectionTool/SelectionTool.cs +++ b/Runtime/Tools/SelectionTool/SelectionTool.cs @@ -1,19 +1,19 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Proxies; -using Unity.Labs.EditorXR.UI; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Proxies; +using Unity.EditorXR.UI; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; using UnityEngine.InputNew; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Tools +namespace Unity.EditorXR.Tools { [SpatialMenuItem("Selection", "Tools", "Select & manipulate objects in the scene")] sealed class SelectionTool : MonoBehaviour, ITool, IUsesRayOrigin, IUsesRaycastResults, ICustomActionMap, diff --git a/Runtime/Tools/TransformTool/TransformTool.cs b/Runtime/Tools/TransformTool/TransformTool.cs index 27981ea74..1e13dcf35 100644 --- a/Runtime/Tools/TransformTool/TransformTool.cs +++ b/Runtime/Tools/TransformTool/TransformTool.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Manipulators; -using Unity.Labs.EditorXR.Proxies; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Manipulators; +using Unity.EditorXR.Proxies; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; using UnityEngine.InputNew; @@ -20,7 +20,7 @@ enum PivotRotation } #endif -namespace Unity.Labs.EditorXR.Tools +namespace Unity.EditorXR.Tools { sealed class TransformTool : MonoBehaviour, ITool, ITransformer, ISelectionChanged, IActions, IUsesDirectSelection, IGrabObjects, IUsesSelectObject, IManipulatorController, IUsesSnapping, IUsesSetHighlight, ILinkedObject, IRayToNode, diff --git a/Runtime/Tools/VacuumTool/VacuumTool.cs b/Runtime/Tools/VacuumTool/VacuumTool.cs index cf40bd009..7041e9b78 100644 --- a/Runtime/Tools/VacuumTool/VacuumTool.cs +++ b/Runtime/Tools/VacuumTool/VacuumTool.cs @@ -1,14 +1,14 @@ using System.Collections; using System.Collections.Generic; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Proxies; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Proxies; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Tools +namespace Unity.EditorXR.Tools { sealed class VacuumTool : MonoBehaviour, ITool, ICustomActionMap, IUsesRayOrigin, IUsesViewerScale, IUsesRequestFeedback, IUsesNode diff --git a/Runtime/Unity.Labs.EditorXR.asmdef b/Runtime/Unity.Labs.EditorXR.asmdef index cf44ad670..eb7961e2e 100644 --- a/Runtime/Unity.Labs.EditorXR.asmdef +++ b/Runtime/Unity.Labs.EditorXR.asmdef @@ -1,18 +1,18 @@ { - "name": "Unity.Labs.EditorXR", + "name": "Unity.EditorXR", "references": [ "input-prototype", - "Unity.Labs.XRLineRenderer", + "Unity.XRLineRenderer", "Unity.TextMeshPro", "PolyToolkit", - "Unity.Labs.Utils", - "Unity.Labs.Utils.Editor", - "Unity.Labs.ListViewFramework", - "Unity.Labs.ModuleLoader.Interfaces", - "Unity.Labs.ModuleLoader", - "Unity.Labs.EditorXR.Interfaces", + "Unity.XRTools.Utils", + "Unity.XRTools.Utils.Editor", + "Unity.ListViewFramework", + "Unity.XRTools.ModuleLoader.Interfaces", + "Unity.XRTools.ModuleLoader", + "Unity.EditorXR.Interfaces", "UnityEngine.SpatialTracking", - "Unity.Labs.SpatialHash.Public" + "Unity.XRTools.SpatialHash.Public" ], "optionalUnityReferences": [], "includePlatforms": [], diff --git a/Runtime/Workspaces/Base/Workspace.cs b/Runtime/Workspaces/Base/Workspace.cs index 06fa4bfb1..1e62a288e 100644 --- a/Runtime/Workspaces/Base/Workspace.cs +++ b/Runtime/Workspaces/Base/Workspace.cs @@ -1,15 +1,15 @@ using System; using System.Collections; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.InputNew; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { abstract class Workspace : MonoBehaviour, IWorkspace, IInstantiateUI, IUsesStencilRef, IUsesConnectInterfaces, IUsesViewerScale, IUsesControlHaptics, IRayToNode, IUsesFunctionalityInjection diff --git a/Runtime/Workspaces/Base/WorkspaceUI.cs b/Runtime/Workspaces/Base/WorkspaceUI.cs index 84e15e811..bf5e94237 100644 --- a/Runtime/Workspaces/Base/WorkspaceUI.cs +++ b/Runtime/Workspaces/Base/WorkspaceUI.cs @@ -1,19 +1,19 @@ using System; using System.Collections; using System.Collections.Generic; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.Helpers; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Proxies; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Handles; +using Unity.EditorXR.Helpers; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Proxies; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.InputNew; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class WorkspaceUI : MonoBehaviour, IUsesStencilRef, IUsesViewerScale, IUsesPointer, IUsesRequestFeedback { diff --git a/Runtime/Workspaces/Common/Scripts/DraggableListItem.cs b/Runtime/Workspaces/Common/Scripts/DraggableListItem.cs index 3828f3622..8f67d6e2a 100644 --- a/Runtime/Workspaces/Common/Scripts/DraggableListItem.cs +++ b/Runtime/Workspaces/Common/Scripts/DraggableListItem.cs @@ -1,15 +1,15 @@ using System; using System.Collections; using System.Collections.Generic; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ListView; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Core; +using Unity.EditorXR.Handles; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.ListViewFramework; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { class DraggableListItem : EditorXRListViewItem, IUsesGetPreviewOrigin, IUsesViewerScale, IRayToNode where TData : IListViewItemData diff --git a/Runtime/Workspaces/Common/Scripts/EditorWindowWorkspace.cs b/Runtime/Workspaces/Common/Scripts/EditorWindowWorkspace.cs index 72c801593..d8e7fa69c 100644 --- a/Runtime/Workspaces/Common/Scripts/EditorWindowWorkspace.cs +++ b/Runtime/Workspaces/Common/Scripts/EditorWindowWorkspace.cs @@ -1,8 +1,8 @@ -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.Helpers; +using Unity.EditorXR.Handles; +using Unity.EditorXR.Helpers; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { #if UNITY_EDITOR abstract class EditorWindowWorkspace : Workspace diff --git a/Runtime/Workspaces/Common/Scripts/FilterButtonUI.cs b/Runtime/Workspaces/Common/Scripts/FilterButtonUI.cs index bf0a02763..ec61f3aaa 100644 --- a/Runtime/Workspaces/Common/Scripts/FilterButtonUI.cs +++ b/Runtime/Workspaces/Common/Scripts/FilterButtonUI.cs @@ -1,12 +1,12 @@ using System; using TMPro; -using Unity.Labs.EditorXR.Modules; +using Unity.EditorXR.Modules; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; -using Button = Unity.Labs.EditorXR.UI.Button; +using Button = Unity.EditorXR.UI.Button; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class FilterButtonUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, IRayEnterHandler { diff --git a/Runtime/Workspaces/Common/Scripts/FilterUI.cs b/Runtime/Workspaces/Common/Scripts/FilterUI.cs index 808e59195..d8d686894 100644 --- a/Runtime/Workspaces/Common/Scripts/FilterUI.cs +++ b/Runtime/Workspaces/Common/Scripts/FilterUI.cs @@ -2,13 +2,13 @@ using System.Collections; using System.Collections.Generic; using TMPro; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.Utils; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Utilities; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class FilterUI : MonoBehaviour, IUsesStencilRef { diff --git a/Runtime/Workspaces/Common/Scripts/NestedDraggableListItem.cs b/Runtime/Workspaces/Common/Scripts/NestedDraggableListItem.cs index a259fa1bc..b2bc68d9e 100644 --- a/Runtime/Workspaces/Common/Scripts/NestedDraggableListItem.cs +++ b/Runtime/Workspaces/Common/Scripts/NestedDraggableListItem.cs @@ -1,7 +1,7 @@ using System; -using Unity.Labs.ListView; +using Unity.ListViewFramework; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { class NestedDraggableListItem : DraggableListItem, INestedListViewItem where TData : INestedListViewItemData diff --git a/Runtime/Workspaces/Common/Scripts/WorkspaceButton.cs b/Runtime/Workspaces/Common/Scripts/WorkspaceButton.cs index 57cbca4b6..ff086a731 100644 --- a/Runtime/Workspaces/Common/Scripts/WorkspaceButton.cs +++ b/Runtime/Workspaces/Common/Scripts/WorkspaceButton.cs @@ -1,14 +1,14 @@ using System; using System.Collections; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Helpers; -using Unity.Labs.EditorXR.Modules; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.Utils; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Helpers; +using Unity.EditorXR.Modules; +using Unity.EditorXR.Utilities; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class WorkspaceButton : MonoBehaviour, IRayEnterHandler, IRayExitHandler, IUsesStencilRef { diff --git a/Runtime/Workspaces/Common/Scripts/WorkspaceHighlight.cs b/Runtime/Workspaces/Common/Scripts/WorkspaceHighlight.cs index 4fa6b711c..3f162609c 100644 --- a/Runtime/Workspaces/Common/Scripts/WorkspaceHighlight.cs +++ b/Runtime/Workspaces/Common/Scripts/WorkspaceHighlight.cs @@ -1,10 +1,10 @@ using System.Collections; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.Utils; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Utilities; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class WorkspaceHighlight : MonoBehaviour { diff --git a/Runtime/Workspaces/Common/Scripts/ZoomSliderUI.cs b/Runtime/Workspaces/Common/Scripts/ZoomSliderUI.cs index e4b3c0f24..798a3dc55 100644 --- a/Runtime/Workspaces/Common/Scripts/ZoomSliderUI.cs +++ b/Runtime/Workspaces/Common/Scripts/ZoomSliderUI.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class ZoomSliderUI : MonoBehaviour { diff --git a/Runtime/Workspaces/ConsoleWorkspace/ConsoleWorkspace.cs b/Runtime/Workspaces/ConsoleWorkspace/ConsoleWorkspace.cs index 5e3887ebc..2b7d96d15 100644 --- a/Runtime/Workspaces/ConsoleWorkspace/ConsoleWorkspace.cs +++ b/Runtime/Workspaces/ConsoleWorkspace/ConsoleWorkspace.cs @@ -1,4 +1,4 @@ -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { #if UNITY_EDITOR [MainMenuItem("Console", "Workspaces", "View errors, warnings and other messages")] diff --git a/Runtime/Workspaces/HierarchyWorkspace/HierarchyWorkspace.cs b/Runtime/Workspaces/HierarchyWorkspace/HierarchyWorkspace.cs index bd4fd7052..e247531f9 100644 --- a/Runtime/Workspaces/HierarchyWorkspace/HierarchyWorkspace.cs +++ b/Runtime/Workspaces/HierarchyWorkspace/HierarchyWorkspace.cs @@ -1,15 +1,15 @@ #if UNITY_EDITOR using System.Collections.Generic; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Handles; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { [EditorOnlyWorkspace] [MainMenuItem("Hierarchy", "Workspaces", "View all GameObjects in your scene(s)")] diff --git a/Runtime/Workspaces/HierarchyWorkspace/Scripts/HierarchyListItem.cs b/Runtime/Workspaces/HierarchyWorkspace/Scripts/HierarchyListItem.cs index 72573d2f8..14a10f1c2 100644 --- a/Runtime/Workspaces/HierarchyWorkspace/Scripts/HierarchyListItem.cs +++ b/Runtime/Workspaces/HierarchyWorkspace/Scripts/HierarchyListItem.cs @@ -1,17 +1,17 @@ using System; using System.Collections.Generic; using TMPro; -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Handles; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class HierarchyListItem : NestedDraggableListItem, IUsesViewerBody, IUsesGetFieldGrabOrigin { diff --git a/Runtime/Workspaces/HierarchyWorkspace/Scripts/HierarchyListViewController.cs b/Runtime/Workspaces/HierarchyWorkspace/Scripts/HierarchyListViewController.cs index 4fb9f6cbb..fff6ead3e 100644 --- a/Runtime/Workspaces/HierarchyWorkspace/Scripts/HierarchyListViewController.cs +++ b/Runtime/Workspaces/HierarchyWorkspace/Scripts/HierarchyListViewController.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.UI; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Handles; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.UI; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class HierarchyListViewController : EditorXRNestedListViewController, IUsesGameObjectLocking, IUsesSetHighlight { @@ -221,7 +221,7 @@ void UpdateHierarchyItem(HierarchyData data, int order, ref float offset, int de ClipText.SetMaterialClip(item.dropZoneMaterial, worldToLocalMatrix, m_Extents); m_VisibleItemHeight += itemSize.z; - UpdateItem(item, order, offset + m_ScrollOffset, ref doneSettling); + UpdateItem(item, order, offset + m_ScrollOffset, false, ref doneSettling); var extraSpace = item.extraSpace * itemSize.z; offset += extraSpace; diff --git a/Runtime/Workspaces/HierarchyWorkspace/Scripts/HierarchyUI.cs b/Runtime/Workspaces/HierarchyWorkspace/Scripts/HierarchyUI.cs index 2dc103d25..939727d6c 100644 --- a/Runtime/Workspaces/HierarchyWorkspace/Scripts/HierarchyUI.cs +++ b/Runtime/Workspaces/HierarchyWorkspace/Scripts/HierarchyUI.cs @@ -1,7 +1,7 @@ -using Unity.Labs.EditorXR.Handles; +using Unity.EditorXR.Handles; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class HierarchyUI : MonoBehaviour { diff --git a/Runtime/Workspaces/InspectorWorkspace/InspectorWorkspace.cs b/Runtime/Workspaces/InspectorWorkspace/InspectorWorkspace.cs index 19010cecc..e2ab53d5d 100644 --- a/Runtime/Workspaces/InspectorWorkspace/InspectorWorkspace.cs +++ b/Runtime/Workspaces/InspectorWorkspace/InspectorWorkspace.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Data; +using Unity.EditorXR.Handles; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { #if UNITY_EDITOR [MainMenuItem("Inspector", "Workspaces", "View and edit GameObject properties")] diff --git a/Runtime/Workspaces/InspectorWorkspace/Prefabs/Components/NumericField.prefab b/Runtime/Workspaces/InspectorWorkspace/Prefabs/Components/NumericField.prefab index 7c287c154..4630f27c3 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Prefabs/Components/NumericField.prefab +++ b/Runtime/Workspaces/InspectorWorkspace/Prefabs/Components/NumericField.prefab @@ -120,7 +120,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114000011995803364} m_CharacterLimit: 0 diff --git a/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorBoundsItem.prefab b/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorBoundsItem.prefab index aa6f313d6..247786219 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorBoundsItem.prefab +++ b/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorBoundsItem.prefab @@ -920,7 +920,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114944808814012386} m_CharacterLimit: 0 @@ -2152,7 +2152,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114104749296456768} m_CharacterLimit: 0 @@ -2278,7 +2278,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114692371002903084} m_CharacterLimit: 0 @@ -2492,7 +2492,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114422673207534042} m_CharacterLimit: 0 @@ -3836,7 +3836,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114962198023033020} m_CharacterLimit: 0 @@ -3962,7 +3962,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114933559999214812} m_CharacterLimit: 0 diff --git a/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorColorItem.prefab b/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorColorItem.prefab index 0f214c4e8..0a5f91c8c 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorColorItem.prefab +++ b/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorColorItem.prefab @@ -803,7 +803,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114571090488055158} m_CharacterLimit: 0 @@ -1504,7 +1504,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114656173588747080} m_CharacterLimit: 0 @@ -1755,7 +1755,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114357000694738060} m_CharacterLimit: 0 @@ -2099,7 +2099,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114838797404758080} m_CharacterLimit: 0 diff --git a/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorHeaderItem.prefab b/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorHeaderItem.prefab index 77bc8ccd5..68c11582c 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorHeaderItem.prefab +++ b/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorHeaderItem.prefab @@ -2439,7 +2439,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 1 - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114993591381409866} m_CharacterLimit: 0 diff --git a/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorNumberItem.prefab b/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorNumberItem.prefab index 8365af2a3..813df0635 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorNumberItem.prefab +++ b/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorNumberItem.prefab @@ -1240,7 +1240,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 1 - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114402847491323882} m_CharacterLimit: 0 diff --git a/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorRectItem.prefab b/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorRectItem.prefab index 5a871cea4..26077ca64 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorRectItem.prefab +++ b/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorRectItem.prefab @@ -1369,7 +1369,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114010275207193182} m_CharacterLimit: 0 @@ -1620,7 +1620,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114728394615051036} m_CharacterLimit: 0 @@ -1940,7 +1940,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114874207648435482} m_CharacterLimit: 0 @@ -2999,7 +2999,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114056717713741404} m_CharacterLimit: 0 diff --git a/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorStringItem.prefab b/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorStringItem.prefab index bd43b3b66..656eb391a 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorStringItem.prefab +++ b/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorStringItem.prefab @@ -283,7 +283,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 1 - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114348476703429590} m_CharacterLimit: 0 diff --git a/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorVectorItem.prefab b/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorVectorItem.prefab index eb204e092..cfd5b10ff 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorVectorItem.prefab +++ b/Runtime/Workspaces/InspectorWorkspace/Prefabs/InspectorVectorItem.prefab @@ -208,7 +208,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114944161131690700} m_CharacterLimit: 0 @@ -407,7 +407,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114581499884947940} m_CharacterLimit: 0 @@ -533,7 +533,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114061348108142264} m_CharacterLimit: 0 @@ -1024,7 +1024,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: Unity.Labs.EditorXR.UI.InputField+OnChangeEvent, Unity.Labs.EditorXR, + m_TypeName: Unity.EditorXR.UI.InputField+OnChangeEvent, Unity.EditorXR, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_TextComponent: {fileID: 114138670273400712} m_CharacterLimit: 0 diff --git a/Runtime/Workspaces/InspectorWorkspace/Scripts/InspectorListViewController.cs b/Runtime/Workspaces/InspectorWorkspace/Scripts/InspectorListViewController.cs index 0e495c2e4..0c4cc6cc3 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Scripts/InspectorListViewController.cs +++ b/Runtime/Workspaces/InspectorWorkspace/Scripts/InspectorListViewController.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.UI; -using Unity.Labs.ListView; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Data; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.UI; +using Unity.ListViewFramework; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { #if UNITY_EDITOR sealed class InspectorListViewController : EditorXRNestedListViewController, IUsesGameObjectLocking, IUsesStencilRef diff --git a/Runtime/Workspaces/InspectorWorkspace/Scripts/InspectorUI.cs b/Runtime/Workspaces/InspectorWorkspace/Scripts/InspectorUI.cs index d1a25e10e..f069e259a 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Scripts/InspectorUI.cs +++ b/Runtime/Workspaces/InspectorWorkspace/Scripts/InspectorUI.cs @@ -1,7 +1,7 @@ -using Unity.Labs.EditorXR.Handles; +using Unity.EditorXR.Handles; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { #if UNITY_EDITOR sealed class InspectorUI : MonoBehaviour diff --git a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorArrayHeaderItem.cs b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorArrayHeaderItem.cs index af07e378f..b56fb1995 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorArrayHeaderItem.cs +++ b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorArrayHeaderItem.cs @@ -1,7 +1,7 @@ using UnityEngine; -using Button = Unity.Labs.EditorXR.UI.Button; +using Button = Unity.EditorXR.UI.Button; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class InspectorArrayHeaderItem : InspectorPropertyItem { diff --git a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorBoolItem.cs b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorBoolItem.cs index a5501467d..3730f0978 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorBoolItem.cs +++ b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorBoolItem.cs @@ -1,8 +1,8 @@ -using Unity.Labs.EditorXR.Data; +using Unity.EditorXR.Data; using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class InspectorBoolItem : InspectorPropertyItem { diff --git a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorBoundsItem.cs b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorBoundsItem.cs index 1ca2435e5..b1fdbf7d5 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorBoundsItem.cs +++ b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorBoundsItem.cs @@ -1,10 +1,10 @@ using System; using System.Linq; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.EditorXR.UI; +using Unity.EditorXR.Data; +using Unity.EditorXR.UI; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class InspectorBoundsItem : InspectorPropertyItem { diff --git a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorColorItem.cs b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorColorItem.cs index f8f01f053..730b7dc51 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorColorItem.cs +++ b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorColorItem.cs @@ -1,9 +1,9 @@ using System; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.EditorXR.UI; +using Unity.EditorXR.Data; +using Unity.EditorXR.UI; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class InspectorColorItem : InspectorPropertyItem { diff --git a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorComponentItem.cs b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorComponentItem.cs index 503c63eab..362632b0d 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorComponentItem.cs +++ b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorComponentItem.cs @@ -1,12 +1,12 @@ using TMPro; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.Utils; +using Unity.EditorXR.Data; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; using UnityEngine.UI; -using Button = Unity.Labs.EditorXR.UI.Button; +using Button = Unity.EditorXR.UI.Button; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class InspectorComponentItem : InspectorListItem { diff --git a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorDropDownItem.cs b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorDropDownItem.cs index 8b081e59d..066dc28a7 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorDropDownItem.cs +++ b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorDropDownItem.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.EditorXR.UI; +using Unity.EditorXR.Data; +using Unity.EditorXR.UI; using UnityEditor; using UnityEngine; #if UNITY_EDITOR using UnityEditorInternal; #endif -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class InspectorDropDownItem : InspectorPropertyItem { diff --git a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorHeaderItem.cs b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorHeaderItem.cs index 87b3647bf..55a9536da 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorHeaderItem.cs +++ b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorHeaderItem.cs @@ -1,14 +1,14 @@ using System; using System.Collections; using System.Linq; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.EditorXR.UI; +using Unity.EditorXR.Data; +using Unity.EditorXR.UI; using UnityEditor; using UnityEngine; using UnityEngine.UI; -using InputField = Unity.Labs.EditorXR.UI.InputField; +using InputField = Unity.EditorXR.UI.InputField; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { #if UNITY_EDITOR sealed class InspectorHeaderItem : InspectorListItem diff --git a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorListItem.cs b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorListItem.cs index f36a369dc..3d90add22 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorListItem.cs +++ b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorListItem.cs @@ -1,17 +1,17 @@ using TMPro; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.UI; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Data; +using Unity.EditorXR.Handles; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.UI; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; using UnityEngine.UI; -using InputField = Unity.Labs.EditorXR.UI.InputField; +using InputField = Unity.EditorXR.UI.InputField; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { abstract class InspectorListItem : NestedDraggableListItem, IUsesSetHighlight, IUsesGetFieldGrabOrigin { diff --git a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorNumberItem.cs b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorNumberItem.cs index dc2f8cdc3..ec1ef3c94 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorNumberItem.cs +++ b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorNumberItem.cs @@ -1,11 +1,11 @@ using System; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.UI; +using Unity.EditorXR.Data; +using Unity.EditorXR.Handles; +using Unity.EditorXR.UI; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class InspectorNumberItem : InspectorPropertyItem { diff --git a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorObjectFieldItem.cs b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorObjectFieldItem.cs index dcb32a7b3..31d0e9c55 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorObjectFieldItem.cs +++ b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorObjectFieldItem.cs @@ -1,11 +1,11 @@ using System; using TMPro; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.Utils; +using Unity.EditorXR.Data; +using Unity.XRTools.Utils; using UnityEngine; using Object = UnityEngine.Object; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { #if UNITY_EDITOR sealed class InspectorObjectFieldItem : InspectorPropertyItem diff --git a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorPropertyItem.cs b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorPropertyItem.cs index 088c7d965..06753b892 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorPropertyItem.cs +++ b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorPropertyItem.cs @@ -1,11 +1,11 @@ using System; using TMPro; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Data; +using Unity.EditorXR.Interfaces; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { abstract class InspectorPropertyItem : InspectorListItem { diff --git a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorRectItem.cs b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorRectItem.cs index d965ac261..fa6945709 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorRectItem.cs +++ b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorRectItem.cs @@ -1,10 +1,10 @@ using System; using System.Linq; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.EditorXR.UI; +using Unity.EditorXR.Data; +using Unity.EditorXR.UI; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class InspectorRectItem : InspectorPropertyItem { diff --git a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorStringItem.cs b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorStringItem.cs index cc69cfd85..1d0c39eef 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorStringItem.cs +++ b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorStringItem.cs @@ -1,9 +1,9 @@ -using Unity.Labs.EditorXR.Data; -using Unity.Labs.EditorXR.UI; +using Unity.EditorXR.Data; +using Unity.EditorXR.UI; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class InspectorStringItem : InspectorPropertyItem { diff --git a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorUnimplementedItem.cs b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorUnimplementedItem.cs index fba836db0..f1407322f 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorUnimplementedItem.cs +++ b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorUnimplementedItem.cs @@ -1,9 +1,9 @@ using TMPro; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.Utils; +using Unity.EditorXR.Data; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class InspectorUnimplementedItem : InspectorPropertyItem { diff --git a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorVectorItem.cs b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorVectorItem.cs index 53397166d..c66967b1d 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorVectorItem.cs +++ b/Runtime/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorVectorItem.cs @@ -1,10 +1,10 @@ using System; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.EditorXR.UI; +using Unity.EditorXR.Data; +using Unity.EditorXR.UI; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class InspectorVectorItem : InspectorPropertyItem { diff --git a/Runtime/Workspaces/InspectorWorkspace/Scripts/LockUI.cs b/Runtime/Workspaces/InspectorWorkspace/Scripts/LockUI.cs index 699fa8102..856b94836 100644 --- a/Runtime/Workspaces/InspectorWorkspace/Scripts/LockUI.cs +++ b/Runtime/Workspaces/InspectorWorkspace/Scripts/LockUI.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class LockUI : MonoBehaviour, IUsesStencilRef { diff --git a/Runtime/Workspaces/LockedObjectsWorkspace/LockedObjectsWorkspace.cs b/Runtime/Workspaces/LockedObjectsWorkspace/LockedObjectsWorkspace.cs index a3e3b2187..c4278ee65 100644 --- a/Runtime/Workspaces/LockedObjectsWorkspace/LockedObjectsWorkspace.cs +++ b/Runtime/Workspaces/LockedObjectsWorkspace/LockedObjectsWorkspace.cs @@ -1,12 +1,12 @@ #if UNITY_EDITOR using System.Collections.Generic; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; using UnityEngine; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { [MainMenuItem("Locked Objects", "Workspaces", "View all locked objects in your scene(s)")] [SpatialMenuItem("Locked Objects", "Workspaces", "View all locked objects in your scene(s)")] diff --git a/Runtime/Workspaces/MiniWorldWorkspace/MiniWorldWorkspace.cs b/Runtime/Workspaces/MiniWorldWorkspace/MiniWorldWorkspace.cs index b2ace8d8e..dead3c709 100644 --- a/Runtime/Workspaces/MiniWorldWorkspace/MiniWorldWorkspace.cs +++ b/Runtime/Workspaces/MiniWorldWorkspace/MiniWorldWorkspace.cs @@ -1,21 +1,21 @@ using System; using System.Collections; using System.Collections.Generic; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Proxies; -using Unity.Labs.EditorXR.UI; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Proxies; +using Unity.EditorXR.UI; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; using UnityEngine.InputNew; using UnityEngine.UI; using Button = UnityEngine.UI.Button; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { [MainMenuItem("MiniWorld", "Workspaces", "Edit a smaller version of your scene(s)", typeof(MiniWorldTooltip))] [SpatialMenuItem("MiniWorld", "Workspaces", "Edit a smaller version of your scene(s)")] diff --git a/Runtime/Workspaces/MiniWorldWorkspace/Scripts/MiniWorld.cs b/Runtime/Workspaces/MiniWorldWorkspace/Scripts/MiniWorld.cs index 0bfb2539d..db6b0b857 100644 --- a/Runtime/Workspaces/MiniWorldWorkspace/Scripts/MiniWorld.cs +++ b/Runtime/Workspaces/MiniWorldWorkspace/Scripts/MiniWorld.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class MiniWorld : MonoBehaviour, IMiniWorld { diff --git a/Runtime/Workspaces/MiniWorldWorkspace/Scripts/MiniWorldRenderer.cs b/Runtime/Workspaces/MiniWorldWorkspace/Scripts/MiniWorldRenderer.cs index 3b157cd0d..fccceda9f 100644 --- a/Runtime/Workspaces/MiniWorldWorkspace/Scripts/MiniWorldRenderer.cs +++ b/Runtime/Workspaces/MiniWorldWorkspace/Scripts/MiniWorldRenderer.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.Utils; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { #if UNITY_EDITOR [RequiresTag(k_MiniWorldCameraTag)] diff --git a/Runtime/Workspaces/MiniWorldWorkspace/Scripts/MiniWorldUI.cs b/Runtime/Workspaces/MiniWorldWorkspace/Scripts/MiniWorldUI.cs index 43ea58fb3..3f8ebe63c 100644 --- a/Runtime/Workspaces/MiniWorldWorkspace/Scripts/MiniWorldUI.cs +++ b/Runtime/Workspaces/MiniWorldWorkspace/Scripts/MiniWorldUI.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { class MiniWorldUI : MonoBehaviour { diff --git a/Runtime/Workspaces/MiniWorldWorkspace/Scripts/ResetUI.cs b/Runtime/Workspaces/MiniWorldWorkspace/Scripts/ResetUI.cs index 25302b33d..9de4f7c2a 100644 --- a/Runtime/Workspaces/MiniWorldWorkspace/Scripts/ResetUI.cs +++ b/Runtime/Workspaces/MiniWorldWorkspace/Scripts/ResetUI.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Labs.EditorXR.UI +namespace Unity.EditorXR.UI { sealed class ResetUI : MonoBehaviour { diff --git a/Runtime/Workspaces/PolyWorkspace/PolyWorkspace.cs b/Runtime/Workspaces/PolyWorkspace/PolyWorkspace.cs index 79e11081d..dbadb0026 100644 --- a/Runtime/Workspaces/PolyWorkspace/PolyWorkspace.cs +++ b/Runtime/Workspaces/PolyWorkspace/PolyWorkspace.cs @@ -1,23 +1,23 @@ using System; using System.Collections; using System.Threading; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.UI; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Handles; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.UI; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; using UnityEngine; #if INCLUDE_POLY_TOOLKIT using System.Collections.Generic; using PolyToolkit; #else -using Unity.Labs.EditorXR.Core; +using Unity.EditorXR.Core; using UnityEngine.InputNew; #endif -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { #if INCLUDE_POLY_TOOLKIT [MainMenuItem("Poly", "Workspaces", "Import models from Google Poly")] diff --git a/Runtime/Workspaces/PolyWorkspace/Scripts/PolyGridAsset.cs b/Runtime/Workspaces/PolyWorkspace/Scripts/PolyGridAsset.cs index bbb532308..313f8f999 100644 --- a/Runtime/Workspaces/PolyWorkspace/Scripts/PolyGridAsset.cs +++ b/Runtime/Workspaces/PolyWorkspace/Scripts/PolyGridAsset.cs @@ -1,15 +1,15 @@ using System; -using Unity.Labs.EditorXR.Interfaces; +using Unity.EditorXR.Interfaces; using UnityEngine; -using Unity.Labs.ListView; +using Unity.ListViewFramework; -using Unity.Labs.ModuleLoader; +using Unity.XRTools.ModuleLoader; #if INCLUDE_POLY_TOOLKIT using PolyToolkit; using UnityEngine.Networking; #endif -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { class PolyGridAsset : IListViewItemData, IUsesWeb { diff --git a/Runtime/Workspaces/PolyWorkspace/Scripts/PolyGridItem.cs b/Runtime/Workspaces/PolyWorkspace/Scripts/PolyGridItem.cs index 8e401ad75..e911ee5fc 100644 --- a/Runtime/Workspaces/PolyWorkspace/Scripts/PolyGridItem.cs +++ b/Runtime/Workspaces/PolyWorkspace/Scripts/PolyGridItem.cs @@ -1,21 +1,21 @@ using System; using System.Collections; using TMPro; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.Helpers; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Proxies; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.SpatialHash; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Handles; +using Unity.EditorXR.Helpers; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Proxies; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.SpatialHash; +using Unity.XRTools.Utils; using UnityEngine; using UnityEngine.InputNew; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { class PolyGridItem : DraggableListItem, IUsesPlaceSceneObject, IUsesSpatialHash, IUsesViewerBody, IUsesRayVisibilitySettings, IUsesRequestFeedback, IUsesGrouping, IUsesControlHaptics diff --git a/Runtime/Workspaces/PolyWorkspace/Scripts/PolyGridViewController.cs b/Runtime/Workspaces/PolyWorkspace/Scripts/PolyGridViewController.cs index 9ff7d7e71..fa19fb86c 100644 --- a/Runtime/Workspaces/PolyWorkspace/Scripts/PolyGridViewController.cs +++ b/Runtime/Workspaces/PolyWorkspace/Scripts/PolyGridViewController.cs @@ -1,12 +1,12 @@ -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.ModuleLoader; using UnityEngine; #if INCLUDE_POLY_TOOLKIT using PolyToolkit; #endif -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { class PolyGridViewController : EditorXRListViewController, IUsesPoly { diff --git a/Runtime/Workspaces/PolyWorkspace/Scripts/PolyModule.cs b/Runtime/Workspaces/PolyWorkspace/Scripts/PolyModule.cs index 49977f39f..c7023af45 100644 --- a/Runtime/Workspaces/PolyWorkspace/Scripts/PolyModule.cs +++ b/Runtime/Workspaces/PolyWorkspace/Scripts/PolyModule.cs @@ -1,19 +1,19 @@ using System; using System.Text; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.EditorXR.Workspaces; +using Unity.EditorXR.Utilities; +using Unity.EditorXR.Workspaces; using UnityEngine; -using Unity.Labs.Utils; +using Unity.XRTools.Utils; #if INCLUDE_POLY_TOOLKIT using PolyToolkit; using System.Collections.Generic; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Interfaces; +using Unity.XRTools.ModuleLoader; #endif #if INCLUDE_POLY_TOOLKIT -namespace Unity.Labs.EditorXR.Modules +namespace Unity.EditorXR.Modules { class PolyModule : IDelayedInitializationModule, IUsesFunctionalityInjection, IProvidesPoly { diff --git a/Runtime/Workspaces/PolyWorkspace/Scripts/PolyUI.cs b/Runtime/Workspaces/PolyWorkspace/Scripts/PolyUI.cs index a32b84533..b54730790 100644 --- a/Runtime/Workspaces/PolyWorkspace/Scripts/PolyUI.cs +++ b/Runtime/Workspaces/PolyWorkspace/Scripts/PolyUI.cs @@ -1,7 +1,7 @@ -using Unity.Labs.EditorXR.Handles; +using Unity.EditorXR.Handles; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class PolyUI : MonoBehaviour { diff --git a/Runtime/Workspaces/ProfilerWorkspace/ProfilerWorkspace.cs b/Runtime/Workspaces/ProfilerWorkspace/ProfilerWorkspace.cs index e8541e13d..e27eacd95 100644 --- a/Runtime/Workspaces/ProfilerWorkspace/ProfilerWorkspace.cs +++ b/Runtime/Workspaces/ProfilerWorkspace/ProfilerWorkspace.cs @@ -1,9 +1,9 @@ #if UNITY_EDITOR -using Unity.Labs.EditorXR.Helpers; -using Unity.Labs.EditorXR.Utilities; +using Unity.EditorXR.Helpers; +using Unity.EditorXR.Utilities; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { [EditorOnlyWorkspace] [MainMenuItem("Profiler", "Workspaces", "Analyze your project's performance")] diff --git a/Runtime/Workspaces/ProjectWorkspace/ProjectWorkspace.cs b/Runtime/Workspaces/ProjectWorkspace/ProjectWorkspace.cs index 1ad5bed9b..e59ee72c4 100644 --- a/Runtime/Workspaces/ProjectWorkspace/ProjectWorkspace.cs +++ b/Runtime/Workspaces/ProjectWorkspace/ProjectWorkspace.cs @@ -2,15 +2,15 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.UI; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; +using Unity.EditorXR.Data; +using Unity.EditorXR.Handles; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.UI; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { [EditorOnlyWorkspace] [MainMenuItem("Project", "Workspaces", "Manage the assets that belong to your project")] diff --git a/Runtime/Workspaces/ProjectWorkspace/Scripts/AssetGridItem.cs b/Runtime/Workspaces/ProjectWorkspace/Scripts/AssetGridItem.cs index f6ff0fe14..213864fcc 100644 --- a/Runtime/Workspaces/ProjectWorkspace/Scripts/AssetGridItem.cs +++ b/Runtime/Workspaces/ProjectWorkspace/Scripts/AssetGridItem.cs @@ -2,23 +2,23 @@ using System.Collections; using System.Collections.Generic; using TMPro; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.Helpers; -using Unity.Labs.EditorXR.Interfaces; -using Unity.Labs.EditorXR.Proxies; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.ModuleLoader; -using Unity.Labs.SpatialHash; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Data; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Handles; +using Unity.EditorXR.Helpers; +using Unity.EditorXR.Interfaces; +using Unity.EditorXR.Proxies; +using Unity.EditorXR.Utilities; +using Unity.XRTools.ModuleLoader; +using Unity.XRTools.SpatialHash; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; using UnityEngine.InputNew; using UnityEngine.UI; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class AssetGridItem : DraggableListItem, IUsesPlaceSceneObject, IUsesSpatialHash, IUsesSetHighlight, IUsesViewerBody, IUsesRayVisibilitySettings, IUsesRequestFeedback, IUsesDirectSelection, IUsesRaycastResults, IUpdateInspectors diff --git a/Runtime/Workspaces/ProjectWorkspace/Scripts/AssetGridViewController.cs b/Runtime/Workspaces/ProjectWorkspace/Scripts/AssetGridViewController.cs index 5d55b33d1..eaa8bfcdf 100644 --- a/Runtime/Workspaces/ProjectWorkspace/Scripts/AssetGridViewController.cs +++ b/Runtime/Workspaces/ProjectWorkspace/Scripts/AssetGridViewController.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.Utils; +using Unity.EditorXR.Data; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class AssetGridViewController : EditorXRListViewController { diff --git a/Runtime/Workspaces/ProjectWorkspace/Scripts/FolderListItem.cs b/Runtime/Workspaces/ProjectWorkspace/Scripts/FolderListItem.cs index 04dba6e23..88cb60628 100644 --- a/Runtime/Workspaces/ProjectWorkspace/Scripts/FolderListItem.cs +++ b/Runtime/Workspaces/ProjectWorkspace/Scripts/FolderListItem.cs @@ -1,11 +1,11 @@ using System; using TMPro; -using Unity.Labs.EditorXR.Handles; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.Utils; +using Unity.EditorXR.Handles; +using Unity.EditorXR.Utilities; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Data +namespace Unity.EditorXR.Data { sealed class FolderListItem : EditorXRNestedListViewItem { diff --git a/Runtime/Workspaces/ProjectWorkspace/Scripts/FolderListViewController.cs b/Runtime/Workspaces/ProjectWorkspace/Scripts/FolderListViewController.cs index 13c6357f3..73ca51341 100644 --- a/Runtime/Workspaces/ProjectWorkspace/Scripts/FolderListViewController.cs +++ b/Runtime/Workspaces/ProjectWorkspace/Scripts/FolderListViewController.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; using System.Linq; -using Unity.Labs.EditorXR.Data; -using Unity.Labs.EditorXR.UI; -using Unity.Labs.Utils; +using Unity.EditorXR.Data; +using Unity.EditorXR.UI; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class FolderListViewController : EditorXRNestedListViewController { @@ -88,7 +88,7 @@ void UpdateFolderItem(FolderData data, int order, float offset, int depth, bool ClipText.SetMaterialClip(item.cubeMaterial, transform.worldToLocalMatrix, m_Extents); - UpdateItem(item, order, offset, ref doneSettling); + UpdateItem(item, order, offset, false, ref doneSettling); } protected override void UpdateNestedItems(ref int order, ref float offset, ref bool doneSettling, int depth = 0) diff --git a/Runtime/Workspaces/ProjectWorkspace/Scripts/ProjectUI.cs b/Runtime/Workspaces/ProjectWorkspace/Scripts/ProjectUI.cs index 530aff6aa..80e45ced3 100644 --- a/Runtime/Workspaces/ProjectWorkspace/Scripts/ProjectUI.cs +++ b/Runtime/Workspaces/ProjectWorkspace/Scripts/ProjectUI.cs @@ -1,7 +1,7 @@ -using Unity.Labs.EditorXR.Handles; +using Unity.EditorXR.Handles; using UnityEngine; -namespace Unity.Labs.EditorXR.Workspaces +namespace Unity.EditorXR.Workspaces { sealed class ProjectUI : MonoBehaviour { diff --git a/Runtime/libs/input-prototype b/Runtime/libs/input-prototype index 2485518d1..499cead2d 160000 --- a/Runtime/libs/input-prototype +++ b/Runtime/libs/input-prototype @@ -1 +1 @@ -Subproject commit 2485518d1e329824cf8cdf8eebecd2fb3ed4a87d +Subproject commit 499cead2db7137c6ec2e35d14e8fdee89041345e diff --git a/Tests/Editor/EditorXRTestInitializer.cs b/Tests/Editor/EditorXRTestInitializer.cs index 14e28a88f..f89ec0f6d 100644 --- a/Tests/Editor/EditorXRTestInitializer.cs +++ b/Tests/Editor/EditorXRTestInitializer.cs @@ -1,8 +1,8 @@ using NUnit.Framework; -using Unity.Labs.EditorXR.Core; +using Unity.EditorXR.Core; using UnityEditor; -namespace Unity.Labs.EditorXR.Tests.Core +namespace Unity.EditorXR.Tests.Core { [SetUpFixture] public class EditorXRTestInitializer diff --git a/Tests/Editor/Unit/Core/EditingContextManagerTests.cs b/Tests/Editor/Unit/Core/EditingContextManagerTests.cs index 8e509d5a5..30849fec4 100644 --- a/Tests/Editor/Unit/Core/EditingContextManagerTests.cs +++ b/Tests/Editor/Unit/Core/EditingContextManagerTests.cs @@ -2,13 +2,13 @@ using System.Collections.Generic; using System.IO; using System.Threading; -using Unity.Labs.EditorXR.Core; -using Unity.Labs.EditorXR.Tools; -using Unity.Labs.Utils; +using Unity.EditorXR.Core; +using Unity.EditorXR.Tools; +using Unity.XRTools.Utils; using UnityEditor; using UnityEngine; -namespace Unity.Labs.EditorXR.Tests.Core +namespace Unity.EditorXR.Tests.Core { [TestFixture] public class EditingContextManagerTests diff --git a/Tests/Editor/Unit/Extension Methods/MonoBehaviourExtensionsTests.cs b/Tests/Editor/Unit/Extension Methods/MonoBehaviourExtensionsTests.cs index 3deb20083..20dd79d8a 100644 --- a/Tests/Editor/Unit/Extension Methods/MonoBehaviourExtensionsTests.cs +++ b/Tests/Editor/Unit/Extension Methods/MonoBehaviourExtensionsTests.cs @@ -1,10 +1,10 @@ using System.Collections; using NUnit.Framework; using UnityEngine; -using Unity.Labs.EditorXR.Extensions; -using Unity.Labs.EditorXR.Proxies; +using Unity.EditorXR.Extensions; +using Unity.EditorXR.Proxies; -namespace Unity.Labs.EditorXR.Tests.Extensions +namespace Unity.EditorXR.Tests.Extensions { public class MonoBehaviourExtensionsTests { diff --git a/Tests/Editor/Unit/Extension Methods/TransformExtensionsTests.cs b/Tests/Editor/Unit/Extension Methods/TransformExtensionsTests.cs index 4bea0f657..bbb8a9711 100644 --- a/Tests/Editor/Unit/Extension Methods/TransformExtensionsTests.cs +++ b/Tests/Editor/Unit/Extension Methods/TransformExtensionsTests.cs @@ -1,8 +1,8 @@ using NUnit.Framework; using UnityEngine; -using Unity.Labs.EditorXR.Extensions; +using Unity.EditorXR.Extensions; -namespace Unity.Labs.EditorXR.Tests.Extensions +namespace Unity.EditorXR.Tests.Extensions { [TestFixture] public class TransformExtensionsTests diff --git a/Tests/Editor/Unit/Utilities/EditorXRUtilsTests.cs b/Tests/Editor/Unit/Utilities/EditorXRUtilsTests.cs index 375cded50..b4e5a69f8 100644 --- a/Tests/Editor/Unit/Utilities/EditorXRUtilsTests.cs +++ b/Tests/Editor/Unit/Utilities/EditorXRUtilsTests.cs @@ -1,10 +1,10 @@ using NUnit.Framework; using System.Collections.Generic; -using Unity.Labs.EditorXR.Utilities; -using Unity.Labs.Utils; +using Unity.EditorXR.Utilities; +using Unity.XRTools.Utils; using UnityEngine; -namespace Unity.Labs.EditorXR.Tests.Utilities +namespace Unity.EditorXR.Tests.Utilities { [TestFixture] public class EditorXRUtilsTests diff --git a/Tests/Editor/Unit/Utilities/GradientPairTests.cs b/Tests/Editor/Unit/Utilities/GradientPairTests.cs index 30b50a811..21098eda2 100644 --- a/Tests/Editor/Unit/Utilities/GradientPairTests.cs +++ b/Tests/Editor/Unit/Utilities/GradientPairTests.cs @@ -1,8 +1,8 @@ using NUnit.Framework; -using Unity.Labs.EditorXR.Helpers; +using Unity.EditorXR.Helpers; using UnityEngine; -namespace Unity.Labs.EditorXR.Tests.Utilities +namespace Unity.EditorXR.Tests.Utilities { [TestFixture] public class GradientPairTests diff --git a/Tests/Editor/Unit/Utilities/MathUtilsExtTests.cs b/Tests/Editor/Unit/Utilities/MathUtilsExtTests.cs index dc3674225..d71eadc42 100644 --- a/Tests/Editor/Unit/Utilities/MathUtilsExtTests.cs +++ b/Tests/Editor/Unit/Utilities/MathUtilsExtTests.cs @@ -1,8 +1,8 @@ using NUnit.Framework; -using Unity.Labs.EditorXR.Utilities; +using Unity.EditorXR.Utilities; using UnityEngine; -namespace Unity.Labs.EditorXR.Tests.Utilities +namespace Unity.EditorXR.Tests.Utilities { [TestFixture] public class MathUtilsExtTests diff --git a/Tests/Editor/Unity.Labs.EditorXR.EditorTests.asmdef b/Tests/Editor/Unity.Labs.EditorXR.EditorTests.asmdef index 1bd83aede..0c5c3e0de 100644 --- a/Tests/Editor/Unity.Labs.EditorXR.EditorTests.asmdef +++ b/Tests/Editor/Unity.Labs.EditorXR.EditorTests.asmdef @@ -1,11 +1,11 @@ { - "name": "Unity.Labs.EditorXR.EditorTests", + "name": "Unity.EditorXR.EditorTests", "references": [ - "Unity.Labs.EditorXR", - "Unity.Labs.Utils", - "Unity.Labs.Utils.Editor", - "Unity.Labs.EditorXR.Interfaces", - "Unity.Labs.ModuleLoader.Interfaces" + "Unity.EditorXR", + "Unity.XRTools.Utils", + "Unity.XRTools.Utils.Editor", + "Unity.EditorXR.Interfaces", + "Unity.XRTools.ModuleLoader.Interfaces" ], "optionalUnityReferences": [ "TestAssemblies" diff --git a/package.json b/package.json index 69ccac54c..df59b434f 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,17 @@ { - "name": "com.unity.labs.editorxr", + "name": "com.unity.editorxr", "displayName": "EditorXR", "version": "0.4.7-preview", "unity": "2019.1", "unityRelease": "14f1", "description": "Author XR in XR\nEditorXR provides a basic set of authoring tools and a framework for using and developing spatial authoring environments. This package adds the VR View to the Unity Editor, allowing users to take advantage of VR devices like Oculus Rift and HTC Vive in edit mode and work directly on their project and scenes in VR.\nIt is also possible to build EditorXR and its tools and workspaces into Player builds for use on devices like Oculus Quest or to incoroprate authoring components into end-user experiences.", "dependencies": { - "com.unity.labs.utils": "0.1.4-preview", - "com.unity.labs.module-loader": "0.1.3-preview", - "com.unity.labs.list-view-framework": "1.1.1-preview", - "com.unity.labs.spatial-hash": "0.1.0-preview", + "com.unity.xrtools.utils": "1.0.1", + "com.unity.xrtools.module-loader": "1.0.1", + "com.unity.list-view-framework": "1.1.2-preview", + "com.unity.xrtools.spatial-hash": "0.1.0-preview", "com.unity.xr.legacyinputhelpers": "2.0.6", - "com.unity.labs.xrlinerenderer": "0.1.1-preview", + "com.unity.xr-line-renderer": "0.1.1-preview", "com.unity.timeline": "1.0.0", "com.unity.textmeshpro": "2.0.1" }