charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added comments for OnRebuildObservers return value and adjusted NetworkProximityChecker to make this less weird.

Browse Source
This commit is contained in:
vis2k 2018-10-09 10:56:31 +02:00
parent 3f9a423258
commit 277f18280e
2 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mirror/Runtime/NetworkBehaviour.cs
View File

@ -571,6 +571,8 @@ public virtual void OnStopAuthority()
{
}
// return true when overwriting so that Mirror knows that we wanted to
// rebuild observers ourselves. otherwise it uses built in rebuild.
public virtual bool OnRebuildObservers(HashSet<NetworkConnection> observers, bool initialize)
{
return false;

64
Mirror/Runtime/NetworkProximityChecker.cs
View File

@ -58,6 +58,7 @@ public override bool OnCheckObserver(NetworkConnection newObserver)
public override bool OnRebuildObservers(HashSet<NetworkConnection> observers, bool initial)
{
// only add self as observer if force hidden
if (forceHidden)
{
// ensure player can still see themself
@ -66,49 +67,54 @@ public override bool OnRebuildObservers(HashSet<NetworkConnection> observers, bo
{
observers.Add(uv.connectionToClient);
}
return true;
}
// find players within range
switch (checkMethod)
// otherwise add everyone in proximity
else
{
case CheckMethod.Physics3D:
// find players within range
switch (checkMethod)
{
Collider[] hits = Physics.OverlapSphere(transform.position, visRange, castLayers);
for (int i = 0; i < hits.Length; i++)
case CheckMethod.Physics3D:
{
Collider hit = hits[i];
// collider might be on pelvis, often the NetworkIdentity is in a parent
// (looks in the object itself and then parents)
NetworkIdentity uv = hit.GetComponentInParent<NetworkIdentity>();
// (if an object has a connectionToClient, it is a player)
if (uv != null && uv.connectionToClient != null)
Collider[] hits = Physics.OverlapSphere(transform.position, visRange, castLayers);
for (int i = 0; i < hits.Length; i++)
{
observers.Add(uv.connectionToClient);
Collider hit = hits[i];
// collider might be on pelvis, often the NetworkIdentity is in a parent
// (looks in the object itself and then parents)
NetworkIdentity uv = hit.GetComponentInParent<NetworkIdentity>();
// (if an object has a connectionToClient, it is a player)
if (uv != null && uv.connectionToClient != null)
{
observers.Add(uv.connectionToClient);
}
}
break;
}
return true;
}
case CheckMethod.Physics2D:
{
Collider2D[] hits = Physics2D.OverlapCircleAll(transform.position, visRange, castLayers);
for (int i = 0; i < hits.Length; i++)
case CheckMethod.Physics2D:
{
Collider2D hit = hits[i];
// collider might be on pelvis, often the NetworkIdentity is in a parent
// (looks in the object itself and then parents)
NetworkIdentity uv = hit.GetComponentInParent<NetworkIdentity>();
// (if an object has a connectionToClient, it is a player)
if (uv != null && uv.connectionToClient != null)
Collider2D[] hits = Physics2D.OverlapCircleAll(transform.position, visRange, castLayers);
for (int i = 0; i < hits.Length; i++)
{
observers.Add(uv.connectionToClient);
Collider2D hit = hits[i];
// collider might be on pelvis, often the NetworkIdentity is in a parent
// (looks in the object itself and then parents)
NetworkIdentity uv = hit.GetComponentInParent<NetworkIdentity>();
// (if an object has a connectionToClient, it is a player)
if (uv != null && uv.connectionToClient != null)
{
observers.Add(uv.connectionToClient);
}
}
break;
}
return true;
}
}
return false;
// always return true when overwriting OnRebuildObservers so that
// Mirror knows not to use the built in rebuild method.
return true;
}
// called hiding and showing objects on the host