Skip to content

Commit

Permalink
Merge pull request microsoft#17 from Microsoft/mrtk_development
Browse files Browse the repository at this point in the history
mrtk_development -> dk.mrtk_development
  • Loading branch information
David Kline authored Jul 26, 2018
2 parents 9b223ea + 01b0d8f commit 69ac17b
Show file tree
Hide file tree
Showing 3 changed files with 195 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

using Microsoft.MixedReality.Toolkit.Internal.Definitions.Utilities;
using UnityEditor;
using UnityEngine;

namespace Microsoft.MixedReality.Toolkit.Internal.Inspectors.PropertyDrawers
{
[CustomPropertyDrawer(typeof(MixedRealityPose))]
public class MixedRealityPosePropertyDrawer : PropertyDrawer
{
private readonly GUIContent positionContent = new GUIContent("Position");
private readonly GUIContent rotationContent = new GUIContent("Rotation");
private readonly int numberOfLines = 3;

public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
{
return EditorGUIUtility.singleLineHeight * numberOfLines;
}

public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
{
bool lastMode = EditorGUIUtility.wideMode;
EditorGUIUtility.wideMode = true;
EditorGUI.BeginProperty(position, label, property);
EditorGUI.PrefixLabel(position, GUIUtility.GetControlID(FocusType.Passive), label);
EditorGUI.indentLevel++;

var fieldHeight = position.height / numberOfLines;
var positionRect = new Rect(position.x, position.y + fieldHeight, position.width, fieldHeight);
var rotationRect = new Rect(position.x, position.y + fieldHeight * 2, position.width, fieldHeight);

EditorGUI.PropertyField(positionRect, property.FindPropertyRelative("position"), positionContent);

EditorGUI.BeginChangeCheck();
var rotationProperty = property.FindPropertyRelative("rotation");
var newEulerRotation = EditorGUI.Vector3Field(rotationRect, rotationContent, rotationProperty.quaternionValue.eulerAngles);

if (EditorGUI.EndChangeCheck())
{
rotationProperty.quaternionValue = Quaternion.Euler(newEulerRotation);
}

EditorGUI.indentLevel--;
EditorGUIUtility.wideMode = lastMode;
EditorGUI.EndProperty();
}
}
}

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

134 changes: 134 additions & 0 deletions Roadmap.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
# Roadmap

This document outlines the roadmap of the Mixed Reality Toolkit.

# Upcoming Releases

