Граф коммитов

129 Коммитов

Автор SHA1 Сообщение Дата
Matt Schoen 0ee00267f8 Remove Labs from namespaces and package names 2020-07-31 00:17:02 -07:00
Matt Schoen 274bb9806c Fix an issue where it is possible to undo input bindings on first import, causing exceptions 2020-02-02 01:56:33 -08:00
Matt Schoen f24f3e2027 Fix bugs that came up during release testing:
- Fix snapping menu not being interactable by disabling settings menu face while submenus are open; Fix off-by-one error in disabling the last subMenu
- Fix NullReferenceExceptions in spatial menu related to FI by using InjectFunctionalitySingle instead of ConnectInterfaces on SpatialMenuElements
- Fix an issue where user position was not being saved due to EditorXRViewerModule clearing state before serializing preferences; Removed properties which cached the state of `preserveLayout` to prevent this issue, and set shutdownOrder for EditorXRViewerModule to be later than SerializedPreferencesModule
- Move RayInputModule out of UnityEngine namespace to fix stack traces; Add namespaces to classes that were missing them
- Fix NullReferenceExceptions in IntersectionUtils by checking for null mesh
2020-02-02 00:48:06 -08:00
Matt Schoen d08b179bb9 Rename EditorVR class to EditorXR 2019-12-08 19:03:44 -08:00
Matt Schoen 2a028b66cb Remove BOM from .cs files that have it 2019-12-07 16:36:11 -08:00
Matt Schoen 644c3c023f Finish implementing PolyToolkitHelper;
Remove CCU attributes for PolyToolkit, since defines are handled in PolyToolkitHelper
2019-12-06 20:21:16 -08:00
Matt Schoen 29eb3ff389 WIP on PolyToolkitHelper 2019-12-06 17:04:35 -08:00
Matt Schoen 2ed26d6619 Remove ExecutionOrderSetter--it is obsolete now that this is a package because users can't change execution order 2019-12-02 16:52:41 -08:00
Matt Schoen da60945c18 Update namespace to Unity.Labs.EditorXR;
Add missing XML comments, fix comments and make things not public and fix validation errors
2019-11-25 03:31:04 -08:00
Matt Schoen d2ab30cfd7 Remove VRLineRenderer;
Update references to VRLineRenderer;
Update missing XML comments
2019-11-24 23:58:21 -08:00
Matt Schoen f2de651d4d Graft missing changes from 0.3 release branch 2019-11-05 23:06:02 -08:00
Matt Schoen 41ccc7ee81 Merge remote-tracking branch 'remotes/public/development' into merge-0.3
# Conflicts:
#	Editor/BuildCallbacks.cs
#	Editor/EditingContextManagerEditor.cs
#	Editor/HapticPulsesEditor.cs
#	Editor/ProxyFeedbackEditor.cs
#	Fonts/Roboto/Roboto-Light SDF.lfs.asset
#	Fonts/Roboto/Roboto-Medium SDF.lfs.asset
#	Fonts/Roboto/Roboto-Regular SDF.lfs.asset
#	Menus/MainMenu/Scripts/MainMenuActionButton.cs
#	Menus/MainMenu/Scripts/MainMenuButton.cs
#	Menus/MainMenu/Scripts/MainMenuFace.cs
#	Menus/MainMenu/Scripts/MainMenuSelectable.cs
#	Menus/MainMenu/Scripts/MainMenuToggle.cs
#	Patches/Dependencies_asmdef.unitypackage.meta
#	README.md
#	Runtime/Patches/Dependencies_asmdef.unitypackage
#	Runtime/Patches/Dependencies_asmdef.unitypackage.meta
#	Runtime/Patches/PolyToolkit_asmdef.unitypackage.meta
#	Runtime/libs/UnityOctree
#	Runtime/libs/VRLineRenderer
#	Scripts/Core/Contexts/EditingContextManager.cs
#	Scripts/Core/Contexts/EditorXRContext.cs
#	Scripts/Core/EditorVR.DirectSelection.cs
#	Scripts/Core/EditorVR.Interfaces.cs
#	Scripts/Core/EditorVR.Menus.cs
#	Scripts/Core/EditorVR.MiniWorlds.cs
#	Scripts/Core/EditorVR.Rays.cs
#	Scripts/Core/EditorVR.Tools.cs
#	Scripts/Core/EditorVR.ToolsMenu.cs
#	Scripts/Core/EditorVR.UI.cs
#	Scripts/Core/EditorVR.Vacuumables.cs
#	Scripts/Core/EditorVR.Viewer.cs
#	Scripts/Core/EditorVR.cs
#	Scripts/Core/InterfaceConnectors/ActionsModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/AdaptivePositionModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/DeviceInputModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/FeedbackModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/GazeDivergenceModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/HapticsModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/HierarchyModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/HighlightModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/IntersectionModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/LockModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/MultipleRayInputModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/PolyModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/ProjectFolderModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/SceneObjectModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/SelectionModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/SerializedPreferencesModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/SnappingModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/SpatialHashModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/SpatialHintModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/SpatialScrollModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/TooltipModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/WebModuleConnector.cs
#	Scripts/Core/InterfaceConnectors/WorkspaceModuleConnector.cs
#	Scripts/Core/VRView.cs
#	Scripts/Data/DefaultScriptReferences.cs
#	Scripts/Handles/UI/DropDown.cs
#	Scripts/Helpers/PlayerFloor.cs
#	Scripts/Helpers/VRSmoothCamera.cs
#	Scripts/Input/BaseVRInputToEvents.cs
#	Scripts/Modules/FeedbackModule/FeedbackModule.cs
#	Scripts/Modules/HapticsModule/HapticsModule.cs
#	Scripts/Modules/HierarchyModule.cs
#	Scripts/Modules/ProjectFolderModule.cs
#	Scripts/Modules/SelectionModule/SelectionModule.cs
#	Scripts/Modules/SnappingModule/SnappingModule.cs
#	Scripts/Modules/TooltipModule/TooltipUI.cs
#	Scripts/UI/GradientButton.cs
#	Scripts/UI/InputField.cs
#	Scripts/Utilities/CameraUtils.cs
#	Scripts/Utilities/Editor/EXR-Utilities-Editor.asmdef
#	Tools/LocomotionTool/LocomotionTool.cs
#	Tools/LocomotionTool/Scripts/Ring.cs
#	Tools/LocomotionTool/Scripts/ViewerScaleVisuals.cs
#	Workspaces/HierarchyWorkspace/Scripts/HierarchyListItem.cs
#	Workspaces/InspectorWorkspace/InspectorWorkspace.cs
#	Workspaces/PolyWorkspace/Scripts/PolyGridAsset.cs
#	Workspaces/PolyWorkspace/Scripts/PolyGridItem.cs
#	Workspaces/PolyWorkspace/Scripts/PolyGridViewController.cs
#	Workspaces/ProjectWorkspace/Scripts/AssetGridViewController.cs
2019-11-05 12:11:42 -08:00
Matt Schoen d537e506e2 Fix a bug where users could undo the step of adding input bindings to their project using `ApplyModifiedPropertiesWithoutUndo`;
Fix a bug with sphere select by togging the intersection tester collider to update the physics system with the new transform values;
Update sphere selection to use Physics.OverlapSphereNonAlloc
2019-11-04 15:40:38 -08:00
Amir Ebrahimi 3d44ca8207 Apply another pass at fixing compile errors 2019-10-04 16:52:43 -07:00
Amir Ebrahimi 4990de806b Utilize the CCU for controlling compilation requirements for EditorXR 2019-09-30 10:10:20 -07:00
Amir Ebrahimi e9f6b1312a Update conditional defines 2019-09-29 20:49:06 -07:00
Matt Schoen d45bf3812f Catch null reference errors in MainMenuEditor and put it in a namespace 2019-08-27 21:51:14 -07:00
Matt Schoen 1ff43a79e5 Fix compile errors in 2018.4 2019-08-27 20:26:33 -07:00
Matt Schoen 72d17e02be Flip VRView texture as workaround for 2019.x;
Refactor project settings windows to be SettingsProviders
2019-08-27 19:43:39 -07:00
Matt Schoen e454b58940 Merge branch 'functionality-injection' into companion-misc 2019-07-14 21:49:26 -07:00
Matt Schoen 977e716197 Fix bug where viewer scale wasn't getting serialized;
Fix tiny undo menu;
Save auto-upgrade changes to font assets
2019-07-08 15:17:07 -07:00
Matt Schoen 80d873cf16 Merge remote-tracking branch 'origin/functionality-injection' into companion-misc 2019-07-03 09:36:34 -07:00
Matt Schoen f82efd5945 Merge remote-tracking branch 'remotes/origin/package' into functionality-injection
# Conflicts:
#	Editor/Unity.Labs.EditorXR.Editor.asmdef
#	Runtime/Scripts/Core/EditorVR.cs
#	Runtime/Scripts/Core/EditorXRDirectSelectionModule.cs
#	Runtime/Scripts/Core/EditorXRMenuModule.cs
#	Runtime/Scripts/Core/EditorXRMiniWorldModule.cs
#	Runtime/Scripts/Core/EditorXRRayModule.cs
#	Runtime/Scripts/Core/EditorXRToolModule.cs
#	Runtime/Scripts/Core/EditorXRToolsMenuModule.cs
#	Runtime/Scripts/Core/EditorXRUIModule.cs
#	Runtime/Scripts/Modules/ActionsModule.cs
#	Runtime/Scripts/Modules/AdaptivePositionModule/AdaptivePositionModule.cs
#	Runtime/Scripts/Modules/DeviceInputModule.cs
#	Runtime/Scripts/Modules/GazeDivergenceModule/GazeDivergenceModule.cs
#	Runtime/Scripts/Modules/WorkspaceModule.cs
#	Runtime/Workspaces/PolyWorkspace/Scripts/PolyGridAsset.cs
2019-07-02 20:11:48 -07:00
Matt Schoen 639a05410d Merge remote-tracking branch 'remotes/origin/module-loader' into package
# Conflicts:
#	Runtime/Fonts/Roboto/Roboto-Light SDF.lfs.asset
#	Runtime/Fonts/Roboto/Roboto-Medium SDF.lfs.asset
#	Runtime/Fonts/Roboto/Roboto-Regular SDF.lfs.asset
#	Runtime/libs/UnityOctree
#	Runtime/libs/VRLineRenderer
2019-07-02 18:53:56 -07:00
Matt Schoen 4020050ccd Remove unnecessary argument to DeserializePreferences 2019-07-02 18:04:11 -07:00
Matt Schoen 592b089313 Add reference to ModuleLoader assembly 2019-07-02 14:15:19 -07:00
Matt Schoen cf105c01b2 Fix issues with the Include In Player Builds setting 2019-06-10 13:34:27 -07:00
Matt Schoen e5e30c8906 Convert IUsesSelectTool to IProvides/UsesSelectTool 2019-06-09 18:57:59 -07:00
Matt Schoen 0f711f0f01 Convert ISetTooltipVisibility to IProvides/UsesSetTooltipVisibility 2019-06-09 17:12:01 -07:00
Matt Schoen d91c585cce Add Package Starter Kit content and update project structure and assembly names to follow the template 2019-06-06 18:00:52 -07:00
Matt Schoen 7716a31c16 Add ExecutionOrderSetter 2019-06-05 00:39:54 -07:00
Matt Schoen 5f4a6cc99d Make SerializedPreferencesModule an InitializableModule and remove IModuleDependency<SerializedPreferencesModule> from EditorVR 2019-06-04 16:39:08 -07:00
Matt Schoen 7ef60c183c Convert MonoBehaviour modules with serialized fields to ScriptableSettings for builds;
Add editors for testing without an HMD
2019-06-04 00:36:59 -07:00
Matt Schoen 0901e93ca1 Move Behavior callbacks to EditingContextManager;
Move EditorVR setup and shutdown out of OnEnable and OnDisable;
Move SetRunInEdit code out of EditorVR and into EditingContextManager
2019-06-03 16:38:34 -07:00
Matt Schoen 824252f60e WIP getting initialization to work 2019-05-29 11:02:57 -07:00
Matt Schoen ed473781a6 Integrate com.unity.labs.utils;
Remove files and methods that are redundant with utils repo;
Misc refactor as issues were encountered
2019-05-08 23:03:35 -07:00
Matt Schoen 995f0b8cad Tweak readme;
Remove unused usings
2019-04-15 20:06:53 -07:00
Matt Schoen 06416de8d9 Fix compile errors in 2018.1 2019-04-15 17:05:51 -07:00
Matt Schoen ea2f0a23a0 Move SeedXRInputBindings to Editor assembly;
Use readonly for planes array in VisibilityDetector
2019-04-15 04:21:32 -07:00
Amir Ebrahimi af6659ad53 Bump minimum Unity version to 2018.3; Remove old, unnecessary conditionals 2019-03-16 16:19:13 -07:00
Matt Schoen 9ab5654a50 Fix prefab-API warnings;
Fix warnings present in .NET 4.x runtime;
Fix style and spelling mistakes in visted files
2019-02-28 00:48:29 -08:00
Dylan Urquidi 1aa5117be5 Remove unnecessary else compiler directive from BuildCallbacks 2019-02-22 17:12:27 -08:00
Matt Schoen 0db0ac7a0b Fix compile errors in 2017 from BuildCallbacks 2019-02-22 16:53:52 -08:00
Matt Schoen 216bd2f7d2 Fix an issue where failed builds leave the EXR assembly definitions in a modified state;
Update Dependencies_asmdef.unitypackage to set SteamVR.Editor to editor-only
2019-02-08 12:04:03 -08:00
Matt Schoen dcb10151d6 Remove logging from BuildCallbacks.cs 2019-02-07 23:32:56 -08:00
Matt Schoen aefdd75b2d Add build actions to manipulate asmdef files;
Change IncludeInBuilds preference default to false;
Add IncludeInBuilds to preferences reset;
Update asmdef to state after builds are made (extra properties from 2018.2)
2019-02-06 21:46:46 -08:00
Matt Schoen ecf1b4788e Fix compile issues in player builds;
Add WIP BuildCallbacks class
2019-02-06 17:12:53 -08:00
Matt Schoen 78cc3b2cb4 Add TextMeshPro package asmdef where needed;
Update input-prototype to merged state
2019-01-24 12:50:35 -08:00
Amir Ebrahimi cfd1eed499 Use assembly definition files; Get play-mode working 2018-05-21 21:55:07 -07:00
Matt Schoen 61d98856e1 Fix tests 2017-12-11 15:40:04 -08:00