Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Editor/Scripts/PropertyDrawer/PropertyDrawerLink.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace OC.Editor
{
[CustomPropertyDrawer(typeof(Link))]
[CustomPropertyDrawer(typeof(Link), true)]
public class PropertyDrawerLink : PropertyDrawer
{
public override VisualElement CreatePropertyGUI(SerializedProperty property)
Expand Down
47 changes: 29 additions & 18 deletions Runtime/Scripts/Communication/Client/Client.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ public abstract class Client : MonoBehaviour, IClient, IConfigAsset, IAfterFixed

public float TimeScale
{
get => _connector.TimeScale;
set => _connector.TimeScale = value;
get => _link.TimeScale;
set => _link.TimeScale = value;
}

[SerializeField]
Expand All @@ -31,10 +31,7 @@ public float TimeScale

[HideInInspector]
[SerializeField]
private Link _link;
[HideInInspector]
[SerializeField]
private ConnectorClient _connector;
private LinkDataSystem _link;

private List<Link> _links;

Expand All @@ -54,20 +51,27 @@ protected void OnDisable()

protected void Start()
{
_link = new Link(this, "fbSystem", $"{_rootName}.fbSystem");
_connector = new ConnectorClient(_link)
{
TimeScale = Time.timeScale
};
_link.TimeScale = Time.timeScale;

_links = new List<Link> { _link };

foreach (var component in GetComponentsInChildren<IConnectable>())
foreach (var component in GetComponentsInChildren<ILink>())
{
if (!component.Link.Enable) continue;
_links.Add(component.Link);
}
}

private void Reset()
{
_link = new LinkDataSystem
{
Name = "fbSystem",
Path = $"{_rootName}.fbSystem",
Component = this,
TimeScale = Time.timeScale
};
}

public virtual void BeforeFixedUpdate()
{
Expand All @@ -92,16 +96,23 @@ public virtual void AfterFixedUpdate()
public abstract void Connect();
public abstract void Disconnect();

private bool TryFindVariable(ClientVariableDescription discription, Object target, out ClientVariable variable)
public ClientVariable GetClientVariable(ClientVariableDescription description)
{
return description.Direction == ClientVariableDirection.Input ?
Buffer.InputVariables.Find(x => x.Name == description.Name) :
Buffer.OutputVariables.Find(x => x.Name == description.Name);
}

private bool TryFindVariable(ClientVariableDescription description, Object target, out ClientVariable variable)
{
try
{
var adsVariable = discription.Direction == ClientVariableDirection.Input ?
Buffer.InputVariables.Find(x => x.Name == discription.Name) :
Buffer.OutputVariables.Find(x => x.Name == discription.Name);
var adsVariable = description.Direction == ClientVariableDirection.Input ?
Buffer.InputVariables.Find(x => x.Name == description.Name) :
Buffer.OutputVariables.Find(x => x.Name == description.Name);

variable = adsVariable ?? throw new Exception($"{discription.Name} can't be found in client!");
if (variable.Reserved) throw new Exception($"{discription.Name} already reserved!");
variable = adsVariable ?? throw new Exception($"{description.Name} can't be found in client!");
if (variable.Reserved) throw new Exception($"{description.Name} already reserved!");
variable.Reserved = true;
return true;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
using System;

namespace OC.Communication
{
[Serializable]
public struct ClientVariableDescription
{
public string Name;
Expand Down
32 changes: 0 additions & 32 deletions Runtime/Scripts/Communication/Client/ConnectorClient.cs

This file was deleted.

3 changes: 0 additions & 3 deletions Runtime/Scripts/Communication/Client/ConnectorClient.cs.meta

This file was deleted.

3 changes: 0 additions & 3 deletions Runtime/Scripts/Communication/Connector.meta

This file was deleted.

49 changes: 0 additions & 49 deletions Runtime/Scripts/Communication/Connector/Connector.cs

This file was deleted.

3 changes: 0 additions & 3 deletions Runtime/Scripts/Communication/Connector/Connector.cs.meta

This file was deleted.

33 changes: 0 additions & 33 deletions Runtime/Scripts/Communication/Connector/ConnectorDataByte.cs

This file was deleted.

11 changes: 0 additions & 11 deletions Runtime/Scripts/Communication/Connector/ConnectorDataByte.cs.meta

This file was deleted.

33 changes: 0 additions & 33 deletions Runtime/Scripts/Communication/Connector/ConnectorDataDWord.cs

This file was deleted.

11 changes: 0 additions & 11 deletions Runtime/Scripts/Communication/Connector/ConnectorDataDWord.cs.meta

This file was deleted.

33 changes: 0 additions & 33 deletions Runtime/Scripts/Communication/Connector/ConnectorDataFloat.cs

This file was deleted.

11 changes: 0 additions & 11 deletions Runtime/Scripts/Communication/Connector/ConnectorDataFloat.cs.meta

This file was deleted.

33 changes: 0 additions & 33 deletions Runtime/Scripts/Communication/Connector/ConnectorDataLWord.cs

This file was deleted.

11 changes: 0 additions & 11 deletions Runtime/Scripts/Communication/Connector/ConnectorDataLWord.cs.meta

This file was deleted.

Loading