From 96c5ea3c2f0a5b1c184db5c158af958a06aa44f4 Mon Sep 17 00:00:00 2001 From: Antonio Valentini Date: Fri, 30 Jun 2017 10:18:16 +0200 Subject: [PATCH] Remove warnings --- Scripts/Effects/UIParticleSystem.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Scripts/Effects/UIParticleSystem.cs b/Scripts/Effects/UIParticleSystem.cs index 826e3ad..bf1d582 100644 --- a/Scripts/Effects/UIParticleSystem.cs +++ b/Scripts/Effects/UIParticleSystem.cs @@ -74,7 +74,8 @@ namespace UnityEngine.UI.Extensions } // automatically set scaling - _particleSystem.scalingMode = ParticleSystemScalingMode.Local; + var main = _particleSystem.main; + main.scalingMode = ParticleSystemScalingMode.Local; _particles = null; setParticleSystemMaterial = true; @@ -113,7 +114,7 @@ namespace UnityEngine.UI.Extensions // prepare particles array if (_particles == null) { - _particles = new ParticleSystem.Particle[_particleSystem.maxParticles]; + _particles = new ParticleSystem.Particle[_particleSystem.main.maxParticles]; } // prepare uvs @@ -177,14 +178,14 @@ namespace UnityEngine.UI.Extensions ParticleSystem.Particle particle = _particles[i]; // get particle properties - Vector2 position = (_particleSystem.simulationSpace == ParticleSystemSimulationSpace.Local ? particle.position : _transform.InverseTransformPoint(particle.position)); + Vector2 position = (_particleSystem.main.simulationSpace == ParticleSystemSimulationSpace.Local ? particle.position : _transform.InverseTransformPoint(particle.position)); float rotation = -particle.rotation * Mathf.Deg2Rad; float rotation90 = rotation + Mathf.PI / 2; Color32 color = particle.GetCurrentColor(_particleSystem); float size = particle.GetCurrentSize(_particleSystem) * 0.5f; // apply scale - if (_particleSystem.scalingMode == ParticleSystemScalingMode.Shape) + if (_particleSystem.main.scalingMode == ParticleSystemScalingMode.Shape) { position /= canvas.scaleFactor; } @@ -195,7 +196,7 @@ namespace UnityEngine.UI.Extensions { #if UNITY_5_5_OR_NEWER float frameProgress = 1 - (particle.remainingLifetime / particle.startLifetime); -#else +#else float frameProgress = 1 - (particle.lifetime / particle.startLifetime); #endif // float frameProgress = textureSheetAnimation.frameOverTime.curveMin.Evaluate(1 - (particle.lifetime / particle.startLifetime)); // TODO - once Unity allows MinMaxCurve reading