From 8b53dce9a07c53bbd98475e7344c2adc13811d06 Mon Sep 17 00:00:00 2001 From: Robin Leroy Date: Sat, 15 Mar 2014 13:10:14 +0100 Subject: [PATCH] Les poules du PersistentKSPParticleEmitter persistent. --- ModelMultiParticlePersistFX.cs | 10 ++++----- PersistantEmitterManager.cs | 36 ++++++++++++++++----------------- PersistantKSPParticleEmitter.cs | 8 ++++---- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ModelMultiParticlePersistFX.cs b/ModelMultiParticlePersistFX.cs index 2b78c73..35e5361 100644 --- a/ModelMultiParticlePersistFX.cs +++ b/ModelMultiParticlePersistFX.cs @@ -121,7 +121,7 @@ public class ModelMultiParticlePersistFX : EffectBehaviour public FXCurve angle = new FXCurve("angle", 1f); public FXCurve distance = new FXCurve("distance", 1f); - private List peristantEmitters; + private List peristantEmitters; private float emissionPower; private float minEmissionBase; @@ -557,7 +557,7 @@ public override void OnInitialize() templateKspParticleEmitter.material.shader = shader; - // TODO : move those in PersistantKSPParticleEmitter + // TODO : move those in PersistentKSPParticleEmitter scale1DBase = (templateKspParticleEmitter.shape1D *= fixedScale); scale2DBase = (templateKspParticleEmitter.shape2D *= fixedScale); scale3DBase = (templateKspParticleEmitter.shape3D *= fixedScale); @@ -573,7 +573,7 @@ public override void OnInitialize() localVelocityBase = templateKspParticleEmitter.localVelocity; if (peristantEmitters == null) - peristantEmitters = new List(); + peristantEmitters = new List(); for (int i = 0; i < transforms.Count; i++) @@ -582,7 +582,7 @@ public override void OnInitialize() GameObject emmitterGameObject = UnityEngine.Object.Instantiate(model) as GameObject; KSPParticleEmitter componentInChildren = emmitterGameObject.GetComponentInChildren(); - PersistantKSPParticleEmitter pkpe = new PersistantKSPParticleEmitter(emmitterGameObject, componentInChildren, templateKspParticleEmitter.maxParticleSize); + PersistentKSPParticleEmitter pkpe = new PersistentKSPParticleEmitter(emmitterGameObject, componentInChildren, templateKspParticleEmitter.maxParticleSize); if (componentInChildren != null) { @@ -609,7 +609,7 @@ public override void OnInitialize() emmitterGameObject.transform.localPosition = localPosition; emmitterGameObject.transform.localRotation = Quaternion.Euler(localRotation); - PersistantEmitterManager.Add(pkpe); + PersistentEmitterManager.Add(pkpe); } diff --git a/PersistantEmitterManager.cs b/PersistantEmitterManager.cs index 644338d..6fd1c68 100644 --- a/PersistantEmitterManager.cs +++ b/PersistantEmitterManager.cs @@ -14,19 +14,19 @@ [KSPAddon(KSPAddon.Startup.EveryScene, false)] -class PersistantEmitterManager : MonoBehaviour +class PersistentEmitterManager : MonoBehaviour { - public static PersistantEmitterManager Instance { get; private set; } + public static PersistentEmitterManager Instance { get; private set; } - private static List persistantEmitters; + private static List persistentEmitters; private void Awake() { - PersistantEmitterManager.Instance = this; + PersistentEmitterManager.Instance = this; - persistantEmitters = new List(); + persistentEmitters = new List(); GameEvents.onGameSceneLoadRequested.Add(new EventData.OnEvent(this.OnSceneChange)); } @@ -36,34 +36,34 @@ private void OnDestroy() GameEvents.onGameSceneLoadRequested.Remove(new EventData.OnEvent(this.OnSceneChange)); } - static public void Add(PersistantKSPParticleEmitter pkpe) + static public void Add(PersistentKSPParticleEmitter pkpe) { - persistantEmitters.Add(pkpe); + persistentEmitters.Add(pkpe); EffectBehaviour.AddParticleEmitter(pkpe.pe); } private void OnSceneChange(GameScenes scene) { - for (int i = 0; i < persistantEmitters.Count; i++) + for (int i = 0; i < persistentEmitters.Count; i++) { - EffectBehaviour.RemoveParticleEmitter(persistantEmitters[i].pe); - if (persistantEmitters[i].go.transform.parent == null) - Destroy(persistantEmitters[i].go); + EffectBehaviour.RemoveParticleEmitter(persistentEmitters[i].pe); + if (persistentEmitters[i].go.transform.parent == null) + Destroy(persistentEmitters[i].go); } - persistantEmitters = new List(); + persistentEmitters = new List(); } void FixedUpdate() { - List persistantEmittersCopy = new List(persistantEmitters); - for (int i = 0; i < persistantEmittersCopy.Count; i++) + List persistentEmittersCopy = new List(persistentEmitters); + for (int i = 0; i < persistentEmittersCopy.Count; i++) { - if (persistantEmittersCopy[i].go.transform.parent == null && persistantEmittersCopy[i].pe.pe.particles.Count() == 0) + if (persistentEmittersCopy[i].go.transform.parent == null && persistentEmittersCopy[i].pe.pe.particles.Count() == 0) { - EffectBehaviour.RemoveParticleEmitter(persistantEmittersCopy[i].pe); - persistantEmitters.Remove(persistantEmittersCopy[i]); - Destroy(persistantEmittersCopy[i].go); + EffectBehaviour.RemoveParticleEmitter(persistentEmittersCopy[i].pe); + persistentEmitters.Remove(persistentEmittersCopy[i]); + Destroy(persistentEmittersCopy[i].go); } } diff --git a/PersistantKSPParticleEmitter.cs b/PersistantKSPParticleEmitter.cs index 893405c..a593ff4 100644 --- a/PersistantKSPParticleEmitter.cs +++ b/PersistantKSPParticleEmitter.cs @@ -14,22 +14,22 @@ using UnityEngine; -// TODO : handle the relation with PersistantEmitterManager inside the class -public class PersistantKSPParticleEmitter +// TODO : handle the relation with PersistentEmitterManager inside the class +public class PersistentKSPParticleEmitter { public GameObject go; public KSPParticleEmitter pe; public bool fixedEmit = false; public float baseMaxSize; - public PersistantKSPParticleEmitter(GameObject go, KSPParticleEmitter pe, float ms) + public PersistentKSPParticleEmitter(GameObject go, KSPParticleEmitter pe, float ms) { this.go = go; this.pe = pe; baseMaxSize = ms; } - public PersistantKSPParticleEmitter(GameObject go, KSPParticleEmitter pe) + public PersistentKSPParticleEmitter(GameObject go, KSPParticleEmitter pe) { this.go = go; this.pe = pe;