animate engn in editor, aimLight fixes, alg FAR fix

Author: BahamutoD

BDAnimationModules/AnimatedEngine.cs

@@ -20,25 +20,34 @@ public class AnimatedEngine : PartModule
 		private ModuleEnginesFX modEngFX = null;
 		private AnimationState[]  engineStates;
 		private bool engineIsFX = false;
+
+		[KSPEvent(guiActive = false, guiActiveEditor = true, guiName = "Toggle Animation")]
+		public void ToggleAnimationEditor()
+		{
+			engineIsOn = !engineIsOn;
+		}
 
 
-		public override void OnStart(PartModule.StartState state)
+		public void Start()
 		{
 
 			engineStates = SetUpAnimation(EngineAnimationName, this.part);
 
-			foreach (var me in this.part.FindModulesImplementing<ModuleEngines>())
-			{
-				engineIsOn = me.EngineIgnited;
-				modEng = me;
-				engineIsFX = false;
-			}
-		
-			foreach (var me in this.part.FindModulesImplementing<ModuleEnginesFX>())
+			if(HighLogic.LoadedSceneIsFlight)
 			{
-				engineIsOn = me.EngineIgnited;
-				modEngFX = me;
-				engineIsFX = true;
+				foreach (var me in this.part.FindModulesImplementing<ModuleEngines>())
+				{
+					engineIsOn = me.EngineIgnited;
+					modEng = me;
+					engineIsFX = false;
+				}
+			
+				foreach (var me in this.part.FindModulesImplementing<ModuleEnginesFX>())
+				{
+					engineIsOn = me.EngineIgnited;
+					modEngFX = me;
+					engineIsFX = true;
+				}
 			}
 
 
@@ -58,32 +67,34 @@ public override void OnStart(PartModule.StartState state)
 
 
 
-		public override void OnUpdate()
+		public void Update()
 		{
-			if(!engineIsFX)
+			if(HighLogic.LoadedSceneIsFlight)
 			{
-				engineIsOn = modEng.EngineIgnited;
-			}
-			else
-			{
-				engineIsOn = modEngFX.EngineIgnited;
+				if(!engineIsFX)
+				{
+					engineIsOn = modEng.EngineIgnited;
+				}
+				else
+				{
+					engineIsOn = modEngFX.EngineIgnited;
+				}
 			}
-			
 
 			foreach(var anim in engineStates)
 			{
-				
-				
 				if(engineIsOn && anim.normalizedTime < WaitForAnimation)
 				{
 					anim.speed = 1;
-					if(engineIsFX) modEngFX.Shutdown();
-					else modEng.Shutdown();
-					
+					if(HighLogic.LoadedSceneIsFlight)
+					{
+						if(engineIsFX) modEngFX.Shutdown();
+						else modEng.Shutdown();
+					}
 				}
 
 
-				if(anim.normalizedTime >= WaitForAnimation && anim.speed > 0)
+				if(HighLogic.LoadedSceneIsFlight &&  anim.normalizedTime >= WaitForAnimation && anim.speed > 0)
 				{
 					if(engineIsFX) modEngFX.Activate();
 					else modEng.Activate();	
@@ -107,7 +118,6 @@ public override void OnUpdate()
 					anim.normalizedTime = 0;
 				}
 
-				
 			}
 
 		}

BDAnimationModules/BDAdjustableLandingGear.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
 using UnityEngine;
@@ -153,6 +154,8 @@ public void ToggleAdjustment()
 
 		[KSPField(isPersistant = true)]
 		public GearStates TargetState = GearStates.Deployed;
+
+		GearStates previousState;
 
 		[KSPField(isPersistant = true, guiActiveEditor = false)]
 		public bool isMirrored = false;
@@ -433,7 +436,7 @@ public override void OnStart(PartModule.StartState state)
 
 			if(part.FindModelTransform(boundsCollider)!=null)
 			{
-				Destroy(part.FindModelTransform(boundsCollider).gameObject);
+				DestroyImmediate(part.FindModelTransform(boundsCollider).gameObject);
 			}
 
 			if(!HighLogic.LoadedSceneIsEditor)
@@ -443,6 +446,9 @@ public override void OnStart(PartModule.StartState state)
 			RefreshTweakables();
 
 			wheelColliders = part.FindModelComponents<WheelCollider>();
+
+			previousState = CurrentState;
+			part.SendMessage("GeometryPartModuleRebuildMeshData");
 		}
 
 		public override void OnLoad (ConfigNode node)
@@ -644,6 +650,28 @@ public void FixedUpdate()
 			UpdateWheelAlignment();
 
 			SavePosAndRot();