The following table lists the releases planned through the end of 2018 for the Mixed Reality Toolkit. Release details, including backlog items, can be found on the [GitHub project pages](https://github.com/Microsoft/MixedRealityToolkit-Unity/projects).

| Product | Version | Timeline | Project board |
| --- | --- | --- | --- |
| [Mixed Reality Toolkit](#mixed-reality-toolkit-mrtk-roadmap) | 2018.7.0.0 (Alpha) | July 2018 | [Version Next Alpha](https://github.com/Microsoft/MixedRealityToolkit-Unity/projects/11) |
| [Mixed Reality Toolkit](#mixed-toolkit-toolkit-roadmap) | 2018.8.0.0 (Beta) | August 2018 | [Version Next Beta](https://github.com/Microsoft/MixedRealityToolkit-Unity/projects/12) |
| [Mixed Reality Toolkit](#mixed-reality-toolkit-roadmap) | 2018.9.0.0 | September 2018 | [2018.9.0.0 (Version Next initial release)](https://github.com/Microsoft/MixedRealityToolkit-Unity/projects/14) |
| [Mixed Reality Toolkit](#mixed-toolkit-toolkit-roadmap) | 2018.10.0.0 | October 2018 | |
| [Mixed Reality Toolkit](#mixed-toolkit-toolkit-roadmap) | 2018.11.0.0 | November 2018 | |

Release details, including backlog items, can be found on the [GitHub project pages](https://github.com/Microsoft/MixedRealityToolkit-Unity/projects).

# Mixed Reality Toolkit (MRTK) Roadmap

The Mixed Reality Toolkit (also known as "vNext") is an all-new product, built to be cross MR/AR/VR/XR platform by design. There are two planned pre-releases after which the Mixed Reality Toolkit will become the primary product.

The Mixed Reality Toolkit will require Unity 2018 or newer.

> When Unity releases an LTS (Long Term Support) product, the Mixed Reality Toolkit will branch (ex: mrtk_2018_LTS) and require an LTS release. This branch will be targeted at developers who wish to have the most stable MRTK on which to build. It is expected that the branched Mixed Reality Toolkit will receive bug fixes and no new features. The mrtk_development branch will update to the next Unity Tech release (ex: 2019.1) and **may** drop backward compatibility.
## New Architecture

The MRTK is being rewritten to be cross AR/VR/MR/XR platform and to be more modular. The core layer will contain the interfaces and definitions required to build manager components (ex: input manager) as well as the abstractions needed to support multiple platforms. The SDK layer is where pre-built / reusable components will be delivered. The SDK will be further modularized to make it simple to opt-in to specific functionality (ex: UX controls).

## July 2018 - Alpha

The Mixed Reality Toolkit (MRTK) Alpha, released in late July 2018 is being released as a single package (core, sdk and examples) as the team introduces the new architecture. This release does **not** contain all of the features and functionality of the HoloToolkit releases.

The theme(s) for the Alpha release are

- Minimum Viable Product
- New architecture
- VR Boundary support
- Input and Interactions
- Locomotion / Teleportation
- Standard shader

Supported platforms

- Windows Mixed Reality
- Immersive Headsets
- Microsoft HoloLens
- OpenVR

## August 2018 - Beta

The MRTK Beta release will introduce initial support for modularization. It is also when the vast majority of HoloToolkit features will be added. Supported platforms will be unchanged from the Alpha release.

> It is important to note that the goal is feature parity and **not** zero app code change. There will be consolidation of duplicated functionality as well as namespace, component and API changes.
The theme(s) for the Beta release are

- HoloToolkit feature parity
- Not including the HoloLens-iOS Spectator View feature
- Improved Core and SDK layer alignment
- Components are expected to move to their "final" layer
- Core and SDK feature packages
- SDK features (ex: UX controls) will be in separate packages
- Bug fixes

Supported platforms

- Windows Mixed Reality
- Immersive Headsets
- Microsoft HoloLens
- OpenVR

## September 2018 - First Release

The September 2018 (2018.9.0.0) release marks the first official release of MRTK vNext and will support the same platforms as the Beta. With this release, the Mixed Reality Toolkit will replace the HoloToolkit, which will be transitioned into sustained engineering mode.

The theme(s) for the 2018.9.0.0 release are

- Fit and finish work
- Package management UI
- Bug fixes

Supported platforms

- Windows Mixed Reality
- Immersive Headsets
- Microsoft HoloLens
- OpenVR

## October 2018

The October 2018 (2018.10.0.0) release is planned to be the first update to add additional device support.

The theme(s) for the 2018.10.0.0 release are

- Bug fixes
- New device support
- Features
- Spectator View

Supported platforms

- Windows Mixed Reality
- Immersive Headsets
- Microsoft HoloLens
- OpenVR
- Phone based AR
- ARKit
- ARCore

## November 2018

The November 2018 (2018.11.0.0) release will continue to add additional device support.

The theme(s) for the 2018.11.0.0 release are

- Bug fixes
- New device support

Supported platforms

- Windows Mixed Reality
- Immersive Headsets
- Microsoft HoloLens
- OpenVR
- Phone based AR
- ARKit
- ARCore
- TBD

## December 2018

There is no planned December 2018 MRTK release. Releases will resume in January 2019.

0 comments on commit 69ac17b

Please sign in to comment.