Skip to content

Commit 31fa74e

Browse files
committed
Merge remote-tracking branch 'refs/remotes/Microsoft/Dev_Unity_2017.2.0' into Dev_Unity_2017.2.0
2 parents f33f974 + 3d095af commit 31fa74e

File tree

110 files changed

+7156
-91
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+7156
-91
lines changed

Assets/HoloToolkit/Input/Materials/TeleportMarker.mat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Material:
77
m_PrefabParentObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: TeleportMarker
10-
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
10+
m_Shader: {fileID: 4800000, guid: 30a212a88e1063a428c85e50b1e427f2, type: 3}
1111
m_ShaderKeywords: ETC1_EXTERNAL_ALPHA
1212
m_LightmapFlags: 4
1313
m_EnableInstancingVariants: 0
@@ -71,5 +71,5 @@ Material:
7171
- _UVSec: 0
7272
- _ZWrite: 1
7373
m_Colors:
74-
- _Color: {r: 0.588, g: 0.588, b: 0.588, a: 1}
74+
- _Color: {r: 0.77931046, g: 1, b: 0, a: 1}
7575
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/HoloToolkit/Input/Prefabs/Controllers.prefab

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,59 +9,49 @@ Prefab:
99
m_Modifications: []
1010
m_RemovedComponents: []
1111
m_ParentPrefab: {fileID: 0}
12-
m_RootGameObject: {fileID: 1530297684732174}
12+
m_RootGameObject: {fileID: 1831102304595788}
1313
m_IsPrefabParent: 1
14-
--- !u!1 &1530297684732174
14+
--- !u!1 &1831102304595788
1515
GameObject:
1616
m_ObjectHideFlags: 0
1717
m_PrefabParentObject: {fileID: 0}
1818
m_PrefabInternal: {fileID: 100100000}
1919
serializedVersion: 5
2020
m_Component:
21-
- component: {fileID: 4101394502355204}
22-
- component: {fileID: 114014424083103802}
23-
- component: {fileID: 114750748633442924}
21+
- component: {fileID: 4307559140576838}
22+
- component: {fileID: 114895734277317420}
2423
m_Layer: 0
2524
m_Name: Controllers
2625
m_TagString: Untagged
2726
m_Icon: {fileID: 0}
2827
m_NavMeshLayer: 0
2928
m_StaticEditorFlags: 0
3029
m_IsActive: 1
31-
--- !u!4 &4101394502355204
30+
--- !u!4 &4307559140576838
3231
Transform:
3332
m_ObjectHideFlags: 1
3433
m_PrefabParentObject: {fileID: 0}
3534
m_PrefabInternal: {fileID: 100100000}
36-
m_GameObject: {fileID: 1530297684732174}
35+
m_GameObject: {fileID: 1831102304595788}
3736
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3837
m_LocalPosition: {x: 0, y: 0, z: 0}
3938
m_LocalScale: {x: 1, y: 1, z: 1}
4039
m_Children: []
4140
m_Father: {fileID: 0}
4241
m_RootOrder: 0
4342
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
44-
--- !u!114 &114014424083103802
43+
--- !u!114 &114895734277317420
4544
MonoBehaviour:
4645
m_ObjectHideFlags: 1
4746
m_PrefabParentObject: {fileID: 0}
4847
m_PrefabInternal: {fileID: 100100000}
49-
m_GameObject: {fileID: 1530297684732174}
50-
m_Enabled: 1
51-
m_EditorHideFlags: 0
52-
m_Script: {fileID: 11500000, guid: cae8f3c88e9704a4393cb8d904b62372, type: 3}
53-
m_Name:
54-
m_EditorClassIdentifier:
55-
--- !u!114 &114750748633442924
56-
MonoBehaviour:
57-
m_ObjectHideFlags: 1
58-
m_PrefabParentObject: {fileID: 0}
59-
m_PrefabInternal: {fileID: 100100000}
60-
m_GameObject: {fileID: 1530297684732174}
48+
m_GameObject: {fileID: 1831102304595788}
6149
m_Enabled: 1
6250
m_EditorHideFlags: 0
6351
m_Script: {fileID: 11500000, guid: 03314f8008ae1ed4fbd45c95a7ed5182, type: 3}
6452
m_Name:
6553
m_EditorClassIdentifier:
66-
controllerModel: {fileID: 1097318689274706, guid: 869d340c69dbcef459070c1a159d38ac,
67-
type: 2}
54+
leftControllerOverride: {fileID: 0}
55+
rightControllerOverride: {fileID: 0}
56+
touchpadTouchedOverride: {fileID: 0}
57+
GLTFShader: {fileID: 4800000, guid: 30a212a88e1063a428c85e50b1e427f2, type: 3}

Assets/HoloToolkit/Input/Prefabs/MixedRealityCameraParent.prefab

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -614,8 +614,6 @@ MonoBehaviour:
614614
GoBackButtonName: Fire2
615615
LeftJoystickX: ControllerLeftStickX
616616
LeftJoystickY: ControllerLeftStickY
617-
RightJoystickX: ControllerRightStickX
618-
RightJoystickY: ControllerRightStickY
619617
EnableTeleport: 1
620618
EnableJoystickMovement: 0
621619
BumperRotationSize: 30

Assets/HoloToolkit/Input/Prefabs/MixedRealityCameraParentWithControllers.prefab

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ GameObject:
201201
serializedVersion: 5
202202
m_Component:
203203
- component: {fileID: 4564773429358892}
204-
- component: {fileID: 114537258085395934}
205204
- component: {fileID: 114178310629464548}
206205
m_Layer: 0
207206
m_Name: Controllers
@@ -637,7 +636,10 @@ MonoBehaviour:
637636
m_Script: {fileID: 11500000, guid: 03314f8008ae1ed4fbd45c95a7ed5182, type: 3}
638637
m_Name:
639638
m_EditorClassIdentifier:
640-
controllerModel: {fileID: 0}
639+
leftControllerOverride: {fileID: 0}
640+
rightControllerOverride: {fileID: 0}
641+
touchpadTouchedOverride: {fileID: 0}
642+
GLTFShader: {fileID: 4800000, guid: 30a212a88e1063a428c85e50b1e427f2, type: 3}
641643
--- !u!114 &114190553654752226
642644
MonoBehaviour:
643645
m_ObjectHideFlags: 1
@@ -758,17 +760,6 @@ MonoBehaviour:
758760
Axis0Destination: 2
759761
Axis1Destination: 0
760762
Axis2Destination: 6
761-
--- !u!114 &114537258085395934
762-
MonoBehaviour:
763-
m_ObjectHideFlags: 1
764-
m_PrefabParentObject: {fileID: 0}
765-
m_PrefabInternal: {fileID: 100100000}
766-
m_GameObject: {fileID: 1549804133911870}
767-
m_Enabled: 1
768-
m_EditorHideFlags: 0
769-
m_Script: {fileID: 11500000, guid: cae8f3c88e9704a4393cb8d904b62372, type: 3}
770-
m_Name:
771-
m_EditorClassIdentifier:
772763
--- !u!114 &114616030507582890
773764
MonoBehaviour:
774765
m_ObjectHideFlags: 1

Assets/HoloToolkit/Input/Prefabs/TeleportMarker.prefab

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ GameObject:
4343
m_Icon: {fileID: 0}
4444
m_NavMeshLayer: 0
4545
m_StaticEditorFlags: 0
46-
m_IsActive: 0
46+
m_IsActive: 1
4747
--- !u!1 &1842892255633488
4848
GameObject:
4949
m_ObjectHideFlags: 0
@@ -177,7 +177,7 @@ MeshRenderer:
177177
m_LightProbeUsage: 1
178178
m_ReflectionProbeUsage: 1
179179
m_Materials:
180-
- {fileID: 2100000, guid: cc68797d6e1fe5d4faee6e16f316ba68, type: 2}
180+
- {fileID: 2100000, guid: 8a6e5d945b5976841836dea28530e6d7, type: 2}
181181
m_StaticBatchInfo:
182182
firstSubMesh: 0
183183
subMeshCount: 0
@@ -209,7 +209,7 @@ MeshRenderer:
209209
m_LightProbeUsage: 1
210210
m_ReflectionProbeUsage: 1
211211
m_Materials:
212-
- {fileID: 2100000, guid: cc68797d6e1fe5d4faee6e16f316ba68, type: 2}
212+
- {fileID: 2100000, guid: 8a6e5d945b5976841836dea28530e6d7, type: 2}
213213
m_StaticBatchInfo:
214214
firstSubMesh: 0
215215
subMeshCount: 0
@@ -241,7 +241,7 @@ MeshRenderer:
241241
m_LightProbeUsage: 1
242242
m_ReflectionProbeUsage: 1
243243
m_Materials:
244-
- {fileID: 2100000, guid: cc68797d6e1fe5d4faee6e16f316ba68, type: 2}
244+
- {fileID: 2100000, guid: 8a6e5d945b5976841836dea28530e6d7, type: 2}
245245
m_StaticBatchInfo:
246246
firstSubMesh: 0
247247
subMeshCount: 0
@@ -273,7 +273,7 @@ MeshRenderer:
273273
m_LightProbeUsage: 1
274274
m_ReflectionProbeUsage: 1
275275
m_Materials:
276-
- {fileID: 2100000, guid: cc68797d6e1fe5d4faee6e16f316ba68, type: 2}
276+
- {fileID: 2100000, guid: 8a6e5d945b5976841836dea28530e6d7, type: 2}
277277
m_StaticBatchInfo:
278278
firstSubMesh: 0
279279
subMeshCount: 0

