Just moving some things around

Nivekk · Mar 24, 2015 · bb86db3 · bb86db3
1 parent 5d69f35
commit bb86db3
Show file tree

Hide file tree

Showing 46 changed files with 1,180 additions and 1,788 deletions.
diff --git a/Binding.cs → Bindings/Binding.cs b/Binding.cs → Bindings/Binding.cs
diff --git a/BindingsFlightControl.cs → Bindings/BindingsFlightControl.cs b/BindingsFlightControl.cs → Bindings/BindingsFlightControl.cs
@@ -237,9 +237,9 @@ public override void AddTo(BindingManager manager)
                 {
                     VesselUtils.SetTarget(((VesselTarget)val).target);
                 }
-                else if (val is BodyTarget)
+                else if (val is Body)
                 {
-                    VesselUtils.SetTarget(((BodyTarget)val).target);
+                    VesselUtils.SetTarget(((Body)val).BodyRef);
                 }
                 else
                 {
@@ -269,7 +269,7 @@ public override void AddTo(BindingManager manager)
                 }
                 else if (currentTarget is CelestialBody)
                 {
-                    return new BodyTarget((CelestialBody)currentTarget, cpu);
+                    return new Body((CelestialBody)currentTarget, cpu);
                 }
 
                 return null;

diff --git a/BindingsFlightStats.cs → Bindings/BindingsFlightStats.cs b/BindingsFlightStats.cs → Bindings/BindingsFlightStats.cs
@@ -13,7 +13,7 @@ public class BindingsFlightStats : Binding
     {
         public override void AddTo(BindingManager manager)
         {
-            manager.AddGetter("ALT:RADAR",      delegate(CPU cpu) { return cpu.Vessel.heightFromTerrain > 0 ? Mathf.Min(cpu.Vessel.heightFromTerrain, (float)cpu.Vessel.altitude) : (float)cpu.Vessel.altitude; });
+            manager.AddGetter("ALT:RADAR",      delegate(CPU cpu) { return Mathf.Min(0, cpu.Vessel.heightFromTerrain, (float)cpu.Vessel.altitude); });
             manager.AddGetter("ALT:APOAPSIS",   delegate(CPU cpu) { return cpu.Vessel.orbit.ApA; });
             manager.AddGetter("ALT:PERIAPSIS",  delegate(CPU cpu) { return cpu.Vessel.orbit.PeA; });
             manager.AddGetter("ETA:APOAPSIS",   delegate(CPU cpu) { return cpu.Vessel.orbit.timeToAp; });
@@ -26,8 +26,8 @@ public override void AddTo(BindingManager manager)
             manager.AddGetter("COMMRANGE",      delegate(CPU cpu) { return VesselUtils.GetCommRange(cpu.Vessel); });
             manager.AddGetter("INCOMMRANGE",    delegate(CPU cpu) { return Convert.ToDouble(CheckCommRange(cpu.Vessel)); });
 
-            manager.AddGetter("AV", delegate(CPU cpu) { return cpu.Vessel.transform.InverseTransformDirection(cpu.Vessel.rigidbody.angularVelocity); });
-            manager.AddGetter("STAGE", delegate(CPU cpu) { return new StageValues(cpu.Vessel); });
+            manager.AddGetter("AV",             delegate(CPU cpu) { return cpu.Vessel.transform.InverseTransformDirection(cpu.Vessel.rigidbody.angularVelocity); });
+            manager.AddGetter("STAGE",          delegate(CPU cpu) { return new StageValues(cpu.Vessel); });
 
             manager.AddGetter("ENCOUNTER",      delegate(CPU cpu) { return VesselUtils.TryGetEncounter(cpu.Vessel); });
 
@@ -50,7 +50,7 @@ public override void AddTo(BindingManager manager)
 
             manager.AddSetter("VESSELNAME", delegate(CPU cpu, object value) { cpu.Vessel.vesselName = value.ToString(); });
             }
-
+            
             private static float getLattitude(CPU cpu)
             {
                 float retVal = (float)cpu.Vessel.latitude;

diff --git a/BindingsRoverStats.cs → Bindings/BindingsRoverStats.cs b/BindingsRoverStats.cs → Bindings/BindingsRoverStats.cs
diff --git a/BindingsTerminalSettings.cs → Bindings/BindingsTerminalSettings.cs b/BindingsTerminalSettings.cs → Bindings/BindingsTerminalSettings.cs
diff --git a/BindingsTest.cs → Bindings/BindingsTest.cs b/BindingsTest.cs → Bindings/BindingsTest.cs
diff --git a/BindingsUniverse.cs → Bindings/BindingsUniverse.cs b/BindingsUniverse.cs → Bindings/BindingsUniverse.cs
@@ -22,7 +22,7 @@ public override void AddTo(BindingManager manager)
 
             foreach (CelestialBody body in FlightGlobals.fetch.bodies)
             {
-                manager.AddGetter(body.name, delegate(CPU cpu) { return new BodyTarget(body, cpu); });
+                manager.AddGetter(body.name, delegate(CPU cpu) { return new Body(body, cpu); });
             }
         }
     }

