Skip to content

Commit

Permalink
Remove old code
Browse files Browse the repository at this point in the history
  • Loading branch information
@DMagic1
DMagic1 committed Feb 10, 2017
1 parent c5d00b0 commit 68fb180
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 106 deletions.
124 changes: 21 additions & 103 deletions SCANsat/SCANcontroller.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,98 +47,6 @@ public static SCANcontroller controller
private static int minScanAlt = 5000;
private static int maxScanAlt = 500000;
private static int bestScanAlt = 250000;
//[KSPField(isPersistant = true)]
//public int colours = 0;
//[KSPField(isPersistant = true)]
//public bool map_markers = true;
//[KSPField(isPersistant = true)]
//public bool map_flags = true;
//[KSPField(isPersistant = true)]
//public bool map_waypoints = true;
//[KSPField(isPersistant = true)]
//public bool map_orbit = true;
//[KSPField(isPersistant = true)]
//public bool map_asteroids = true;
//[KSPField(isPersistant = true)]
//public bool map_grid = true;
//[KSPField(isPersistant = true)]
//public bool map_ResourceOverlay = false; //Is the overlay activated for the selected resource
//[KSPField(isPersistant = true)]
//public int projection = 0;
//[KSPField(isPersistant = true)]
//public int map_width = 0;
//[KSPField(isPersistant = true)]
//public int map_x = 100;
//[KSPField(isPersistant = true)]
//public int map_y = 50;
//[KSPField(isPersistant = true)]
//public string anomalyMarker = "X";
//public string closeBox = "X";
//[KSPField(isPersistant = true)]
//public bool legend = false;
//[KSPField(isPersistant = true)]
//public bool scan_background = true;
//[KSPField(isPersistant = true)]
//public int timeWarpResolution = 15;
//[KSPField(isPersistant = true)]
//public string resourceSelection;
//[KSPField(isPersistant = true)]
//public bool dataRebuild = true;
//[KSPField(isPersistant = true)]
//public bool mainMapVisibleOld = false;
//[KSPField(isPersistant = true)]
//public bool bigMapVisibleOld = false;
//[KSPField(isPersistant = true)]
//public bool kscMapVisible = false;
//[KSPField(isPersistant = true)]
//public bool toolTips = true;
//[KSPField(isPersistant = true)]
//public bool useStockAppLauncher = true;
//[KSPField(isPersistant = true)]
//public bool resourceBiomeLock = true;
//[KSPField(isPersistant = true)]
//public bool useStockBiomes = false;
//[KSPField(isPersistant = true)]
//public float biomeTransparency = 40;
//[KSPField(isPersistant = true)]
//public bool mechJebTargetSelection = false;
//[KSPField(isPersistant = true)]
//public bool easyModeScanning = true;
//[KSPField(isPersistant = true)]
//public bool needsNarrowBand = true;
//[KSPField(isPersistant = true)]
//public bool biomeBorder = true;
//[KSPField(isPersistant = true)]
//public bool disableStockResource = false;
//[KSPField(isPersistant = true)]
//public bool hiDetailZoomMap = false;
//[KSPField(isPersistant = true)]
//public bool planetaryOverlayTooltips = true;
//[KSPField(isPersistant = true)]
//public int overlayInterpolation = 8;
//[KSPField(isPersistant = true)]
//public int overlayMapHeight = 256;
//[KSPField(isPersistant = true)]
//public int overlayBiomeHeight = 512;
//[KSPField(isPersistant = true)]
//public float overlayTransparency = 0;
//[KSPField(isPersistant = true)]
//public bool trueGreyScale = false;
//[KSPField(isPersistant = true)]
//public bool groundTracks = true;
//[KSPField(isPersistant = true)]
//public bool groundTrackActiveOnly = true;
//[KSPField(isPersistant = true)]
//public bool exportCSV = false;
//[KSPField(isPersistant = true)]
//public float scanThreshold = 0.90f;
//[KSPField(isPersistant = true)]
//public bool useScanThreshold = true;
//[KSPField(isPersistant = true)]
//public float slopeCutoff = 1f;
//[KSPField(isPersistant = true)]
//public float windowScale = 1f;


