Version 2.8.2

ntwest · ntwest · commit cf1a3f9e51db · 2017-11-15T22:57:45.000-05:00
diff --git a/GameData/TimeControl/TimeControl.dll b/GameData/TimeControl/TimeControl.dll
diff --git a/TimeControl/GlobalSettings.cs b/TimeControl/GlobalSettings.cs
@@ -139,6 +139,7 @@ public bool AssignFromConfigNode(ConfigNode pCN)
         private EventData<float> OnTimeControlHyperWarpPhysicsAccuracyChangedEvent { get; set; }
         private EventData<float> OnTimeControlSlowMoRateChangedEvent { get; set; }
         private EventData<TimeControlKeyBinding> OnTimeControlKeyBindingsChangedEvent;
+        private EventData<bool> OnTimeControlSlowMoDeltaLockedChangedEvent { get; set; }
 
         private const float saveTimeDelta = 10f;
         private float saveTimeDelay = 0f;
@@ -207,6 +208,17 @@ public float SlowMoRate
             }
         }
 
+        private bool deltaLocked = true;
+        public bool DeltaLocked
+        {
+            get => deltaLocked;
+            set
+            {
+                deltaLocked = value;
+                mainNode?.SetValue( nameof( DeltaLocked ), value, true );
+                saveOnNextUpdate = true;
+            }
+        }
         private float resetAltitudeToValue = 1000f;
         public float ResetAltitudeToValue
         {
@@ -262,7 +274,7 @@ public int KeyRepeatInterval
         }
 
         // This is managed in the time control parameters screen, but is applied globally by the settings
-        private LogSeverity loggingLevel;
+        private LogSeverity loggingLevel = LogSeverity.Warning;
         public LogSeverity LoggingLevel
         {
             get => loggingLevel;
@@ -299,6 +311,7 @@ public bool UseKerbinTime
             }
         }
 
+
         private string version = TimeControl.PluginAssemblyUtilities.VERSION;
         
         #region MonoBehavior
@@ -331,6 +344,7 @@ private void Start()
                 mainNode.SetValue( nameof( HyperWarpPhysicsAccuracy ), HyperWarpPhysicsAccuracy, true );
                 mainNode.SetValue( nameof( HyperWarpMaxAttemptedRate ), HyperWarpMaxAttemptedRate, true );
                 mainNode.SetValue( nameof( SlowMoRate ), SlowMoRate, true );
+                mainNode.SetValue( nameof( DeltaLocked ), DeltaLocked, true );
                 mainNode.SetValue( nameof( ResetAltitudeToValue ), ResetAltitudeToValue, true );
                 mainNode.SetValue( nameof( LoggingLevel ), LoggingLevel.ToString(), true );
                 mainNode.SetValue( nameof( CameraZoomFix ), CameraZoomFix, true );
@@ -382,6 +396,9 @@ private void SubscribeToEvents()
             OnTimeControlSlowMoRateChangedEvent = GameEvents.FindEvent<EventData<float>>( nameof( TimeControlEvents.OnTimeControlSlowMoRateChanged ) );
             OnTimeControlSlowMoRateChangedEvent?.Add( OnTimeControlSlowMoRateChanged );
 
+            OnTimeControlSlowMoDeltaLockedChangedEvent = GameEvents.FindEvent<EventData<bool>>( nameof( TimeControlEvents.OnTimeControlSlowMoDeltaLockedChanged ) );
+            OnTimeControlSlowMoDeltaLockedChangedEvent?.Add( OnTimeControlSlowMoDeltaLockedChanged );
+
             SpaceCenterWindow.OnChanged += GUIWindowsChanged;
             TrackStationWindow.OnChanged += GUIWindowsChanged;
             FlightWindow.OnChanged += GUIWindowsChanged;
@@ -491,6 +508,18 @@ private void OnTimeControlSlowMoRateChanged(float data)
             }
         }
 
+        private void OnTimeControlSlowMoDeltaLockedChanged(bool data)
+        {
+            const string logBlockName = nameof( GlobalSettings ) + "." + nameof( OnTimeControlSlowMoDeltaLockedChanged );
+            using (EntryExitLogger.EntryExitLog( logBlockName, EntryExitLoggerOptions.All ))
+            {
+                if (SlowMoController.IsReady)
+                {
+                    DeltaLocked = SlowMoController.Instance.DeltaLocked;
+                }
+            }
+        }
+        
         private void OnTimeControlKeyBindingsChanged(TimeControlKeyBinding tckb)
         {
             const string logBlockName = nameof( GlobalSettings ) + "." + nameof( OnTimeControlKeyBindingsChanged );
@@ -662,6 +691,18 @@ private void LoadFromConfig()
                     Log.Warning( nameof( SlowMoRate ) + " has error in configuration file. Using default.", logBlockName );
                 }
 