diff --git a/BodyTarget.cs b/BodyTarget.cs
diff --git a/Command.cs → Commands/Command.cs b/Command.cs → Commands/Command.cs
diff --git a/CommandBasicIO.cs → Commands/CommandBasicIO.cs b/CommandBasicIO.cs → Commands/CommandBasicIO.cs
@@ -159,9 +159,9 @@ public override void Evaluate()
             {
                 object baseObj = new Expression(targetTerm.SubTerms[0], ParentContext).GetValue();
 
-                if (baseObj is SpecialValue)
+                if (baseObj is Structure)
                 {
-                    if (((SpecialValue)baseObj).SetSuffix(targetTerm.SubTerms[1].Text.ToUpper(), e.GetValue()))
+                    if (((Structure)baseObj).SetSuffix(targetTerm.SubTerms[1].Text.ToUpper(), e.GetValue()))
                     {
                         State = ExecutionState.DONE;
                         return;

diff --git a/CommandCallExternal.cs → Commands/CommandCallExternal.cs b/CommandCallExternal.cs → Commands/CommandCallExternal.cs
diff --git a/CommandFileIO.cs → Commands/CommandFileIO.cs b/CommandFileIO.cs → Commands/CommandFileIO.cs
diff --git a/CommandFlowControl.cs → Commands/CommandFlowControl.cs b/CommandFlowControl.cs → Commands/CommandFlowControl.cs
diff --git a/CommandTemporal.cs → Commands/CommandTemporal.cs b/CommandTemporal.cs → Commands/CommandTemporal.cs
diff --git a/CommandVessel.cs → Commands/CommandVessel.cs b/CommandVessel.cs → Commands/CommandVessel.cs
diff --git a/ContextRunProgram.cs b/ContextRunProgram.cs
@@ -16,8 +16,6 @@ public class ContextRunProgram : ExecutionContext
         private List<Expression> parameters = new List<Expression>();
         private int executionLine = 0;
 
-
-
         public string Filename;
 
         public ContextRunProgram(ExecutionContext parent, List<Expression> parameters, String filename) : base(parent) 

diff --git a/Core.cs b/Core.cs
@@ -69,7 +69,7 @@ void InjectModules()
 
             ConfigNode propNode = new ConfigNode("PROP");
             propNode.AddValue("name", "kOSInternalDisplay");
-            propNode.AddValue("position", "-0.105,0.202,-0.4557");
+            propNode.AddValue("position", "-0.1055,0.202,-0.4557");
             propNode.AddValue("rotation", "0.5372996,0,0,0.8433914");
             propNode.AddValue("scale", "0.79,1,0.82");
 
@@ -99,7 +99,7 @@ void Update()
             {
                 hasTriggeredInjectScript = true;
 
-                //InjectModules();
+                InjectModules();
             }
         }