Overhaul Map Drawing

.gitignore

@@ -3,6 +3,9 @@
 bin/
 obj/
 *.user
+*.dll
+*.pdb
+SCANsat.Unity/Properties/launchSettings.json
 GameData/SCANsat/Plugins/SCAN*
 GameData/SCANsat/PluginData/Settings.cfg
 GameData/SCANsat/Parts/@thumbs/

GameData/SCANsat/Resources/SCANcolors.cfg

@@ -10,7 +10,6 @@ SCAN_Color_Config
 		Item
 		{
 			name = Kerbin
-			index = 1
 			minHeightRange = -1500
 			maxHeightRange = 6500
 			clampHeight = 0
@@ -25,7 +24,6 @@ SCAN_Color_Config
 		Item
 		{
 			name = Sun
-			index = 0
 			minHeightRange = 0
 			maxHeightRange = 1000
 			clampHeight = Null
@@ -40,7 +38,6 @@ SCAN_Color_Config
 		Item
 		{
 			name = Mun
-			index = 2
 			minHeightRange = -500
 			maxHeightRange = 7000
 			clampHeight = Null
@@ -55,7 +52,6 @@ SCAN_Color_Config
 		Item
 		{
 			name = Minmus
-			index = 3
 			minHeightRange = -500
 			maxHeightRange = 5500
 			clampHeight = Null
@@ -70,7 +66,6 @@ SCAN_Color_Config
 		Item
 		{
 			name = Moho
-			index = 4
 			minHeightRange = -300
 			maxHeightRange = 6500
 			clampHeight = Null
@@ -85,7 +80,6 @@ SCAN_Color_Config
 		Item
 		{
 			name = Eve
-			index = 5
 			minHeightRange = -2000
 			maxHeightRange = 7000
 			clampHeight = 0
@@ -100,7 +94,6 @@ SCAN_Color_Config
 		Item
 		{
 			name = Duna
-			index = 6
 			minHeightRange = 0
 			maxHeightRange = 7000
 			clampHeight = Null
@@ -115,7 +108,6 @@ SCAN_Color_Config
 		Item
 		{
 			name = Ike
-			index = 7
 			minHeightRange = 0
 			maxHeightRange = 12000
 			clampHeight = Null
@@ -130,7 +122,6 @@ SCAN_Color_Config
 		Item
 		{
 			name = Jool
-			index = 8
 			minHeightRange = 0
 			maxHeightRange = 1000
 			clampHeight = Null
@@ -145,7 +136,6 @@ SCAN_Color_Config
 		Item
 		{
 			name = Laythe
-			index = 9
 			minHeightRange = -3000
 			maxHeightRange = 6000
 			clampHeight = 0
@@ -160,7 +150,6 @@ SCAN_Color_Config
 		Item
 		{
 			name = Vall
-			index = 10
 			minHeightRange = -500
 			maxHeightRange = 7500
 			clampHeight = Null
@@ -175,7 +164,6 @@ SCAN_Color_Config
 		Item
 		{
 			name = Bop
-			index = 11
 			minHeightRange = 2000
 			maxHeightRange = 21500
 			clampHeight = Null
@@ -190,7 +178,6 @@ SCAN_Color_Config
 		Item
 		{
 			name = Tylo
-			index = 12
 			minHeightRange = 0
 			maxHeightRange = 11000
 			clampHeight = Null
@@ -205,7 +192,6 @@ SCAN_Color_Config
 		Item
 		{
 			name = Gilly
-			index = 13
 			minHeightRange = 1500
 			maxHeightRange = 6000
 			clampHeight = Null
@@ -220,7 +206,6 @@ SCAN_Color_Config
 		Item
 		{
 			name = Pol
-			index = 14
 			minHeightRange = 500
 			maxHeightRange = 5500
 			clampHeight = Null
@@ -235,7 +220,6 @@ SCAN_Color_Config
 		Item
 		{
 			name = Dres
-			index = 15
 			minHeightRange = -200
 			maxHeightRange = 5500
 			clampHeight = Null
@@ -250,7 +234,6 @@ SCAN_Color_Config
 		Item
 		{
 			name = Eeloo
-			index = 16
 			minHeightRange = -500
 			maxHeightRange = 3500
 			clampHeight = Null

GameData/SCANsat/SCANsat.version

@@ -1,6 +1,7 @@
 {
   "NAME": "SCANsat",
-  "URL": "https://github.com/KSPModStewards/SCANsat/releases/latest/download/SCANsat.version",
-  "DOWNLOAD": "https://github.com/KSPModStewards/SCANsat/releases"
-
+  "VERSION": "21.1.0.0",
+  "KSP_VERSION": "1.12",
+  "KSP_VERSION_MIN": "1.12.3",
+  "KSP_VERSION_MAX": "1.12"
 }

GameData/SCANsat/SCANsat/SCANsat.version

@@ -0,0 +1,7 @@
+{
+  "NAME": "SCANsat",
+  "VERSION": "21.1.0.0",
+  "KSP_VERSION": "1.12",
+  "KSP_VERSION_MIN": "1.12.3",
+  "KSP_VERSION_MAX": "1.12"
+}

README.md

@@ -7,6 +7,7 @@
 > ![scan your planetoid like the big boys do][bigmap-scan-10000x]
 > ###### **Example SAR scan of Kerbin at 1000x and then 10,000x warp**
 
+[![][shield:support-ksptl]][ksptl:release] 
 [![][shield:support-rpm]][RPM:release] 
 [![][shield:support-mm]][mm:release] 
 [![][shield:support-toolbar]][toolbar:release] 
@@ -25,7 +26,8 @@
 * [1. Installation and Interoperability][1]
   * [a. Installation][1a]
   * [b. GameData Layout][1b]
-  * [c. Other Add-Ons][1c]
+  * [c. Texture Configurations][1c]
+  * [d. Other Add-Ons][1d]
 * [2. Types of Scans][2]
   * [a. Native SCANsat][2a]
 * [3. Resource Scanning][3]
@@ -165,7 +167,25 @@ For licensing information, please see the [included LICENSE.txt][SCANsat:rel-lic
 
 ![][SCANsat:gamedata]
 
-#### [:top:][top] 1c. Other Add-Ons 
+#### [:top:][top] 1c. Texture Configurations
+
+S.C.A.N. was originally designed to load all visual and normal textures into RAM directly from the game, as this doesn't require any additional configuration steps for planet packs to integrate directly with the mod. This, however, has led to performance issues with large scale textures and planet packs (notoriously Real Solar System scale packs like Sol).
+
+To get around this, support has been added for memory mapping external textures through KSPTextureLoader. This works by defining the relative path to the height, normal and color textures for each planet, and defining them in a config file as shown below (recommend making one for each body titled "BodyName_SCANsat.cfg"): 
+
+```
+SCANSAT_BODY_TEXTURES
+{
+    name = Mercury  // Use name of body in Kopernicus
+    heightMap = GameData/Sol-Textures/PluginData/01_Mercury/Kopernicus/Mercury_Height.dds
+    normalMap = GameData/Sol-Textures/PluginData/01_Mercury/Kopernicus/Mercury_Normal.dds
+    colorMap  = GameData/Sol-Textures/PluginData/01_Mercury/Kopernicus/Mercury_Color.dds
+}
+```
+
+With these paths defined, the CPU is able to pull data directly out of the texture from the file system without loading it into RAM. Planet pack makers are encouraged to use this new interface with their packs as this directly specifies the textures SCANsat will display in game.
+
+#### [:top:][top] 1d. Other Add-Ons 
 
 S.C.A.N. is proud to collaborate with other KSP mods and modding teams. Following is a table of all of the mods, add-ons, or software that we interoperate with.
 
@@ -175,14 +195,14 @@ S.C.A.N. is proud to collaborate with other KSP mods and modding teams. Followin
 [**Blizzy78's Toolbar**][toolbar:release] | [![Support for Karbonite][karbonite:logo]][karbonite:release]
 [**ModuleManager**][mm:release]  | [![Support for ALCOR][alcor:logo]][alcor:release]
 [**RasterPropMonitor**][rpm:release]  | 
+[**KSPTextureLoader**][ksptl:release]  | 
 
-* **SCANsat**
-  * [x] [**v16.0**][SCANsat:rel-thread] SCANsat Release **version: v16.0**
-  * [x] [**v15.0**][SCANsat:dev-thread] SCANsat Dev **version: v15.0**
+ **MM**, **RPM**, **MechJeb** and **Toolbar** are all **soft** dependencies. This means your experience with SCANsat will be enhanced if you are using these mods, but they are not necessary.
 
- **MM**, **RPM**, **MechJeb**, and **Toolbar** are all **soft** dependencies. This means your experience with SCANsat will be enhanced if you are using these mods, but they are not necessary.
+**KSPTextureLoader** is a built dependency, however, as all planets that have external texture files are strongly recommended to use memory mapped textures, with RAM cached variants only being a fallback. This ensures that no errors occur with shader configs and that the exact texture desired ends up displayed in game.
 
 **SCANsat** is built against the following mods:
+  * [x] [![][shield:support-ksptl]][ksptl:release]
   * [x] [![][shield:support-mm]][mm:release]
   * [x] [![][shield:support-rpm]][rpm:release]
   * [x] [![][shield:support-alcor]][alcor:release]
@@ -200,6 +220,8 @@ scanning modules or parts).
   * **RadarHi**: Advanced, High-Resolution RADAR Altimetry (in color, unlimited zoom)
   * **Slope**: Slope Data converted from RADAR data
   * **Biome**: Biome Detection and Classification (in color, unlimited zoom)
+  * **VisualLo**: Basic, Low-Resolution Visual Imaging (b&w, limited zoom)
+  * **VisualHi**: Full Color, High Resolution Visual Imaging
   * **Anomaly**: Anomaly Detection and Labeling
   * **Resource**: Scan for chemical or mineral resource on the surface.
 
@@ -815,7 +837,8 @@ sneaky then they can of course be sneaky.
 [1]: #top-1-installation-and-interoperability
 [1a]: #top-1a-installation
 [1b]: #top-1b-gamedata-layout
-[1c]: #top-1c-other-add-ons
+[1c]: #top-1c-texture-configurations
+[1d]: #top-1d-other-add-ons
 [2]: #top-2-types-of-scans
 [2a]: #top-2a-scansat-scans
 [3]: #top-3-resource-scanning
@@ -863,8 +886,9 @@ sneaky then they can of course be sneaky.
 
 [shield:jenkins-dev]: http://img.shields.io/jenkins/s/https/ksp.sarbian.com/jenkins/SCANsat-dev.svg
 [shield:jenkins-rel]: http://img.shields.io/jenkins/s/https/ksp.sarbian.com/jenkins/SCANsat-release.svg
-[shield:support-ksp]: http://img.shields.io/badge/for%20KSP-v1.4.1-bad455.svg
+[shield:support-ksp]: http://img.shields.io/badge/for%20KSP-v1.12.x-bad455.svg
 [shield:support-rpm]: http://img.shields.io/badge/works%20with%20RPM-v0.28.x-a31f34.svg
+[shield:support-ksptl]: https://img.shields.io/badge/requires%20KSPTextureLoader-1.0.34+-84e0d7.svg
 [shield:support-mm]: http://img.shields.io/badge/works%20with%20MM-v3.x-40b7c0.svg
 [shield:support-toolbar]: http://img.shields.io/badge/works%20with%20Blizzy's%20Toolbar-1.7.x-7c69c0.svg
 [shield:support-alcor]: http://img.shields.io/badge/works%20with%20ALCOR-0.9-299bc7.svg
@@ -961,7 +985,9 @@ sneaky then they can of course be sneaky.
 
 [toolbar:release]: http://forum.kerbalspaceprogram.com/threads/60863
 
-[rpm:release]: http://forum.kerbalspaceprogram.com/threads/117471
+[rpm:release]: https://github.com/FirstPersonKSP/RasterPropMonitor/releases
+
+[ksptl:release]: https://github.com/Phantomical/KSPTextureLoader/releases
 
 [cconfig:release]: http://forum.kerbalspaceprogram.com/threads/101604
 

SCANmechjeb/SCANmechjeb.cs

@@ -14,12 +14,12 @@
 using System.Collections;
 using SCANsat;
 using SCANsat.SCAN_Data;
-using log = SCANsat.SCAN_Platform.Logging.ConsoleLogger;
-using palette = SCANsat.SCAN_UI.UI_Framework.SCANcolorUtil;
+using Log = KSPCommunityLib.Logging.Log;
 using MuMech;
 
 using UnityEngine;
 using UnityEngine.Events;
+using System.Reflection;
 
 namespace SCANmechjeb
 {
@@ -36,6 +36,55 @@ class SCANmechjeb : MonoBehaviour
 		private Vector2d coords = new Vector2d();
 		private bool shutdown, mjOnboard, mjTechTreeLocked;
 
+		// Store references to required fields - type name changes between Target / Hidden and target / hidden across MechJeb versions
+		private static FieldInfo targetField;
+		private static FieldInfo hiddenField;
+
+		/// <summary>
+		/// Reflectively fetches MechJebCore fields, tolerating the
+		/// 'Target'/'target' field rename across MechJeb versions. Returns null
+		/// (and logs) if the field can't be resolved under any known name.
+		/// </summary>
+		static SCANmechjeb()
+		{
+			var t = new MechJebCore().GetType();
+			targetField = t.GetField("Target") ?? t.GetField("target");
+			if (targetField == null)
+			{
+				Log.Message("MechJebCore 'target' field could not be found under any known name; MechJeb support broken.");
+			}
+
+			hiddenField = t.GetField("Hidden") ?? t.GetField("hidden");
+			if (hiddenField == null)
+			{
+				Log.Message("MechJebGuidanceModule 'hidden' field could not be found under any known name; MechJeb support broken.");
+			}
+		}
+
+		#region Helpers
+
+		/// <summary>
+		/// Reflectively fetches MechJebCore's target controller, tolerating the
+		/// 'Target'/'target' field rename across MechJeb versions. Returns null
+		/// (and logs) if the field can't be resolved under any known name.
+		/// </summary>
+		private static MechJebModuleTargetController GetMJCoreTarget(MechJebCore mjc)
+		{
+			return targetField?.GetValue(mjc) as MechJebModuleTargetController;
+		}
+
+		/// <summary>
+		/// Reflectively reads the guidance module's hidden flag, tolerating the
+		/// 'Hidden'/'hidden' field rename across MechJeb versions. Returns null
+		/// (and logs) if the field can't be resolved under any known name.
+		/// </summary>
+		private static bool? IsMJGuidanceModuleHidden(DisplayModule gm)
+		{
+			return hiddenField?.GetValue(gm) as bool?;
+		}
+
+		#endregion
+
 		private void Start()
 		{
 			GameEvents.onVesselWasModified.Add(VesselChange);
@@ -227,7 +276,7 @@ private void RefereshAfterVesselChange()
 				return;
 			}
 
-			target = mjCore.target;
+			target = GetMJCoreTarget(mjCore);
 
 			if (target == null)
 			{
@@ -256,7 +305,8 @@ private void RefereshAfterVesselChange()
 
 				guidanceModule.UnlockCheck();
 
-				if (guidanceModule.hidden)
+				var hidden = IsMJGuidanceModuleHidden(guidanceModule);
+				if (hidden ?? true) // Defaults to a hidden state if the field cannot be found
 				{
 					SCANcontroller.controller.MechJebLoaded = false;
 					way = null;
@@ -270,4 +320,4 @@ private void RefereshAfterVesselChange()
 			mjTechTreeLocked = false;
 		}
 	}
-}
+}

SCANmechjeb/SCANmechjeb.csproj

@@ -3,23 +3,22 @@
     <OutputType>Library</OutputType>
     <RootNamespace>SCANmechjeb</RootNamespace>
     <AssemblyName>SCANmechjeb</AssemblyName>
-    <TargetFramework>net4.8</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
-    <GenerateKSPAssemblyAttribute>true</GenerateKSPAssemblyAttribute>
-    <GenerateKSPAssemblyDependencyAttributes>true</GenerateKSPAssemblyDependencyAttributes>
+	  <KSPBT_GenerateAssemblyAttribute>true</KSPBT_GenerateAssemblyAttribute>
+	  <KSPBT_GenerateDependencyAttributes>true</KSPBT_GenerateDependencyAttributes>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MechJeb2">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(KSPRoot)\GameData\MechJeb2\Plugins\MechJeb2.dll</HintPath>
-      <Private>False</Private>
+    <ModReference Include="MechJeb2">
+      <DLLPath>GameData/MechJeb2/Plugins/MechJeb2.dll</DLLPath>
       <CKANIdentifier>MechJeb2</CKANIdentifier>
-      <KSPAssemblyVersion>2.5</KSPAssemblyVersion>
-    </Reference>
+	  <KSPAssemblyVersion>2.5</KSPAssemblyVersion>
+    </ModReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="KSPBuildTools" Version="0.0.4" />
+    <PackageReference Include="KSPBuildTools" Version="1.1.1" />
+    <PackageReference Include="KSPCommunityLib" Version="0.1.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SCANsat\SCANsat.csproj" />