Skip to content

Commit

Permalink
Merge pull request #1 from realitycollective/feature/package-initial-…
Browse files Browse the repository at this point in the history
…support

Initialize package
  • Loading branch information
FejZa authored May 11, 2024
2 parents e72be0e + 5a918bb commit dd399f6
Show file tree
Hide file tree
Showing 25 changed files with 296 additions and 28 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/development-buildandtestupmrelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,11 @@ jobs:
with:
unityversion: ${{ needs.Validate-Unity.outputs.unityeditorversion }}
dependencies: '[{"development": "github.com/realitycollective/com.realitytoolkit.core.git"},{"development": "github.com/realitycollective/com.realitytoolkit.player.git"},{"development": "github.com/realitycollective/com.realitycollective.utilities.git"},{"development": "github.com/realitycollective/com.realitytoolkit.service-framework.git"}]'
secrets: inherit
secrets: inherit

Build-Complete:
runs-on: ubuntu-latest
name: Build completion task
needs: Run-Unit-Tests
steps:
- run: echo "Build Complete"
8 changes: 8 additions & 0 deletions Assets~/Profiles/Player.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions Assets~/Profiles/VisionOSPackageInstallerProfile.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: da64fb88269149f8a95f1fb969d6a0b4, type: 3}
m_Name: VisionOSPackageInstallerProfile
m_EditorClassIdentifier:
platformEntries:
runtimePlatforms:
- reference: ff382950-9384-41fd-8617-48d0b6573a94
configurations:
- instancedType:
reference: 4ed59a54-7d07-4abf-929a-2350d26be9e7
name: VisionOS Player Rig Service Module
priority: 0
profile: {fileID: 11400000, guid: 0fe80e76c2c0d7c44b9a28f0f0ab5a9e, type: 2}
platformEntries:
runtimePlatforms:
- reference: ff382950-9384-41fd-8617-48d0b6573a94
8 changes: 8 additions & 0 deletions Assets~/Profiles/VisionOSPackageInstallerProfile.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

127 changes: 127 additions & 0 deletions Assets~/StandardAssets/PlaceholderFile.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Editor/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Copyright (c) Reality Collective. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

using System.Reflection;

[assembly: AssemblyVersion("1.0.0")]
[assembly: AssemblyTitle("com.realitytoolkit.visionos.editor")]
[assembly: AssemblyCompany("Reality Collective")]
[assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")]
11 changes: 11 additions & 0 deletions Editor/AssemblyInfo.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Editor/VisionOSPackageInstaller.cs
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 System.IO;
using RealityCollective.Editor.Utilities;
using RealityCollective.Extensions;
using RealityCollective.ServiceFramework.Editor;
using RealityCollective.ServiceFramework.Editor.Packages;
using RealityCollective.Utilities.Editor;
using RealityCollective.Utilities.Extensions;
using RealityToolkit.Editor;
using System.IO;
using UnityEditor;
using UnityEngine;

Expand Down
11 changes: 10 additions & 1 deletion Editor/VisionOSPackageInstaller.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
11 changes: 11 additions & 0 deletions Editor/VisionOSPackagePathFinder.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Editor/VisionOSPathFinder.cs.meta

This file was deleted.

9 changes: 9 additions & 0 deletions Runtime/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Copyright (c) Reality Collective. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

using System.Reflection;

[assembly: AssemblyVersion("1.0.0")]
[assembly: AssemblyTitle("com.realitytoolkit.visionos")]
[assembly: AssemblyCompany("Reality Collective")]
[assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")]
11 changes: 11 additions & 0 deletions Runtime/AssemblyInfo.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Runtime/Player/Rigs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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

using RealityToolkit.Player.Interfaces;
using RealityToolkit.Player.Rigs;

namespace RealityToolkit.VisionOS.Player
namespace RealityToolkit.VisionOS.Player.Rigs
{
/// <summary>
/// Fully qualifies the <see cref="VisionOSPlatform"/> specific implementation of <see cref="IPlayerRigServiceModule"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.

using RealityCollective.ServiceFramework.Attributes;
using RealityToolkit.Player.Interfaces;
using RealityToolkit.Player.Modules;
using RealityToolkit.Player;
using RealityToolkit.Player.Rigs;
using UnityEngine;

namespace RealityToolkit.VisionOS.Player
namespace RealityToolkit.VisionOS.Player.Rigs
{
/// <summary>
/// <see cref="IPlayerRigServiceModule"/> used when running on the <see cref="VisionOSPlatform"/>.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright (c) Reality Collective. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

using RealityToolkit.Player.Definitions;
using RealityToolkit.Player.Rigs;

namespace RealityToolkit.VisionOS.Player
namespace RealityToolkit.VisionOS.Player.Rigs
{
/// <summary>
/// Configuration profile for <see cref="VisionOSPlayerRigServiceModule"/>.
Expand Down
16 changes: 13 additions & 3 deletions Runtime/RealityToolkit.VisionOS.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,25 @@
"GUID:f3241d040533491e8a1e2714b27c3111",
"GUID:13703f41b24bb904cb2305abe6317e3d",
"GUID:b2d046948d6452a4b8485efc9ce0f88c",
"GUID:de07d9dfb71843b46aa2c474f73ca4cc"
"GUID:de07d9dfb71843b46aa2c474f73ca4cc",
"GUID:ae3d1603ce9534ff5a9eb62408568574"
],
"includePlatforms": [
"Editor",
"VisionOS"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [],
"versionDefines": [
{
"name": "com.unity.polyspatial.visionos",
"expression": "1.0.0",
"define": "VISIONOS_POLYSPATIAL"
}
],
"noEngineReferences": false
}
8 changes: 4 additions & 4 deletions Runtime/VisionOSPlatform.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright (c) Reality Collective. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

using System.Collections.Generic;
using RealityCollective.ServiceFramework.Definitions.Platforms;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.XR;

Expand All @@ -14,8 +14,8 @@ namespace RealityToolkit.VisionOS
[System.Runtime.InteropServices.Guid("ff382950-9384-41fd-8617-48d0b6573a94")]
public class VisionOSPlatform : BasePlatform
{
private const string xrDisplaySubsystemDescriptorId = "visionOS Display";
private const string xrInputSubsystemDescriptorId = "visionOS Input";
private const string xrDisplaySubsystemDescriptorId = "VisionOS-Display";
private const string xrInputSubsystemDescriptorId = "VisionOS-Input";

/// <inheritdoc />
public override bool IsAvailable
Expand Down Expand Up @@ -74,7 +74,7 @@ public override bool IsAvailable
/// <inheritdoc />
public override UnityEditor.BuildTarget[] ValidBuildTargets { get; } =
{
//UnityEditor.BuildTarget.visionOS
UnityEditor.BuildTarget.VisionOS
};
#endif
}
Expand Down
11 changes: 10 additions & 1 deletion Runtime/VisionOSPlatform.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit dd399f6

Please sign in to comment.