close #18; New scaling system

2018-12-12 21:56:38 +09:00 · 2018-12-12 21:56:38 +09:00 · 56d949e028
parent e3af854366
commit 56d949e028
1 changed files with 3 additions and 2 deletions
--- a/UIParticle.cs
+++ b/UIParticle.cs
@ -237,8 +237,9 @@ namespace Coffee.UIExtensions
 					Profiler.EndSample ();

 					Profiler.BeginSample ("Make Matrix");
-					var s = scale * canvas.scaleFactor;
-					scaleaMatrix = Matrix4x4.Scale (new Vector3 (s, s, s));
+					scaleaMatrix = m_ParticleSystem.main.scalingMode == ParticleSystemScalingMode.Hierarchy
+					                               ? Matrix4x4.Scale (scale * Vector3.one)
+					                               : Matrix4x4.Scale (scale * canvas.rootCanvas.transform.localScale);
 					Matrix4x4 matrix = default (Matrix4x4);
 					switch (m_ParticleSystem.main.simulationSpace)
 					{