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.

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

Input Updates #1028

Merged
merged 35 commits into from
Oct 3, 2017
Merged
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
371f7de
Removed static flags on text mesh components
Sep 26, 2017
f77f8e6
First pass at Input System Update.
Sep 27, 2017
dab4570
removed extra semi colon.
StephenHodgson Sep 27, 2017
79e2049
More updates to the InputManger. Upated tag reference to tags and mad…
Sep 27, 2017
2ac13fb
Merge branch 'Dev_Unity_2017.2.0' into MRTK-Dev2017.2-InputUpdate
Sep 27, 2017
f94d273
Merge branch 'Dev_Unity_2017.2.0' into MRTK-Dev2017.2-InputUpdate
Sep 27, 2017
6fadf32
Merge branch 'Dev_Unity_2017.2.0' into MRTK-Dev2017.2-InputUpdate
Sep 27, 2017
896893d
Input/Scripts folder organization
Sep 27, 2017
f12453f
A bit more organization. Minor changes.
Sep 27, 2017
a0582e3
A couple more updates to the WSA wrapping, and better handling of des…
Sep 27, 2017
54c9c5c
Removed obsolete Keyword Manager and test class.
Sep 27, 2017
40c01f8
nicer editor checking
Sep 27, 2017
fb22aad
Commented out ControllerInfo unimplemented controller components
Sep 27, 2017
e77f2eb
Merge branch 'Dev_Unity_2017.2.0' into MRTK-Dev2017.2-InputUpdate
StephenHodgson Sep 29, 2017
6bb1649
Removed static flags on text mesh components
Sep 26, 2017
f88313e
First pass at Input System Update.
Sep 27, 2017
b546340
removed extra semi colon.
StephenHodgson Sep 27, 2017
d4f8d97
More updates to the InputManger. Upated tag reference to tags and mad…
Sep 27, 2017
9857547
Input/Scripts folder organization
Sep 27, 2017
218fe04
A bit more organization. Minor changes.
Sep 27, 2017
cb11ca9
A couple more updates to the WSA wrapping, and better handling of des…
Sep 27, 2017
e2f019b
Removed obsolete Keyword Manager and test class.
Sep 27, 2017
4b5c9b7
nicer editor checking
Sep 27, 2017
6931c74
Commented out ControllerInfo unimplemented controller components
Sep 27, 2017
098940f
Merge branch 'MRTK-Dev2017.2-InputUpdate' of https://github.com/Steph…
StephenHodgson Sep 29, 2017
7efcc49
Merge branch 'Dev_Unity_2017.2.0' into MRTK-Dev2017.2-InputUpdate
StephenHodgson Sep 29, 2017
52ed922
Merge branch 'Dev_Unity_2017.2.0' into MRTK-Dev2017.2-InputUpdate
Oct 2, 2017
2a23394
escaped comment ampersand
Oct 2, 2017
b744689
Merge branch 'Dev_Unity_2017.2.0' into MRTK-Dev2017.2-InputUpdate
Oct 3, 2017
f239a81
Updated Managers prefab
Oct 3, 2017
bc98c35
Merge branch 'Dev_Unity_2017.2.0' into MRTK-Dev2017.2-InputUpdate
Oct 3, 2017
df1a3c5
updated gaze controls on mixed reality camera prefabs
Oct 3, 2017
a8b2832
Merge branch 'Dev_Unity_2017.2.0' into MRTK-Dev2017.2-InputUpdate
Oct 3, 2017
d9c1382
fixed flipped logic
Oct 3, 2017
af16c3f
Updated InputManager.asset download URL
Oct 3, 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
15 changes: 14 additions & 1 deletion Assets/HoloToolkit-Tests/Boundary/Scripts/BoundaryTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ namespace HoloToolkit.Unity.Boundary.Tests
{
public class BoundaryTest : MonoBehaviour
{
private Material[] defaultMaterials;
private Material[] defaultMaterials = null;

private void Start()
{
#if UNITY_WSA
BoundaryManager.Instance.RenderBoundary = true;
BoundaryManager.Instance.RenderFloor = true;

Expand All @@ -27,6 +28,18 @@ private void Start()
defaultMaterials[i].SetColor("_Color", highlightColor);
}
}
#else
BoundaryManager.Instance.RenderBoundary = false;
BoundaryManager.Instance.RenderFloor = false;
#endif
}

private void OnDestroy()
{
for (int i = 0; i < defaultMaterials.Length; i++)
{
Destroy(defaultMaterials[i]);
}
}
}
}
Loading