Version 0.11.0 0.11.0
[VOID.git] / VOID_Core.cs
blob:a/VOID_Core.cs -> blob:b/VOID_Core.cs
--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -75,13 +75,13 @@
 		}
 		#endregion
 
-		public static double Constant_G = 6.674e-11;
+		public static readonly double Constant_G = 6.674e-11;
 
 		/*
 		 * Fields
 		 * */
 		protected string VoidName = "VOID";
-		protected string VoidVersion = "0.11.0";
+		protected string VoidVersion;
 
 		protected bool _factoryReset = false;
 
@@ -175,6 +175,8 @@
 		protected VOID_SaveValue<bool> _UseToolbarManager;
 		internal IButton ToolbarButton;
 
+		internal ApplicationLauncherButton AppLauncherButton;
+
 		/*
 		 * Properties
 		 * */
@@ -333,6 +335,12 @@
 				}
 				if (value == true)
 				{
+					if (this.AppLauncherButton != null)
+					{
+						ApplicationLauncher.Instance.RemoveModApplication(this.AppLauncherButton);
+						this.AppLauncherButton = null;
+					}
+
 					this.InitializeToolbarButton();
 				}
 
@@ -366,9 +374,9 @@
 
 			if (!this.UseToolbarManager)
 			{
-				if (GUI.Button(VOIDIconPos, VOIDIconTexture, this.iconStyle) && this.VOIDIconLocked)
-				{
-					this.ToggleMainWindow();
+				if (this.AppLauncherButton == null)
+				{
+					this.InitializeAppLauncherButton();
 				}
 			}
 			else if (this.ToolbarButton == null)
@@ -384,7 +392,7 @@
 				_mainWindowPos = GUILayout.Window(
 					this.windowID,
 					_mainWindowPos,
-					this.VOIDMainWindow,
+					VOID_Tools.GetWindowHandler(this.VOIDMainWindow),
 					string.Join(" ", new string[] { this.VoidName, this.VoidVersion }),
 					GUILayout.Width(250),
 					GUILayout.Height(50)
@@ -405,7 +413,7 @@
 				_configWindowPos = GUILayout.Window(
 					this.windowID,
 					_configWindowPos,
-					this.VOIDConfigWindow,
+					VOID_Tools.GetWindowHandler(this.VOIDConfigWindow),
 					string.Join(" ", new string[] { this.VoidName, "Configuration" }),
 					GUILayout.Width(250),
 					GUILayout.Height(50)
@@ -480,8 +488,10 @@
 
 			if (this.vessel != null && this.vesselSimActive)
 			{
-				SimManager.Gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
-					Math.Pow(VOID_Core.Instance.vessel.Radius(), 2);
+				double radius = this.vessel.Radius();
+				SimManager.Gravity = this.vessel.mainBody.gravParameter /
+					(radius * radius);
+				SimManager.minSimTime = (long)(this.updatePeriod * 1000);
 				SimManager.TryStartSimulation();
 			}
 			else if (!this.vesselSimActive)
@@ -899,6 +909,27 @@
 			};
 
 			Tools.PostDebugMessage(string.Format("{0}: Toolbar Button initialized.", this.GetType().Name));
+		}
+
+		protected void InitializeAppLauncherButton()
+		{
+			if (ApplicationLauncher.Ready)
+			{
+				this.AppLauncherButton = ApplicationLauncher.Instance.AddModApplication(
+					this.ToggleMainWindow, this.ToggleMainWindow,
+					HighLogic.LoadedScene.ToAppScenes(),
+					this.VOIDIconTexture
+				);
+
+				Tools.PostDebugMessage(
+					this,
+					"AppLauncherButton initialized in {0}",
+					Enum.GetName(
+						typeof(GameScenes),
+						HighLogic.LoadedScene
+					)
+				);
+			}
 		}
 
 		protected void ToggleMainWindow()
@@ -935,7 +966,12 @@
 				this.ToolbarButton.TexturePath = texturePath;
 			}
 
-			this.VOIDIconTexture = GameDatabase.Instance.GetTexture(texturePath, false);
+			this.VOIDIconTexture = GameDatabase.Instance.GetTexture(texturePath.Replace("icon", "appIcon"), false);
+
+			if (this.AppLauncherButton != null)
+			{
+				this.AppLauncherButton.SetTexture(VOIDIconTexture);
+			}
 		}
 
 		protected void CheckAndSave()
@@ -987,9 +1023,34 @@
 			this.configDirty = false;
 		}
 
+		public void onSceneChangeRequested(GameScenes scene)
+		{
+			if (this.AppLauncherButton != null)
+			{
+				if (this is VOID_EditorCore)
+				{
+					if (!HighLogic.LoadedSceneIsEditor)
+					{
+						ApplicationLauncher.Instance.RemoveModApplication(this.AppLauncherButton);
+					}
+				}
+				else
+				{
+					if (!HighLogic.LoadedSceneIsFlight)
+					{
+						ApplicationLauncher.Instance.RemoveModApplication(this.AppLauncherButton);
+					}
+				}
+			}
+		}
+
 		protected VOID_Core()
 		{
 			this._Name = "VOID Core";
+
+			System.Version version = this.GetType().Assembly.GetName().Version;
+
+			this.VoidVersion = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.MajorRevision);
 
 			this._Active.value = true;
 
@@ -1025,7 +1086,14 @@
 		{
 			get
 			{
-				return VOID_Core.Instance;
+				if (HighLogic.LoadedSceneIsEditor)
+				{
+					return VOID_EditorCore.Instance;
+				}
+				else
+				{
+					return VOID_Core.Instance;
+				}
 			}
 		}
 
@@ -1033,7 +1101,7 @@
 		{
 			get
 			{
-				return core.Kerbin.gravParameter / Math.Pow(core.Kerbin.Radius, 2);
+				return core.Kerbin.gravParameter / (core.Kerbin.Radius * core.Kerbin.Radius);
 			}
 		}
 	}