+                ////////////////////////////////////////////////
+                // DeltaLocked
+                ////////////////////////////////////////////////
+                if (tmpConfigMain.TryAssignFromConfigBool( nameof( DeltaLocked ), out bool tmpDeltaLocked ))
+                {
+                    DeltaLocked = tmpDeltaLocked;
+                }
+                else
+                {
+                    Log.Warning( nameof( DeltaLocked ) + " has error in configuration file. Using default.", logBlockName );
+                }
+                
                 ////////////////////////////////////////////////
                 // ResetAltitudeToValue
                 ////////////////////////////////////////////////
diff --git a/TimeControl/IMGUI/KeyBindingsAddIMGUI.cs b/TimeControl/IMGUI/KeyBindingsAddIMGUI.cs
@@ -118,7 +118,8 @@ public bool KeyBindingsAddGUI()
                 }
                 if (GUILayout.Button( "ADD", GUILayout.Width( 40 ) ))
                 {
-                    KeyboardInputManager.Instance.AddKeyBinding( kb );
+                    var newkb = TimeControlKeyBindingFactory.LoadFromConfigNode( kb.GetConfigNode() );
+                    KeyboardInputManager.Instance.AddKeyBinding( newkb );
                     return true;
                 }                
             }
diff --git a/TimeControl/IMGUI/KeyBindingsEditorIMGUI.cs b/TimeControl/IMGUI/KeyBindingsEditorIMGUI.cs
@@ -135,8 +135,8 @@ public void KeyBindingsEditorGUI()
             {
                 GUILayout.BeginHorizontal();
                 {
-                    GUILayout.Label( "Adding New User-Defined Key Binding Action" );
-                    if (GUILayout.Button( "Cancel" ))
+                    GUILayout.Label( "Adding New User-Defined Key Binding Actions" );
+                    if (GUILayout.Button( "DONE" ))
                     {
                         addingNewKeyBinding = false;
                     }
@@ -151,7 +151,6 @@ public void KeyBindingsEditorGUI()
                         {
                             if (kbadd.KeyBindingsAddGUI())
                             {
-                                addingNewKeyBinding = false;
                                 refreshKBCache = true;
                             }
                         }
diff --git a/TimeControl/IMGUI/TimeControlIMGUI.cs b/TimeControl/IMGUI/TimeControlIMGUI.cs
@@ -357,7 +357,7 @@ private void onLevelWasLoaded(GameScenes gs)
                     WindowVisible = flightModeWindowIsDisplayed;
                 }
                 windowRect.ClampToScreen();
-                onShowUI();
+                TempUnHideGUI();
             }
         }
 
