Skip to content

Commit c42519a

Browse files
authored
Merge pull request #3861 from keveleigh/link-fixes
Docs link fixes
2 parents 3f92b5f + 59e5917 commit c42519a

14 files changed

+70
-70
lines changed

Documentation/GettingStartedWithTheMRTK.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,17 +165,17 @@ For more information on the rest of the toolkit, please check the following guid
165165
* [Guide to Pointers documentation]() (Coming Soon)
166166

167167
## Building blocks for UI and Interactions
168-
| [![Button](../External/ReadMeImages/Button/MRTK_Button_Main.png)](/Documentation/README_Button.md) [Button](/Documentation/README_Button.md) | [![Bounding Box](../External/ReadMeImages/BoundingBox/MRTK_BoundingBox_Main.png)](/Documentation/README_BoundingBox.md) [Bounding Box](/Documentation/README_BoundingBox.md) | [![Manipulation Handler](../External/ReadMeImages/ManipulationHandler/MRTK_Manipulation_Main.png)](/Documentation/README_ManipulationHandler.md) [Manipulation Handler](/Documentation/README_ManipulationHandler.md) |
168+
| [![Button](../External/ReadMeImages/Button/MRTK_Button_Main.png)](README_Button.md) [Button](README_Button.md) | [![Bounding Box](../External/ReadMeImages/BoundingBox/MRTK_BoundingBox_Main.png)](README_BoundingBox.md) [Bounding Box](README_BoundingBox.md) | [![Manipulation Handler](../External/ReadMeImages/ManipulationHandler/MRTK_Manipulation_Main.png)](README_ManipulationHandler.md) [Manipulation Handler](README_ManipulationHandler.md) |
169169
|:--- | :--- | :--- |
170170
| A button control which supports various input methods including HoloLens2's articulated hand | Standard UI for manipulating objects in 3D space | Script for manipulating objects with one or two hands |
171-
| [![Slate](../External/ReadMeImages/Slate/MRTK_Slate_Main.png)](/Documentation/README_Slate.md) [Slate](/Documentation/README_Slate.md) | [![System Keyboard](../External/ReadMeImages/SystemKeyboard/MRTK_SystemKeyboard_Main.png)](/Documentation/README_SystemKeyboard.md) [System Keyboard](/Documentation/README_SystemKeyboard.md) | [![Interactable](../External/ReadMeImages/Interactable/InteractableExamples.png)](/Documentation/README_Interactable.md) [Interactable](/Documentation/README_Interactable.md) |
171+
| [![Slate](../External/ReadMeImages/Slate/MRTK_Slate_Main.png)](README_Slate.md) [Slate](README_Slate.md) | [![System Keyboard](../External/ReadMeImages/SystemKeyboard/MRTK_SystemKeyboard_Main.png)](README_SystemKeyboard.md) [System Keyboard](README_SystemKeyboard.md) | [![Interactable](../External/ReadMeImages/Interactable/InteractableExamples.png)](README_Interactable.md) [Interactable](README_Interactable.md) |
172172
| 2D style plane which supports scrolling with articulated hand input | Example script of using the system keyboard in Unity | A script for making objects interactable with visual states and theme support |
173-
| [![Solver](../External/ReadMeImages/Solver/MRTK_Solver_Main.png)](/Documentation/README_Solver.md) [Solver](/Documentation/README_Solver.md) | [![Object Collection](../External/ReadMeImages/ObjectCollection/MRTK_ObjectCollection_Main.png)](/Documentation/README_ObjectCollection.md) [Object Collection](/Documentation/README_ObjectCollection.md) | [![Tooltip](../External/ReadMeImages/Tooltip/MRTK_Tooltip_Main.png)](/Documentation/README_Tooltip.md) [Tooltip](/Documentation/README_Tooltip.md) |
173+
| [![Solver](../External/ReadMeImages/Solver/MRTK_Solver_Main.png)](README_Solver.md) [Solver](README_Solver.md) | [![Object Collection](../External/ReadMeImages/ObjectCollection/MRTK_ObjectCollection_Main.png)](README_ObjectCollection.md) [Object Collection](README_ObjectCollection.md) | [![Tooltip](../External/ReadMeImages/Tooltip/MRTK_Tooltip_Main.png)](README_Tooltip.md) [Tooltip](README_Tooltip.md) |
174174
| Various object positioning behaviors such as tag-along, body-lock, constant view size and surface magnetism | Script for lay out an array of objects in a three-dimensional shape | Annotation UI with flexible anchor/pivot system which can be used for labeling motion controllers and object. |
175-
| [![App Bar](../External/ReadMeImages/AppBar/MRTK_AppBar_Main.png)](/Documentation/README_AppBar.md) [App Bar](/Documentation/README_AppBar.md) | [![Pointers](../External/ReadMeImages/Pointers/MRTK_Pointer_Main.png)](/Documentation/README_Pointers.md) [Pointers](/Documentation/README_Pointers.md) | [![Fingertip Visualization](../External/ReadMeImages/Fingertip/MRTK_FingertipVisualization_Main.png)](/Documentation/README_FingertipVisualization.md) [Fingertip Visualization](/Documentation/README_FingertipVisualization.md) |
175+
| [![App Bar](../External/ReadMeImages/AppBar/MRTK_AppBar_Main.png)](README_AppBar.md) [App Bar](README_AppBar.md) | [![Pointers](../External/ReadMeImages/Pointers/MRTK_Pointer_Main.png)](README_Pointers.md) [Pointers](README_Pointers.md) | [![Fingertip Visualization](../External/ReadMeImages/Fingertip/MRTK_FingertipVisualization_Main.png)](README_FingertipVisualization.md) [Fingertip Visualization](README_FingertipVisualization.md) |
176176
| UI for Bounding Box's manual activation | Learn about various types of pointers | Visual affordance on the fingertip which improves the confidence for the direct interaction |
177177

