Merge pull request #154 from DMagic1/release

version 14.1

SCANassets/SCANsat.version

@@ -11,7 +11,7 @@
          "MAJOR":1,
          "MINOR":1,
          "PATCH":4,
-         "BUILD":0
+         "BUILD":1
      },
      "KSP_VERSION":{
          "MAJOR":1,

SCANmechjeb/Properties/AssemblyInfo.cs

@@ -32,9 +32,9 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
-[assembly: AssemblyInformationalVersion ("v14")]
+[assembly: AssemblyVersion("1.4.0.1")]
+[assembly: AssemblyFileVersion("1.4.0.1")]
+[assembly: AssemblyInformationalVersion ("v14.1")]
 
 [assembly: KSPAssembly ("SCANmechjeb", 0, 3)]
 [assembly: KSPAssemblyDependency ("SCANsat", 1, 4)]

SCANsat/CHANGELOG.txt

@@ -1,4 +1,14 @@
-Version 14.0 - 2014-7-5
+Version 14.1 - 2015-7-15
+------------------------
+
+- Across the board performance improvement for map rendering
+
+- Fixed a bug causing performance drop for greyscale maps
+
+- Fixed a bug preventing landed resource scanners from working
+
+
+Version 14.0 - 2015-7-5
 ------------------------
 
 - Updated for KSP 1.0.4

SCANsat/Properties/AssemblyInfo.cs

@@ -14,9 +14,9 @@
 // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion ("1.4.0.0")]
-[assembly: AssemblyFileVersion ("1.4.0.0")]
-[assembly: AssemblyInformationalVersion ("v14")]
+[assembly: AssemblyVersion ("1.4.0.1")]
+[assembly: AssemblyFileVersion ("1.4.0.1")]
+[assembly: AssemblyInformationalVersion ("v14.1")]
 
 [assembly: KSPAssembly ("SCANsat", 1, 4)]
 

SCANsat/SCAN_PartModules/SCANresourceDisplay.cs

@@ -170,10 +170,11 @@ private void FixedUpdate()
 			if (!activated)
 			{
 				abundanceValue = -1f;
+				tooHigh = false;
 				return;
 			}
 
-			if (ResourceUtilities.GetAltitude(vessel) > MaxAbundanceAltitude)
+			if (!vessel.Landed && ResourceUtilities.GetAltitude(vessel) > MaxAbundanceAltitude)
 			{
 				tooHigh = true;
 				return;

SCANsat/SCANcontroller.cs

@@ -35,24 +35,7 @@ public class SCANcontroller : ScenarioModule
 	{
 		public static SCANcontroller controller
 		{
-			get
-			{
-				Game g = HighLogic.CurrentGame;
-				if (g == null) return null;
-				try
-				{
-					var mod = g.scenarios.FirstOrDefault(m => m.moduleName == typeof(SCANcontroller).Name);
-					if (mod != null)
-						return (SCANcontroller)mod.moduleRef;
-					else
-						return null;
-				}
-				catch (Exception e)
-				{
-					SCANUtil.SCANlog("Could not find SCANsat Scenario Module: {0}", e);
-					return null;
-				}
-			}
+			get { return instance; }
 		}
 
 		private static int minScanAlt = 5000;
@@ -204,6 +187,8 @@ public static SCANcontroller controller
 		private bool bodyCoverage = false;
 		private bool heightMapsBuilt = false;
 
+		private static SCANcontroller instance;
+
 		#region Public Accessors
 
 		public SCANdata getData(string bodyName)
@@ -529,6 +514,8 @@ public SCANwaypoint LandingTarget
 
 		public override void OnLoad(ConfigNode node)
 		{
+			instance = this;
+
 			try
 			{
 				lowBiomeColor = ConfigNode.ParseColor(node.GetValue("lowBiomeColor"));

SCANsat/SCANutil.cs

@@ -47,16 +47,13 @@ public static bool isCovered(double lon, double lat, CelestialBody body, int SCA
 			int ilon = icLON(lon);
 			int ilat = icLAT(lat);
 			if (badLonLat (ilon, ilat)) return false;
-			if (SCANcontroller.controller != null)
-			{
-				SCANdata data = getData(body);
-				if (data != null)
-					return (data.Coverage[ilon, ilat] & SCANtype) != 0;
-				else
-					return false;
-			}
-			else
+
+			SCANdata data = getData(body.name);
+
+			if (data == null)
 				return false;
+
+			return (data.Coverage[ilon, ilat] & SCANtype) != 0;
 		}
 
 		/// <summary>
@@ -70,16 +67,13 @@ public static bool isCovered(double lon, double lat, CelestialBody body, int SCA
 		public static bool isCovered(int lon, int lat, CelestialBody body, int SCANtype)
 		{
 			if (badLonLat(lon, lat)) return false;
-			if (SCANcontroller.controller != null)
-			{
-				SCANdata data = getData(body);
-				if (data != null)
-					return (data.Coverage[lon, lat] & SCANtype) != 0;
-				else
-					return false;
-			}
-			else
+
+			SCANdata data = getData(body.name);
+
+			if (data == null)
 				return false;
+
+			return (data.Coverage[lon, lat] & SCANtype) != 0;
 		}
 
 		/// <summary>
@@ -90,16 +84,12 @@ public static bool isCovered(int lon, int lat, CelestialBody body, int SCANtype)
 		/// <returns>Scanning percentage as a double from 0-100</returns>
 		public static double GetCoverage(int SCANtype, CelestialBody Body)
 		{
-			if (SCANcontroller.controller != null)
-			{
-				SCANdata data = getData(Body);
-				if (data != null)
-					return getCoveragePercentage(data, (SCANtype)SCANtype);
-				else
-					return 0;
-			}
-			else
+			SCANdata data = getData(Body.name);
+
+			if (data == null)
 				return 0;
+
+			return getCoveragePercentage(data, (SCANtype)SCANtype);
 		}
 
 		/// <summary>