Refactor
mob-sakai
parent
5e6cd8c8f6
commit
279a470202
|
|
@ -4,15 +4,15 @@ using UnityEngine;
|
|||
|
||||
namespace Coffee.UIExtensions
|
||||
{
|
||||
[CustomEditor(typeof(UIParticle))]
|
||||
[CustomEditor (typeof (UIParticle))]
|
||||
[CanEditMultipleObjects]
|
||||
public class UIParticleEditor : GraphicEditor
|
||||
{
|
||||
//################################
|
||||
// Constant or Static Members.
|
||||
//################################
|
||||
static readonly GUIContent contentParticleMaterial = new GUIContent("Particle Material", "The material for rendering particles");
|
||||
static readonly GUIContent contentTrailMaterial = new GUIContent("Trail Material", "The material for rendering particle trails");
|
||||
static readonly GUIContent contentParticleMaterial = new GUIContent ("Particle Material", "The material for rendering particles");
|
||||
static readonly GUIContent contentTrailMaterial = new GUIContent ("Trail Material", "The material for rendering particle trails");
|
||||
|
||||
|
||||
//################################
|
||||
|
|
@ -21,42 +21,42 @@ namespace Coffee.UIExtensions
|
|||
/// <summary>
|
||||
/// This function is called when the object becomes enabled and active.
|
||||
/// </summary>
|
||||
protected override void OnEnable()
|
||||
protected override void OnEnable ()
|
||||
{
|
||||
base.OnEnable();
|
||||
_spParticleSystem = serializedObject.FindProperty("m_ParticleSystem");
|
||||
_spTrailParticle = serializedObject.FindProperty("m_TrailParticle");
|
||||
base.OnEnable ();
|
||||
_spParticleSystem = serializedObject.FindProperty ("m_ParticleSystem");
|
||||
_spTrailParticle = serializedObject.FindProperty ("m_TrailParticle");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Implement this function to make a custom inspector.
|
||||
/// </summary>
|
||||
public override void OnInspectorGUI()
|
||||
public override void OnInspectorGUI ()
|
||||
{
|
||||
serializedObject.Update();
|
||||
serializedObject.Update ();
|
||||
|
||||
EditorGUILayout.PropertyField(_spParticleSystem);
|
||||
EditorGUILayout.PropertyField (_spParticleSystem);
|
||||
EditorGUI.indentLevel++;
|
||||
var ps = _spParticleSystem.objectReferenceValue as ParticleSystem;
|
||||
if (ps)
|
||||
{
|
||||
var pr = ps.GetComponent<ParticleSystemRenderer>();
|
||||
var sp = new SerializedObject(pr).FindProperty("m_Materials");
|
||||
var pr = ps.GetComponent<ParticleSystemRenderer> ();
|
||||
var sp = new SerializedObject (pr).FindProperty ("m_Materials");
|
||||
|
||||
EditorGUILayout.PropertyField(sp.GetArrayElementAtIndex(0), contentParticleMaterial);
|
||||
EditorGUILayout.PropertyField(sp.GetArrayElementAtIndex(1), contentTrailMaterial);
|
||||
sp.serializedObject.ApplyModifiedProperties();
|
||||
EditorGUILayout.PropertyField (sp.GetArrayElementAtIndex (0), contentParticleMaterial);
|
||||
EditorGUILayout.PropertyField (sp.GetArrayElementAtIndex (1), contentTrailMaterial);
|
||||
sp.serializedObject.ApplyModifiedProperties ();
|
||||
|
||||
if(!Application.isPlaying && pr.enabled)
|
||||
if (!Application.isPlaying && pr.enabled)
|
||||
{
|
||||
EditorGUILayout.HelpBox("ParticleSystemRenderer will be disable on playing.", MessageType.Info);
|
||||
EditorGUILayout.HelpBox ("ParticleSystemRenderer will be disable on playing.", MessageType.Info);
|
||||
}
|
||||
}
|
||||
EditorGUI.indentLevel--;
|
||||
|
||||
EditorGUI.BeginDisabledGroup(true);
|
||||
EditorGUILayout.PropertyField(_spTrailParticle);
|
||||
EditorGUI.EndDisabledGroup();
|
||||
EditorGUI.BeginDisabledGroup (true);
|
||||
EditorGUILayout.PropertyField (_spTrailParticle);
|
||||
EditorGUI.EndDisabledGroup ();
|
||||
|
||||
if ((target as UIParticle).GetComponentsInParent<UIParticle> (false).Length == 1)
|
||||
{
|
||||
|
|
@ -64,7 +64,7 @@ namespace Coffee.UIExtensions
|
|||
}
|
||||
EditorGUILayout.PropertyField (serializedObject.FindProperty ("m_IgnoreParent"));
|
||||
|
||||
serializedObject.ApplyModifiedProperties();
|
||||
serializedObject.ApplyModifiedProperties ();
|
||||
}
|
||||
|
||||
//################################
|
||||
|
|
|
|||
|
|
@ -16,23 +16,23 @@ namespace Coffee.UIExtensions
|
|||
//################################
|
||||
// Constant or Readonly Static Members.
|
||||
//################################
|
||||
static readonly int s_IdMainTex = Shader.PropertyToID("_MainTex");
|
||||
static readonly List<Vector3> s_Vertices = new List<Vector3>();
|
||||
static readonly List<UIParticle> s_TempRelatables = new List<UIParticle>();
|
||||
static readonly List<UIParticle> s_ActiveSoftMasks = new List<UIParticle>();
|
||||
static readonly int s_IdMainTex = Shader.PropertyToID ("_MainTex");
|
||||
static readonly List<Vector3> s_Vertices = new List<Vector3> ();
|
||||
static readonly List<UIParticle> s_TempRelatables = new List<UIParticle> ();
|
||||
static readonly List<UIParticle> s_ActiveSoftMasks = new List<UIParticle> ();
|
||||
|
||||
|
||||
//################################
|
||||
// Serialize Members.
|
||||
//################################
|
||||
[Tooltip("The ParticleSystem rendered by CanvasRenderer")]
|
||||
[Tooltip ("The ParticleSystem rendered by CanvasRenderer")]
|
||||
[SerializeField] ParticleSystem m_ParticleSystem;
|
||||
[Tooltip("The UIParticle to render trail effect")]
|
||||
[Tooltip ("The UIParticle to render trail effect")]
|
||||
[SerializeField] UIParticle m_TrailParticle;
|
||||
[HideInInspector] [SerializeField] bool m_IsTrail = false;
|
||||
[Tooltip("Particle effect scale")]
|
||||
[Tooltip ("Particle effect scale")]
|
||||
[SerializeField] float m_Scale = 1;
|
||||
[Tooltip("Ignore parent scale")]
|
||||
[Tooltip ("Ignore parent scale")]
|
||||
[SerializeField] bool m_IgnoreParent = false;
|
||||
|
||||
|
||||
|
|
@ -46,27 +46,27 @@ namespace Coffee.UIExtensions
|
|||
Texture tex = null;
|
||||
if (!m_IsTrail)
|
||||
{
|
||||
Profiler.BeginSample("Check TextureSheetAnimation module");
|
||||
Profiler.BeginSample ("Check TextureSheetAnimation module");
|
||||
var textureSheet = m_ParticleSystem.textureSheetAnimation;
|
||||
if (textureSheet.enabled && textureSheet.mode == ParticleSystemAnimationMode.Sprites && 0 < textureSheet.spriteCount)
|
||||
{
|
||||
tex = textureSheet.GetSprite(0).texture;
|
||||
tex = textureSheet.GetSprite (0).texture;
|
||||
}
|
||||
Profiler.EndSample();
|
||||
Profiler.EndSample ();
|
||||
}
|
||||
if (!tex && _renderer)
|
||||
{
|
||||
Profiler.BeginSample("Check material");
|
||||
Profiler.BeginSample ("Check material");
|
||||
var mat = m_IsTrail
|
||||
? _renderer.trailMaterial
|
||||
: Application.isPlaying
|
||||
? _renderer.material
|
||||
: _renderer.sharedMaterial;
|
||||
if (mat && mat.HasProperty(s_IdMainTex))
|
||||
if (mat && mat.HasProperty (s_IdMainTex))
|
||||
{
|
||||
tex = mat.mainTexture;
|
||||
}
|
||||
Profiler.EndSample();
|
||||
Profiler.EndSample ();
|
||||
}
|
||||
return tex ?? s_WhiteTexture;
|
||||
}
|
||||
|
|
@ -86,95 +86,95 @@ namespace Coffee.UIExtensions
|
|||
get { return m_IgnoreParent; }
|
||||
set
|
||||
{
|
||||
if(m_IgnoreParent != value)
|
||||
if (m_IgnoreParent != value)
|
||||
{
|
||||
m_IgnoreParent = value;
|
||||
OnTransformParentChanged();
|
||||
OnTransformParentChanged ();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public override Material GetModifiedMaterial(Material baseMaterial)
|
||||
public override Material GetModifiedMaterial (Material baseMaterial)
|
||||
{
|
||||
return base.GetModifiedMaterial(_renderer ? _renderer.sharedMaterial : baseMaterial);
|
||||
return base.GetModifiedMaterial (_renderer ? _renderer.sharedMaterial : baseMaterial);
|
||||
}
|
||||
|
||||
protected override void OnEnable()
|
||||
protected override void OnEnable ()
|
||||
{
|
||||
// Register.
|
||||
if(s_ActiveSoftMasks.Count == 0)
|
||||
if (s_ActiveSoftMasks.Count == 0)
|
||||
{
|
||||
Canvas.willRenderCanvases += UpdateMeshes;
|
||||
}
|
||||
s_ActiveSoftMasks.Add(this);
|
||||
s_ActiveSoftMasks.Add (this);
|
||||
|
||||
// Reset the parent-child relation.
|
||||
GetComponentsInChildren<UIParticle>(false, s_TempRelatables);
|
||||
for(int i = s_TempRelatables.Count - 1; 0 <= i; i--)
|
||||
GetComponentsInChildren<UIParticle> (false, s_TempRelatables);
|
||||
for (int i = s_TempRelatables.Count - 1; 0 <= i; i--)
|
||||
{
|
||||
s_TempRelatables [i].OnTransformParentChanged();
|
||||
s_TempRelatables [i].OnTransformParentChanged ();
|
||||
}
|
||||
s_TempRelatables.Clear();
|
||||
s_TempRelatables.Clear ();
|
||||
|
||||
m_ParticleSystem = m_ParticleSystem ? m_ParticleSystem : GetComponent<ParticleSystem>();
|
||||
_renderer = m_ParticleSystem ? m_ParticleSystem.GetComponent<ParticleSystemRenderer>() : null;
|
||||
m_ParticleSystem = m_ParticleSystem ? m_ParticleSystem : GetComponent<ParticleSystem> ();
|
||||
_renderer = m_ParticleSystem ? m_ParticleSystem.GetComponent<ParticleSystemRenderer> () : null;
|
||||
|
||||
// Create objects.
|
||||
_mesh = new Mesh();
|
||||
_mesh.MarkDynamic();
|
||||
CheckTrail();
|
||||
_mesh = new Mesh ();
|
||||
_mesh.MarkDynamic ();
|
||||
CheckTrail ();
|
||||
|
||||
base.OnEnable();
|
||||
base.OnEnable ();
|
||||
}
|
||||
|
||||
protected override void OnDisable()
|
||||
protected override void OnDisable ()
|
||||
{
|
||||
// Unregister.
|
||||
s_ActiveSoftMasks.Remove(this);
|
||||
if(s_ActiveSoftMasks.Count == 0)
|
||||
s_ActiveSoftMasks.Remove (this);
|
||||
if (s_ActiveSoftMasks.Count == 0)
|
||||
{
|
||||
Canvas.willRenderCanvases -= UpdateMeshes;
|
||||
}
|
||||
|
||||
// Reset the parent-child relation.
|
||||
for(int i = _children.Count - 1; 0 <= i; i--)
|
||||
for (int i = _children.Count - 1; 0 <= i; i--)
|
||||
{
|
||||
_children [i].SetParent(_parent);
|
||||
_children [i].SetParent (_parent);
|
||||
}
|
||||
_children.Clear();
|
||||
SetParent(null);
|
||||
_children.Clear ();
|
||||
SetParent (null);
|
||||
|
||||
// Destroy objects.
|
||||
DestroyImmediate(_mesh);
|
||||
DestroyImmediate (_mesh);
|
||||
_mesh = null;
|
||||
CheckTrail();
|
||||
CheckTrail ();
|
||||
|
||||
base.OnDisable();
|
||||
base.OnDisable ();
|
||||
}
|
||||
|
||||
protected override void UpdateGeometry()
|
||||
protected override void UpdateGeometry ()
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// This function is called when the parent property of the transform of the GameObject has changed.
|
||||
/// </summary>
|
||||
protected override void OnTransformParentChanged()
|
||||
protected override void OnTransformParentChanged ()
|
||||
{
|
||||
UIParticle newParent = null;
|
||||
if(isActiveAndEnabled && !m_IgnoreParent)
|
||||
if (isActiveAndEnabled && !m_IgnoreParent)
|
||||
{
|
||||
var parentTransform = transform.parent;
|
||||
while(parentTransform &&(!newParent || !newParent.enabled))
|
||||
while (parentTransform && (!newParent || !newParent.enabled))
|
||||
{
|
||||
newParent = parentTransform.GetComponent<UIParticle>();
|
||||
newParent = parentTransform.GetComponent<UIParticle> ();
|
||||
parentTransform = parentTransform.parent;
|
||||
}
|
||||
}
|
||||
SetParent(newParent);
|
||||
SetParent (newParent);
|
||||
}
|
||||
|
||||
protected override void OnDidApplyAnimationProperties()
|
||||
protected override void OnDidApplyAnimationProperties ()
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -182,10 +182,10 @@ namespace Coffee.UIExtensions
|
|||
/// <summary>
|
||||
/// This function is called when the script is loaded or a value is changed in the inspector(Called in the editor only).
|
||||
/// </summary>
|
||||
protected override void OnValidate()
|
||||
protected override void OnValidate ()
|
||||
{
|
||||
OnTransformParentChanged();
|
||||
base.OnValidate();
|
||||
OnTransformParentChanged ();
|
||||
base.OnValidate ();
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -196,45 +196,45 @@ namespace Coffee.UIExtensions
|
|||
Mesh _mesh;
|
||||
ParticleSystemRenderer _renderer;
|
||||
UIParticle _parent;
|
||||
List<UIParticle> _children = new List<UIParticle>();
|
||||
Matrix4x4 scaleaMatrix = default(Matrix4x4);
|
||||
List<UIParticle> _children = new List<UIParticle> ();
|
||||
Matrix4x4 scaleaMatrix = default (Matrix4x4);
|
||||
|
||||
static void UpdateMeshes()
|
||||
static void UpdateMeshes ()
|
||||
{
|
||||
foreach(var uip in s_ActiveSoftMasks)
|
||||
foreach (var uip in s_ActiveSoftMasks)
|
||||
{
|
||||
uip.UpdateMesh();
|
||||
uip.UpdateMesh ();
|
||||
}
|
||||
}
|
||||
|
||||
void UpdateMesh()
|
||||
void UpdateMesh ()
|
||||
{
|
||||
try
|
||||
{
|
||||
Profiler.BeginSample("CheckTrail");
|
||||
CheckTrail();
|
||||
Profiler.EndSample();
|
||||
Profiler.BeginSample ("CheckTrail");
|
||||
CheckTrail ();
|
||||
Profiler.EndSample ();
|
||||
|
||||
if (m_ParticleSystem)
|
||||
{
|
||||
Profiler.BeginSample("Disable ParticleSystemRenderer");
|
||||
Profiler.BeginSample ("Disable ParticleSystemRenderer");
|
||||
if (Application.isPlaying)
|
||||
{
|
||||
_renderer.enabled = false;
|
||||
}
|
||||
Profiler.EndSample();
|
||||
Profiler.EndSample ();
|
||||
|
||||
Profiler.BeginSample("Make Matrix");
|
||||
Profiler.BeginSample ("Make Matrix");
|
||||
var s = scale;
|
||||
scaleaMatrix = Matrix4x4.Scale(new Vector3(s, s, s));
|
||||
Matrix4x4 matrix = default(Matrix4x4);
|
||||
scaleaMatrix = Matrix4x4.Scale (new Vector3 (s, s, s));
|
||||
Matrix4x4 matrix = default (Matrix4x4);
|
||||
switch (m_ParticleSystem.main.simulationSpace)
|
||||
{
|
||||
case ParticleSystemSimulationSpace.Local:
|
||||
matrix =
|
||||
scaleaMatrix
|
||||
* Matrix4x4.Rotate(m_ParticleSystem.transform.rotation).inverse
|
||||
* Matrix4x4.Scale(m_ParticleSystem.transform.lossyScale).inverse;
|
||||
* Matrix4x4.Rotate (m_ParticleSystem.transform.rotation).inverse
|
||||
* Matrix4x4.Scale (m_ParticleSystem.transform.lossyScale).inverse;
|
||||
break;
|
||||
case ParticleSystemSimulationSpace.World:
|
||||
matrix =
|
||||
|
|
@ -244,64 +244,64 @@ namespace Coffee.UIExtensions
|
|||
case ParticleSystemSimulationSpace.Custom:
|
||||
break;
|
||||
}
|
||||
Profiler.EndSample();
|
||||
Profiler.EndSample ();
|
||||
|
||||
_mesh.Clear();
|
||||
_mesh.Clear ();
|
||||
if (0 < m_ParticleSystem.particleCount)
|
||||
{
|
||||
Profiler.BeginSample("Bake Mesh");
|
||||
Profiler.BeginSample ("Bake Mesh");
|
||||
if (m_IsTrail)
|
||||
{
|
||||
_renderer.BakeTrailsMesh(_mesh, true);
|
||||
_renderer.BakeTrailsMesh (_mesh, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
_renderer.BakeMesh(_mesh, true);
|
||||
_renderer.BakeMesh (_mesh, true);
|
||||
}
|
||||
Profiler.EndSample();
|
||||
Profiler.EndSample ();
|
||||
|
||||
// Apply matrix.
|
||||
Profiler.BeginSample("Apply matrix to position");
|
||||
_mesh.GetVertices(s_Vertices);
|
||||
Profiler.BeginSample ("Apply matrix to position");
|
||||
_mesh.GetVertices (s_Vertices);
|
||||
var count = s_Vertices.Count;
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
s_Vertices[i] = matrix.MultiplyPoint3x4(s_Vertices[i]);
|
||||
s_Vertices [i] = matrix.MultiplyPoint3x4 (s_Vertices [i]);
|
||||
}
|
||||
_mesh.SetVertices(s_Vertices);
|
||||
s_Vertices.Clear();
|
||||
Profiler.EndSample();
|
||||
_mesh.SetVertices (s_Vertices);
|
||||
s_Vertices.Clear ();
|
||||
Profiler.EndSample ();
|
||||
}
|
||||
|
||||
|
||||
// Set mesh to CanvasRenderer.
|
||||
Profiler.BeginSample("Set mesh and texture to CanvasRenderer");
|
||||
canvasRenderer.SetMesh(_mesh);
|
||||
canvasRenderer.SetTexture(mainTexture);
|
||||
Profiler.EndSample();
|
||||
Profiler.BeginSample ("Set mesh and texture to CanvasRenderer");
|
||||
canvasRenderer.SetMesh (_mesh);
|
||||
canvasRenderer.SetTexture (mainTexture);
|
||||
Profiler.EndSample ();
|
||||
}
|
||||
}
|
||||
catch(System.Exception e)
|
||||
catch (System.Exception e)
|
||||
{
|
||||
Debug.LogException(e);
|
||||
Debug.LogException (e);
|
||||
}
|
||||
}
|
||||
|
||||
void CheckTrail()
|
||||
void CheckTrail ()
|
||||
{
|
||||
if (isActiveAndEnabled && !m_IsTrail && m_ParticleSystem && m_ParticleSystem.trails.enabled)
|
||||
{
|
||||
if (!m_TrailParticle)
|
||||
{
|
||||
m_TrailParticle = new GameObject("[UIParticle] Trail").AddComponent<UIParticle>();
|
||||
m_TrailParticle = new GameObject ("[UIParticle] Trail").AddComponent<UIParticle> ();
|
||||
var trans = m_TrailParticle.transform;
|
||||
trans.SetParent(transform);
|
||||
trans.SetParent (transform);
|
||||
trans.localPosition = Vector3.zero;
|
||||
trans.localRotation = Quaternion.identity;
|
||||
trans.localScale = Vector3.one;
|
||||
|
||||
m_TrailParticle._renderer = GetComponent<ParticleSystemRenderer>();
|
||||
m_TrailParticle.m_ParticleSystem = GetComponent<ParticleSystem>();
|
||||
m_TrailParticle._renderer = GetComponent<ParticleSystemRenderer> ();
|
||||
m_TrailParticle.m_ParticleSystem = GetComponent<ParticleSystem> ();
|
||||
m_TrailParticle.m_IsTrail = true;
|
||||
}
|
||||
m_TrailParticle.enabled = true;
|
||||
|
|
@ -316,21 +316,21 @@ namespace Coffee.UIExtensions
|
|||
/// Set the parent of the soft mask.
|
||||
/// </summary>
|
||||
/// <param name="newParent">The parent soft mask to use.</param>
|
||||
void SetParent(UIParticle newParent)
|
||||
void SetParent (UIParticle newParent)
|
||||
{
|
||||
if(_parent != newParent && this != newParent)
|
||||
if (_parent != newParent && this != newParent)
|
||||
{
|
||||
if(_parent && _parent._children.Contains(this))
|
||||
if (_parent && _parent._children.Contains (this))
|
||||
{
|
||||
_parent._children.Remove(this);
|
||||
_parent._children.RemoveAll(x => x == null);
|
||||
_parent._children.Remove (this);
|
||||
_parent._children.RemoveAll (x => x == null);
|
||||
}
|
||||
_parent = newParent;
|
||||
}
|
||||
|
||||
if(_parent && !_parent._children.Contains(this))
|
||||
if (_parent && !_parent._children.Contains (this))
|
||||
{
|
||||
_parent._children.Add(this);
|
||||
_parent._children.Add (this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue