Various UI and other fixes

S-C-A-N · Feb 10, 2017 · 14c66fc · 14c66fc
1 parent a5d77ee
commit 14c66fc
Show file tree

Hide file tree

Showing 20 changed files with 758 additions and 171 deletions.
diff --git a/SCANsat.Unity/Interfaces/ISCAN_BigMap.cs b/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);
 

diff --git a/SCANsat.Unity/Interfaces/ISCAN_MainMap.cs b/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; }

diff --git a/SCANsat.Unity/Interfaces/ISCAN_Settings.cs b/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; }