178178
## Example Scene
179179
You can find various types of interactions and UI controls in this example scene.
180180

181-
[![Button](../External/ReadMeImages/MRTK_Examples.png)](/Documentation/README_HandInteractionExamples.md)
181+
[![Button](../External/ReadMeImages/MRTK_Examples.png)](README_HandInteractionExamples.md)

Documentation/HTKToMRTKPortingGuide.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,16 @@ Some events no longer have unique events and now contain a MixedRealityInputActi
107107
## UX
108108
| | HTK 2017 | MRTK v2 |
109109
|---------------------------|----------|-----------|
110-
| Button | [Interactable Objects](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/htk_release/Assets/HoloToolkit-Examples/UX/Readme/README_InteractableObjectExample.md) | [Button](/Documentation/README_Button.md) |
111-
| Interactable | [Interactable Objects](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/htk_release/Assets/HoloToolkit-Examples/UX/Readme/README_InteractableObjectExample.md) | [Interactable](/Documentation/README_Interactable.md) |
112-
| Bounding Box | [Bounding Box](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/htk_release/Assets/HoloToolkit-Examples/UX/Readme/README_BoundingBoxGizmoExample.md) | [Bounding Box](/Documentation/README_BoundingBox.md) |
113-
| App Bar | [App Bar](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/htk_release/Assets/HoloToolkit-Examples/UX/Readme/README_BoundingBoxGizmoExample.md) | [App Bar](/Documentation/README_AppBar.md) |
114-
| One Hand Manipulation (Grb and Move) | [HandDraggable](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/htk_release/Assets/HoloToolkit/Input/Scripts/Utilities/Interactions/HandDraggable.cs) | [Manipulation Handler](/Documentation/README_ManipulationHandler.md) |
115-
| Two Hand Manipulation (Grab/Move/Rotate/Scale) | [TwoHandManipulatable](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/htk_release/Assets/HoloToolkit/Input/Scripts/Utilities/Interactions/TwoHandManipulatable.cs) | [Manipulation Handler](/Documentation/README_ManipulationHandler.md) |
116-
| Keyboard | [Keyboard prefab]() | [System Keyboard](/Documentation/README_SystemKeyboard.md) |
117-
| Tooltip | [Tooltip](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/htk_release/Assets/HoloToolkit-Examples/UX/Readme/README_TooltipExample.md) | [Tooltip](/Documentation/README_Tooltip.md) |
118-
| Object Collection | [Object Collection](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/htk_release/Assets/HoloToolkit-Examples/UX/Readme/README_ObjectCollection.md) | [Object Collection](/Documentation/README_ObjectCollection.md) |
119-
| Solver | [Solver](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/htk_release/Assets/HoloToolkit-Examples/Utilities/Readme/README_SolverSystem.md) | [Solver](/Documentation/README_Solver.md) |
110+
| Button | [Interactable Objects](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/htk_release/Assets/HoloToolkit-Examples/UX/Readme/README_InteractableObjectExample.md) | [Button](README_Button.md) |
111+
| Interactable | [Interactable Objects](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/htk_release/Assets/HoloToolkit-Examples/UX/Readme/README_InteractableObjectExample.md) | [Interactable](README_Interactable.md) |
112+
| Bounding Box | [Bounding Box](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/htk_release/Assets/HoloToolkit-Examples/UX/Readme/README_BoundingBoxGizmoExample.md) | [Bounding Box](README_BoundingBox.md) |
113+
| App Bar | [App Bar](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/htk_release/Assets/HoloToolkit-Examples/UX/Readme/README_BoundingBoxGizmoExample.md) | [App Bar](README_AppBar.md) |
114+
| One Hand Manipulation (Grb and Move) | [HandDraggable](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/htk_release/Assets/HoloToolkit/Input/Scripts/Utilities/Interactions/HandDraggable.cs) | [Manipulation Handler](README_ManipulationHandler.md) |
115+
| Two Hand Manipulation (Grab/Move/Rotate/Scale) | [TwoHandManipulatable](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/htk_release/Assets/HoloToolkit/Input/Scripts/Utilities/Interactions/TwoHandManipulatable.cs) | [Manipulation Handler](README_ManipulationHandler.md) |
116+
| Keyboard | [Keyboard prefab]() | [System Keyboard](README_SystemKeyboard.md) |
117+
| Tooltip | [Tooltip](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/htk_release/Assets/HoloToolkit-Examples/UX/Readme/README_TooltipExample.md) | [Tooltip](README_Tooltip.md) |
118+
| Object Collection | [Object Collection](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/htk_release/Assets/HoloToolkit-Examples/UX/Readme/README_ObjectCollection.md) | [Object Collection](README_ObjectCollection.md) |
119+
| Solver | [Solver](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/htk_release/Assets/HoloToolkit-Examples/Utilities/Readme/README_SolverSystem.md) | [Solver](README_Solver.md) |
120120