+
+			UpdateFAR();
+		}
+
+		void UpdateFAR()
+		{
+			if(previousState!=CurrentState)
+			{
+				if(CurrentState == GearStates.Retracted || CurrentState == GearStates.Deployed)
+				{
+					StartCoroutine(DelayedMeshUpdate());
+				}
+			}
+
+			previousState = CurrentState;
+		}
+
+		IEnumerator DelayedMeshUpdate()
+		{
+			yield return new WaitForSeconds(1.25f);
+			Debug.Log ("BDAdjustableLandingGear : Rebuilding mesh data.");
+			part.SendMessage("GeometryPartModuleRebuildMeshData");
 		}
 
 		void UpdateWheelAlignment()
@@ -770,6 +798,7 @@ void LoadPosAndRot()
 
 		public void OnEditorAttach()
 		{
+			Debug.Log ("BDADJ oneditorattach");
 			foreach(Part pSym in part.symmetryCounterparts)
 			{
 				if(pSym!=part && isMirrored == false)
@@ -933,7 +962,8 @@ void Steering()
 
 				float vPosMult = vesselWheelPos.y > vessel.localCoM.y ? 1 : -1;
 
-				float yawValue = vessel.ctrlState.yaw;
+				float yawValue;// = vessel.ctrlState.yaw;
+				yawValue = vessel.ctrlState.wheelSteer;
 				float reverseFactor = reverseSteering ? -1 : 1;
 				float speedFactor = Mathf.Clamp01((40-(float)vessel.srfSpeed)/40);
 				float targetAngle = yawValue * maxSteerAngle * reverseFactor * speedFactor * vPosMult;

BDAnimationModules/BDAnimationModules.userprefs

@@ -1,19 +1,17 @@
 <Properties>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|x86" PreferredExecutionTarget="MonoDevelop.Default" />
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|x86" />
   <MonoDevelop.Ide.Workbench ActiveDocument="BDAdjustableLandingGear.cs">
     <Files>
-      <File FileName="BDAdjustableLandingGear.cs" Line="18" Column="4" />
-      <File FileName="AnimatedThrust.cs" Line="1" Column="1" />
-      <File FileName="SurfaceWalker.cs" Line="17" Column="28" />
-      <File FileName="FSwheel\FSBDwheel.cs" Line="844" Column="19" />
-      <File FileName="Utils.cs" Line="41" Column="4" />
+      <File FileName="BDAdjustableLandingGear.cs" Line="965" Column="20" />
+      <File FileName="AnimatedEngine.cs" Line="1" Column="1" />
+      <File FileName="FSwheel\FSBDwheel.cs" Line="1" Column="1" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State expanded="True">
           <Node name="BDAnimationModules" expanded="True">
             <Node name="FSwheel" expanded="True" />
-            <Node name="BDGenericAnimationState.cs" selected="True" />
+            <Node name="BDAdjustableLandingGear.cs" selected="True" />
           </Node>
         </State>
       </Pad>

BDAnimationModules/MouseAimLight.cs

@@ -6,6 +6,7 @@ namespace BDAnimationModules
 {
 	public class MouseAimLight : PartModule
 	{
+		[KSPField(isPersistant = true)]
 		public bool turretEnabled = false;  //user initiated
 		public bool deployed = false;  //actual status
 		public AnimationState[] deployStates;
@@ -39,9 +40,21 @@ public class MouseAimLight : PartModule
 		public string yawTransformName = "aimRotate";
 		[KSPField(isPersistant = false)]
 		public string pitchTransformName = "aimPitch";
-		
-		
+
+		[KSPField(isPersistant = true)]
+		public Vector3 localAimPoint;
+
+		[KSPField(isPersistant = true)]
 		public bool mouseTracking = true;
+
+		[KSPField(isPersistant = false)]
+		public string emissiveObjectName = "lightPlane";
+
+		[KSPField(isPersistant = false)]
+		public string lightObjectName = "light";
+
+
+		Material emissiveMatRef;
 
 		[KSPAction("Toggle Position Lock", KSPActionGroup.Light)]
 		public void AGToggleTracking(KSPActionParam param)
@@ -78,10 +91,17 @@ public override void OnStart (PartModule.StartState state)
 			{
 				deployStates = SetUpAnimation(deployAnimName, this.part);
 			}
+
+			emissiveMatRef = part.FindModelTransform(emissiveObjectName).renderer.material;
 
-			spotLight = part.FindModelTransform("light").GetComponent<Light>();
+			spotLight = part.FindModelTransform(lightObjectName).GetComponent<Light>();
 			spotlightIntensity = spotLight.intensity;
-			spotLight.intensity = 4;
+			spotLight.intensity = turretEnabled ? spotlightIntensity : 0;
+			spotLight.enabled = turretEnabled;
+
+			//emissive
+			float colorSet = spotLight.intensity/spotlightIntensity;
+			emissiveMatRef.SetColor("_EmissiveColor", new Color(colorSet,colorSet,colorSet,1));
 
 			pitchTransform = part.FindModelTransform(pitchTransformName);
 			yawTransform = part.FindModelTransform(yawTransformName);
@@ -130,8 +150,6 @@ public override void OnFixedUpdate ()
 					//deploying
 					if(turretEnabled)
 					{
-						
-						
 						if(anim.normalizedTime<1 && anim.speed<1)
 						{
 							anim.speed = 1;	
@@ -155,6 +173,7 @@ public override void OnFixedUpdate ()
 
 						if(turretZeroed)
 						{
+							spotLight.enabled = false;
 							anim.enabled = true;
 							if(anim.normalizedTime > 0 && anim.speed > -1)
 							{
@@ -171,40 +190,39 @@ public override void OnFixedUpdate ()
 
 			if(hasPower && deployed && (TimeWarp.WarpMode!=TimeWarp.Modes.HIGH || TimeWarp.CurrentRate == 1))
 			{
-				if(mouseTracking) Aim ();	
+				if(mouseTracking)
+				{
+					Aim(GetTarget());
+				}
+				else
+				{
+					Aim (transform.TransformPoint(localAimPoint));
+				}
+				spotLight.enabled = true;
 				spotLight.intensity = Mathf.MoveTowards(spotLight.intensity, spotlightIntensity, spotlightIntensity * TimeWarp.fixedDeltaTime);
 			}
 			if(!hasPower)
+			{
 				spotLight.intensity = Mathf.MoveTowards(spotLight.intensity, 0, 3*spotlightIntensity * TimeWarp.fixedDeltaTime);
+				if(spotLight.intensity == 0)
+				{
+					spotLight.enabled = false;
+				}
+			}
 			//emissive
 			float colorSet = spotLight.intensity/spotlightIntensity;
-			part.FindModelTransform("lightPlane").renderer.material.SetColor("_EmissiveColor", new Color(colorSet,colorSet,colorSet,1));
+			emissiveMatRef.SetColor("_EmissiveColor", new Color(colorSet,colorSet,colorSet,1));
 
 		}
 
-		
-		
-		private void Aim()
+		Vector3 GetTarget()
 		{
-			Vector3 target = Vector3.zero;
-			Vector3 targetYawOffset;
-			Vector3 targetPitchOffset;
-			
-			//auto target tracking
-			
-			Vessel targetVessel = null;
-			if(vessel.targetObject!=null)
+			Vector3 target;
+			if(vessel.targetObject!=null && vessel.targetObject.GetTransform()!=null)
 			{
-				targetVessel = vessel.targetObject.GetVessel();
+				target = vessel.targetObject.GetTransform ().position;
 			}
-			if(targetVessel!=null)
-			{
-				target = targetVessel.transform.position;
-			}
-			
-			//
-			
-			if (target == Vector3.zero)  //if no target from vessel Target, use mouse aim
+			else
 			{
 				Vector3 mouseAim = new Vector3(Input.mousePosition.x/Screen.width, Input.mousePosition.y/Screen.height, 0);
 				Ray ray = FlightCamera.fetch.mainCamera.ViewportPointToRay(mouseAim);
@@ -228,6 +246,16 @@ private void Aim()
 					target = ray.direction * maxTargetingRange + FlightCamera.fetch.mainCamera.transform.position;	
 				}
 			}
+
+			localAimPoint = transform.InverseTransformPoint(target);
+			return target;
+		}
+		
+		private void Aim(Vector3 target)
+		{
+			Vector3 targetYawOffset;
+			Vector3 targetPitchOffset;
+			
 			targetDistance = (target - part.transform.position).magnitude;
 			spotlightIntensity = Mathf.Clamp(0.005f * targetDistance, 1, 4.5f);
 			targetYawOffset = yawTransform.position - target;
@@ -274,10 +302,7 @@ private void Aim()
 						yawTransform.localRotation *= Quaternion.AngleAxis(-rotationSpeedYaw, yawAxis);
 					}
 				}
-				
-				
-			
-			
+
 				//pitch movement
 				if(targetPitchOffset.z > 0 && pitchTransform.localRotation.Yaw ()>-maxPitch*Mathf.Deg2Rad)
 				{