Merge pull request #256 from DMagic1/dev

Version 17.1

SCANassets/Resources/SCANlocalization.cfg

@@ -88,6 +88,21 @@ SCAN_Localization
 			overlayRefresh = Map Refresh
 			insNextResource = Next Resource
 			insPreviousResource = Previous Resource
+			zoomVesselSync = Sync Current Vessel
+			zoomVesselLock = Lock Position To Vessel
+			zoomMapRefresh = Map Refresh
+			zoomMapWindowState = Toggle Window Size
+			zoomMapIn = Zoom In
+			zoomMapOut = Zoom Out
+			zoomMapLeft = Shift Left
+			zoomMapRight = Shift Right
+			zoomMapUp = Shift Up
+			zoomMapDown = Shift Down
+			zoomMapIcons = Map Icons
+			waypointToggle = Waypoint Selector
+			waypointSet = Create Waypoint
+			waypointCancel = Cancel Waypoint
+			waypointMechJeb = Set MechJeb Landing Target
 		}
 	}
 }

SCANassets/SCANsat.version

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

SCANsat.Unity/Interfaces/ISCAN_BigMap.cs

@@ -16,6 +16,8 @@ public interface ISCAN_BigMap
 
 		string CurrentCelestialBody { get; set; }
 
+		string RandomWaypoint { get; }
+
 		bool IsVisible { get; set; }
 
 		bool ColorToggle { get; set; }
@@ -46,12 +48,16 @@ public interface ISCAN_BigMap
 
 		bool TooltipsOn { get; }
 
+		bool LockInput { get; set; }
+
 		int OrbitSteps { get; }
 
 		int CurrentScene { get; }
 
 		float Scale { get; }
 
+		Sprite WaypointSprite { get; }
+
 		Canvas MainCanvas { get; }
 
 		Canvas TooltipCanvas { get; }
@@ -60,8 +66,6 @@ public interface ISCAN_BigMap
 
 		Vector2 Size { get; set; }
 
-		Vector2 MapScreenPosition { get; set; }
-
 		Texture2D LegendImage { get; }
 
 		IList<string> Projections { get; }
@@ -102,7 +106,9 @@ public interface ISCAN_BigMap
 
 		void Update();
 
-		void OnGUI();
+		void SetWaypoint(string id, Vector2 pos);
+
+		void ClickMap(Vector2 pos);
 
 		SimpleLabelInfo OrbitInfo(int index);
 

SCANsat.Unity/Interfaces/ISCAN_MainMap.cs

@@ -18,6 +18,8 @@ public interface ISCAN_MainMap
 
 		bool TooltipsOn { get; }
 
+		bool MapGenerating { get; }
+
 		float Scale { get; }
 
 		Canvas TooltipCanvas { get; }

SCANsat.Unity/Interfaces/ISCAN_Settings.cs

@@ -38,6 +38,8 @@ public interface ISCAN_Settings
 
 		bool WindowTooltips { get; set; }
 
+		bool MapGenSpeed { get; set; }
+
 		bool StockToolbar { get; set; }
 
 		bool ToolbarMenu { get; set; }
@@ -64,6 +66,8 @@ public interface ISCAN_Settings
 
 		bool ShowMapFill { get; }
 
+		bool LockInput { get; set; }
+
 		Canvas TooltipCanvas { get; }
 
 		Vector2 Position { set; }

SCANsat.Unity/Interfaces/ISCAN_ZoomMap.cs

@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace SCANsat.Unity.Interfaces
+{
+	public interface ISCAN_ZoomMap
+	{
+		string Version { get; }
+
+		string CurrentMapType { get; set; }
+
+		string CurrentResource { get; set; }
+
+		string ZoomLevelText { get; }
+
+		string MapCenterText { get; }
+
+		string RandomWaypoint { get; }
+
+		bool IsVisible { get; set; }
+
+		bool VesselLock { get; set; }
+
+		bool ColorToggle { get; set; }
+
+		bool OrbitToggle { get; set; }
+
+		bool IconsToggle { get; set; }
+
+		bool LegendToggle { get; set; }
+
+		bool ResourceToggle { get; set; }
+
+		bool OrbitAvailable { get; }
+
+		bool ShowOrbit { get; }
+
+		bool ShowWaypoint { get; }
+
+		bool ShowResource { get; }
+
+		bool TooltipsOn { get; }
+
+		bool LockInput { get; set; }
+
+		int OrbitSteps { get; }
+
+		int CurrentScene { get; }
+
+		int WindowState { get; set; }
+
+		float Scale { get; }
+
+		Sprite WaypointSprite { get; }
+
+		Canvas MainCanvas { get; }
+
+		Canvas TooltipCanvas { get; }
+
+		Vector2 Position { get; set; }
+
+		Vector2 Size { get; set; }
+
+		Texture2D LegendImage { get; }
+
+		IList<string> MapTypes { get; }
+
+		IList<string> Resources { get; }
+
+		IList<string> LegendLabels { get; }
+
+		Dictionary<string, MapLabelInfo> OrbitLabelList { get; }
+
+		Dictionary<Guid, MapLabelInfo> FlagInfoList { get; }
+
+		Dictionary<string, MapLabelInfo> AnomalyInfoList { get; }
+
+		Dictionary<int, MapLabelInfo> WaypointInfoList { get; }
+
+		KeyValuePair<Guid, MapLabelInfo> VesselInfo { get; }
+
+		string MapInfo(Vector2 rectPosition);
+
+		void RefreshMap();
+
+		void Update();
+
+		void VesselSync();
+
+		void MoveMap(int i);
+
+		void ZoomMap(bool zoom);
+
+		void SetWaypoint(string id, Vector2 pos);
+
+		void ClickMap(int button, Vector2 pos);
+
+		SimpleLabelInfo OrbitInfo(int index);
+
+		MapLabelInfo OrbitIconInfo(string id);
+
+		Vector2 VesselPosition();
+	}
+}

SCANsat.Unity/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // 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.7.0.0")]
-[assembly: AssemblyFileVersion("1.7.0.0")]
+[assembly: AssemblyVersion("1.7.1.0")]
+[assembly: AssemblyFileVersion("1.7.1.0")]

SCANsat.Unity/SCANsat.Unity.csproj

@@ -48,6 +48,7 @@
     <Compile Include="Interfaces\ISCAN_Overlay.cs" />
     <Compile Include="Interfaces\ISCAN_Settings.cs" />
     <Compile Include="Interfaces\ISCAN_Toolbar.cs" />
+    <Compile Include="Interfaces\ISCAN_ZoomMap.cs" />
     <Compile Include="MapLabelInfo.cs" />
     <Compile Include="SCAN_DoubleButton.cs" />
     <Compile Include="SCAN_Toggle.cs" />
@@ -79,6 +80,7 @@
     <Compile Include="Unity\SCAN_Toolbar.cs" />
     <Compile Include="Unity\SCAN_Tooltip.cs" />
     <Compile Include="Unity\SCAN_VesselInfo.cs" />
+    <Compile Include="Unity\SCAN_ZoomMap.cs" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />