Merge pull request #647 from MOARdV/master

v0.29.2
Mihara · Oct 18, 2017 · 17a183e · 17a183e
2 parents aa0bf1e + 5ed448b
commit 17a183e
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 18 deletions.
diff --git a/GameData/JSI/RasterPropMonitor/RasterPropMonitor.version b/GameData/JSI/RasterPropMonitor/RasterPropMonitor.version
@@ -5,7 +5,7 @@
   "VERSION": {
     "MAJOR": 0,
     "MINOR": 29,
-    "PATCH": 1
+    "PATCH": 2
   },
   "KSP_VERSION": {
     "MAJOR": 1,

diff --git a/RasterPropMonitor.sln b/RasterPropMonitor.sln
@@ -195,6 +195,6 @@ Global
 		$36.inheritsSet = Mono
 		$36.inheritsScope = text/plain
 		$36.scope = text/plain
-		version = 0.29.1
+		version = 0.29.2
 	EndGlobalSection
 EndGlobal
diff --git a/RasterPropMonitor/Core/MathVariable.cs b/RasterPropMonitor/Core/MathVariable.cs
@@ -41,6 +41,7 @@ enum Operator
             ATAN2,
             MAXINDEX,
             MININDEX,
+            MODULO,
         };
 
         public readonly string name;
@@ -107,6 +108,12 @@ internal MathVariable(ConfigNode node, RasterPropMonitorComputer rpmComp)
                 indexOperator = false;
                 maxParameters = 2;
             }
+            else if (oper == Operator.MODULO.ToString())
+            {
+                op = Operator.MODULO;
+                indexOperator = false;
+                maxParameters = 2;
+            }
             else if (oper == Operator.MAXINDEX.ToString())
             {
                 op = Operator.MAXINDEX;
@@ -207,6 +214,9 @@ public object Evaluate()
                         case Operator.ATAN2:
                             value = Math.Atan2(value, operand) * Mathf.Rad2Deg;
                             break;
+                        case Operator.MODULO:
+                            value = (operand == 0.0) ? 0.0 : (value - operand * Math.Floor(value / operand));
+                            break;
                     }
                 }
 

diff --git a/RasterPropMonitor/Core/MonitorPage.cs b/RasterPropMonitor/Core/MonitorPage.cs
@@ -136,11 +136,11 @@ public void UpdateText(RasterPropMonitorComputer rpmComp)
             {
                 if (isMutable)
                 {
-                    if(spf == null)
+                    if (spf == null)
                     {
                         string[] linesArray = text.Split(JUtil.LineSeparator, StringSplitOptions.None);
                         spf = new StringProcessorFormatter[linesArray.Length];
-                        for(int i=0; i<linesArray.Length; ++i)
+                        for (int i = 0; i < linesArray.Length; ++i)
                         {
                             spf[i] = new StringProcessorFormatter(linesArray[i], rpmComp);
                         }
@@ -388,6 +388,7 @@ public MonitorPage(int idNum, ConfigNode node, RasterPropMonitor thatMonitor)
             {
                 if (node.HasValue("cameraTransform"))
                 {
+                    JUtil.LogInfo(this, "WARNING: 'cameraTransform' in a PAGE node is deprecated, and the functionality will be removed in a future RPM release.  Please use a JSISteerableCamera background handler instead.");
                     isMutable = true;
                     background = BackgroundType.Camera;
                     camera = node.GetValue("cameraTransform");

diff --git a/RasterPropMonitor/Core/RPMVCPerModule.cs b/RasterPropMonitor/Core/RPMVCPerModule.cs
@@ -94,7 +94,6 @@ internal enum DockingNodeState
 
         //--- Power production
         internal List<ModuleAlternator> availableAlternators = new List<ModuleAlternator>();
-        internal List<float> availableAlternatorOutput = new List<float>();
         internal List<ModuleResourceConverter> availableFuelCells = new List<ModuleResourceConverter>();
         internal List<float> availableFuelCellOutput = new List<float>();
         internal List<ModuleGenerator> availableGenerators = new List<ModuleGenerator>();
@@ -136,7 +135,6 @@ internal void InvalidateModuleLists()
             availableAblators.Clear();
             availableAirIntakes.Clear();
             availableAlternators.Clear();
-            availableAlternatorOutput.Clear();
             availableDeployableWheels.Clear();
             availableEngines.Clear();
             availableFuelCells.Clear();
@@ -209,7 +207,6 @@ internal void UpdateModuleLists()
                                     if (alt.resHandler.outputResources[i].name == "ElectricCharge")
                                     {
                                         availableAlternators.Add(alt);
-                                        availableAlternatorOutput.Add((float)alt.resHandler.outputResources[i].rate);
                                         break;
                                     }
                                 }
@@ -415,7 +412,7 @@ private void FetchElectricData()
             for (int i = 0; i < availableAlternators.Count; ++i)
             {
                 // I assume there's only one ElectricCharge output in a given ModuleAlternator
-                alternatorOutput += availableAlternatorOutput[i] * availableAlternators[i].outputRate;
+                alternatorOutput += availableAlternators[i].outputRate;
             }
 
             for (int i = 0; i < availableSolarPanels.Count; ++i)

diff --git a/RasterPropMonitor/Core/RasterPropMonitor.cs b/RasterPropMonitor/Core/RasterPropMonitor.cs
@@ -506,10 +506,7 @@ public override void OnUpdate()
                 }
                 else
                 {
-                    if (!resourceDepleted && !noCommConnection)
-                    {
-                        RenderScreen();
-                    }
+                    RenderScreen();
                 }
             }
             else
@@ -519,10 +516,8 @@ public override void OnUpdate()
                     FillScreenBuffer();
                     textRefreshRequired = false;
                 }
-                if (!resourceDepleted && !noCommConnection)
-                {
-                    RenderScreen();
-                }
+                RenderScreen();
+
                 firstRenderComplete = true;
             }
 
@@ -584,10 +579,14 @@ void ResourceDepletedCallback(bool newValue)
         void CommConnectionCallback(float newValue)
         {
             //None, ProbeNone, Partial, ProbePartial
-            if ((newValue == 0.0) || (newValue == 2.0) || (newValue == 8.0) || (newValue == 10.0))
+            if ((newValue == 0.0f) || (newValue == 2.0f) || (newValue == 8.0f) || (newValue == 10.0f))
+            {
                 noCommConnection = true;
+            }
             else
+            {
                 noCommConnection = false;
+            }
         }
     }
 }

diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
@@ -12,7 +12,7 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 // Revision number is altered automatically.
-[assembly: AssemblyVersion("0.29.1.*")]
+[assembly: AssemblyVersion("0.29.2.*")]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.