Skip to content
This repository has been archived by the owner on Dec 20, 2022. It is now read-only.

Changes for Mirror 66.0.9 #3

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Changes for Mirror 66.0.9 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions MirrorOculusP2P/OculusClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ private void OnConnectionStatusChanged(Message<NetworkingPeer> message)

break;
case PeerConnectionState.Timeout:
Net.Connect(message.Data.ID);
break;
case PeerConnectionState.Closed:
InternalDisconnect();
Expand Down
10 changes: 5 additions & 5 deletions MirrorOculusP2P/OculusCommon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ protected bool SendPacket(ulong userId, byte[] data, int channelId)
{
switch (channelId)
{
case Channels.DefaultReliable:
case Channels.Reliable:
return Net.SendPacket(userId, data, SendPolicy.Reliable);
case Channels.DefaultUnreliable:
case Channels.Unreliable:
return Net.SendPacket(userId, data, SendPolicy.Unreliable);
default:
OculusLogError("Unknown send policy. Defaulting to reliable.");
Expand All @@ -39,13 +39,13 @@ protected bool SendPacket(ulong userId, byte[] data, int channelId)
switch (packet.Policy)
{
case SendPolicy.Unreliable:
channel = Channels.DefaultUnreliable;
channel = Channels.Unreliable;
break;
case SendPolicy.Reliable:
channel = Channels.DefaultReliable;
channel = Channels.Reliable;
break;
default:
channel = Channels.DefaultReliable;
channel = Channels.Reliable;
OculusLogWarning("Unknown packet policy, defaulting to reliable");
break;
}
Expand Down
4 changes: 4 additions & 0 deletions MirrorOculusP2P/OculusServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,14 @@ private void OnPeerConnectRequest(Message<NetworkingPeer> message)
Net.Accept(oculusId);
}
}

Net.Accept(oculusId);
}

private void OnConnectionStatusChanged(Message<NetworkingPeer> message)
{
var oculusId = message.Data.ID;

switch (message.Data.State)
{
case PeerConnectionState.Unknown:
Expand All @@ -78,6 +81,7 @@ private void OnConnectionStatusChanged(Message<NetworkingPeer> message)

break;
case PeerConnectionState.Timeout:
Net.Connect(oculusId);
break;
case PeerConnectionState.Closed:
if (_oculusIDToMirrorID.TryGetValue(oculusId, out int connId))
Expand Down
19 changes: 11 additions & 8 deletions MirrorOculusP2P/OculusTransport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public override void ClientConnect(string address)
return;
}

if (!ClientActive() || client.Error)
if (client == null && (!ClientActive() || client.Error))
{
Debug.Log($"Starting client [Oculus], target address {address}.");
client = OculusClient.CreateClient(this, address);
Expand All @@ -56,7 +56,7 @@ public override void ClientConnect(string address)
}
}

public override void ClientSend(int channelId, ArraySegment<byte> segment)
public override void ClientSend(ArraySegment<byte> segment, int channelId)
{
byte[] data = new byte[segment.Count];
Array.Copy(segment.Array, segment.Offset, data, 0, segment.Count);
Expand Down Expand Up @@ -104,10 +104,11 @@ public override void ServerStart()

public override Uri ServerUri()
{
return new Uri(_user.ID.ToString());
return new Uri(_user.ID.ToString
());
}

public override void ServerSend(int connectionId, int channelId, ArraySegment<byte> segment)
public override void ServerSend(int connectionId, ArraySegment<byte> segment, int channelId)
{
if (ServerActive())
{
Expand All @@ -117,8 +118,10 @@ public override void ServerSend(int connectionId, int channelId, ArraySegment<by
}
}

public override bool ServerDisconnect(int connectionId) => ServerActive() && server.Disconnect(connectionId);

//public override bool ServerDisconnect(int connectionId) => ServerActive() && server.Disconnect(connectionId);
public override void ServerDisconnect(int connectionId) => server.Disconnect(connectionId);


public override string ServerGetClientAddress(int connectionId) => ServerActive() ? server.ServerGetClientAddress(connectionId) : string.Empty;

public override void ServerStop()
Expand Down Expand Up @@ -150,9 +153,9 @@ public override int GetMaxPacketSize(int channelId)
{
switch (channelId)
{
case Mirror.Channels.DefaultReliable:
case Mirror.Channels.Reliable:
return OculusCommon.ReliableMaxMessageSize;
case Mirror.Channels.DefaultUnreliable:
case Mirror.Channels.Unreliable:
return OculusCommon.UnreliableMaxMessageSize;
default:
OculusLogWarning("Unknown channel");
Expand Down