Skip to content
This repository has been archived by the owner on Aug 11, 2024. It is now read-only.

Feature - Platform System #416

Merged
merged 53 commits into from
Apr 1, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
23e3770
First pass at Platform System
StephenHodgson Dec 16, 2019
c37d131
revert the active profile null check in the static accessors
StephenHodgson Dec 16, 2019
2de1d20
Merge branch 'development' into feature/platforms
StephenHodgson Dec 16, 2019
83480b6
Merge branch 'development' into feature/platforms
StephenHodgson Dec 18, 2019
903a520
Fixed unit tests
StephenHodgson Dec 18, 2019
e2036a4
fixed inspector for platform system profile
StephenHodgson Dec 18, 2019
7742d7b
Made the platform profile abstract and to be used as a base profile
StephenHodgson Dec 18, 2019
d04cfe2
updated namespaces a bit
StephenHodgson Dec 18, 2019
c075058
Added editor, osx, and windows standalone platform definitions
StephenHodgson Dec 18, 2019
ad6f1ce
Merge branch 'development' into feature/platforms
StephenHodgson Dec 20, 2019
b07bf2b
Merge branch 'development' into feature/platforms
StephenHodgson Dec 27, 2019
3494f8e
Merge branch 'development' into feature/platforms
StephenHodgson Dec 28, 2019
7b9b295
Removed the SupportedPlatforms enum from the platform configuration
StephenHodgson Dec 28, 2019
bbc737d
Merge branch 'development' into feature/platforms
StephenHodgson Dec 30, 2019
2f8fa10
Merge branch 'development' into feature/platforms
StephenHodgson Dec 30, 2019
c1cd20a
Merge branch 'development' into feature/platforms
StephenHodgson Jan 2, 2020
2e0adec
Merge branch 'development' into feature/platforms
StephenHodgson Jan 6, 2020
9802a9a
Merge branch 'development' into feature/platforms
StephenHodgson Jan 6, 2020
b67c6ed
Fixed compiler error
StephenHodgson Jan 6, 2020
706b40f
Merge branch 'development' into feature/platforms
StephenHodgson Jan 9, 2020
4ed313e
Merge branch 'development' into feature/platforms
StephenHodgson Jan 13, 2020
79c5007
Merge branch 'development' into feature/platforms
StephenHodgson Jan 21, 2020
a5df0ae
updated sdk checkout
StephenHodgson Jan 21, 2020
84e3ddc
Merge branch 'development' into feature/platforms
StephenHodgson Jan 23, 2020
ffcd723
Merge branch 'development' into feature/platforms
StephenHodgson Jan 28, 2020
c0693b0
Merge branch 'development' into feature/platforms
StephenHodgson Jan 29, 2020
edbf572
updated sdk
StephenHodgson Feb 3, 2020
1639866
Merge branch 'development' into feature/platforms
StephenHodgson Feb 3, 2020
b20147c
some changes to auto registration
StephenHodgson Feb 4, 2020
8c97103
Merge branch 'development' into feature/platforms
StephenHodgson Feb 8, 2020
cf55a59
Merge branch 'development' into feature/platforms
StephenHodgson Feb 11, 2020
44108c9
updated tests to support existing systems/services setup by the toolkit
StephenHodgson Feb 15, 2020
a4e17fc
Merge branch 'development' into feature/platforms
StephenHodgson Feb 15, 2020
3b103ca
Merge branch 'development' into feature/platforms
StephenHodgson Feb 18, 2020
d382399
Merge branch 'development' into feature/platforms
StephenHodgson Mar 10, 2020
ce29da3
Merge branch 'development' into feature/platforms
StephenHodgson Mar 14, 2020
566e66b
Merge branch 'development' into feature/platforms
StephenHodgson Mar 19, 2020
79f42b5
Merge branch 'development' into feature/platforms
StephenHodgson Mar 20, 2020
01fe293
Merge branch 'development' into feature/platforms
StephenHodgson Mar 28, 2020
8d429fb
Renamed IMixedRealityPlatform.IsActive to IMixedRealityPlatform.IsAva…
StephenHodgson Mar 28, 2020
873a6a6
Merge branch 'development' into feature/platforms
StephenHodgson Mar 29, 2020
d04927b
Added the android platform data provider
StephenHodgson Mar 30, 2020
d3a3fe6
Added IOS platform data provider
StephenHodgson Mar 30, 2020
f295d27
Added ability to get active platforms from platform system
StephenHodgson Mar 30, 2020
4f6b40c
Merge branch 'development' into feature/platforms
StephenHodgson Mar 30, 2020
c4604c4
Added a base platform class
StephenHodgson Mar 30, 2020
ebf26ef
better sorting of registered platform configurations
StephenHodgson Mar 30, 2020
f63aa0d
rolled back obsolete flag for now until I've figured out a better rep…
StephenHodgson Mar 30, 2020
4d08247
Finalized platform feature
StephenHodgson Mar 31, 2020
07b7e48
bumped version numbers
StephenHodgson Mar 31, 2020
487f648
Merge branch 'development' into feature/platforms
StephenHodgson Mar 31, 2020
c430ef9
Apply suggestions from code review
StephenHodgson Mar 31, 2020
86dc172
Merge branch 'development' into feature/platforms
StephenHodgson Apr 1, 2020
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,9 @@ namespace XRTK.Interfaces.PlatformSystem
/// </summary>
public interface IMixedRealityPlatform : IMixedRealityDataProvider
{
/// <summary>
/// Is this platform currently active and available?
/// </summary>
bool IsActive { get; }
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,38 @@
using XRTK.Interfaces.PlatformSystem;
// Copyright (c) XRTK. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

using XRTK.Interfaces.PlatformSystem;

namespace XRTK.Services.PlatformSystem.Platforms
{
/// <summary>
/// The Editor platform definition for the Mixed Reality Toolkit.
/// </summary>
/// <remarks>
/// Defines any editor platform for Win, OSX, and Linux.
/// </remarks>
public class EditorPlatform : BaseDataProvider, IMixedRealityPlatform
{
/// <summary>
/// Constructor.
/// </summary>
/// <param name="name"></param>
/// <param name="priority"></param>
public EditorPlatform(string name, uint priority) : base(name, priority)
{
}

/// <inheritdoc />
public bool IsActive
{
get
{
#if UNITY_EDITOR
return true;
#else
return false;
#endif
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// Copyright (c) XRTK. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

using XRTK.Interfaces.PlatformSystem;

namespace XRTK.Services.PlatformSystem.Platforms
{
/// <summary>
/// The OSX platform definition for the Mixed Reality Toolkit.
/// </summary>
public class OSXPlatform : BaseDataProvider, IMixedRealityPlatform
{
/// <summary>
/// Constructor.
/// </summary>
/// <param name="name"></param>
/// <param name="priority"></param>
public OSXPlatform(string name, uint priority) : base(name, priority)
{
}

/// <inheritdoc />
public bool IsActive
{
get
{
#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
return true;
#else
return false;
#endif
}
}
}
}

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
@@ -0,0 +1,35 @@
// Copyright (c) XRTK. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

using XRTK.Interfaces.PlatformSystem;

namespace XRTK.Services.PlatformSystem.Platforms
{
/// <summary>
/// The Windows Standalone platform definition for the Mixed Reality Toolkit.
/// </summary>
public class WindowsStandalonePlatform : BaseDataProvider, IMixedRealityPlatform
{
/// <summary>
/// Constructor.
/// </summary>
/// <param name="name"></param>
/// <param name="priority"></param>
public WindowsStandalonePlatform(string name, uint priority) : base(name, priority)
{
}

/// <inheritdoc />
public bool IsActive
{
get
{
#if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN
return true;
#else
return false;
#endif
}
}
}
}

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