Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Feature/service framework updates #112

Merged
merged 3 commits into from
Mar 13, 2024
Merged

Feature/service framework updates #112

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
297ff21
Updates required for SF update
SimonDarksideJ Mar 12, 2024
776f530
Fix tests
SimonDarksideJ Mar 12, 2024
e84777a
Bump COre package to Unity 2022 to enable VisonOS testing
SimonDarksideJ Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Editor/ControllerPopupWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using RealityCollective.Definitions.Utilities;
using RealityCollective.Extensions;
using RealityCollective.ServiceFramework.Editor.Utilities;
using RealityToolkit.Definitions.Controllers;
using RealityToolkit.Editor.Data;
using RealityToolkit.Editor.PropertyDrawers;
Expand Down
2 changes: 1 addition & 1 deletion Editor/CorePackageInstaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ private static ServiceManagerInstance SetupServiceManager()

if (serviceManagerInstance.Manager == null)
{
serviceManagerInstance.InitialiseServiceManager();
serviceManagerInstance.InitializeServiceManager();
}

if (serviceManagerInstance.Manager.ActiveProfile.IsNull())
Expand Down
1 change: 1 addition & 0 deletions Editor/Profiles/InputService/Controllers/BaseControllerServiceModuleProfileInspector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using RealityCollective.Definitions.Utilities;
using RealityCollective.Editor.Extensions;
using RealityCollective.Extensions;
using RealityCollective.ServiceFramework;
using RealityCollective.ServiceFramework.Editor.Profiles;
using RealityCollective.ServiceFramework.Editor.PropertyDrawers;
using RealityToolkit.Definitions.Controllers;
Expand Down
2 changes: 1 addition & 1 deletion Editor/RealityToolkitPreferences.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

using RealityCollective.Editor.Extensions;
using RealityCollective.Editor.Utilities;
using RealityCollective.Extensions;
using RealityCollective.ServiceFramework.Definitions.Platforms;
using RealityCollective.ServiceFramework.Extensions;
using RealityCollective.ServiceFramework.Interfaces;
using RealityCollective.ServiceFramework.Services;
using RealityToolkit.Editor.Utilities.SymbolicLinks;
Expand Down
11 changes: 5 additions & 6 deletions Editor/Utilities/Lines/Modules/BaseLineDataProviderInspector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.

using RealityCollective.Editor.Extensions;
using RealityCollective.ServiceFramework.Editor.Utilities;
using RealityToolkit.Utilities.Lines.DataProviders;
using RealityToolkit.Utilities.Lines.Renderers;
using RealityToolkit.Utilities.Physics.Distorters;
Expand Down Expand Up @@ -260,7 +259,7 @@ protected virtual void OnSceneGUI()
float normalizedLength = (1f / (LineData.ManualUpVectors.Length - 1)) * i;
var position = LineData.GetPoint(normalizedLength);
float handleSize = HandleUtility.GetHandleSize(position);
LineData.ManualUpVectors[i] = ServiceFrameworkInspectorUtility.VectorHandle(LineData, position, LineData.ManualUpVectors[i], false, true, ManualUpVectorLength * handleSize, handleSize * ManualUpVectorHandleSizeModifier);
LineData.ManualUpVectors[i] = RealityToolkitInspectorUtility.VectorHandle(LineData, position, LineData.ManualUpVectors[i], false, true, ManualUpVectorLength * handleSize, handleSize * ManualUpVectorHandleSizeModifier);
}
}

Expand Down Expand Up @@ -299,12 +298,12 @@ protected virtual void OnSceneGUI()
if (DrawLineRotations)
{
float arrowSize = HandleUtility.GetHandleSize(currentPosition) * RotationArrowLength;
Handles.color = ServiceFrameworkInspectorUtility.LineVelocityColor;
Handles.color = Color.Lerp(ServiceFrameworkInspectorUtility.LineVelocityColor, Handles.zAxisColor, 0.75f);
Handles.color = RealityToolkitInspectorUtility.LineVelocityColor;
Handles.color = Color.Lerp(RealityToolkitInspectorUtility.LineVelocityColor, Handles.zAxisColor, 0.75f);
Handles.ArrowHandleCap(0, currentPosition, Quaternion.LookRotation(rotation * Vector3.forward), arrowSize, EventType.Repaint);
Handles.color = Color.Lerp(ServiceFrameworkInspectorUtility.LineVelocityColor, Handles.xAxisColor, 0.75f);
Handles.color = Color.Lerp(RealityToolkitInspectorUtility.LineVelocityColor, Handles.xAxisColor, 0.75f);
Handles.ArrowHandleCap(0, currentPosition, Quaternion.LookRotation(rotation * Vector3.right), arrowSize, EventType.Repaint);
Handles.color = Color.Lerp(ServiceFrameworkInspectorUtility.LineVelocityColor, Handles.yAxisColor, 0.75f);
Handles.color = Color.Lerp(RealityToolkitInspectorUtility.LineVelocityColor, Handles.yAxisColor, 0.75f);
Handles.ArrowHandleCap(0, currentPosition, Quaternion.LookRotation(rotation * Vector3.up), arrowSize, EventType.Repaint);
}

Expand Down
Loading
Loading