* Concealment 1.1.3

- Fixed crash related to MyDynamicAABBTree.RemoveLeaf - Fixed button bindings in the UI - Fixed "Enabled" setting not working
TorchAPI · Jul 1, 2017 · c7362e0 · c7362e0
1 parent df8e209
commit c7362e0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/Concealment/ConcealGroup.cs b/Concealment/ConcealGroup.cs
@@ -45,6 +45,13 @@ public void UpdatePostConceal()
             HookOnClosing();
         }
 
+        public void UpdatePostReveal()
+        {
+            IsConcealed = false;
+            foreach (var grid in Grids)
+                grid.OnClosing -= Grid_OnClosing;
+        }
+
         private void HookOnClosing()
         {
             foreach (var grid in Grids)

diff --git a/Concealment/ConcealmentControl.xaml b/Concealment/ConcealmentControl.xaml
@@ -32,9 +32,9 @@
                 <Button Content="Manual Conceal" Margin="3" Click="Conceal_OnClick" />
                 <Button Content="Manual Reveal" Margin="3" Click="Reveal_OnClick" />
             </StackPanel>
-            <Button Content="Edit Excluded Subtypes" Margin="3" Click="RevealSelected_OnClick"/>
+            <Button Content="Edit Excluded Subtypes" Margin="3" Click="EditExclusion_OnClick"/>
         </StackPanel>
-        <Button Content="Reveal Selected" Margin="3" DockPanel.Dock="Bottom" Click="EditExclusion_OnClick" />
+        <Button Content="Reveal Selected" Margin="3" DockPanel.Dock="Bottom" Click="RevealSelected_OnClick" />
         <ListView Name="Concealed" Margin="3" DockPanel.Dock="Bottom" ItemsSource="{Binding ConcealGroups}">
             <ItemsControl.ItemTemplate>
                 <DataTemplate>

diff --git a/Concealment/ConcealmentPlugin.cs b/Concealment/ConcealmentPlugin.cs
@@ -31,15 +31,15 @@
 
 namespace Concealment
 {
-    [Plugin("Concealment", "1.1.2", "17f44521-b77a-4e85-810f-ee73311cf75d")]
+    [Plugin("Concealment", "1.1.3", "17f44521-b77a-4e85-810f-ee73311cf75d")]
     public sealed class ConcealmentPlugin : TorchPluginBase, IWpfPlugin
     {
         public Persistent<Settings> Settings { get; private set; }
         public MTObservableCollection<ConcealGroup> ConcealGroups { get; } = new MTObservableCollection<ConcealGroup>();
 
         private static readonly Logger Log = LogManager.GetLogger("Concealment");
         private UserControl _control;
-        private ulong _counter;
+        private ulong _counter = 1;
         private bool _init;
         private readonly List<ConcealGroup> _concealGroups = new List<ConcealGroup>();
         private readonly List<ConcealGroup> _intersectGroups;
@@ -59,11 +59,16 @@ public override void Init(ITorchBase torch)
         {
             base.Init(torch);
             Settings = Persistent<Settings>.Load(Path.Combine(StoragePath, "Concealment.cfg"));
+            Settings.Data.PropertyChanged += Data_PropertyChanged;
             _concealedAabbTree = new MyDynamicAABBTreeD(MyConstants.GAME_PRUNING_STRUCTURE_AABB_EXTENSION);
-            //torch.SessionUnloading += Torch_SessionUnloading;
             RegisterEntityStorage("Concealment", Id);
         }
 
+        private void Data_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            RevealAll();
+        }
+
         private void RegisterEntityStorage(string name, Guid id)
         {
             var comp = new MyModStorageComponentDefinition
@@ -74,14 +79,9 @@ private void RegisterEntityStorage(string name, Guid id)
             MyDefinitionManager.Static.Definitions.AddDefinition(comp);
         }
 
-        private void Torch_SessionUnloading()
-        {
-            RevealAll();
-        }
-
         public override void Update()
         {
-            if (MyAPIGateway.Session == null)
+            if (MyAPIGateway.Session == null || !Settings.Data.Enabled)
                 return;
 
             if (_counter % Settings.Data.ConcealInterval == 0)
@@ -93,7 +93,6 @@ public override void Update()
             if (_init)
                 return;
 
-            //MySession.Static.Players.PlayerRequesting += RevealSpawns;
             MyMultiplayer.Static.ClientJoined += RevealCryoPod;
 
             _init = true;
@@ -236,6 +235,7 @@ public int RevealGroup(ConcealGroup group)
 #if !NOPHYS
             _concealGroups.Remove(group);
             _concealedAabbTree.RemoveProxy(group.ProxyId);
+            group.UpdatePostReveal();
 #endif
             return count;
         }

diff --git a/Concealment/Settings.cs b/Concealment/Settings.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Runtime.CompilerServices;
 using System.Xml.Serialization;
 using Torch;