Skip to content

Commit 364321e

Browse files
StephenHodgsonStephenHodgson
committed
Change Requests
1 parent 900f29b commit 364321e

File tree

7 files changed

+12
-84
lines changed

7 files changed

+12
-84
lines changed

‎Assets/HoloToolkit-Examples/ColorPicker/GazeableColorPicker.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ private void Update()
2727

2828
private void UpdatePickedColor(PickedColorCallback cb)
2929
{
30-
GameObject hitObject = GazeManager.Instance.HitObject;
31-
32-
if (hitObject != rendererComponent.gameObject) { return; }
33-
3430
RaycastHit hit = GazeManager.Instance.HitInfo;
3531

3632
if (hit.transform.gameObject != rendererComponent.gameObject) { return; }

‎Assets/HoloToolkit-Examples/Input/Scenes/InputNavigationRotateTest.unity‎

Lines changed: 5 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ NavMeshSettings:
110110
manualTileSize: 0
111111
tileSize: 256
112112
accuratePlacement: 0
113+
debug:
114+
m_Flags: 0
113115
m_NavMeshData: {fileID: 0}
114116
--- !u!1001 &54657778
115117
Prefab:
@@ -246,7 +248,7 @@ Transform:
246248
m_Children:
247249
- {fileID: 1499115225}
248250
m_Father: {fileID: 0}
249-
m_RootOrder: 7
251+
m_RootOrder: 6
250252
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
251253
--- !u!114 &942915101
252254
MonoBehaviour:
@@ -362,48 +364,6 @@ Prefab:
362364
m_RemovedComponents: []
363365
m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
364366
m_IsPrefabParent: 0
365-
--- !u!1001 &1203127917
366-
Prefab:
367-
m_ObjectHideFlags: 0
368-
serializedVersion: 2
369-
m_Modification:
370-
m_TransformParent: {fileID: 0}
371-
m_Modifications:
372-
- target: {fileID: 4000013973311998, guid: 2bb0375303b23a34b8f642bbf61f1a9d, type: 2}
373-
propertyPath: m_LocalPosition.x
374-
value: 0
375-
objectReference: {fileID: 0}
376-
- target: {fileID: 4000013973311998, guid: 2bb0375303b23a34b8f642bbf61f1a9d, type: 2}
377-
propertyPath: m_LocalPosition.y
378-
value: 0
379-
objectReference: {fileID: 0}
380-
- target: {fileID: 4000013973311998, guid: 2bb0375303b23a34b8f642bbf61f1a9d, type: 2}
381-
propertyPath: m_LocalPosition.z
382-
value: 0
383-
objectReference: {fileID: 0}
384-
- target: {fileID: 4000013973311998, guid: 2bb0375303b23a34b8f642bbf61f1a9d, type: 2}
385-
propertyPath: m_LocalRotation.x
386-
value: 0
387-
objectReference: {fileID: 0}
388-
- target: {fileID: 4000013973311998, guid: 2bb0375303b23a34b8f642bbf61f1a9d, type: 2}
389-
propertyPath: m_LocalRotation.y
390-
value: 0
391-
objectReference: {fileID: 0}
392-
- target: {fileID: 4000013973311998, guid: 2bb0375303b23a34b8f642bbf61f1a9d, type: 2}
393-
propertyPath: m_LocalRotation.z
394-
value: 0
395-
objectReference: {fileID: 0}
396-
- target: {fileID: 4000013973311998, guid: 2bb0375303b23a34b8f642bbf61f1a9d, type: 2}
397-
propertyPath: m_LocalRotation.w
398-
value: 1
399-
objectReference: {fileID: 0}
400-
- target: {fileID: 4000013973311998, guid: 2bb0375303b23a34b8f642bbf61f1a9d, type: 2}
401-
propertyPath: m_RootOrder
402-
value: 6
403-
objectReference: {fileID: 0}
404-
m_RemovedComponents: []
405-
m_ParentPrefab: {fileID: 100100000, guid: 2bb0375303b23a34b8f642bbf61f1a9d, type: 2}
406-
m_IsPrefabParent: 0
407367
--- !u!1001 &1485337784
408368
Prefab:
409369
m_ObjectHideFlags: 0
@@ -513,6 +473,7 @@ MeshRenderer:
513473
m_Enabled: 1
514474
m_CastShadows: 1
515475
m_ReceiveShadows: 1
476+
m_DynamicOccludee: 1
516477
m_MotionVectors: 1
517478
m_LightProbeUsage: 1
518479
m_ReflectionProbeUsage: 1
@@ -528,6 +489,7 @@ MeshRenderer:
528489
m_PreserveUVs: 0
529490
m_IgnoreNormalsForChartDetection: 0
530491
m_ImportantGI: 0
492+
m_StitchLightmapSeams: 0
531493
m_SelectedEditorRenderState: 3
532494
m_MinimumChartSize: 4
533495
m_AutoUVMaxDistance: 0.5

‎Assets/HoloToolkit-Examples/Input/Scripts/InputTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void OnHoldCanceled(HoldEventData eventData)
7575
public void OnManipulationStarted(ManipulationEventData eventData)
7676
{
7777
Debug.LogFormat("OnManipulationStarted\r\nSource: {0} SourceId: {1}\r\nCumulativeDelta: {2} {3} {4}",
78-
eventData.InputSource,
78+
eventData.InputSource,
7979
eventData.SourceId,
8080
eventData.CumulativeDelta.x,
8181
eventData.CumulativeDelta.y,

‎Assets/HoloToolkit-Examples/Input/Scripts/TapResponder.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace HoloToolkit.Unity.InputModule.Tests
1212
/// </summary>
1313
public class TapResponder : MonoBehaviour, IInputClickHandler
1414
{
15-
public void OnInputClicked(InputClickedEventData eventData)
15+
public void OnInputClicked(InputClickedEventData eventData)
1616
{
1717
// Increase the scale of the object just as a response.
1818
gameObject.transform.localScale += 0.05f * gameObject.transform.localScale;

‎Assets/HoloToolkit-Examples/SpatialMapping/Scenes/PlaneFinding.unity‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,11 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
<<<<<<< HEAD
4241
m_IndirectSpecularColor: {r: 0.44657892, g: 0.4964128, b: 0.5748171, a: 1}
4342
--- !u!157 &3
4443
LightmapSettings:
4544
m_ObjectHideFlags: 0
4645
serializedVersion: 9
47-
=======
48-
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
49-
--- !u!157 &3
50-
LightmapSettings:
51-
m_ObjectHideFlags: 0
52-
serializedVersion: 11
53-
>>>>>>> MRTK-Master
5446
m_GIWorkflowMode: 0
5547
m_GISettings:
5648
serializedVersion: 2
@@ -62,11 +54,7 @@ LightmapSettings:
6254
m_EnableBakedLightmaps: 1
6355
m_EnableRealtimeLightmaps: 1
6456
m_LightmapEditorSettings:
65-
<<<<<<< HEAD
6657
serializedVersion: 8
67-
=======
68-
serializedVersion: 9
69-
>>>>>>> MRTK-Master
7058
m_Resolution: 2
7159
m_BakeResolution: 40
7260
m_TextureWidth: 1024
@@ -89,32 +77,17 @@ LightmapSettings:
8977
m_PVRDirectSampleCount: 32
9078
m_PVRSampleCount: 500
9179
m_PVRBounces: 2
92-
<<<<<<< HEAD
9380
m_PVRFiltering: 0
9481
m_PVRFilteringMode: 1
95-
=======
96-
m_PVRFilterTypeDirect: 0
97-
m_PVRFilterTypeIndirect: 0
98-
m_PVRFilterTypeAO: 0
99-
m_PVRFilteringMode: 0
100-
>>>>>>> MRTK-Master
10182
m_PVRCulling: 1
10283
m_PVRFilteringGaussRadiusDirect: 1
10384
m_PVRFilteringGaussRadiusIndirect: 5
10485
m_PVRFilteringGaussRadiusAO: 2
105-
<<<<<<< HEAD
10686
m_PVRFilteringAtrousColorSigma: 1
10787
m_PVRFilteringAtrousNormalSigma: 1
10888
m_PVRFilteringAtrousPositionSigma: 1
10989
m_LightingDataAsset: {fileID: 0}
11090
m_ShadowMaskMode: 2
111-
=======
112-
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
113-
m_PVRFilteringAtrousPositionSigmaIndirect: 2
114-
m_PVRFilteringAtrousPositionSigmaAO: 1
115-
m_LightingDataAsset: {fileID: 0}
116-
m_UseShadowmask: 0
117-
>>>>>>> MRTK-Master
11891
--- !u!196 &4
11992
NavMeshSettings:
12093
serializedVersion: 2
@@ -422,15 +395,9 @@ Prefab:
422395
objectReference: {fileID: 0}
423396
- target: {fileID: 114742747811649402, guid: 3eddd1c29199313478dd3f912bfab2ab,
424397
type: 2}
425-
<<<<<<< HEAD
426398
propertyPath: SearchForCursorIfUnset
427399
value: 0
428400
objectReference: {fileID: 0}
429-
=======
430-
propertyPath: Cursor
431-
value:
432-
objectReference: {fileID: 1518734423}
433-
>>>>>>> MRTK-Master
434401
m_RemovedComponents: []
435402
m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
436403
m_IsPrefabParent: 0

‎Assets/HoloToolkit-Examples/Utilities/Scripts/TextToSpeechOnTapTest.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55

66
namespace HoloToolkit.Unity.InputModule.Tests
77
{
8+
/// <summary>
9+
/// Tap Test for text to speech. This voice will appear to emanate from the object
10+
/// </summary>
811
public class TextToSpeechOnTapTest : MonoBehaviour, IInputClickHandler
912
{
1013
private TextToSpeech textToSpeech;
@@ -13,7 +16,7 @@ private void Awake()
1316
{
1417
textToSpeech = GetComponent<TextToSpeech>();
1518
}
16-
19+
1720
public void OnInputClicked(InputClickedEventData eventData)
1821
{
1922
// If we have a text to speech manager on the target object, say something.

‎Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace HoloToolkit.Unity
1616
public class ProjectSettingsWindow : AutoConfigureWindow<ProjectSettingsWindow.ProjectSetting>
1717
{
1818
private const string SharingServiceURL = "https://raw.githubusercontent.com/Microsoft/MixedRealityToolkit-Unity/master/External/HoloToolkit/Sharing/Server/SharingService.exe";
19-
private const string InputManagerAssetURL = "https://raw.githubusercontent.com/Microsoft/MixedRealityToolkit-Unity/Dev_Unity_2017.2.0/ProjectSettings/InputManager.asset";
19+
private const string InputManagerAssetURL = "https://raw.githubusercontent.com/Microsoft/MixedRealityToolkit-Unity/master/ProjectSettings/InputManager.asset";
2020

2121
#region Nested Types
2222

0 commit comments

Comments
 (0)