121121

122122
## Utilities
@@ -125,9 +125,9 @@ Some Utilities have been reconciled as duplicates with the Solver system. Please
125125

126126
| HTK 2017 | MRTK v2 |
127127
|----------|-----------|
128-
| Billboard | [`RadialView`](xref:Microsoft.MixedReality.Toolkit.Utilities.Solvers.RadialView) [Solver](/Documentation/README_Solver.md) |
129-
| Tagalong | [`RadialView`](xref:Microsoft.MixedReality.Toolkit.Utilities.Solvers.RadialView) or [`Orbital`](xref:Microsoft.MixedReality.Toolkit.Utilities.Solvers.Orbital) [Solver](/Documentation/README_Solver.md) |
130-
| FixedAngularSize | [`ConstantViewSize`](xref:Microsoft.MixedReality.Toolkit.Utilities.Solvers.ConstantViewSize) [Solver](/Documentation/README_Solver.md) |
128+
| Billboard | [`RadialView`](xref:Microsoft.MixedReality.Toolkit.Utilities.Solvers.RadialView) [Solver](README_Solver.md) |
129+
| Tagalong | [`RadialView`](xref:Microsoft.MixedReality.Toolkit.Utilities.Solvers.RadialView) or [`Orbital`](xref:Microsoft.MixedReality.Toolkit.Utilities.Solvers.Orbital) [Solver](README_Solver.md) |
130+
| FixedAngularSize | [`ConstantViewSize`](xref:Microsoft.MixedReality.Toolkit.Utilities.Solvers.ConstantViewSize) [Solver](README_Solver.md) |
131131
| FpsDisplay | [Diagnostics System](Diagnostics/DiagnosticsSystemGettingStarted.md) (in Configuration Profile) |
132132
| NearFade | Built-in to MixedRealityStandard.shader |
133133

Documentation/README_AppBar.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ App Bar is a UI component used with Bounding Box. Using the 'Adjust' button, you
66
## How to use App Bar
77
Drag and drop **AppBar** prefab into the scene hierarchy. In the inspector panel of the AppBar, you will see **Bounding Box** under **Target Bounding Box** section. Assign any objects that has Bounding Box. **Important: Target object's Bounding Box activation option should be 'Activate Manually'**
88

