diff --git a/Assets/SpeckleExamples.cs b/Assets/SpeckleExamples.cs index 533e5b9..3f4edd7 100644 --- a/Assets/SpeckleExamples.cs +++ b/Assets/SpeckleExamples.cs @@ -16,12 +16,12 @@ namespace Speckle.ConnectorUnity public Button AddReceiverBtn; public Toggle AutoReceiveToggle; public Button AddSenderBtn; - public GameObject StreamPrefab; + public GameObject StreamPanel; public Canvas StreamsCanvas; private List StreamList = null; private Stream SelectedStream = null; - private List StreamPrefabs = new List(); + private List StreamPanels = new List(); async void Start() { @@ -84,46 +84,46 @@ namespace Speckle.ConnectorUnity var autoReceive = AutoReceiveToggle.isOn; var stream = await Streams.Get(SelectedStream.id, 10); - var streamPrefab = Instantiate(StreamPrefab, new Vector3(0, 0, 0), + var streamPrefab = Instantiate(StreamPanel, new Vector3(0, 0, 0), Quaternion.identity); //set position streamPrefab.transform.SetParent(StreamsCanvas.transform); var rt = streamPrefab.GetComponent(); - rt.anchoredPosition = new Vector3(-10, -110 - StreamPrefabs.Count * 110, 0); + rt.anchoredPosition = new Vector3(-10, -110 - StreamPanels.Count * 110, 0); streamPrefab.AddComponent().InitReceiver(stream, autoReceive); - StreamPrefabs.Add(streamPrefab); + StreamPanels.Add(streamPrefab); } private async void AddSender() { var stream = await Streams.Get(SelectedStream.id, 10); - var streamPrefab = Instantiate(StreamPrefab, new Vector3(0, 0, 0), + var streamPrefab = Instantiate(StreamPanel, new Vector3(0, 0, 0), Quaternion.identity); streamPrefab.transform.SetParent(StreamsCanvas.transform); var rt = streamPrefab.GetComponent(); - rt.anchoredPosition = new Vector3(-10, -110 - StreamPrefabs.Count * 110, 0); + rt.anchoredPosition = new Vector3(-10, -110 - StreamPanels.Count * 110, 0); streamPrefab.AddComponent().InitSender(stream); - StreamPrefabs.Add(streamPrefab); + StreamPanels.Add(streamPrefab); } public void RemoveStreamPrefab(GameObject streamPrefab) { - StreamPrefabs.RemoveAt(StreamPrefabs.FindIndex(x => x.name == streamPrefab.name)); + StreamPanels.RemoveAt(StreamPanels.FindIndex(x => x.name == streamPrefab.name)); ReorderStreamPrefabs(); } private void ReorderStreamPrefabs() { - for (var i = 0; i < StreamPrefabs.Count; i++) + for (var i = 0; i < StreamPanels.Count; i++) { - var rt = StreamPrefabs[i].GetComponent(); + var rt = StreamPanels[i].GetComponent(); rt.anchoredPosition = new Vector3(-10, -110 - i * 110, 0); } } diff --git a/Assets/SpecklePlayground.unity b/Assets/SpecklePlayground.unity index 8e8d107..ecd6a89 100644 --- a/Assets/SpecklePlayground.unity +++ b/Assets/SpecklePlayground.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 869165414} - m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -4821,9 +4821,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2060322467} - - component: {fileID: 2060322466} - component: {fileID: 2060322468} - - component: {fileID: 2060322469} + - component: {fileID: 2060322466} m_Layer: 0 m_Name: EditorReceiver m_TagString: Untagged @@ -4840,7 +4839,7 @@ MonoBehaviour: m_GameObject: {fileID: 2060322465} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ff01a67f68be18c4084a664ad1fd2f2a, type: 3} + m_Script: {fileID: 11500000, guid: ecc776084f7b46bfbf6d1f3b4f4d68c4, type: 3} m_Name: m_EditorClassIdentifier: --- !u!4 &2060322467 @@ -4866,27 +4865,15 @@ MonoBehaviour: m_GameObject: {fileID: 2060322465} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 23c4419ba13bf1f4fbde5fa524400b07, type: 3} + m_Script: {fileID: 11500000, guid: ff01a67f68be18c4084a664ad1fd2f2a, type: 3} m_Name: m_EditorClassIdentifier: - SelectedAccountIndex: 0 - SelectedStreamIndex: 7 - SelectedBranchIndex: 1 + SelectedAccountIndex: 2 + SelectedStreamIndex: 0 + SelectedBranchIndex: 0 SelectedCommitIndex: 0 - OldSelectedAccountIndex: 0 - OldSelectedStreamIndex: 7 ---- !u!114 &2060322469 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2060322465} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b2d07ac05ae47bd41ae4c5ed2e43d333, type: 3} - m_Name: - m_EditorClassIdentifier: + OldSelectedAccountIndex: 2 + OldSelectedStreamIndex: 0 --- !u!1 &2066864134 GameObject: m_ObjectHideFlags: 0 @@ -5046,7 +5033,7 @@ MonoBehaviour: m_GameObject: {fileID: 2068176107} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4742105c6b43d644089e28f1952fc7dc, type: 3} + m_Script: {fileID: 11500000, guid: b92189c3e4c187945ae253704dce9797, type: 3} m_Name: m_EditorClassIdentifier: scrollSpeed: 10 @@ -5091,7 +5078,7 @@ MonoBehaviour: AddReceiverBtn: {fileID: 1707872732} AutoReceiveToggle: {fileID: 1587881870} AddSenderBtn: {fileID: 1279250014} - StreamPrefab: {fileID: 4459616723848542877, guid: 0df621c241cd10345a0013b35a425559, type: 3} + StreamPanel: {fileID: 4459616723848542877, guid: 56efeb256feb62a4f9822d61f43c9abf, type: 3} StreamsCanvas: {fileID: 448199411} --- !u!4 &2071474493 Transform: