Merge pull request #143 from snjo/DEVELOP

Updates for KSP 1.1
snjo · Mar 30, 2016 · e12d883 · e12d883
2 parents dc62075 + 66fac87
commit e12d883
Show file tree

Hide file tree

Showing 28 changed files with 252 additions and 241 deletions.
diff --git a/Firespitter/Firespitter.csproj b/Firespitter/Firespitter.csproj
@@ -41,6 +41,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
     </Reference>
+    <Reference Include="KSPUtil">
+      <HintPath>..\..\..\KSP_DEV\KSP_Data\Managed\KSPUtil.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -51,6 +54,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="aero\FSbladeLiftSurface.cs" />
@@ -151,7 +157,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy Firespitter.dll D:\KSP_DEV\GameData\Firespitter\Plugins</PostBuildEvent>
+    <PostBuildEvent>copy Firespitter.dll C:\SYNC\Dropbox\KSP_DEV\GameData\Firespitter\Plugins</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/Firespitter/aero/FSwingBase.cs b/Firespitter/aero/FSwingBase.cs
@@ -267,11 +267,11 @@ private void updateFlap()
     {
         if (leadingEdgeCurrent > 0f)
         {
-            part.rigidbody.drag = leadingEdgeDrag * (float)vessel.atmDensity * leadingEdgeCurrent;
+            part.GetComponent<Rigidbody>().drag = leadingEdgeDrag * (float)vessel.atmDensity * leadingEdgeCurrent;
         }
         else
         {
-            part.rigidbody.drag = 0f;
+            part.GetComponent<Rigidbody>().drag = 0f;
         }
     }
 
@@ -281,7 +281,7 @@ public void setLeadingEdge(bool newState)
         if (newState == true)
         {
             leadingEdgeTarget = 1f;
-            //part.rigidbody.drag = leadingEdgeDrag * vessel.atmDensity * ;            
+            //part.GetComponent<Rigidbody>().drag = leadingEdgeDrag * vessel.atmDensity * ;            
             if (affectStockWingModule)
             {
                 currentDeflectionLiftCoeff = deflectionLiftCoeff + leadingEdgeLift;
@@ -295,7 +295,7 @@ public void setLeadingEdge(bool newState)
         else
         {
             leadingEdgeTarget = 0f;
-            //part.rigidbody.drag = 0f;
+            //part.GetComponent<Rigidbody>().drag = 0f;
             if (affectStockWingModule)
             {
                 stockWingModule.deflectionLiftCoeff = deflectionLiftCoeff;

diff --git a/Firespitter/cockpit/FSActionGroupSwitch.cs b/Firespitter/cockpit/FSActionGroupSwitch.cs
@@ -97,8 +97,8 @@ public void buttonClick() //(int buttonNumber)
             //set emissive color if used when clicked, start countdown to reset emissive if that applies
             if (useEmissiveToggle == 1)
             {
-                switchObjectTransform.renderer.material.SetColor("_EmissiveColor", new Color(onEmissiveColor.x, onEmissiveColor.y, onEmissiveColor.z));
-                //switchObjectTransform.renderer.material.SetColor("_EmissiveColor", Color.yellow);            
+                switchObjectTransform.GetComponent<Renderer>().material.SetColor("_EmissiveColor", new Color(onEmissiveColor.x, onEmissiveColor.y, onEmissiveColor.z));
+                //switchObjectTransform.GetComponent<Renderer>().material.SetColor("_EmissiveColor", Color.yellow);            
                 emissiveCountdown = resetEmissiveTime;
             }
 
@@ -254,8 +254,8 @@ public void Update()
                 {
                     if (emissiveCountdown == 0)
                     {
-                        switchObjectTransform.renderer.material.SetColor("_EmissiveColor", new Color(offEmissiveColor.x, offEmissiveColor.y, offEmissiveColor.z, 1f));
-                        //switchObjectTransform.renderer.material.SetColor("_EmissiveColor", Color.green);
+                        switchObjectTransform.GetComponent<Renderer>().material.SetColor("_EmissiveColor", new Color(offEmissiveColor.x, offEmissiveColor.y, offEmissiveColor.z, 1f));
+                        //switchObjectTransform.GetComponent<Renderer>().material.SetColor("_EmissiveColor", Color.green);
                         emissiveCountdown--;
                     }
                     else if (emissiveCountdown > 0)

diff --git a/Firespitter/cockpit/FSartificialHorizon.cs b/Firespitter/cockpit/FSartificialHorizon.cs
@@ -64,7 +64,7 @@ void Start()
             if (innerDiscTransform != null)
             {
                 innerDisc = innerDiscTransform.gameObject;
-                discMat = innerDisc.renderer.material;
+                discMat = innerDisc.GetComponent<Renderer>().material;
             }
         }
         catch

diff --git a/Firespitter/cockpit/FScameraToTV.cs b/Firespitter/cockpit/FScameraToTV.cs
@@ -66,12 +66,12 @@ public void Start()
         newTex.Create();
         newMat = new Material(Shader.Find("Diffuse"));
         //newMat = new Material(Shader.Find("KSP/Emissive/Diffuse"));
-        //newMat = TVplaneObject.renderer.material;
-        //newMat.CopyPropertiesFromMaterial(TVplaneObject.renderer.material);
+        //newMat = TVplaneObject.GetComponent<Renderer>().material;
+        //newMat.CopyPropertiesFromMaterial(TVplaneObject.GetComponent<Renderer>().material);
         newMat.SetTexture("_MainTex", newTex);        
 
         TVplaneObject = base.internalProp.FindModelTransform(TVplaneName).gameObject;
-        TVplaneObject.renderer.material = newMat;
+        TVplaneObject.GetComponent<Renderer>().material = newMat;
 
         foreach (Part part in vessel.Parts)
         {

diff --git a/Firespitter/cockpit/FSkerbalPuppet.cs b/Firespitter/cockpit/FSkerbalPuppet.cs
@@ -85,7 +85,7 @@ private void updatePuppetActive()
         {            
             foreach (Transform t in puppetTransforms)
             {
-                t.gameObject.renderer.enabled = showPuppet;                
+                t.gameObject.GetComponent<Renderer>().enabled = showPuppet;                
             }
             doUpdate = false;
         }

diff --git a/Firespitter/cockpit/FSmonitorScript.cs b/Firespitter/cockpit/FSmonitorScript.cs
@@ -91,7 +91,7 @@ public void createTextGrid()
         {
             int charCount = 0;
             int lineCount = 0;
-            spriteSheetMat = base.internalProp.FindModelTransform(charPlateObject).renderer.material;
+            spriteSheetMat = base.internalProp.FindModelTransform(charPlateObject).GetComponent<Renderer>().material;
 
             //baseCharPlate = GameObject.Find(charPlateObject);
             baseCharPlate = base.internalProp.FindModelTransform(charPlateObject).gameObject;
@@ -111,9 +111,9 @@ public void createTextGrid()
                         //newPlate.transform.localPosition += new Vector3(charSpacing * (charCount), 0f, lineSpacing * (lineCount));
                         newPlate.transform.localPosition += new Vector3(-charSpacing * charCount, -lineSpacing * lineCount, 0f);
                         newPlate.name = "cpl" + lineCount + "c" + charCount;
-                        newPlate.renderer.material = new Material(spriteSheetMat.shader);
-                        newPlate.renderer.material.mainTexture = spriteSheetMat.mainTexture;
-                        newPlate.renderer.material.mainTextureScale = new Vector2(-spriteScale, spriteScale); ;
+                        newPlate.GetComponent<Renderer>().material = new Material(spriteSheetMat.shader);
+                        newPlate.GetComponent<Renderer>().material.mainTexture = spriteSheetMat.mainTexture;
+                        newPlate.GetComponent<Renderer>().material.mainTextureScale = new Vector2(-spriteScale, spriteScale); ;
                         charList.Add(newPlate);
                     }
                     lineList.Add(charList);
@@ -198,7 +198,7 @@ private void parseStringArray(string[] inputTextArray)
                         {
                             char paddedChar = ' ';
                             if (charCount < charArray.Length) paddedChar = charArray[charCount];
-                            lineList[lineCount][charCount].renderer.material.mainTextureOffset = (getSheetCharPosition(paddedChar) * spriteScale) - new Vector2(spriteShift, 0f);
+                            lineList[lineCount][charCount].GetComponent<Renderer>().material.mainTextureOffset = (getSheetCharPosition(paddedChar) * spriteScale) - new Vector2(spriteShift, 0f);
                         }
                         oldTextArray[lineCount] = inputTextArray[lineCount];
                     }
@@ -215,7 +215,7 @@ private void parseSingleString(string inputText)
                 int lineNum = (i - charNum) / 10; // hmmm, seems hard coded somehow...
                 //int lineNum = (i - charNum) / charPerLine; // should try this instead later.
                 if (lineNum >= linesPerPage) break;
-                lineList[lineNum][charNum].renderer.material.mainTextureOffset = (getSheetCharPosition(c[i]) * spriteScale) - new Vector2(spriteShift, 0f);
+                lineList[lineNum][charNum].GetComponent<Renderer>().material.mainTextureOffset = (getSheetCharPosition(c[i]) * spriteScale) - new Vector2(spriteShift, 0f);
                 oldText = inputText;
             }
         }

diff --git a/Firespitter/control/FSmoveCraftAtLaunch.cs b/Firespitter/control/FSmoveCraftAtLaunch.cs
@@ -183,10 +183,10 @@ public void tryMoveVessel()
         {
             //Debug.Log("FSmoveCAL: moving vessel to: " + launchPosition);
             vessel.SetPosition(calculateLaunchPosition(), true);
-            if (!vessel.rigidbody.isKinematic)
+            if (!vessel.GetComponent<Rigidbody>().isKinematic)
             {
-                vessel.rigidbody.velocity = Vector3.zero;
-                vessel.rigidbody.angularVelocity = Vector3.zero;
+                vessel.GetComponent<Rigidbody>().velocity = Vector3.zero;
+                vessel.GetComponent<Rigidbody>().angularVelocity = Vector3.zero;
             }
         }
     }
@@ -198,7 +198,7 @@ public void fixCraftLock()
         base.vessel.Landed = false;
         base.vessel.Splashed = true;
         base.vessel.GoOnRails();
-        base.vessel.rigidbody.WakeUp();
+        base.vessel.GetComponent<Rigidbody>().WakeUp();
         base.vessel.ResumeStaging();
         vessel.landedAt = "";
         InputLockManager.ClearControlLocks();

diff --git a/Firespitter/customization/FSfuelSwitch.cs b/Firespitter/customization/FSfuelSwitch.cs
@@ -75,6 +75,10 @@ public override void OnLoad(ConfigNode node)
             {
                 initializeData();
             }
+            if (basePartMass != part.mass)
+            {
+                Debug.LogError("Error: FSFuelSwitch Mass Discrepancy detected in part '" + part.name + "'.", part);
+            }
             configLoaded = true;
             //Debug.Log("FS LOAD DONE " + tankList.Count);
         }
