Skip to content

Commit 32cd616

Browse files
StephenHodgsonStephenHodgson
committed
Some Updates to the AutoJoinSessionAndRoom and Sharing Test scene
1 parent 59d9089 commit 32cd616

File tree

2 files changed

+262
-3
lines changed

2 files changed

+262
-3
lines changed

‎Assets/HoloToolkit-Tests/Sharing/Scenes/SharingTest.unity‎

Lines changed: 253 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,8 @@ Transform:
255255
m_LocalScale: {x: 1, y: 1, z: 1}
256256
m_Children:
257257
- {fileID: 1076342369}
258+
- {fileID: 2130965246}
259+
- {fileID: 1406705845}
258260
m_Father: {fileID: 0}
259261
m_RootOrder: 1
260262
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -348,6 +350,106 @@ MonoBehaviour:
348350
SmoothPositionLerpRatio: 0.5
349351
SmoothRotationLerpRatio: 0.5
350352
SmoothScaleLerpRatio: 0.5
353+
--- !u!1001 &668407913
354+
Prefab:
355+
m_ObjectHideFlags: 0
356+
serializedVersion: 2
357+
m_Modification:
358+
m_TransformParent: {fileID: 0}
359+
m_Modifications:
360+
- target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
361+
type: 2}
362+
propertyPath: m_LocalPosition.x
363+
value: 0
364+
objectReference: {fileID: 0}
365+
- target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
366+
type: 2}
367+
propertyPath: m_LocalPosition.y
368+
value: 0
369+
objectReference: {fileID: 0}
370+
- target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
371+
type: 2}
372+
propertyPath: m_LocalPosition.z
373+
value: 1.5
374+
objectReference: {fileID: 0}
375+
- target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
376+
type: 2}
377+
propertyPath: m_LocalRotation.x
378+
value: -0
379+
objectReference: {fileID: 0}
380+
- target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
381+
type: 2}
382+
propertyPath: m_LocalRotation.y
383+
value: -0
384+
objectReference: {fileID: 0}
385+
- target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
386+
type: 2}
387+
propertyPath: m_LocalRotation.z
388+
value: -0
389+
objectReference: {fileID: 0}
390+
- target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
391+
type: 2}
392+
propertyPath: m_LocalRotation.w
393+
value: 1
394+
objectReference: {fileID: 0}
395+
- target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
396+
type: 2}
397+
propertyPath: m_RootOrder
398+
value: 5
399+
objectReference: {fileID: 0}
400+
- target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
401+
type: 2}
402+
propertyPath: m_AnchoredPosition.x
403+
value: 0
404+
objectReference: {fileID: 0}
405+
- target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
406+
type: 2}
407+
propertyPath: m_AnchoredPosition.y
408+
value: 0
409+
objectReference: {fileID: 0}
410+
- target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
411+
type: 2}
412+
propertyPath: m_SizeDelta.x
413+
value: 320
414+
objectReference: {fileID: 0}
415+
- target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
416+
type: 2}
417+
propertyPath: m_SizeDelta.y
418+
value: 320
419+
objectReference: {fileID: 0}
420+
- target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
421+
type: 2}
422+
propertyPath: m_AnchorMin.x
423+
value: 0
424+
objectReference: {fileID: 0}
425+
- target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
426+
type: 2}
427+
propertyPath: m_AnchorMin.y
428+
value: 0
429+
objectReference: {fileID: 0}
430+
- target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
431+
type: 2}
432+
propertyPath: m_AnchorMax.x
433+
value: 0
434+
objectReference: {fileID: 0}
435+
- target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
436+
type: 2}
437+
propertyPath: m_AnchorMax.y
438+
value: 0
439+
objectReference: {fileID: 0}
440+
- target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
441+
type: 2}
442+
propertyPath: m_Pivot.x
443+
value: 0.5
444+
objectReference: {fileID: 0}
445+
- target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
446+
type: 2}
447+
propertyPath: m_Pivot.y
448+
value: 0.5
449+
objectReference: {fileID: 0}
450+
m_RemovedComponents: []
451+
m_ParentPrefab: {fileID: 100100000, guid: 9a2f56337670a294baaf9bba300b1c1c, type: 2}
452+
m_IsPrefabParent: 0
351453
--- !u!4 &685058485 stripped
352454
Transform:
353455
m_PrefabParentObject: {fileID: 4602009831510650, guid: b0fe7085cd74d354ebbbe62b0177cfeb,
@@ -435,10 +537,114 @@ MonoBehaviour:
435537
m_Script: {fileID: 11500000, guid: 9236b45f60c55874b93c630faf4d45b9, type: 3}
436538
m_Name:
437539
m_EditorClassIdentifier:
540+
--- !u!1001 &1037168511
541+
Prefab:
542+
m_ObjectHideFlags: 0
543+
serializedVersion: 2
544+
m_Modification:
545+
m_TransformParent: {fileID: 0}
546+
m_Modifications:
547+
- target: {fileID: 4000011792100794, guid: a611e772ef8ddf64d8106a9cbb70f31c, type: 2}
548+
propertyPath: m_LocalPosition.x
549+
value: 0
550+
objectReference: {fileID: 0}
551+
- target: {fileID: 4000011792100794, guid: a611e772ef8ddf64d8106a9cbb70f31c, type: 2}
552+
propertyPath: m_LocalPosition.y
553+
value: 0
554+
objectReference: {fileID: 0}
555+
- target: {fileID: 4000011792100794, guid: a611e772ef8ddf64d8106a9cbb70f31c, type: 2}
556+
propertyPath: m_LocalPosition.z
557+
value: 0
558+
objectReference: {fileID: 0}
559+
- target: {fileID: 4000011792100794, guid: a611e772ef8ddf64d8106a9cbb70f31c, type: 2}
560+
propertyPath: m_LocalRotation.x
561+
value: 0
562+
objectReference: {fileID: 0}
563+
- target: {fileID: 4000011792100794, guid: a611e772ef8ddf64d8106a9cbb70f31c, type: 2}
564+
propertyPath: m_LocalRotation.y
565+
value: 0
566+
objectReference: {fileID: 0}
567+
- target: {fileID: 4000011792100794, guid: a611e772ef8ddf64d8106a9cbb70f31c, type: 2}
568+
propertyPath: m_LocalRotation.z
569+
value: 0
570+
objectReference: {fileID: 0}
571+
- target: {fileID: 4000011792100794, guid: a611e772ef8ddf64d8106a9cbb70f31c, type: 2}
572+
propertyPath: m_LocalRotation.w
573+
value: 1
574+
objectReference: {fileID: 0}
575+
- target: {fileID: 4000011792100794, guid: a611e772ef8ddf64d8106a9cbb70f31c, type: 2}
576+
propertyPath: m_RootOrder
577+
value: 4
578+
objectReference: {fileID: 0}
579+
m_RemovedComponents: []
580+
m_ParentPrefab: {fileID: 100100000, guid: a611e772ef8ddf64d8106a9cbb70f31c, type: 2}
581+
m_IsPrefabParent: 0
438582
--- !u!4 &1076342369 stripped
439583
Transform:
440584
m_PrefabParentObject: {fileID: 475158, guid: 8aaf37823b26ee449bb3b3d7775965c3, type: 2}
441585
m_PrefabInternal: {fileID: 1703234099}
586+
--- !u!1 &1406705844
587+
GameObject:
588+
m_ObjectHideFlags: 0
589+
m_PrefabParentObject: {fileID: 0}
590+
m_PrefabInternal: {fileID: 0}
591+
serializedVersion: 5
592+
m_Component:
593+
- component: {fileID: 1406705845}
594+
- component: {fileID: 1406705847}
595+
- component: {fileID: 1406705846}
596+
m_Layer: 0
597+
m_Name: EventSystem
598+
m_TagString: Untagged
599+
m_Icon: {fileID: 0}
600+
m_NavMeshLayer: 0
601+
m_StaticEditorFlags: 0
602+
m_IsActive: 1
603+
--- !u!4 &1406705845
604+
Transform:
605+
m_ObjectHideFlags: 0
606+
m_PrefabParentObject: {fileID: 0}
607+
m_PrefabInternal: {fileID: 0}
608+
m_GameObject: {fileID: 1406705844}
609+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
610+
m_LocalPosition: {x: 0, y: 0, z: 0}
611+
m_LocalScale: {x: 1, y: 1, z: 1}
612+
m_Children: []
613+
m_Father: {fileID: 569724391}
614+
m_RootOrder: 2
615+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
616+
--- !u!114 &1406705846
617+
MonoBehaviour:
618+
m_ObjectHideFlags: 0
619+
m_PrefabParentObject: {fileID: 0}
620+
m_PrefabInternal: {fileID: 0}
621+
m_GameObject: {fileID: 1406705844}
622+
m_Enabled: 1
623+
m_EditorHideFlags: 0
624+
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
625+
m_Name:
626+
m_EditorClassIdentifier:
627+
m_HorizontalAxis: Horizontal
628+
m_VerticalAxis: Vertical
629+
m_SubmitButton: Submit
630+
m_CancelButton: Cancel
631+
m_InputActionsPerSecond: 10
632+
m_RepeatDelay: 0.5
633+
m_ForceModuleActive: 0
634+
--- !u!114 &1406705847
635+
MonoBehaviour:
636+
m_ObjectHideFlags: 0
637+
m_PrefabParentObject: {fileID: 0}
638+
m_PrefabInternal: {fileID: 0}
639+
m_GameObject: {fileID: 1406705844}
640+
m_Enabled: 1
641+
m_EditorHideFlags: 0
642+
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
643+
m_Name:
644+
m_EditorClassIdentifier:
645+
m_FirstSelected: {fileID: 0}
646+
m_sendNavigationEvents: 1
647+
m_DragThreshold: 5
442648
--- !u!1001 &1703234099
443649
Prefab:
444650
m_ObjectHideFlags: 0
@@ -486,3 +692,50 @@ Prefab:
486692
m_RemovedComponents: []
487693
m_ParentPrefab: {fileID: 100100000, guid: 8aaf37823b26ee449bb3b3d7775965c3, type: 2}
488694
m_IsPrefabParent: 0
695+
--- !u!1001 &2130965245
696+
Prefab:
697+
m_ObjectHideFlags: 0
698+
serializedVersion: 2
699+
m_Modification:
700+
m_TransformParent: {fileID: 569724391}
701+
m_Modifications:
702+
- target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
703+
propertyPath: m_LocalPosition.x
704+
value: 0
705+
objectReference: {fileID: 0}
706+
- target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
707+
propertyPath: m_LocalPosition.y
708+
value: 0
709+
objectReference: {fileID: 0}
710+
- target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
711+
propertyPath: m_LocalPosition.z
712+
value: 0
713+
objectReference: {fileID: 0}
714+
- target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
715+
propertyPath: m_LocalRotation.x
716+
value: 0
717+
objectReference: {fileID: 0}
718+
- target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
719+
propertyPath: m_LocalRotation.y
720+
value: 0
721+
objectReference: {fileID: 0}
722+
- target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
723+
propertyPath: m_LocalRotation.z
724+
value: 0
725+
objectReference: {fileID: 0}
726+
- target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
727+
propertyPath: m_LocalRotation.w
728+
value: 1
729+
objectReference: {fileID: 0}
730+
- target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
731+
propertyPath: m_RootOrder
732+
value: 1
733+
objectReference: {fileID: 0}
734+
m_RemovedComponents: []
735+
m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
736+
m_IsPrefabParent: 0
737+
--- !u!4 &2130965246 stripped
738+
Transform:
739+
m_PrefabParentObject: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab,
740+
type: 2}
741+
m_PrefabInternal: {fileID: 2130965245}

