Skip to content

Commit ca79c25

Browse files
author
Robert El-Soudani
committed
Switch from SimpleSinglePointerSelector to GazeManager in SpatialUnderstandingExample
Since SpatialUnderstandingExample uses a non-standard cursor, it's not compatible with SimpleSinglePointerSelector, so for now, I disabled SimpleSinglePointerSelector and made InputManager auto-register the GazeManager as its pointer. If the SpatialUnderstandingExample scene is updated to use a standard cursor in the future, someone can easily turn off InputManager's GazeManager autoregistration and turn back on SimpleSinglePointerSelector to make it compatible with 6DoF controllers.
1 parent 9c704ee commit ca79c25

File tree

1 file changed

+45
-9
lines changed

1 file changed

+45
-9
lines changed

Assets/HoloToolkit-Examples/SpatialUnderstanding/SpatialUnderstanding-FeatureOverview/Scenes/SpatialUnderstandingExample.unity

Lines changed: 45 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
1313
--- !u!104 &2
1414
RenderSettings:
1515
m_ObjectHideFlags: 0
16-
serializedVersion: 7
16+
serializedVersion: 8
1717
m_Fog: 0
1818
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
1919
m_FogMode: 3
@@ -25,6 +25,7 @@ RenderSettings:
2525
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
2626
m_AmbientIntensity: 1
2727
m_AmbientMode: 0
28+
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
2829
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
2930
m_HaloStrength: 0.5
3031
m_FlareStrength: 1
@@ -37,11 +38,11 @@ RenderSettings:
3738
m_ReflectionIntensity: 1
3839
m_CustomReflection: {fileID: 0}
3940
m_Sun: {fileID: 0}
40-
m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1}
41+
m_IndirectSpecularColor: {r: 0.44657886, g: 0.4964128, b: 0.57481706, a: 1}
4142
--- !u!157 &3
4243
LightmapSettings:
4344
m_ObjectHideFlags: 0
44-
serializedVersion: 7
45+
serializedVersion: 9
4546
m_GIWorkflowMode: 0
4647
m_GISettings:
4748
serializedVersion: 2
@@ -53,7 +54,7 @@ LightmapSettings:
5354
m_EnableBakedLightmaps: 1
5455
m_EnableRealtimeLightmaps: 1
5556
m_LightmapEditorSettings:
56-
serializedVersion: 4
57+
serializedVersion: 8
5758
m_Resolution: 2
5859
m_BakeResolution: 40
5960
m_TextureWidth: 1024
@@ -66,13 +67,27 @@ LightmapSettings:
6667
m_LightmapParameters: {fileID: 0}
6768
m_LightmapsBakeMode: 1
6869
m_TextureCompression: 1
69-
m_DirectLightInLightProbes: 1
7070
m_FinalGather: 0
7171
m_FinalGatherFiltering: 1
7272
m_FinalGatherRayCount: 256
7373
m_ReflectionCompression: 2
74+
m_MixedBakeMode: 1
75+
m_BakeBackend: 0
76+
m_PVRSampling: 1
77+
m_PVRDirectSampleCount: 32
78+
m_PVRSampleCount: 500
79+
m_PVRBounces: 2
80+
m_PVRFiltering: 0
81+
m_PVRFilteringMode: 1
82+
m_PVRCulling: 1
83+
m_PVRFilteringGaussRadiusDirect: 1
84+
m_PVRFilteringGaussRadiusIndirect: 5
85+
m_PVRFilteringGaussRadiusAO: 2
86+
m_PVRFilteringAtrousColorSigma: 1
87+
m_PVRFilteringAtrousNormalSigma: 1
88+
m_PVRFilteringAtrousPositionSigma: 1
7489
m_LightingDataAsset: {fileID: 0}
75-
m_RuntimeCPUUsage: 25
90+
m_ShadowMaskMode: 2
7691
--- !u!196 &4
7792
NavMeshSettings:
7893
serializedVersion: 2
@@ -89,6 +104,8 @@ NavMeshSettings:
89104
minRegionArea: 2
90105
manualCellSize: 0
91106
cellSize: 0.16666667
107+
manualTileSize: 0
108+
tileSize: 256
92109
accuratePlacement: 0
93110
m_NavMeshData: {fileID: 0}
94111
--- !u!1 &81406031
@@ -185,6 +202,7 @@ MeshRenderer:
185202
m_AutoUVMaxAngle: 89
186203
m_LightmapParameters: {fileID: 0}
187204
m_SortingLayerID: 0
205+
m_SortingLayer: 0
188206
m_SortingOrder: 0
189207
--- !u!1 &87500976
190208
GameObject:
@@ -493,6 +511,7 @@ MeshRenderer:
493511
m_AutoUVMaxAngle: 89
494512
m_LightmapParameters: {fileID: 0}
495513
m_SortingLayerID: 0
514+
m_SortingLayer: 0
496515
m_SortingOrder: 0
497516
--- !u!1 &381623879
498517
GameObject:
@@ -1059,6 +1078,7 @@ MeshRenderer:
10591078
m_AutoUVMaxAngle: 89
10601079
m_LightmapParameters: {fileID: 0}
10611080
m_SortingLayerID: 0
1081+
m_SortingLayer: 0
10621082
m_SortingOrder: 0
10631083
--- !u!1 &903006227
10641084
GameObject:
@@ -1305,6 +1325,16 @@ Prefab:
13051325
propertyPath: m_RootOrder
13061326
value: 2
13071327
objectReference: {fileID: 0}
1328+
- target: {fileID: 114742747811649402, guid: 3eddd1c29199313478dd3f912bfab2ab,
1329+
type: 2}
1330+
propertyPath: m_Enabled
1331+
value: 0
1332+
objectReference: {fileID: 0}
1333+
- target: {fileID: 114708646396671696, guid: 3eddd1c29199313478dd3f912bfab2ab,
1334+
type: 2}
1335+
propertyPath: autoRegisterGazePointerIfNoPointersRegistered
1336+
value: 1
1337+
objectReference: {fileID: 0}
13081338
m_RemovedComponents: []
13091339
m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
13101340
m_IsPrefabParent: 0
@@ -1403,6 +1433,7 @@ MeshRenderer:
14031433
m_AutoUVMaxAngle: 89
14041434
m_LightmapParameters: {fileID: 0}
14051435
m_SortingLayerID: 0
1436+
m_SortingLayer: 0
14061437
m_SortingOrder: 0
14071438
--- !u!1 &1283525608
14081439
GameObject:
@@ -1665,6 +1696,7 @@ MonoBehaviour:
16651696
m_Script: {fileID: 11500000, guid: fb69de839bd015f4099b5bd2c45e53e5, type: 3}
16661697
m_Name:
16671698
m_EditorClassIdentifier:
1699+
UseUnscaledTime: 1
16681700
PositionPerSecond: 30
16691701
RotationDegreesPerSecond: 720
16701702
RotationSpeedScaler: 0
@@ -2226,7 +2258,7 @@ Canvas:
22262258
m_PrefabInternal: {fileID: 0}
22272259
m_GameObject: {fileID: 1850738765}
22282260
m_Enabled: 1
2229-
serializedVersion: 2
2261+
serializedVersion: 3
22302262
m_RenderMode: 2
22312263
m_Camera: {fileID: 0}
22322264
m_PlaneDistance: 100
@@ -2235,6 +2267,7 @@ Canvas:
22352267
m_OverrideSorting: 0
22362268
m_OverridePixelPerfect: 0
22372269
m_SortingBucketNormalizedSize: 0
2270+
m_AdditionalShaderChannelsFlag: 25
22382271
m_SortingLayerID: 0
22392272
m_SortingOrder: 0
22402273
m_TargetDisplay: 0
@@ -2249,6 +2282,7 @@ MonoBehaviour:
22492282
m_Script: {fileID: 11500000, guid: fb69de839bd015f4099b5bd2c45e53e5, type: 3}
22502283
m_Name:
22512284
m_EditorClassIdentifier:
2285+
UseUnscaledTime: 1
22522286
PositionPerSecond: 30
22532287
RotationDegreesPerSecond: 720
22542288
RotationSpeedScaler: 0
@@ -2473,7 +2507,7 @@ Light:
24732507
m_PrefabInternal: {fileID: 0}
24742508
m_GameObject: {fileID: 1991503800}
24752509
m_Enabled: 1
2476-
serializedVersion: 7
2510+
serializedVersion: 8
24772511
m_Type: 1
24782512
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
24792513
m_Intensity: 1
@@ -2498,6 +2532,8 @@ Light:
24982532
m_Lightmapping: 4
24992533
m_AreaSize: {x: 1, y: 1}
25002534
m_BounceIntensity: 1
2535+
m_ColorTemperature: 6570
2536+
m_UseColorTemperature: 0
25012537
m_ShadowRadius: 0
25022538
m_ShadowAngle: 0
25032539
--- !u!4 &1991503802
@@ -2506,7 +2542,7 @@ Transform:
25062542
m_PrefabParentObject: {fileID: 0}
25072543
m_PrefabInternal: {fileID: 0}
25082544
m_GameObject: {fileID: 1991503800}
2509-
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
2545+
m_LocalRotation: {x: 0.4082179, y: -0.23456971, z: 0.10938164, w: 0.8754262}
25102546
m_LocalPosition: {x: 0, y: 3, z: 0}
25112547
m_LocalScale: {x: 1, y: 1, z: 1}
25122548
m_Children: []

0 commit comments

Comments
 (0)