Skip to content

Commit 9c704ee

Browse files
author
Robert El-Soudani
committed
Turn off cursor-finding in sharingwithunet.unity, since it doesn't have a cursor
1 parent 3558e43 commit 9c704ee

File tree

1 file changed

+81
-42
lines changed

1 file changed

+81
-42
lines changed

Assets/HoloToolkit-Examples/SharingWithUNET/Scenes/sharingwithunet.unity

Lines changed: 81 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!29 &1
4-
SceneSettings:
4+
OcclusionCullingSettings:
55
m_ObjectHideFlags: 0
6-
m_PVSData: 120000d62e3da696d00400000000a041000000000000a0c10000a0c10000a0c10000a0410000a0410000a041200000005001000000000000010000006001000002000000d001000000000000000000000002000021000000a0010000020000000000000000000000000000000000000000000000000000000000000001000000b00100000000000090010000010000000100000001000000700100008001000010020000000000000000000000000000000000000000000000000000542032302e3020534f20352e3020534820302e323530204246203130302046203020435320302e30202d20332e332e3136204620302030204f4720300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000ffff7f7f0000000000000000000000000100000000000000000000000000000000000040000000000000000000000000000000000400000000000000000000000e000000000000000000000000000000000000000000000000000000ffff0000ffffffff000000000000000000000000ea509dc0e17a94be0cb53cc016afa240e17a94be7aa5e140cdccccbd8d97ee3e3333f33fcdcccc3dfa7e2a3f6666064000000000010000000000000000000000200200000000000000000000000000000000a0c10000a0c10000a0c10000a0410000a0410000a041e300000080020000a0020000020000009002000001b002000000a03e0400010050000000e00000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000ffff00000040008006000000060000000000000001000000000000000000000000000000ffffff3f008000800c0000000700000000000000010000000000000000000000ff7f0000ffff00000080ffff13000000070000000000000002000000000000000000000000000000ffffff7fffffffff000000a0ff3f0100ffff0000ff7f000000000060ff7f0200ff3f0000ffff0000ffffff9300000000ffff0000ff7f0000ffffff1300000000ff7f0000ff3f0000ffffff33ffff0000ff7f0000ff3f0000ffffff5300000000ff3f0000ffff000000000080ff3f0000ffff0000ff7f000000000060ff7f0200ff7fff3fffff0000000000a0ff7f0300ffff0000ff7f0000ffffff1300000000ff7f0000ff7fff3fffffff33ffff0000ff7f0000ff7fff3fffffff5300000000ff7fff3fffff000000000040ff7f0000ff3f0000ffff000000000040ff7f0100ff7fff3fffff0000000000a0ff7f0300ffff0000ffffff7fffffff9300000000ffff0000ffffff7fffffff1300000000ffffff7fff7f0000ffffff33ffff0000ffffff7fff7f0000ffffff73ffff0000ff7f0000ffff000000000080ff7f0100ffff0000ff7f000000000080ff7f0200ffff0000ffffff7fffffff1300000000ffff0000ffffff7fffffff33ffff0000ffff0000ffffff7fffffff5300000000ffffff7fffff0000ffffff73ffff0000ffffff7fffff0000ffffffb3ffff0000ffff0000ffff0000b63f00000000000000000000000000000000000000000000000000000000000013020000000000000000000000000000
7-
m_PVSObjectsArray:
8-
- {fileID: 0}
9-
- {fileID: 0}
10-
m_PVSPortalsArray: []
6+
serializedVersion: 2
117
m_OcclusionBakeSettings:
128
smallestOccluder: 5
139
smallestHole: 0.25
1410
backfaceThreshold: 100
11+
m_SceneGUID: 00000000000000000000000000000000
12+
m_OcclusionCullingData: {fileID: 0}
1513
--- !u!104 &2
1614
RenderSettings:
1715
m_ObjectHideFlags: 0
18-
serializedVersion: 7
16+
serializedVersion: 8
1917
m_Fog: 1
2018
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
2119
m_FogMode: 3
@@ -27,6 +25,7 @@ RenderSettings:
2725
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
2826
m_AmbientIntensity: 1
2927
m_AmbientMode: 0
28+
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
3029
m_SkyboxMaterial: {fileID: 0}
3130
m_HaloStrength: 0.5
3231
m_FlareStrength: 1
@@ -43,7 +42,7 @@ RenderSettings:
4342
--- !u!157 &3
4443
LightmapSettings:
4544
m_ObjectHideFlags: 0
46-
serializedVersion: 7
45+
serializedVersion: 9
4746
m_GIWorkflowMode: 1
4847
m_GISettings:
4948
serializedVersion: 2
@@ -55,7 +54,7 @@ LightmapSettings:
5554
m_EnableBakedLightmaps: 1
5655
m_EnableRealtimeLightmaps: 1
5756
m_LightmapEditorSettings:
58-
serializedVersion: 4
57+
serializedVersion: 8
5958
m_Resolution: 2
6059
m_BakeResolution: 40
6160
m_TextureWidth: 1024
@@ -68,40 +67,57 @@ LightmapSettings:
6867
m_LightmapParameters: {fileID: 0}
6968
m_LightmapsBakeMode: 1
7069
m_TextureCompression: 1
71-
m_DirectLightInLightProbes: 1
7270
m_FinalGather: 0
7371
m_FinalGatherFiltering: 1
7472
m_FinalGatherRayCount: 256
7573
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
7689
m_LightingDataAsset: {fileID: 112000001, guid: f7b6b724857b3584584b684aabfb6ff6,
7790
type: 2}
78-
m_RuntimeCPUUsage: 25
91+
m_ShadowMaskMode: 2
7992
--- !u!196 &4
8093
NavMeshSettings:
8194
serializedVersion: 2
8295
m_ObjectHideFlags: 0
8396
m_BuildSettings:
8497
serializedVersion: 2
98+
agentTypeID: 0
8599
agentRadius: 0.5
86100
agentHeight: 2
87101
agentSlope: 45
88102
agentClimb: 0.4
89103
ledgeDropHeight: 0
90104
maxJumpAcrossDistance: 0
91-
accuratePlacement: 0
92105
minRegionArea: 2
93-
cellSize: 0.16666667
94106
manualCellSize: 0
107+
cellSize: 0.16666667
108+
manualTileSize: 0
109+
tileSize: 256
110+
accuratePlacement: 0
95111
m_NavMeshData: {fileID: 0}
96112
--- !u!1 &543313553
97113
GameObject:
98114
m_ObjectHideFlags: 0
99115
m_PrefabParentObject: {fileID: 0}
100116
m_PrefabInternal: {fileID: 0}
101-
serializedVersion: 4
117+
serializedVersion: 5
102118
m_Component:
103-
- 4: {fileID: 543313555}
104-
- 108: {fileID: 543313554}
119+
- component: {fileID: 543313555}
120+
- component: {fileID: 543313554}
105121
m_Layer: 0
106122
m_Name: Directional Light
107123
m_TagString: Untagged
@@ -116,7 +132,7 @@ Light:
116132
m_PrefabInternal: {fileID: 0}
117133
m_GameObject: {fileID: 543313553}
118134
m_Enabled: 1
119-
serializedVersion: 7
135+
serializedVersion: 8
120136
m_Type: 1
121137
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
122138
m_Intensity: 1
@@ -141,6 +157,8 @@ Light:
141157
m_Lightmapping: 1
142158
m_AreaSize: {x: 1, y: 1}
143159
m_BounceIntensity: 1
160+
m_ColorTemperature: 6570
161+
m_UseColorTemperature: 0
144162
m_ShadowRadius: 0
145163
m_ShadowAngle: 0
146164
--- !u!4 &543313555
@@ -149,22 +167,22 @@ Transform:
149167
m_PrefabParentObject: {fileID: 0}
150168
m_PrefabInternal: {fileID: 0}
151169
m_GameObject: {fileID: 543313553}
152-
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
170+
m_LocalRotation: {x: 0.4082179, y: -0.23456971, z: 0.10938164, w: 0.8754262}
153171
m_LocalPosition: {x: 6.95, y: 1.61, z: 2.11}
154172
m_LocalScale: {x: 1, y: 1, z: 1}
155-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
156173
m_Children: []
157174
m_Father: {fileID: 0}
158175
m_RootOrder: 0
176+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
159177
--- !u!1 &942915099
160178
GameObject:
161179
m_ObjectHideFlags: 0
162180
m_PrefabParentObject: {fileID: 0}
163181
m_PrefabInternal: {fileID: 0}
164-
serializedVersion: 4
182+
serializedVersion: 5
165183
m_Component:
166-
- 4: {fileID: 942915100}
167-
- 114: {fileID: 942915101}
184+
- component: {fileID: 942915100}
185+
- component: {fileID: 942915101}
168186
m_Layer: 0
169187
m_Name: HologramCollection
170188
m_TagString: Untagged
@@ -181,11 +199,11 @@ Transform:
181199
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
182200
m_LocalPosition: {x: 0, y: 0, z: 0}
183201
m_LocalScale: {x: 1, y: 1, z: 1}
184-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
185202
m_Children:
186203
- {fileID: 1499115225}
187204
m_Father: {fileID: 0}
188205
m_RootOrder: 4
206+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
189207
--- !u!114 &942915101
190208
MonoBehaviour:
191209
m_ObjectHideFlags: 0
@@ -202,11 +220,11 @@ GameObject:
202220
m_ObjectHideFlags: 0
203221
m_PrefabParentObject: {fileID: 0}
204222
m_PrefabInternal: {fileID: 0}
205-
serializedVersion: 4
223+
serializedVersion: 5
206224
m_Component:
207-
- 4: {fileID: 987084766}
208-
- 114: {fileID: 987084768}
209-
- 114: {fileID: 987084769}
225+
- component: {fileID: 987084766}
226+
- component: {fileID: 987084768}
227+
- component: {fileID: 987084769}
210228
m_Layer: 0
211229
m_Name: Managers
212230
m_TagString: Untagged
@@ -223,11 +241,11 @@ Transform:
223241
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
224242
m_LocalPosition: {x: 0, y: 0, z: 0}
225243
m_LocalScale: {x: 1, y: 1, z: 1}
226-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
227244
m_Children:
228245
- {fileID: 1943070928}
229246
m_Father: {fileID: 0}
230247
m_RootOrder: 2
248+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
231249
--- !u!114 &987084768
232250
MonoBehaviour:
233251
m_ObjectHideFlags: 0
@@ -298,12 +316,12 @@ GameObject:
298316
m_ObjectHideFlags: 0
299317
m_PrefabParentObject: {fileID: 0}
300318
m_PrefabInternal: {fileID: 0}
301-
serializedVersion: 4
319+
serializedVersion: 5
302320
m_Component:
303-
- 4: {fileID: 1499115225}
304-
- 23: {fileID: 1499115227}
305-
- 102: {fileID: 1499115226}
306-
- 114: {fileID: 1499115228}
321+
- component: {fileID: 1499115225}
322+
- component: {fileID: 1499115227}
323+
- component: {fileID: 1499115226}
324+
- component: {fileID: 1499115228}
307325
m_Layer: 0
308326
m_Name: Shared Anchor Pos Text
309327
m_TagString: Untagged
@@ -320,10 +338,10 @@ Transform:
320338
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
321339
m_LocalPosition: {x: 0, y: 0, z: 0}
322340
m_LocalScale: {x: 0.005, y: 0.005, z: 0.005}
323-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
324341
m_Children: []
325342
m_Father: {fileID: 942915100}
326343
m_RootOrder: 0
344+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
327345
--- !u!102 &1499115226
328346
TextMesh:
329347
serializedVersion: 3
@@ -359,20 +377,23 @@ MeshRenderer:
359377
m_ReflectionProbeUsage: 1
360378
m_Materials:
361379
- {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
362-
m_SubsetIndices:
380+
m_StaticBatchInfo:
381+
firstSubMesh: 0
382+
subMeshCount: 0
363383
m_StaticBatchRoot: {fileID: 0}
364384
m_ProbeAnchor: {fileID: 0}
365385
m_LightProbeVolumeOverride: {fileID: 0}
366386
m_ScaleInLightmap: 1
367387
m_PreserveUVs: 0
368388
m_IgnoreNormalsForChartDetection: 0
369389
m_ImportantGI: 0
370-
m_SelectedWireframeHidden: 0
390+
m_SelectedEditorRenderState: 3
371391
m_MinimumChartSize: 4
372392
m_AutoUVMaxDistance: 0.5
373393
m_AutoUVMaxAngle: 89
374394
m_LightmapParameters: {fileID: 0}
375395
m_SortingLayerID: 0
396+
m_SortingLayer: 0
376397
m_SortingOrder: 0
377398
--- !u!114 &1499115228
378399
MonoBehaviour:
@@ -391,11 +412,11 @@ GameObject:
391412
m_ObjectHideFlags: 0
392413
m_PrefabParentObject: {fileID: 0}
393414
m_PrefabInternal: {fileID: 0}
394-
serializedVersion: 4
415+
serializedVersion: 5
395416
m_Component:
396-
- 4: {fileID: 1898807463}
397-
- 114: {fileID: 1898807461}
398-
- 114: {fileID: 1898807462}
417+
- component: {fileID: 1898807463}
418+
- component: {fileID: 1898807461}
419+
- component: {fileID: 1898807462}
399420
m_Layer: 0
400421
m_Name: UNETSharingStage
401422
m_TagString: Untagged
@@ -447,19 +468,32 @@ MonoBehaviour:
447468
m_OverflowDropThreshold: 5
448469
m_MaxConnectionAttempt: 10
449470
m_AckDelay: 33
471+
m_SendDelay: 10
450472
m_MaxCombinedReliableMessageSize: 100
451473
m_MaxCombinedReliableMessageCount: 10
452474
m_MaxSentMessageQueueSize: 128
453-
m_IsAcksLong: 0
475+
m_AcksType: 1
454476
m_UsePlatformSpecificProtocols: 0
477+
m_InitialBandwidth: 0
478+
m_BandwidthPeakFactor: 2
455479
m_WebSocketReceiveBufferMaxSize: 0
480+
m_UdpSocketReceiveBufferMaxSize: 0
481+
m_SSLCertFilePath:
482+
m_SSLPrivateKeyFilePath:
483+
m_SSLCAFilePath:
456484
m_Channels: []
457485
m_GlobalConfig:
458486
m_ThreadAwakeTimeout: 1
459487
m_ReactorModel: 0
460488
m_ReactorMaximumReceivedMessages: 1024
461489
m_ReactorMaximumSentMessages: 1024
462490
m_MaxPacketSize: 2000
491+
m_MaxHosts: 16
492+
m_ThreadPoolSize: 1
493+
m_MinTimerTimeout: 1
494+
m_MaxTimerTimeout: 12000
495+
m_MinNetSimulatorTimeout: 1
496+
m_MaxNetSimulatorTimeout: 12000
463497
m_Channels: 0500000000000000
464498
m_UseWebSockets: 0
465499
m_UseSimulator: 0
@@ -504,10 +538,10 @@ Transform:
504538
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
505539
m_LocalPosition: {x: 0, y: 0, z: 0}
506540
m_LocalScale: {x: 1, y: 1, z: 1}
507-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
508541
m_Children: []
509542
m_Father: {fileID: 0}
510543
m_RootOrder: 1
544+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
511545
--- !u!1001 &1943070927
512546
Prefab:
513547
m_ObjectHideFlags: 0
@@ -547,6 +581,11 @@ Prefab:
547581
propertyPath: m_RootOrder
548582
value: 0
549583
objectReference: {fileID: 0}
584+
- target: {fileID: 114742747811649402, guid: 3eddd1c29199313478dd3f912bfab2ab,
585+
type: 2}
586+
propertyPath: SearchForCursorIfUnset
587+
value: 0
588+
objectReference: {fileID: 0}
550589
m_RemovedComponents: []
551590
m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
552591
m_IsPrefabParent: 0

0 commit comments

Comments
 (0)