‎Assets/HoloToolkit/Sharing/Scripts/Utilities/AutoJoinSessionAndRoom.cs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,11 @@ private void Start()
6464

6565
protected override void OnDestroy()
6666
{
67-
SharingStage.Instance.SharingManagerConnected -= Connected;
68-
SharingStage.Instance.SharingManagerDisconnected -= Disconnected;
67+
if (SharingStage.Instance != null)
68+
{
69+
SharingStage.Instance.SharingManagerConnected -= Connected;
70+
SharingStage.Instance.SharingManagerDisconnected -= Disconnected;
71+
}
6972

7073
if (autoConnect != null)
7174
{
@@ -82,6 +85,7 @@ protected override void OnDestroy()
8285
/// <param name="e">Events Arguments.</param>
8386
private void Connected(object sender = null, EventArgs e = null)
8487
{
88+
StopCoroutine(autoConnect);
8589
SharingStage.Instance.SharingManagerConnected -= Connected;
8690
SharingStage.Instance.SharingManagerDisconnected += Disconnected;
8791
}
@@ -93,17 +97,19 @@ private void Connected(object sender = null, EventArgs e = null)
9397
/// <param name="e">Events Arguments.</param>
9498
private void Disconnected(object sender = null, EventArgs e = null)
9599
{
100+
Debug.LogError("[AutoJoinSession] Disconnected!");
96101
SharingStage.Instance.SharingManagerDisconnected -= Disconnected;
97102
SharingStage.Instance.SharingManagerConnected += Connected;
98103

99-
if (SharingStage.Instance.ClientRole == ClientRole.Primary && autoConnect == null)
104+
if (SharingStage.Instance.ClientRole == ClientRole.Primary)
100105
{
101106
autoConnect = StartCoroutine(AutoConnect());
102107
}
103108
}
104109

105110
private IEnumerator AutoConnect()
106111
{
112+
Debug.LogWarning("[AutoJoinSession] Attempting to connect...");
107113
if (SharingStage.Instance.SessionsTracker == null)
108114
{
109115
if (SharingStage.Instance.ShowDetailedLogs)

0 commit comments

Comments
 (0)