@@ -347,5 +351,5 @@ public override string GetInfo()
             else
                 return string.Empty;
         }
-    }    
+    }
 }
diff --git a/Firespitter/customization/FSmeshSwitch.cs b/Firespitter/customization/FSmeshSwitch.cs
@@ -143,8 +143,8 @@ private void setObject(int objectNumber, bool calledByPlayer)
                     if (affectColliders)
                     {
                         debug.debugMessage("setting collider states");
-                        if (objectTransforms[i][j].gameObject.collider != null)
-                            objectTransforms[i][j].gameObject.collider.enabled = false;
+                        if (objectTransforms[i][j].gameObject.GetComponent<Collider>() != null)
+                            objectTransforms[i][j].gameObject.GetComponent<Collider>().enabled = false;
                     }                    
                 }
             }
@@ -155,10 +155,10 @@ private void setObject(int objectNumber, bool calledByPlayer)
                 objectTransforms[objectNumber][i].gameObject.SetActive(true);
                 if (affectColliders)
                 {
-                    if (objectTransforms[objectNumber][i].gameObject.collider != null)
+                    if (objectTransforms[objectNumber][i].gameObject.GetComponent<Collider>() != null)
                     {
                         debug.debugMessage("Setting collider true on new active object");
-                        objectTransforms[objectNumber][i].gameObject.collider.enabled = true;
+                        objectTransforms[objectNumber][i].gameObject.GetComponent<Collider>().enabled = true;
                     }
                 }                
             }            