9-
<img src="/External/ReadMeImages/AppBar/MRTK_AppBar_Setup1.png" width="450">
9+
<img src="../External/ReadMeImages/AppBar/MRTK_AppBar_Setup1.png" width="450">
1010

11-
<img src="/External/ReadMeImages/AppBar/MRTK_AppBar_Setup2.png" width="450">
11+
<img src="../External/ReadMeImages/AppBar/MRTK_AppBar_Setup2.png" width="450">
1212

Documentation/README_BoundingBox.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ You can enable Bounding Box by simply assigning the `BoundingBox` script to any
1313
### Example Scene ###
1414
You can find bounding box examples in the *HandInteractionExamples.unity* scene:
1515

16-
<img src="/External/ReadMeImages/BoundingBox/MRTK_BoundingBox_Examples.png" width="550">
16+
<img src="../External/ReadMeImages/BoundingBox/MRTK_BoundingBox_Examples.png" width="550">
1717

1818
### Inspector Properties ###
1919
![Bounding Box](../External/ReadMeImages/BoundingBox/MRTK_BoundingBox_Structure.png)
@@ -54,11 +54,11 @@ Bounding Box provides the following events. The example uses these events to pla
5454
- **Scale Started**
5555
- **Scale Ended**
5656

57-
<img src="/External/ReadMeImages/BoundingBox/MRTK_BoundingBox_Events.png" width="450">
57+
<img src="../External/ReadMeImages/BoundingBox/MRTK_BoundingBox_Events.png" width="450">
5858

5959
### Make an object movable with Manipulation Handler ###
6060
If you want to make the object movable using far interaction, you can combine [`ManipulationHandler.cs`](README_ManipulationHandler.md) with `BoundingBox.cs`. [ManipulationHandler](README_ManipulationHandler.md) supports both one and two-handed interactions. To make [`ManipulationHandler.cs`](README_ManipulationHandler.md) work with near interaction, you should add `NearInteractionGrabbable.cs` too.
6161

62-
<img src="/External/ReadMeImages/BoundingBox/MRTK_BoundingBox_ManipulationHandler.png" width="450">
62+
<img src="../External/ReadMeImages/BoundingBox/MRTK_BoundingBox_ManipulationHandler.png" width="450">
6363

6464
In order for the bounding box edges to be highlighted the same way when moving it using [`ManipulationHandler`](README_ManipulationHandler.md)'s far interaction, it is advised to connect its events for **On Manipulation Started** / **On Manipulation Ended** to `BoundingBox.HighlightWires` / `BoundingBox.UnhighlightWires` respectively, as shown in the screenshot above.

Documentation/README_Button.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
The button supports all available input methods including articulated hand input for the near interactions and gaze + air-tap for the far interactions. You can also use voice command to trigger the button.
44

55
## How to use the Pressable Button prefab
6-
Simply drag [PressableButton.prefab](/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButton.prefab) or [PressableButtonPlated.prefab](/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonPlated.prefab) into the scene. These button prefabs are already configured to have audio-visual feedback for the various types of inputs, including articulated hand input and gaze. The events exposed in the `PressableButton` and the [`Interactable`](README_Interactable.md) component can be used to trigger additional actions. 
6+
Simply drag [PressableButton.prefab](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/mrtk_release/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButton.prefab) or [PressableButtonPlated.prefab](https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/mrtk_release/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonPlated.prefab) into the scene. These button prefabs are already configured to have audio-visual feedback for the various types of inputs, including articulated hand input and gaze. The events exposed in the `PressableButton` and the [`Interactable`](README_Interactable.md) component can be used to trigger additional actions. 
77

88
The Pressable Buttons in the HandInteractionExamples scene use [`Interactable`](README_Interactable.md)'s *OnClick* event to trigger a change in the color of a cube. This event gets triggered for different types of input methods such as gaze, air-tap, hand-ray, as well as physical button presses through the `PressableButton` script.
99

10-
<img src="/External/ReadMeImages/Button/MRTK_Button_HowToUse_Interactable.png" width="450">
10+
<img src="../External/ReadMeImages/Button/MRTK_Button_HowToUse_Interactable.png" width="450">
1111

