You've already forked ParticleEffectForUGUI
mirror of
https://github.com/mob-sakai/ParticleEffectForUGUI.git
synced 2026-05-15 04:30:09 +00:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6884c62687 | ||
|
|
fc4bd708fd | ||
|
|
08273cb0c3 |
@@ -1,3 +1,10 @@
|
|||||||
|
# [3.2.0](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/3.1.1...3.2.0) (2020-11-15)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* compatibility with other IMaterialModifier ([08273cb](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/08273cb0c340ccb4f35120dc804c37d758da9ce1)), closes [#115](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/115)
|
||||||
|
|
||||||
## [3.1.1](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/3.1.0...3.1.1) (2020-11-09)
|
## [3.1.1](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/3.1.0...3.1.1) (2020-11-09)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -89,11 +89,11 @@ namespace Coffee.UIExtensions
|
|||||||
{
|
{
|
||||||
EditorGUI.LabelField(new Rect(rect.x, rect.y, 150, rect.height), s_ContentRenderingOrder);
|
EditorGUI.LabelField(new Rect(rect.x, rect.y, 150, rect.height), s_ContentRenderingOrder);
|
||||||
|
|
||||||
#if UNITY_2019_3_OR_NEWER
|
#if UNITY_2019_3_OR_NEWER
|
||||||
rect = new Rect(rect.width - 55, rect.y, 80, rect.height);
|
rect = new Rect(rect.width - 55, rect.y, 80, rect.height);
|
||||||
#else
|
#else
|
||||||
rect = new Rect(rect.width - 55, rect.y - 1, 80, rect.height);
|
rect = new Rect(rect.width - 55, rect.y - 1, 80, rect.height);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (GUI.Button(rect, s_ContentRefresh, EditorStyles.miniButton))
|
if (GUI.Button(rect, s_ContentRefresh, EditorStyles.miniButton))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -42,8 +42,7 @@ namespace Coffee.UIExtensions
|
|||||||
private List<ParticleSystem> m_Particles = new List<ParticleSystem>();
|
private List<ParticleSystem> m_Particles = new List<ParticleSystem>();
|
||||||
|
|
||||||
#if !SERIALIZE_FIELD_MASKABLE
|
#if !SERIALIZE_FIELD_MASKABLE
|
||||||
[SerializeField]
|
[SerializeField] private bool m_Maskable = true;
|
||||||
private bool m_Maskable = true;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
private bool _shouldBeRemoved;
|
private bool _shouldBeRemoved;
|
||||||
@@ -57,6 +56,7 @@ namespace Coffee.UIExtensions
|
|||||||
private static MaterialPropertyBlock s_Mpb;
|
private static MaterialPropertyBlock s_Mpb;
|
||||||
private static readonly List<Material> s_PrevMaskMaterials = new List<Material>();
|
private static readonly List<Material> s_PrevMaskMaterials = new List<Material>();
|
||||||
private static readonly List<Material> s_PrevModifiedMaterials = new List<Material>();
|
private static readonly List<Material> s_PrevModifiedMaterials = new List<Material>();
|
||||||
|
private static readonly List<Component> s_Components = new List<Component>();
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -124,6 +124,11 @@ namespace Coffee.UIExtensions
|
|||||||
get { return _modifiedMaterials; }
|
get { return _modifiedMaterials; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override Material materialForRendering
|
||||||
|
{
|
||||||
|
get { return canvasRenderer.GetMaterial(0); }
|
||||||
|
}
|
||||||
|
|
||||||
public List<bool> activeMeshIndices
|
public List<bool> activeMeshIndices
|
||||||
{
|
{
|
||||||
get { return _activeMeshIndices; }
|
get { return _activeMeshIndices; }
|
||||||
@@ -250,6 +255,7 @@ namespace Coffee.UIExtensions
|
|||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
GetComponents(typeof(IMaterialModifier), s_Components);
|
||||||
var materialCount = Mathf.Max(8, count);
|
var materialCount = Mathf.Max(8, count);
|
||||||
canvasRenderer.materialCount = materialCount;
|
canvasRenderer.materialCount = materialCount;
|
||||||
var j = 0;
|
var j = 0;
|
||||||
@@ -268,6 +274,8 @@ namespace Coffee.UIExtensions
|
|||||||
if (activeMeshIndices[index] && 0 < s_TempMaterials.Count)
|
if (activeMeshIndices[index] && 0 < s_TempMaterials.Count)
|
||||||
{
|
{
|
||||||
var mat = GetModifiedMaterial(s_TempMaterials[0], ps.GetTextureForSprite());
|
var mat = GetModifiedMaterial(s_TempMaterials[0], ps.GetTextureForSprite());
|
||||||
|
for (var k = 1; k < s_Components.Count; k++)
|
||||||
|
mat = (s_Components[k] as IMaterialModifier).GetModifiedMaterial(mat);
|
||||||
canvasRenderer.SetMaterial(mat, j);
|
canvasRenderer.SetMaterial(mat, j);
|
||||||
UpdateMaterialProperties(r, j);
|
UpdateMaterialProperties(r, j);
|
||||||
j++;
|
j++;
|
||||||
@@ -279,6 +287,8 @@ namespace Coffee.UIExtensions
|
|||||||
if (activeMeshIndices[index] && 1 < s_TempMaterials.Count)
|
if (activeMeshIndices[index] && 1 < s_TempMaterials.Count)
|
||||||
{
|
{
|
||||||
var mat = GetModifiedMaterial(s_TempMaterials[1], null);
|
var mat = GetModifiedMaterial(s_TempMaterials[1], null);
|
||||||
|
for (var k = 1; k < s_Components.Count; k++)
|
||||||
|
mat = (s_Components[k] as IMaterialModifier).GetModifiedMaterial(mat);
|
||||||
canvasRenderer.SetMaterial(mat, j++);
|
canvasRenderer.SetMaterial(mat, j++);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -210,10 +210,10 @@ namespace Coffee.UIParticleExtensions
|
|||||||
// Z position & sortingFudge: descending
|
// Z position & sortingFudge: descending
|
||||||
var aTransform = a.transform;
|
var aTransform = a.transform;
|
||||||
var bTransform = b.transform;
|
var bTransform = b.transform;
|
||||||
var aPos = tr.InverseTransformPoint(aTransform.position).z+ aRenderer.sortingFudge;
|
var aPos = tr.InverseTransformPoint(aTransform.position).z + aRenderer.sortingFudge;
|
||||||
var bPos = tr.InverseTransformPoint(bTransform.position).z+ bRenderer.sortingFudge;
|
var bPos = tr.InverseTransformPoint(bTransform.position).z + bRenderer.sortingFudge;
|
||||||
if (!Mathf.Approximately(aPos, bPos))
|
if (!Mathf.Approximately(aPos, bPos))
|
||||||
return (int)Mathf.Sign(bPos - aPos);
|
return (int) Mathf.Sign(bPos - aPos);
|
||||||
|
|
||||||
// Material instance ID: match
|
// Material instance ID: match
|
||||||
if (aMat.GetInstanceID() == bMat.GetInstanceID())
|
if (aMat.GetInstanceID() == bMat.GetInstanceID())
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"name": "com.coffee.ui-particle",
|
"name": "com.coffee.ui-particle",
|
||||||
"displayName": "UI Particle",
|
"displayName": "UI Particle",
|
||||||
"description": "This plugin provide a component to render particle effect for uGUI.\nThe particle rendering is maskable and sortable, without Camera, RenderTexture or Canvas.",
|
"description": "This plugin provide a component to render particle effect for uGUI.\nThe particle rendering is maskable and sortable, without Camera, RenderTexture or Canvas.",
|
||||||
"version": "3.1.1",
|
"version": "3.2.0",
|
||||||
"unity": "2018.2",
|
"unity": "2018.2",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|||||||
Reference in New Issue
Block a user