Refactor of Targeting Window. Some clean up of window method names fo…

…r standardization. minor preparation for later major window refactoring. Remove obsolete missile configs.

BDArmory.Core/BDArmorySettings.cs

@@ -30,6 +30,9 @@ public class BDArmorySettings
         [BDAPersistantSettingsField] public static float RADAR_WINDOW_SCALE_MIN = 0.50f;
         [BDAPersistantSettingsField] public static float RADAR_WINDOW_SCALE = 1f;
         [BDAPersistantSettingsField] public static float RADAR_WINDOW_SCALE_MAX = 1.50f;
+        [BDAPersistantSettingsField] public static float TARGET_WINDOW_SCALE_MIN = 0.50f;
+        [BDAPersistantSettingsField] public static float TARGET_WINDOW_SCALE = 1f;
+        [BDAPersistantSettingsField] public static float TARGET_WINDOW_SCALE_MAX = 2f;
         [BDAPersistantSettingsField] public static float BDARMORY_UI_VOLUME = 0.35f;
         [BDAPersistantSettingsField] public static float BDARMORY_WEAPONS_VOLUME = 0.32f;
         [BDAPersistantSettingsField] public static float MAX_GUARD_VISUAL_RANGE = 40000f;

BDArmory/BDArmory.csproj

@@ -253,8 +253,6 @@
     <None Include="Distribution\GameData\BDArmory\Parts\ABL\model.mu" />
     <None Include="Distribution\GameData\BDArmory\Parts\adjustableRail\adjustableRail.cfg" />
     <None Include="Distribution\GameData\BDArmory\Parts\adjustableRail\model.mu" />
-    <None Include="Distribution\GameData\BDArmory\Parts\agm-86Cruise\agm86.cfg" />
-    <None Include="Distribution\GameData\BDArmory\Parts\agm-86Cruise\model.mu" />
     <None Include="Distribution\GameData\BDArmory\Parts\AGM86-17\AGM86-17.cfg" />
     <None Include="Distribution\GameData\BDArmory\Parts\AGM86-17\AGM86-17.mu" />
     <None Include="Distribution\GameData\BDArmory\Parts\aim-120\amraam.cfg" />
@@ -347,8 +345,6 @@
     <None Include="Distribution\GameData\BDArmory\Parts\RBS-15-17AL\rbs15-17AL.cfg" />
     <None Include="Distribution\GameData\BDArmory\Parts\RBS-15-17\RBS-15-17.mu" />
     <None Include="Distribution\GameData\BDArmory\Parts\RBS-15-17\rbs15-17.cfg" />
-    <None Include="Distribution\GameData\BDArmory\Parts\rbs-15\model.mu" />
-    <None Include="Distribution\GameData\BDArmory\Parts\rbs-15\rbs15.cfg" />
     <None Include="Distribution\GameData\BDArmory\Parts\rotaryBombBay\model.mu" />
     <None Include="Distribution\GameData\BDArmory\Parts\rotaryBombBay\rotaryBombBay.cfg" />
     <None Include="Distribution\GameData\BDArmory\Parts\s-8Launcher\model.mu" />
@@ -436,8 +432,6 @@
     <Content Include="Distribution\GameData\BDArmory\Parts\ABL\sounds\laser.wav" />
     <Content Include="Distribution\GameData\BDArmory\Parts\ABL\texture.png" />
     <Content Include="Distribution\GameData\BDArmory\Parts\adjustableRail\texture.png" />
-    <Content Include="Distribution\GameData\BDArmory\Parts\agm-86Cruise\srbsmoke.png" />
-    <Content Include="Distribution\GameData\BDArmory\Parts\agm-86Cruise\texture.png" />
     <Content Include="Distribution\GameData\BDArmory\Parts\AGM86-17\AGM86-17.png" />
     <Content Include="Distribution\GameData\BDArmory\Parts\aim-120\texture.png" />
     <Content Include="Distribution\GameData\BDArmory\Parts\aiPilot\SAI1.png" />
