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.

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/camera to player #36

Merged
merged 5 commits into from
Jan 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/development-buildandtestupmrelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ jobs:
uses: realitycollective/reusableworkflows/.github/workflows/rununityUPMbuild.yml@v2
with:
unityversion: ${{ needs.Validate-Unity.outputs.unityeditorversion }}
dependencies: '[{"development": "github.com/realitycollective/com.realitycollective.buildtools.git"},{"development": "github.com/realitycollective/com.realitytoolkit.core.git"},{"development": "github.com/realitycollective/com.realitycollective.utilities.git"},{"development": "github.com/realitycollective/com.realitycollective.service-framework.git"},{"development": "github.com/realitycollective/com.realitytoolkit.camera.git"},{"development": "github.com/realitycollective/com.realitytoolkit.boundary.git"}]'
dependencies: '[{"development": "github.com/realitycollective/com.realitycollective.buildtools.git"},{"development": "github.com/realitycollective/com.realitytoolkit.core.git"},{"development": "github.com/realitycollective/com.realitycollective.utilities.git"},{"development": "github.com/realitycollective/com.realitycollective.service-framework.git"},{"development": "github.com/realitycollective/com.realitytoolkit.player.git"},{"development": "github.com/realitycollective/com.realitytoolkit.boundary.git"}]'
secrets: inherit
5 changes: 4 additions & 1 deletion Assets~/Profiles/MetaPackageInstallerProfile.asset
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ MonoBehaviour:
configurations:
- instancedType:
reference: 83eff552-adf4-47c8-ad53-df7406856d3f
name: Meta Camera Rig Service Module
name: Meta Player Rig Service Module
priority: 0
profile: {fileID: 11400000, guid: 69601914bd8789b49bc45cc0a9220b4d, type: 2}
platformEntries:
runtimePlatforms:
- reference: 5a504905-0968-4b2f-a537-7fe804f1bd8e
- reference: db1acc26-ec8d-4bc6-afca-c51351b2da2e
- instancedType:
reference: 0de5da40-feb8-4891-b9b2-942eafd041b9
Expand All @@ -31,6 +32,7 @@ MonoBehaviour:
profile: {fileID: 11400000, guid: b849f3a28dc36b84a92d2ec4d8239cd6, type: 2}
platformEntries:
runtimePlatforms:
- reference: 5a504905-0968-4b2f-a537-7fe804f1bd8e
- reference: db1acc26-ec8d-4bc6-afca-c51351b2da2e
- instancedType:
reference: ea666456-baef-4412-a829-a4c7132e98c3
Expand All @@ -39,6 +41,7 @@ MonoBehaviour:
profile: {fileID: 11400000, guid: d9b3b9f611dffee4883c089dc35e0ce7, type: 2}
platformEntries:
runtimePlatforms:
- reference: 5a504905-0968-4b2f-a537-7fe804f1bd8e
- reference: db1acc26-ec8d-4bc6-afca-c51351b2da2e
- instancedType:
reference: 8ef0cab5-a37c-4912-ad5e-1e57e92a314d
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 00d813fd5a164e19a160f322b2926006, type: 3}
m_Name: MetaCameraRigServiceModuleProfile
m_Name: MetaPlayerRigServiceModuleProfile
m_EditorClassIdentifier:
trackingType: 0
eyeTextureResolution: 2
2 changes: 1 addition & 1 deletion Runtime/BoundaryService/MetaBoundaryServiceModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public bool TryGetBoundaryGeometry(ref List<Vector3> geometry)

/// <summary>
/// Returns an array of 3d points (in clockwise order) that define the specified boundary type.
/// All points are returned in local tracking space shared by tracked nodes and accessible through OVRCameraRig's trackingSpace anchor.
/// All points are returned in local tracking space shared by tracked nodes and accessible through OVRPlayerRig's trackingSpace anchor.
/// </summary>
private Vector3[] GetGeometry(OculusApi.BoundaryType boundaryType)
{
Expand Down
6 changes: 3 additions & 3 deletions Runtime/InputService/Utilities/MetaHandDataConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using RealityCollective.Definitions.Utilities;
using RealityCollective.Extensions;
using RealityCollective.ServiceFramework.Services;
using RealityToolkit.CameraService.Interfaces;
using RealityToolkit.PlayerService.Interfaces;
using RealityToolkit.Definitions.Devices;
using RealityToolkit.Input.Hands;
using RealityToolkit.Input.Hands.Utilities;
Expand Down Expand Up @@ -49,8 +49,8 @@ private Transform RigTransform
{
if (rigTransform == null)
{
rigTransform = ServiceManager.Instance.TryGetService<ICameraService>(out var cameraSystem)
? cameraSystem.CameraRig.RigTransform
rigTransform = ServiceManager.Instance.TryGetService<IPlayerService>(out var playerService)
? playerService.PlayerRig.RigTransform
: Camera.main.transform.parent;
}

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Copyright (c) Reality Collective. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

using RealityToolkit.CameraService.Interfaces;
using RealityToolkit.PlayerService.Interfaces;

namespace RealityToolkit.MetaPlatform.CameraService
namespace RealityToolkit.MetaPlatform.PlayerService
{
/// <summary>
/// Fully qualifies the <see cref="MetaPlatform"/> specific implementation of <see cref="ICameraRigServiceModule"/>.
/// Fully qualifies the <see cref="MetaPlatform"/> specific implementation of <see cref="IPlayerRigServiceModule"/>.
/// </summary>
public interface IMetaCameraRigServiceModule : ICameraRigServiceModule { }
public interface IMetaPlayerRigServiceModule : IPlayerRigServiceModule { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.

using RealityCollective.ServiceFramework.Attributes;
using RealityToolkit.CameraService.Definitions;
using RealityToolkit.CameraService.Interfaces;
using RealityToolkit.CameraService.Modules;
using RealityToolkit.PlayerService.Definitions;
using RealityToolkit.PlayerService.Interfaces;
using RealityToolkit.PlayerService.Modules;
using RealityToolkit.MetaPlatform.Plugins;

namespace RealityToolkit.MetaPlatform.CameraService
namespace RealityToolkit.MetaPlatform.PlayerService
{
[RuntimePlatform(typeof(MetaPlatform))]
[System.Runtime.InteropServices.Guid("83EFF552-ADF4-47C8-AD53-DF7406856D3F")]
public class MetaCameraRigServiceModule : BaseCameraRigServiceModule, IMetaCameraRigServiceModule
public class MetaPlayerRigServiceModule : BasePlayerRigServiceModule, IMetaPlayerRigServiceModule
{
/// <inheritdoc />
public MetaCameraRigServiceModule(string name, uint priority, BaseCameraRigServiceModuleProfile profile, ICameraService parentService)
public MetaPlayerRigServiceModule(string name, uint priority, BasePlayerRigServiceModuleProfile profile, IPlayerService parentService)
: base(name, priority, profile, parentService)
{
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"dependencies": {
"com.realitytoolkit.core": "1.0.0-pre.29",
"com.realitytoolkit.camera": "1.0.1-pre.5",
"com.realitytoolkit.player": "1.0.1-pre.5",
"com.realitytoolkit.boundary": "1.0.0-pre.1",
"com.unity.xr.oculus": "3.3.0"
},
Expand Down
Loading