diff --git a/Firespitter/customization/FStextureSwitch.cs b/Firespitter/customization/FStextureSwitch.cs
@@ -203,9 +203,9 @@ public override void OnStart(PartModule.StartState state)
             foreach (String targetObjectName in objectList)
             {
                 Transform targetObjectTransform = part.FindModelTransform(targetObjectName);
-                if (targetObjectTransform != null && targetObjectTransform.gameObject.renderer != null) // check for if the object even has a mesh. otherwise part list loading crashes
+                if (targetObjectTransform != null && targetObjectTransform.gameObject.GetComponent<Renderer>() != null) // check for if the object even has a mesh. otherwise part list loading crashes
                 {
-                    Material targetMat = targetObjectTransform.gameObject.renderer.material;
+                    Material targetMat = targetObjectTransform.gameObject.GetComponent<Renderer>().material;
                     if (targetMat != null)
                     {
                         if (!targetMats.Contains(targetMat))

diff --git a/Firespitter/customization/FStextureSwitch2.cs b/Firespitter/customization/FStextureSwitch2.cs
@@ -327,9 +327,9 @@ private void initializeData()
                     List<Material> matList = new List<Material>();
                     foreach (Transform t in targetObjectTransformArray)
                     {
-                        if (t != null && t.gameObject.renderer != null) // check for if the object even has a mesh. otherwise part list loading crashes
+                        if (t != null && t.gameObject.GetComponent<Renderer>() != null) // check for if the object even has a mesh. otherwise part list loading crashes
                         {
-                            Material targetMat = t.gameObject.renderer.material;
+                            Material targetMat = t.gameObject.GetComponent<Renderer>().material;
                             if (targetMat != null)
                             {
                                 if (!matList.Contains(targetMat))

diff --git a/Firespitter/engine/FS engine modules/FSengine.cs b/Firespitter/engine/FS engine modules/FSengine.cs
@@ -301,7 +301,7 @@ public virtual void FixedUpdate()
 
             for (int i = 0; i < thrustTransforms.Length; i++)
             {
-                rigidbody.AddForceAtPosition(-thrustTransforms[i].forward * applyThrust, thrustTransforms[i].position);
+                GetComponent<Rigidbody>().AddForceAtPosition(-thrustTransforms[i].forward * applyThrust, thrustTransforms[i].position);
             }
             smoothFxThrust = Mathf.Lerp(smoothFxThrust, finalThrustNormalized, smoothFXSpeed);
 
@@ -310,7 +310,7 @@ public virtual void FixedUpdate()
 
         private float getForwardSpeed()
         {
-            Vector3 vel = GetVelocity(part.rigidbody, thrustTransforms[0].position);
+            Vector3 vel = GetVelocity(part.GetComponent<Rigidbody>(), thrustTransforms[0].position);
             float thrustTransformRelativeSpeed = Vector3.Dot(-vel.normalized, thrustTransforms[0].forward) * vel.magnitude;
             thrustTransformRelativeSpeed = Mathf.Max(0f, thrustTransformRelativeSpeed);            
             return thrustTransformRelativeSpeed;

diff --git a/Firespitter/engine/FS engine modules/FSengineBladed.cs b/Firespitter/engine/FS engine modules/FSengineBladed.cs
@@ -239,7 +239,7 @@ public override void FixedUpdate()
 
         private float getAirSpeed()
         {
-            partVelocity = GetVelocity(rigidbody, transform.position);
+            partVelocity = GetVelocity(GetComponent<Rigidbody>(), transform.position);
             float airDirection = Vector3.Dot(baseTransform.up, partVelocity.normalized);
             airSpeedThroughRotor = partVelocity.magnitude * airDirection;
             partFacingUp = Mathf.Sign(Vector3.Dot(vessel.upAxis, baseTransform.up));

diff --git a/Firespitter/engine/FSengineSounds.cs b/Firespitter/engine/FSengineSounds.cs
@@ -149,7 +149,7 @@ public bool createGroup(FXGroup group, string name, bool loop)
                 //group.audio.rolloffMode = AudioRolloffMode.Logarithmic;            
                 group.audio.rolloffMode = AudioRolloffMode.Linear;
                 group.audio.dopplerLevel = 0f;
-                group.audio.panLevel = 1f;
+                group.audio.panStereo = 1f;
                 group.audio.clip = GameDatabase.Instance.GetAudioClip(name);
                 group.audio.loop = loop;
                 group.audio.playOnAwake = false;

diff --git a/Firespitter/engine/FSparticleFX.cs b/Firespitter/engine/FSparticleFX.cs
@@ -51,7 +51,7 @@ public FSparticleFX(GameObject _gameObject, Texture2D _particleTexture)
 
         private void addComponents()
         {
-            pEmitter = (ParticleEmitter)gameObject.AddComponent("MeshParticleEmitter");
+            pEmitter =  gameObject.AddComponent<MeshParticleEmitter>();
             pRenderer = gameObject.AddComponent<ParticleRenderer>();
             pAnimator = gameObject.AddComponent<ParticleAnimator>();
         }
@@ -95,8 +95,8 @@ public void updateFX()
 
             if (useLocalSpaceVelocityHack)
             {
-                //float velMagnitude = parentObject.rigidbody.velocity.magnitude;
-                float fxSpeed = Vector3.Dot(gameObject.transform.forward, parentObject.rigidbody.velocity);
+                //float velMagnitude = parentObject.GetComponent<Rigidbody>().velocity.magnitude;
+                float fxSpeed = Vector3.Dot(gameObject.transform.forward, parentObject.GetComponent<Rigidbody>().velocity);
                 if (fxSpeed > 0f)
                     fxSpeed = 0;
                 pEmitter.localVelocity = new Vector3(0f, 0f, 1f + (-fxSpeed * 0.1f));

diff --git a/Firespitter/engine/FSplanePropellerSpinner.cs b/Firespitter/engine/FSplanePropellerSpinner.cs
@@ -64,18 +64,18 @@ private void setBladeRendererState(bool newState)
         {
             for (int i = 0; i < bladeObjects.Count; i++)
             {
-                bladeObjects[i].renderer.enabled = newState;                
+                bladeObjects[i].GetComponent<Renderer>().enabled = newState;                
             }
             if (duplicatedBlades)
             {
                 for (int i = 0; i < blurObjects.Length; i++)
                 {
-                    blurObjects[i].gameObject.renderer.enabled = !newState;                    
+                    blurObjects[i].gameObject.GetComponent<Renderer>().enabled = !newState;                    
                 }
             }
             else
             {
-                rotorDisc.renderer.enabled = !newState;
+                rotorDisc.GetComponent<Renderer>().enabled = !newState;
             }
         }
 
@@ -118,7 +118,7 @@ public override void OnStart(PartModule.StartState state)
                     rotorDisc = part.FindModelTransform(rotorDiscName);
                     if (rotorDisc != null)
                     {
-                        rotorDisc.gameObject.renderer.enabled = false;
+                        rotorDisc.gameObject.GetComponent<Renderer>().enabled = false;
 
                         if (blade1 != "")
                             bladeNames.Add(blade1);

diff --git a/Firespitter/engine/FSpropellerTweak.cs b/Firespitter/engine/FSpropellerTweak.cs
@@ -271,7 +271,7 @@ private void updateEngineLength()
 
                 //if (centerOfMass != null)
                 //{
-                //    part.rigidbody.centerOfMass = centerOfMass.po;
+                //    part.GetComponent<Rigidbody>().centerOfMass = centerOfMass.po;
                 //}
             }
         }
@@ -282,11 +282,11 @@ private void updateExhaustNumber(int amount)
             {
                 if (amount == 0)
                 {
-                    exhausts[0].renderer.enabled = false;
+                    exhausts[0].GetComponent<Renderer>().enabled = false;
                 }
                 else
                 {
-                    exhausts[0].renderer.enabled = true;
+                    exhausts[0].GetComponent<Renderer>().enabled = true;
                 }
 
                 if (amount != exhausts.Count)

diff --git a/Firespitter/engine/FSrotorTrim.cs b/Firespitter/engine/FSrotorTrim.cs
@@ -111,7 +111,7 @@ private void autoHover()
         {
             {
                 Vector3 heading = (Vector3d)this.vessel.transform.up;
-                Vector3d up = (this.vessel.rigidbody.position - this.vessel.mainBody.position).normalized;
+                Vector3d up = (this.vessel.GetComponent<Rigidbody>().position - this.vessel.mainBody.position).normalized;
 
                 Transform modifiedUp = new GameObject().transform;
                 modifiedUp.rotation = Quaternion.LookRotation(up, heading);