1212
You can configure when the `PressableButton` fires the [`Interactable`](README_Interactable.md)'s *OnClick* event via the `PhysicalPressEventRouter` on the button. For example, you can set *OnClick* to fire when the button is first pressed, as opposed to be pressed, and then released, by setting *Interactable On Click* to *Event On Press*.
1313

14-
<img src="/External/ReadMeImages/Button/MRTK_Button_HowTo_Events.png" width="450">
14+
<img src="../External/ReadMeImages/Button/MRTK_Button_HowTo_Events.png" width="450">
1515

1616
To leverage specific articulated hand input state information, you can use `PressableButton`'s events - *Touch Begin*, *Touch End*, *Button Pressed*, *Button Released*. These events will not fire in response to air-tap, hand-ray, or eye inputs, however.
1717

18-
<img src="/External/ReadMeImages/Button/MRTK_Button_HowTo_PressableButton.png" width="450">
18+
<img src="../External/ReadMeImages/Button/MRTK_Button_HowTo_PressableButton.png" width="450">
1919

2020
## Interaction States
2121
In the idle state, the button's front plate is not visible. As a finger approaches or a cursor from gaze input targets the surface, the front plate's glowing border becomes visible. There is additional highlighting of the fingertip position on the front plate surface. When pushed with a finger, the front plate moves with the fingertip. When the fingertip touches the surface of the front plate, it shows a subtle pulse effect to give visual feedback of the touch point.
2222

23-
<img src="/External/ReadMeImages/Button/MRTK_Button_InteractionStates.png" width="600">
23+
<img src="../External/ReadMeImages/Button/MRTK_Button_InteractionStates.png" width="600">
2424

2525
The subtle pulse effect is triggered by the `PressableButton.` The `PressableButton` looks for `ProximityLight(s)` that live on the currently interacting pointer. If any `ProximityLight(s)` are found, the ProximityLight.Pulse method is called which automatically animates shader parameters to display a pulse.
2626

@@ -57,28 +57,28 @@ The *ButtonContent* object contains front plate, text label and icon. The *Fron
5757
#### Speech Input Handler
5858
The [`Interactable`](README_Interactable.md) script in Pressable Button already implements IMixedRealitySpeechHandler. A voice command keyword can be set here. 
5959

60-
<img src="/External/ReadMeImages/Button/MRTK_Button_Speech1.png" width="450">
60+
<img src="../External/ReadMeImages/Button/MRTK_Button_Speech1.png" width="450">
6161

6262
#### Speech Input Profile
6363
Additionally, you need to register the voice command keyword in the global `Speech Commands Profile`
6464

65-
<img src="/External/ReadMeImages/Button/MRTK_Button_Speech2.png" width="450">
65+
<img src="../External/ReadMeImages/Button/MRTK_Button_Speech2.png" width="450">
6666

6767
#### See-it, Say-it label
6868
The Pressable Button prefab has a placeholder TextMesh Pro label under the *SeeItSayItLabel* object. You can use this label to communicate the voice command keyword for the button to the user.
6969

70-
<img src="/External/ReadMeImages/Button/MRTK_Button_Speech3.png" width="450">
70+
<img src="../External/ReadMeImages/Button/MRTK_Button_Speech3.png" width="450">
7171

7272
## Using PressableButton on other types of objects
7373

7474
You can use the `PressableButton`s script to configure an object to react to finger pushes.
7575

7676
In the HandInteractionExamples scene, you can take a look at the piano and round button examples which are both using `PressableButton`
7777

78-
<img src="/External/ReadMeImages/Button/MRTK_Button_Custom1.png" width="450">
78+
<img src="../External/ReadMeImages/Button/MRTK_Button_Custom1.png" width="450">
7979

80-
<img src="/External/ReadMeImages/Button/MRTK_Button_Custom2.png" width="450">
80+
<img src="../External/ReadMeImages/Button/MRTK_Button_Custom2.png" width="450">
8181

8282
Each piano key has a `PressableButton` and a `NearInteractionTouchable` script assigned. It is important to verify that the *Local Forward* direction of `NearInteractionTouchable` is correct. It is represented by a white arrow in the editor. Make sure the arrow points away from the button's front face:
8383

84-
<img src="/External/ReadMeImages/Button/MRTK_Button_Custom3.png" width="450">
84+
<img src="../External/ReadMeImages/Button/MRTK_Button_Custom3.png" width="450">

0 commit comments

Comments
 (0)