@@ -519,8 +513,6 @@
     <Content Include="Distribution\GameData\BDArmory\Parts\radome125\tex_radome125.png" />
     <Content Include="Distribution\GameData\BDArmory\Parts\RBS-15-17AL\RBS15-17.png" />
     <Content Include="Distribution\GameData\BDArmory\Parts\RBS-15-17\RBS15-17.png" />
-    <Content Include="Distribution\GameData\BDArmory\Parts\rbs-15\srbsmoke.png" />
-    <Content Include="Distribution\GameData\BDArmory\Parts\rbs-15\texture.png" />
     <Content Include="Distribution\GameData\BDArmory\Parts\rotaryBombBay\tex_rotBombBay.png" />
     <Content Include="Distribution\GameData\BDArmory\Parts\s-8Launcher\nrm2_NRM.png" />
     <Content Include="Distribution\GameData\BDArmory\Parts\s-8Launcher\s-8Rocket\rocketTexture.png" />

BDArmory/Distribution/GameData/BDArmory/ChangeLog.txt

@@ -6,11 +6,13 @@
   * Reintroduce BDAcUniversalAmmoBox Module Manager config file.  Somehow was dropped during a merge somewhere back.
   * Separate RWR operation from RWR display.  RWR should be enabled at all times when a Radar is installed on craft. 
     - Opening and closing the RWR window now leaves RWR operation active.  Git Issues 410, #411, #461
+  * removed part configs for the AGM86-ruise an the RBS-15  They have been broken, and are superceded by improved weapons.
 
 * ENHANCEMENTS:
   * Increase the limits of the Radar and RWR window scaling to allow for larger windows.  
     - Add min and max settings to the settings.cfg to allow user defined limits. Git Issue #521
-  * Add mouse driven RWR and Radar windows resizing.  Now you can intuitivly resize by mouse.
+  * Add mouse driven RWR and Radar windows resizing.  Now you can intuitivly resize by mouse.  Click an drag the lower right corner.
+  * Redesigned Targeting Cam window to incorporate all features added to the Radar window - resizing, boundary checks, mouse resize, relocate buttons
   * Retune BDAc missiles to improve characteristics, performance, and balance.  Tuning performed by Kergan
 
 

BDArmory/Misc/Misc.cs

@@ -75,9 +75,9 @@ public static bool CheckMouseIsOnGui()
 
 
             if (topGui.Contains(inverseMousePos)) return true;
-            if (BDArmorySetup.toolbarGuiEnabled && BDArmorySetup.WindowRectToolbar.Contains(inverseMousePos))
+            if (BDArmorySetup.windowBDAToolBarEnabled && BDArmorySetup.WindowRectToolbar.Contains(inverseMousePos))
                 return true;
-            if (ModuleTargetingCamera.windowIsOpen && ModuleTargetingCamera.camWindowRect.Contains(inverseMousePos))
+            if (ModuleTargetingCamera.windowIsOpen && BDArmorySetup.WindowRectTargetingCam.Contains(inverseMousePos))
                 return true;
             if (BDArmorySetup.Instance.ActiveWeaponManager)
             {

BDArmory/MissileFire.cs

@@ -628,7 +628,7 @@ public void AGCycleBack(KSPActionParam param)
         [KSPEvent(guiActive = true, guiActiveEditor = false, guiName = "Open GUI", active = true)]
         public void ToggleToolbarGUI()
         {
-            BDArmorySetup.toolbarGuiEnabled = !BDArmorySetup.toolbarGuiEnabled;
+            BDArmorySetup.windowBDAToolBarEnabled = !BDArmorySetup.windowBDAToolBarEnabled;
         }
 
         #endregion
@@ -1071,7 +1071,7 @@ void OnGUI()
                     }
                 }
 
-                if ((missile && missile.TargetingMode == MissileBase.TargetingModes.Gps) || BDArmorySetup.Instance.showingGPSWindow)
+                if ((missile && missile.TargetingMode == MissileBase.TargetingModes.Gps) || BDArmorySetup.Instance.showingWindowGPS)
                 {
                     if (designatedGPSCoords != Vector3d.zero)
                     {