Assets/HoloToolkit/Input/README.md

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,32 @@ You can either use the defaults that have been set or customize them to match yo
7676
2. Near clip plane is set to 0.3 which is typical for VR applications.
7777
3. Quality Settings to be Fantastic as it uses the PC GPU to render content.
7878

79-
#### HoloToolkitCameraParent.prefab
79+
#### MixedRealityCameraParent.prefab
8080
This prefab is used when you want to enable teleporting on mixed reality enabled occluded devices.
8181
In order to prevent the MainCamera position from being overwritten in the next update we use a parent GameObject.
8282

83+
#### MixedRealityCameraParentWithControllers.prefab
84+
This prefab is used when you want to enable teleporting on mixed reality enabled occluded devices, as well as motion controller visualization.
85+
In order to prevent the MainCamera position from being overwritten in the next update we use a parent GameObject.
86+
8387
### [Scripts](Scripts)
8488
Scripts related to the input features.
8589

8690
##### ControllerVisualizer.cs
87-
Use this to visualize a 6DoF controller in your application. Add this script to a GameObject at the root of your scene and add a model prefab to be used to represent the controller.
91+
Use this to visualize a 6DoF controller in your application. Add this script to a GameObject as a child of the MainCamera, or use the MixedRealityCameraParentWithControllers prefab. Either specify a shader to use for the [glTF](https://www.khronos.org/gltf) model or add GameObject overrides to represent the controllers.
8892

89-
- **controllerModel** A prefab to spawn to represent the controllers. This will automatically move and reorient when the controller is moved.
93+
- **leftControllerOverride** [Optional] A prefab to spawn to represent the left controller. This will automatically move and reorient when the controller is moved.
94+
- **rightControllerOverride** [Optional] A prefab to spawn to represent the right controller. This will automatically move and reorient when the controller is moved.
95+
- **touchpadTouchedOverride** [Optional] A prefab to spawn to represent the user's touch location on the touchpad. This will automatically move when the user moves their touch location. Default is a sphere.
96+
- **GLTFShader** [Optional, if using overrides] If using the controller's built-in [glTF](https://www.khronos.org/gltf) model, this will be the shader applied to the resulting GameObject.
97+
98+
##### ControllerDebug.cs
99+
This can be used to load a [glTF](https://www.khronos.org/gltf) file in the editor, as well as displaying input and source data from motion controllers on a text panel for debugging purposes on the device.
100+
- **LoadGLTFFile** A boolean to specify if a glTF file should be loaded from StreamingAssets.
101+
- **GLTFName** The name of the GLTF file to be loaded from StreamingAssets.
102+
- **touchpadTouchedOverride** [Optional] A prefab to spawn on the touchpad of the glTF file specified. Default is a sphere.
103+
- **GLTFShader** [Optional, if not loading a glTF model] If loading a [glTF](https://www.khronos.org/gltf) model, this will be the shader applied to the resulting GameObject.
104+
- **TextPanel** This is the text display where controller state info will be logged, for on-device debugging purposes.
90105

91106
##### SetGlobalListener.cs
92107
Add this to a GameObject to register it as a global listener on the InputManager. This means it will receive events from the InputManager even while not focused.
@@ -421,6 +436,9 @@ This scene shows how to manually control the camera. The script is on the main
421436
#### MicrophoneStream.unity
422437
Example usage of MicStream.cs to select and record beam-formed audio from the hololens. In editor, the script lets you choose if you want to beam-form capture on voice or on the room. When running, press 'Q' to start the stream you selected, 'W' will stop the stream, 'A' starts recording a wav file, and 'S' stops the recording, saves it to your Music library, and prints the full path of the audio clip.
423438

439+
#### MotionControllerTest.unity
440+
This scene shows how to render motion controllers in your app. It also contains a debug panel to help diagnose the state of a connected controller.
441+
424442
#### SelectedObjectKeywords.unity
425443
Example on how to send keyword messages to currently selected dynamically instantiated object.
426444
Gazing on an object and saying "Select Object" will persistently select that object for interaction with voice commands,

0 commit comments

Comments
 (0)