[KSPField(isPersistant = true)]
public bool mainMapVisible = false;
Expand Down Expand Up @@ -177,22 +85,24 @@ public static SCANcontroller controller
[KSPField(isPersistant = true)]
public string bigMapBody = "Kerbin";
[KSPField(isPersistant = true)]
public bool zoomMapVesselLock = false;
[KSPField(isPersistant = true)]
public bool zoomMapColor = true;
[KSPField(isPersistant = true)]
public bool zoomMapOrbit = true;
[KSPField(isPersistant = true)]
public bool zoomMapWaypoint = true;
public bool zoomMapIcons = true;
[KSPField(isPersistant = true)]
public bool zoomMapAnomaly = true;
[KSPField(isPersistant = true)]
public bool zoomMapFlag = true;
public bool zoomMapLegend = true;
[KSPField(isPersistant = true)]
public bool zoomMapResourceOn = false;
[KSPField(isPersistant = true)]
public string zoomMapType = "Altimetry";
[KSPField(isPersistant = true)]
public string zoomMapResource = "Ore";
[KSPField(isPersistant = true)]
public int zoomMapState = 0;
[KSPField(isPersistant = true)]
public int overlaySelection = 0;
[KSPField(isPersistant = true)]
public string overlayResource = "Ore";
Expand Down Expand Up @@ -240,13 +150,13 @@ public static SCANcontroller controller

/* UI window objects */
internal SCANcolorSelection colorManager;
internal SCANzoomWindow zoomMap;

internal SCAN_UI_MainMap _mainMap;
internal SCAN_UI_Instruments _instruments;
internal SCAN_UI_BigMap _bigMap;
internal SCAN_UI_Overlay _overlay;
internal SCAN_UI_Settings _settings;
private SCAN_UI_MainMap _mainMap;
private SCAN_UI_Instruments _instruments;
private SCAN_UI_BigMap _bigMap;
private SCAN_UI_ZoomMap _zoomMap;
private SCAN_UI_Overlay _overlay;
private SCAN_UI_Settings _settings;

/* App launcher object */
internal SCANappLauncher appLauncher;
Expand Down Expand Up @@ -931,17 +841,18 @@ private void Start()
GameEvents.onPartCouple.Add(dockingEventCheck);
GameEvents.Contract.onContractsLoaded.Add(contractsCheck);
GameEvents.Contract.onParameterChange.Add(onParamChange);

if (HighLogic.LoadedSceneIsFlight)
{
if (!body_data.Contains(FlightGlobals.currentMainBody.name))
body_data.Add(FlightGlobals.currentMainBody.name, new SCANdata(FlightGlobals.currentMainBody));
try
{
colorManager = gameObject.AddComponent<SCANcolorSelection>();
zoomMap = gameObject.AddComponent<SCANzoomWindow>();

_mainMap = new SCAN_UI_MainMap();
_bigMap = new SCAN_UI_BigMap();
_zoomMap = new SCAN_UI_ZoomMap();
_instruments = new SCAN_UI_Instruments();
_overlay = new SCAN_UI_Overlay();
_settings = new SCAN_UI_Settings();
Expand All @@ -961,6 +872,7 @@ private void Start()

_bigMap = new SCAN_UI_BigMap();
_settings = new SCAN_UI_Settings();
_zoomMap = new SCAN_UI_ZoomMap();

if (HighLogic.LoadedScene == GameScenes.TRACKSTATION)
{
Expand Down Expand Up @@ -1123,6 +1035,7 @@ private void OnDestroy()
GameEvents.onPartCouple.Remove(dockingEventCheck);
GameEvents.Contract.onContractsLoaded.Remove(contractsCheck);
GameEvents.Contract.onParameterChange.Remove(onParamChange);

if (appLauncher != null)
Destroy(appLauncher);

Expand All @@ -1136,6 +1049,8 @@ private void OnDestroy()
_overlay.OnDestroy();
if (_settings != null)
_settings.OnDestroy();
if (_zoomMap != null)
_zoomMap.OnDestroy();

if (SCAN_Settings_Config.Instance != null)
SCAN_Settings_Config.Instance.Save();
Expand Down Expand Up @@ -1590,6 +1505,9 @@ private void onParamChange(Contract c, ContractParameter p)
return;

data.addSurveyWaypoints(b, s);

if (_bigMap.IsVisible && _bigMap.WaypointToggle)
_bigMap.RefreshIcons();
}

private void SOIChange(GameEvents.HostedFromToAction<Vessel, CelestialBody> VC)
Expand Down
4 changes: 1 addition & 3 deletions SCANsat/SCANutil.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -636,9 +636,7 @@ internal static bool MouseIsOverWindow()
switch (HighLogic.LoadedScene)
{
case GameScenes.FLIGHT:
if (SCANcontroller.controller.zoomMap != null && SCANcontroller.controller.zoomMap.Visible && SCANcontroller.controller.zoomMap.GetWindowRect.Contains(pos))
return true;
else if (SCANcontroller.controller.colorManager != null && SCANcontroller.controller.colorManager.Visible && SCANcontroller.controller.colorManager.GetWindowRect.Contains(pos))
if (SCANcontroller.controller.colorManager != null && SCANcontroller.controller.colorManager.Visible && SCANcontroller.controller.colorManager.GetWindowRect.Contains(pos))
return true;
break;
case GameScenes.TRACKSTATION:
Expand Down

0 comments on commit 68fb180

Please sign in to comment.