diff --git a/TimeControl/KeyBindings/TimeControlKeyBindingFactory.cs b/TimeControl/KeyBindings/TimeControlKeyBindingFactory.cs
@@ -162,7 +162,7 @@ private static TimeControlKeyBinding GetFromAction(TimeControlKeyAction tcka)
 
         private static List<KeyCode> GetKeyCombinationFromString(string s)
         {
-            const string logBlockName = nameof( TimeControlKeyBinding ) + "." + nameof( GetKeyCombinationFromString );
+            const string logBlockName = nameof( TimeControlKeyBindingFactory ) + "." + nameof( GetKeyCombinationFromString );
             using (EntryExitLogger.EntryExitLog( logBlockName, EntryExitLoggerOptions.All ))
             {
                 string parse = s.Trim();
@@ -180,10 +180,10 @@ private static List<KeyCode> GetKeyCombinationFromString(string s)
                 parse = parse.Substring( 1, parse.Length - 2 );
 
                 IEnumerable<string> keys;
-                if (s.Contains( "][" ))
+                if (parse.Contains( "][" ))
                 {
                     // Split On ][
-                    keys = s.Split( new string[] { "][" }, StringSplitOptions.None ).Select( x => x.Trim() );
+                    keys = parse.Split( new string[] { "][" }, StringSplitOptions.None ).Select( x => x.Trim() );
                 }
                 else
                 {
diff --git a/TimeControl/Logging/Log.cs b/TimeControl/Logging/Log.cs
@@ -31,9 +31,8 @@ static internal LogSeverity LoggingLevel
 
         static Log()
         {
-            // TODO Change Back to Warning
-            //LoggingLevel = LogSeverity.Warning;
-            LoggingLevel = LogSeverity.Trace;
+            LoggingLevel = LogSeverity.Warning;
+            //LoggingLevel = LogSeverity.Trace;
         }
 
         static internal void Trace(string message, string caller = "", bool always = false)
diff --git a/TimeControl/SlowMoController.cs b/TimeControl/SlowMoController.cs
@@ -109,7 +109,11 @@ private void SetCanRailsWarp(bool canRailsWarp)
         public bool DeltaLocked
         {
             get => deltaLocked;
-            set => deltaLocked = value;
+            set
+            {
+                deltaLocked = value;
+                TimeControlEvents.OnTimeControlSlowMoDeltaLockedChanged?.Fire( deltaLocked );
+            }
         }
         private bool deltaLocked = true;
 
@@ -224,6 +228,7 @@ private IEnumerator Configure()
                 }
 
                 this.slowMoRate = GlobalSettings.Instance.SlowMoRate;
+                this.deltaLocked = GlobalSettings.Instance.DeltaLocked;
 
                 this.SetDefaults();
                 this.SubscribeToGameEvents();
@@ -533,7 +538,7 @@ private void SetTimeScale()
         private void SetFixedDeltaTime()
         {
             float defaultDeltaTime = TimeController.Instance.DefaultFixedDeltaTime;
-            TimeController.Instance.FixedDeltaTime = DeltaLocked ? defaultDeltaTime : defaultDeltaTime * this.SlowMoRate;
+            TimeController.Instance.FixedDeltaTime = DeltaLocked ? defaultDeltaTime : (defaultDeltaTime * this.SlowMoRate);
         }
 
         /// <summary>
diff --git a/TimeControl/TimeControlEvents.cs b/TimeControl/TimeControlEvents.cs
@@ -24,6 +24,7 @@ public class TimeControlEvents : MonoBehaviour
         public static EventData<float> OnTimeControlHyperWarpStopping;
         public static EventData<float> OnTimeControlHyperWarpStopped;
 
+        public static EventData<bool> OnTimeControlSlowMoDeltaLockedChanged;
         public static EventData<float> OnTimeControlSlowMoRateChanged;
         public static EventData<float> OnTimeControlSlowMoStarting;
         public static EventData<float> OnTimeControlSlowMoStarted;
@@ -63,6 +64,7 @@ private void Awake()
 
                 // Slow Motion
                 OnTimeControlSlowMoRateChanged = new EventData<float>( nameof( OnTimeControlSlowMoRateChanged ) );
+                OnTimeControlSlowMoDeltaLockedChanged = new EventData<bool>( nameof( OnTimeControlSlowMoDeltaLockedChanged ) );
 
                 OnTimeControlSlowMoStarting = new EventData<float>( nameof( OnTimeControlSlowMoStarting ) );
                 OnTimeControlSlowMoStarted = new EventData<float>( nameof( OnTimeControlSlowMoStarted ) );
diff --git a/TimeControl/TimeController.cs b/TimeControl/TimeController.cs
@@ -280,6 +280,8 @@ private void onLevelWasLoaded(GameScenes gs)
                         SetupKACAlarms();
                     }
                 }
+
+                TimeControlEvents.OnTimeControlTimeUnpaused?.Fire( true );
             }
         }
         #endregion

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,8 @@ public bool KeyBindingsAddGUI()`
`118`	`118`	`}`
`119`	`119`	`if (GUILayout.Button( "ADD", GUILayout.Width( 40 ) ))`
`120`	`120`	`{`
`121`		`- KeyboardInputManager.Instance.AddKeyBinding( kb );`
	`121`	`+ var newkb = TimeControlKeyBindingFactory.LoadFromConfigNode( kb.GetConfigNode() );`
	`122`	`+ KeyboardInputManager.Instance.AddKeyBinding( newkb );`
`122`	`123`	`return true;`
`123`	`124`	`}`
`124`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,8 +135,8 @@ public void KeyBindingsEditorGUI()`
`135`	`135`	`{`
`136`	`136`	`GUILayout.BeginHorizontal();`
`137`	`137`	`{`
`138`		`- GUILayout.Label( "Adding New User-Defined Key Binding Action" );`
`139`		`- if (GUILayout.Button( "Cancel" ))`
	`138`	`+ GUILayout.Label( "Adding New User-Defined Key Binding Actions" );`
	`139`	`+ if (GUILayout.Button( "DONE" ))`
