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

Jump to bottom

MRTK Master Release Packages #1530

Closed
wants to merge 3 commits into from
Closed

MRTK Master Release Packages #1530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb6fc18
Added Release packages and removed one compiler warning
StephenHodgson Dec 15, 2017
c2d8c33
Fixed an issue for building for Standalone
StephenHodgson Dec 20, 2017
1c7641a
Updated packages
StephenHodgson Dec 20, 2017
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
5 changes: 3 additions & 2 deletions Assets/HoloToolkit/Boundary/Scripts/BoundaryManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ public class BoundaryManager : Singleton<BoundaryManager>
// This puts the origin (0, 0, 0) on the floor if a floor has been established during setup via MixedRealityPortal.
private TrackingSpaceType opaqueTrackingSpaceType = TrackingSpaceType.RoomScale;

[SerializeField]
//[SerializeField]
// Removed for now, until the HoloLens tracking space type story is more clear.
// Defaulting coordinate system to Stationary for transparent headsets, like HoloLens.
// This puts the origin (0, 0, 0) at the first place where the user started the application.
private TrackingSpaceType transparentTrackingSpaceType = TrackingSpaceType.Stationary;
//private TrackingSpaceType transparentTrackingSpaceType = TrackingSpaceType.Stationary;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The non-package parts of this PR look like they should be added to the dev branch instead of into master.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well I already added these changes to the packages and they're already released, soo....

Copy link
Contributor

@keveleigh keveleigh Dec 29, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The packages attached to the release aren't actually a snapshot of master...? That seems counter to the entire idea of a release.

Those packages can also be updated to the correct ones, as they're a GitHub construct and not a git one.

Copy link
Contributor Author

@StephenHodgson StephenHodgson Jan 2, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well the stabilization branch got merged into master before I could review it, and this was the stuff that needed to be fixed. I don't like making releases that include warnings or issues building, which is what the changes outlined show.

So you'd rather put out a broken release?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Packages need to be from master. Is that the case?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are. With the fixes addressed.

#endif

// Testing in the editor found that this moved the floor out of the way enough, and it is only
Expand Down
9 changes: 6 additions & 3 deletions Assets/HoloToolkit/Input/Scripts/Utilities/MotionControllerInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.

using UnityEngine;

#if UNITY_WSA
#if UNITY_2017_2_OR_NEWER
using UnityEngine.XR.WSA.Input;
#else
using UnityEngine.VR.WSA.Input;
#endif
#endif

namespace HoloToolkit.Unity.InputModule
{
Expand All @@ -18,7 +21,7 @@ public class MotionControllerInfo
{
public readonly GameObject ControllerParent;

#if UNITY_2017_2_OR_NEWER
#if UNITY_WSA && UNITY_2017_2_OR_NEWER
public readonly InteractionSourceHandedness Handedness;
#endif

Expand Down Expand Up @@ -67,13 +70,13 @@ public class MotionControllerInfo
private double lastSelectPressedAmount;

public MotionControllerInfo(GameObject controllerParent
#if UNITY_2017_2_OR_NEWER
#if UNITY_WSA && UNITY_2017_2_OR_NEWER
, InteractionSourceHandedness handedness
#endif
)
{
ControllerParent = controllerParent;
#if UNITY_2017_2_OR_NEWER
#if UNITY_WSA && UNITY_2017_2_OR_NEWER
Handedness = handedness;
#endif
}
Expand Down
Binary file added External/Unitypackages/HoloToolkit-Unity-2017.2.1.0.unitypackage
View file
Open in desktop
Binary file not shown.
Binary file added External/Unitypackages/HoloToolkit-Unity-Examples-2017.2.1.0.unitypackage
View file
Open in desktop
Binary file not shown.