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

fix(Prediction): when copying child Colliders, copy their relative position/rotation/scale too

Browse Source
This commit is contained in:
mischa 2024-01-24 12:47:42 +01:00
parent a26d5f0e60
commit 3c3c5c56fd
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Assets/Mirror/Components/PredictedRigidbody/PredictedRigidbody.cs
View File

@ -118,6 +118,24 @@ protected static void MoveRigidbody(GameObject source, GameObject destination)
Destroy(original); Destroy(original);
} }
// helper function: if a collider is on a child, copy that child first.
// this way child's relative position/rotation/scale are preserved.
protected static GameObject CopyRelativeTransform(GameObject source, Transform sourceChild, GameObject destination)
{
// is this on the source root? then we want to put it on the destination root.
if (sourceChild == source.transform) return destination;
// is this on a child? then create the same child with the same transform on destination.
// note this is technically only correct for the immediate child since
// .localPosition is relative to parent, but this is good enough.
GameObject child = new GameObject(sourceChild.name);
child.transform.SetParent(destination.transform, true);
child.transform.localPosition = sourceChild.localPosition;
child.transform.localRotation = sourceChild.localRotation;
child.transform.localScale = sourceChild.localScale;
return child;
}
// move all BoxColliders + settings from one GameObject to another. // move all BoxColliders + settings from one GameObject to another.
protected static void MoveBoxColliders(GameObject source, GameObject destination) protected static void MoveBoxColliders(GameObject source, GameObject destination)
{ {
@ -125,7 +143,11 @@ protected static void MoveBoxColliders(GameObject source, GameObject destination
BoxCollider[] sourceColliders = source.GetComponentsInChildren<BoxCollider>(); BoxCollider[] sourceColliders = source.GetComponentsInChildren<BoxCollider>();
foreach (BoxCollider sourceCollider in sourceColliders) foreach (BoxCollider sourceCollider in sourceColliders)
{ {
BoxCollider colliderCopy = destination.AddComponent<BoxCollider>(); // copy the relative transform:
// if collider is on root, it returns destination root.
// if collider is on a child, it creates and returns a child on destination.
GameObject target = CopyRelativeTransform(source, sourceCollider.transform, destination);
BoxCollider colliderCopy = target.AddComponent<BoxCollider>();
colliderCopy.center = sourceCollider.center; colliderCopy.center = sourceCollider.center;
colliderCopy.size = sourceCollider.size; colliderCopy.size = sourceCollider.size;
colliderCopy.isTrigger = sourceCollider.isTrigger; colliderCopy.isTrigger = sourceCollider.isTrigger;
@ -140,7 +162,11 @@ protected static void MoveSphereColliders(GameObject source, GameObject destinat
SphereCollider[] sourceColliders = source.GetComponentsInChildren<SphereCollider>(); SphereCollider[] sourceColliders = source.GetComponentsInChildren<SphereCollider>();
foreach (SphereCollider sourceCollider in sourceColliders) foreach (SphereCollider sourceCollider in sourceColliders)
{ {
SphereCollider colliderCopy = destination.AddComponent<SphereCollider>(); // copy the relative transform:
// if collider is on root, it returns destination root.
// if collider is on a child, it creates and returns a child on destination.
GameObject target = CopyRelativeTransform(source, sourceCollider.transform, destination);
SphereCollider colliderCopy = target.AddComponent<SphereCollider>();
colliderCopy.center = sourceCollider.center; colliderCopy.center = sourceCollider.center;
colliderCopy.radius = sourceCollider.radius; colliderCopy.radius = sourceCollider.radius;
colliderCopy.isTrigger = sourceCollider.isTrigger; colliderCopy.isTrigger = sourceCollider.isTrigger;
@ -155,7 +181,11 @@ protected static void MoveCapsuleColliders(GameObject source, GameObject destina
CapsuleCollider[] sourceColliders = source.GetComponentsInChildren<CapsuleCollider>(); CapsuleCollider[] sourceColliders = source.GetComponentsInChildren<CapsuleCollider>();
foreach (CapsuleCollider sourceCollider in sourceColliders) foreach (CapsuleCollider sourceCollider in sourceColliders)
{ {
CapsuleCollider colliderCopy = destination.AddComponent<CapsuleCollider>(); // copy the relative transform:
// if collider is on root, it returns destination root.
// if collider is on a child, it creates and returns a child on destination.
GameObject target = CopyRelativeTransform(source, sourceCollider.transform, destination);
CapsuleCollider colliderCopy = target.AddComponent<CapsuleCollider>();
colliderCopy.center = sourceCollider.center; colliderCopy.center = sourceCollider.center;
colliderCopy.radius = sourceCollider.radius; colliderCopy.radius = sourceCollider.radius;
colliderCopy.height = sourceCollider.height; colliderCopy.height = sourceCollider.height;
@ -172,7 +202,11 @@ protected static void MoveMeshColliders(GameObject source, GameObject destinatio
MeshCollider[] sourceColliders = source.GetComponentsInChildren<MeshCollider>(); MeshCollider[] sourceColliders = source.GetComponentsInChildren<MeshCollider>();
foreach (MeshCollider sourceCollider in sourceColliders) foreach (MeshCollider sourceCollider in sourceColliders)
{ {
MeshCollider colliderCopy = destination.AddComponent<MeshCollider>(); // copy the relative transform:
// if collider is on root, it returns destination root.
// if collider is on a child, it creates and returns a child on destination.
GameObject target = CopyRelativeTransform(source, sourceCollider.transform, destination);
MeshCollider colliderCopy = target.AddComponent<MeshCollider>();
colliderCopy.sharedMesh = sourceCollider.sharedMesh; colliderCopy.sharedMesh = sourceCollider.sharedMesh;
colliderCopy.convex = sourceCollider.convex; colliderCopy.convex = sourceCollider.convex;
colliderCopy.isTrigger = sourceCollider.isTrigger; colliderCopy.isTrigger = sourceCollider.isTrigger;
@ -268,7 +302,7 @@ protected virtual void CreateGhosts()
// cache components to avoid GetComponent calls at runtime // cache components to avoid GetComponent calls at runtime
physicsCopyRigidbody = physicsCopy.GetComponent<Rigidbody>(); physicsCopyRigidbody = physicsCopy.GetComponent<Rigidbody>();
physicsCopyCollider = physicsCopy.GetComponent<Collider>(); physicsCopyCollider = physicsCopy.GetComponentInChildren<Collider>();
if (physicsCopyRigidbody == null) throw new Exception("SeparatePhysics: couldn't find final Rigidbody."); if (physicsCopyRigidbody == null) throw new Exception("SeparatePhysics: couldn't find final Rigidbody.");
if (physicsCopyCollider == null) throw new Exception("SeparatePhysics: couldn't find final Collider."); if (physicsCopyCollider == null) throw new Exception("SeparatePhysics: couldn't find final Collider.");
} }