`140`	`140`	`{`
`141`	`141`	`addingNewKeyBinding = false;`
`142`	`142`	`}`
`@@ -151,7 +151,6 @@ public void KeyBindingsEditorGUI()`
`151`	`151`	`{`
`152`	`152`	`if (kbadd.KeyBindingsAddGUI())`
`153`	`153`	`{`
`154`		`- addingNewKeyBinding = false;`
`155`	`154`	`refreshKBCache = true;`
`156`	`155`	`}`
`157`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ private void onLevelWasLoaded(GameScenes gs)`
`357`	`357`	`WindowVisible = flightModeWindowIsDisplayed;`
`358`	`358`	`}`
`359`	`359`	`windowRect.ClampToScreen();`
`360`		`- onShowUI();`
	`360`	`+ TempUnHideGUI();`
`361`	`361`	`}`
`362`	`362`	`}`
`363`	`363`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ private static TimeControlKeyBinding GetFromAction(TimeControlKeyAction tcka)`
`162`	`162`
`163`	`163`	`private static List<KeyCode> GetKeyCombinationFromString(string s)`
`164`	`164`	`{`
`165`		`- const string logBlockName = nameof( TimeControlKeyBinding ) + "." + nameof( GetKeyCombinationFromString );`
	`165`	`+ const string logBlockName = nameof( TimeControlKeyBindingFactory ) + "." + nameof( GetKeyCombinationFromString );`
`166`	`166`	`using (EntryExitLogger.EntryExitLog( logBlockName, EntryExitLoggerOptions.All ))`
`167`	`167`	`{`
`168`	`168`	`string parse = s.Trim();`
`@@ -180,10 +180,10 @@ private static List<KeyCode> GetKeyCombinationFromString(string s)`
`180`	`180`	`parse = parse.Substring( 1, parse.Length - 2 );`
`181`	`181`
`182`	`182`	`IEnumerable<string> keys;`
`183`		`- if (s.Contains( "][" ))`
	`183`	`+ if (parse.Contains( "][" ))`
`184`	`184`	`{`
`185`	`185`	`// Split On ][`
`186`		`- keys = s.Split( new string[] { "][" }, StringSplitOptions.None ).Select( x => x.Trim() );`
	`186`	`+ keys = parse.Split( new string[] { "][" }, StringSplitOptions.None ).Select( x => x.Trim() );`
`187`	`187`	`}`
`188`	`188`	`else`
`189`	`189`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,8 @@ static internal LogSeverity LoggingLevel`
`31`	`31`
`32`	`32`	`static Log()`
`33`	`33`	`{`
`34`		`- // TODO Change Back to Warning`
`35`		`- //LoggingLevel = LogSeverity.Warning;`
`36`		`- LoggingLevel = LogSeverity.Trace;`
	`34`	`+ LoggingLevel = LogSeverity.Warning;`
	`35`	`+ //LoggingLevel = LogSeverity.Trace;`
`37`	`36`	`}`
`38`	`37`
`39`	`38`	`static internal void Trace(string message, string caller = "", bool always = false)`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,11 @@ private void SetCanRailsWarp(bool canRailsWarp)`
`109`	`109`	`public bool DeltaLocked`
`110`	`110`	`{`
`111`	`111`	`get => deltaLocked;`
`112`		`- set => deltaLocked = value;`
	`112`	`+ set`
	`113`	`+ {`
	`114`	`+ deltaLocked = value;`
	`115`	`+ TimeControlEvents.OnTimeControlSlowMoDeltaLockedChanged?.Fire( deltaLocked );`
	`116`	`+ }`
`113`	`117`	`}`
`114`	`118`	`private bool deltaLocked = true;`
`115`	`119`
`@@ -224,6 +228,7 @@ private IEnumerator Configure()`
`224`	`228`	`}`
`225`	`229`
`226`	`230`	`this.slowMoRate = GlobalSettings.Instance.SlowMoRate;`
	`231`	`+ this.deltaLocked = GlobalSettings.Instance.DeltaLocked;`
`227`	`232`
`228`	`233`	`this.SetDefaults();`
`229`	`234`	`this.SubscribeToGameEvents();`
`@@ -533,7 +538,7 @@ private void SetTimeScale()`
`533`	`538`	`private void SetFixedDeltaTime()`
`534`	`539`	`{`
`535`	`540`	`float defaultDeltaTime = TimeController.Instance.DefaultFixedDeltaTime;`
`536`		`- TimeController.Instance.FixedDeltaTime = DeltaLocked ? defaultDeltaTime : defaultDeltaTime * this.SlowMoRate;`
	`541`	`+ TimeController.Instance.FixedDeltaTime = DeltaLocked ? defaultDeltaTime : (defaultDeltaTime * this.SlowMoRate);`
`537`	`542`	`}`
`538`	`543`
`539`	`544`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -280,6 +280,8 @@ private void onLevelWasLoaded(GameScenes gs)`
`280`	`280`	`SetupKACAlarms();`
`281`	`281`	`}`
`282`	`282`	`}`
	`283`	`+`
	`284`	`+ TimeControlEvents.OnTimeControlTimeUnpaused?.Fire( true );`
`283`	`285`	`}`
`284`	`286`	`}`
`285`	`287`	`#endregion`