pengtaihao
/
ParticleEffectForUGUI
mirror of https://github.com/mob-sakai/ParticleEffectForUGUI
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: fix the sorting algorithm

pull/120/head
mob-sakai 2020-10-28 12:21:34 +09:00
parent f7eac0a34f
commit 7acbf22b4d
1 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Scripts/Utils.cs
View File

@ -190,32 +190,54 @@ namespace Coffee.UIParticleExtensions
self.Sort((a, b) => self.Sort((a, b) =>
{ {
var tr = transform; var tr = transform;
var ra = a.GetComponent<ParticleSystemRenderer>(); var aRenderer = a.GetComponent<ParticleSystemRenderer>();
var rb = b.GetComponent<ParticleSystemRenderer>(); var bRenderer = b.GetComponent<ParticleSystemRenderer>();
if (!Mathf.Approximately(ra.sortingFudge, rb.sortingFudge)) // Render queue: ascending
return ra.sortingFudge < rb.sortingFudge ? 1 : -1; var aMat = aRenderer.sharedMaterial;
var bMat = bRenderer.sharedMaterial;
if (aMat.renderQueue != bMat.renderQueue)
return aMat.renderQueue - bMat.renderQueue;
var pa = tr.InverseTransformPoint(a.transform.position).z; // Sorting layer: ascending
var pb = tr.InverseTransformPoint(b.transform.position).z; if (aRenderer.sortingLayerID != bRenderer.sortingLayerID)
return aRenderer.sortingLayerID - bRenderer.sortingLayerID;
if (!Mathf.Approximately(pa, pb)) // Sorting order: ascending
return pa < pb ? 1 : -1; if (aRenderer.sortingOrder != bRenderer.sortingOrder)
return aRenderer.sortingOrder - bRenderer.sortingOrder;
var aQueue = ra.sharedMaterial.renderQueue; // Z position & sortingFudge: descending
var bQueue = rb.sharedMaterial.renderQueue; var aTransform = a.transform;
if (aQueue != bQueue) var bTransform = b.transform;
return aQueue < bQueue ? 1 : -1; var aPos = tr.InverseTransformPoint(aTransform.position).z+ aRenderer.sortingFudge;
var bPos = tr.InverseTransformPoint(bTransform.position).z+ bRenderer.sortingFudge;
if (!Mathf.Approximately(aPos, bPos))
return (int)Mathf.Sign(bPos - aPos);
var aHash = ra.sharedMaterial.GetHashCode(); // Material instance ID: match
var bHash = rb.sharedMaterial.GetHashCode(); if (aMat.GetInstanceID() == bMat.GetInstanceID())
if (aHash != bHash) return 0;
return aHash < bHash ? 1 : -1;
return 0; // Transform: ascending
return TransformCompare(aTransform, bTransform);
}); });
} }
private static int TransformCompare(Transform a, Transform b)
{
while (true)
{
if (!a && !b) return 0;
if (!a) return -1;
if (!b) return 1;
if (a.parent == b.parent) return a.GetSiblingIndex() - b.GetSiblingIndex();
a = a.parent;
b = b.parent;
}
}
public static long GetMaterialHash(this ParticleSystem self, bool trail) public static long GetMaterialHash(this ParticleSystem self, bool trail)
{ {
if (!self) return 0; if (!self) return 0;