Revert concealment update because bugs

Author: Jimmacle

Concealment/Commands.cs

@@ -9,13 +9,32 @@ public class Commands : CommandModule
     {
         public ConcealmentPlugin Plugin => (ConcealmentPlugin)Context.Plugin;
 
-        [Command("update", "Forces a concealment update immediately."), Permission(MyPromoteLevel.SpaceMaster)]
-        public void Conceal()
+        [Command("conceal", "Conceal grids x distance from players."), Permission(MyPromoteLevel.SpaceMaster)]
+        public void Conceal(double distance = 0)
         {
-            var num = Plugin.ConcealGrids();
-            Context.Respond($"{num.Item1} grids concealed, {num.Item2} grids revealed");
+            if (distance == 0)
+            {
+                distance = Plugin.Settings.Data.ConcealDistance;
+            }
+            var num = Plugin.ConcealGrids(distance);
+            Context.Respond($"{num} grids concealed.");
         }
-        
+
+        [Command("reveal", "Reveal all grids within the given distance"), Permission(MyPromoteLevel.SpaceMaster)]
+        public void Reveal(double distance = 1000)
+        {
+            var pos = Context.Player?.Controller.ControlledEntity?.Entity.GetPosition();
+            if (!pos.HasValue)
+            {
+                Context.Respond("You must be controlling an entity.");
+                return;
+            }
+
+            var sphere = new BoundingSphereD(pos.Value, distance);
+            var num = Plugin.RevealGridsInSphere(sphere);
+            Context.Respond($"{num} grids revealed.");
+        }
+
         [Command("reveal all", "Reveal all grids"), Permission(MyPromoteLevel.SpaceMaster)]
         public void RevealAll()
         {
@@ -27,7 +46,7 @@ public void RevealAll()
         public void Enable()
         {
             Plugin.Settings.Data.Enabled = true;
-            Plugin.ConcealGrids();
+            Plugin.ConcealGrids(Plugin.Settings.Data.ConcealDistance);
         }
 
         [Command("conceal off", "Disable concealment.")]

Concealment/ConcealGroup.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Windows.Media.Animation;
 using Havok;
 using NLog;
 using Sandbox.Engine.Physics;
@@ -35,25 +34,6 @@ public class ConcealGroup
         public event Action<ConcealGroup> Closing;
         internal volatile int ProxyId = -1;
 
-        public override int GetHashCode()
-        {
-            int hash = 17;
-            foreach (var grid in Grids)
-                hash = hash * 23 + grid.EntityId.GetHashCode();
-            return hash;
-        }
-
-        public override bool Equals(object obj)
-        {
-            var a = this;
-            var b = obj as ConcealGroup;
-
-            if (b == null)
-                return false;
-
-            return a.GridNames.Equals(b.GridNames);
-        }
-
         public ConcealGroup(MyGroups<MyCubeGrid, MyGridPhysicalGroupData>.Group group)
         {
             Grids = group.Nodes.Select(n => n.NodeData).ToList();

Concealment/Concealment.csproj

@@ -34,7 +34,8 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.2\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -153,10 +154,8 @@
       <DependentUpon>DynamicConcealmentEditor.xaml</DependentUpon>
     </Compile>
     <Compile Include="DynamicConcealmentManager.cs" />
-    <Compile Include="Patches\PatchReplicableRequest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Settings.cs" />
-    <Compile Include="Utilities.cs" />
   </ItemGroup>
   <ItemGroup>
     <Page Include="ConcealmentControl.xaml">

Concealment/ConcealmentControl.xaml

@@ -19,14 +19,26 @@
                 <CheckBox Content="Enable Concealment" Margin="3" IsChecked="{Binding Enabled}" />
                 <CheckBox Content="Conceal Production" ToolTip="Conceal grids with active production blocks." Margin="3" IsChecked="{Binding ConcealProduction}" />
                 <CheckBox Content="Conceal Pirates" ToolTip="Conceal grids owned by Space Pirates." Margin="3" IsChecked="{Binding ConcealPirates}" />
-                
+                <StackPanel Orientation="Horizontal">
+                    <TextBox Margin="3" Width="150" Text="{Binding ConcealDistance}" />
+                    <Label Content="Conceal Distance (meters)" Margin="3" />
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBox Margin="3" Width="150" Text="{Binding RevealDistance}" />
+                    <Label Content="Reveal Distance (meters)" Margin="3" />
+                </StackPanel>
                 <StackPanel Orientation="Horizontal">
                     <TextBox Margin="3" Width="150" Text="{Binding ConcealInterval}" />
                     <Label Content="Conceal Interval (ticks, 1/60 s)" Margin="3" />
                 </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBox Margin="3" Width="150" Text="{Binding RevealInterval}" />
+                    <Label Content="Reveal Interval (ticks, 1/60 s)" Margin="3" />
+                </StackPanel>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-                <Button Content="Force Update" Margin="3" Click="Conceal_OnClick" />
+                <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="EditExclusion_OnClick"/>
             <Button Content="Edit Dynamic Concealment" Margin="3" Click="EditDynamicConcealment_OnClick"/>

Concealment/ConcealmentControl.xaml.cs

@@ -36,10 +36,16 @@ private void RevealSelected_OnClick(object sender, RoutedEventArgs e)
             });
         }
 
+        private void Reveal_OnClick(object sender, RoutedEventArgs e)
+        {
+            var p = Plugin;
+            Plugin.Torch.Invoke(delegate { p.RevealGrids(p.Settings.Data.RevealDistance); });
+        }
+
         private void Conceal_OnClick(object sender, RoutedEventArgs e)
         {
             var p = Plugin;
-            Plugin.Torch.Invoke(delegate { p.ConcealGrids(); });
+            Plugin.Torch.Invoke(delegate { p.ConcealGrids(p.Settings.Data.ConcealDistance); });
         }
 
         private void EditExclusion_OnClick(object sender, RoutedEventArgs e)

Concealment/ConcealmentPlugin.cs

@@ -29,7 +29,6 @@
 using VRage.Game.ModAPI;
 using VRage.Game.ObjectBuilders.ComponentSystem;
 using VRage.ModAPI;
-using VRage.Network;
 using VRageMath;
 
 namespace Concealment
@@ -51,10 +50,6 @@ public sealed class ConcealmentPlugin : TorchPluginBase, IWpfPlugin
         private bool _settingsChanged;
         private bool _ready;
 
-        private MyReplicationServer Replication => (MyReplicationServer)MyMultiplayer.Static.ReplicationLayer;
-
-        public static ConcealmentPlugin Instance { get; private set; }
-
         public ConcealmentPlugin()
         {
             _intersectGroups = new List<ConcealGroup>();
@@ -81,8 +76,6 @@ public override void Init(ITorchBase torch)
             Settings.Data.PropertyChanged += Data_PropertyChanged;
             _concealedAabbTree = new MyDynamicAABBTreeD(MyConstants.GAME_PRUNING_STRUCTURE_AABB_EXTENSION);
             torch.Managers.GetManager<ITorchSessionManager>()?.AddFactory(CreateManager);
-
-            Instance = this;
         }
 
         private IManager CreateManager(ITorchSession session)
@@ -104,7 +97,9 @@ public override void Update()
             if (_ready)
             {
                 if (_counter % (ulong)Settings.Data.ConcealInterval == 0)
-                    ConcealGrids();
+                    ConcealGrids(Settings.Data.ConcealDistance);
+                if (_counter % (ulong)Settings.Data.RevealInterval == 0)
+                    RevealGrids(Settings.Data.RevealDistance);
                 _counter += 1;
             }
 
@@ -244,9 +239,8 @@ public int RevealGroup(ConcealGroup group)
         {
             if (!group.IsConcealed)
             {
-                Log.Trace($"Group for reveal is not concealed: {group.GridNames}");
-                //Log.Warn($"Attempted to reveal a group that wasn't concealed: {group.GridNames}");
-                //Log.Warn(new StackTrace());
+                Log.Warn($"Attempted to reveal a group that wasn't concealed: {group.GridNames}");
+                Log.Warn(new StackTrace());
                 return 0;
             }
 
@@ -274,93 +268,70 @@ public int RevealGridsInSphere(BoundingSphereD sphere)
             return revealed;
         }
 
-        //public int RevealGrids()
-        //{
-        //    var revealed = 0;
-
-        //    foreach (var sphere in playerSpheres)
-        //    {
-        //        Log.Trace($"{sphere.Center}: {sphere.Radius}");
-        //        revealed += RevealGridsInSphere(sphere);
-        //    }
-
-        //    if (_settingsChanged)
-        //    {
-        //        for (var i = ConcealedGroups.Count - 1; i >= 0; i--)
-        //        {
-        //            if (IsExcluded(ConcealedGroups[i]))
-        //                revealed += RevealGroup(ConcealedGroups[i]);
-        //        }
-
-        //        _settingsChanged = false;
-        //    }
-
-        //    if (revealed != 0)
-        //        Log.Info($"Revealed {revealed} grids near players.");
-        //    return revealed;
-        //}
-
-        public (int ,int) ConcealGrids()
+        public int RevealGrids(double distanceFromPlayers)
+        {
+            var revealed = 0;
+            var playerSpheres = GetPlayerViewSpheres(distanceFromPlayers);
+            foreach (var sphere in playerSpheres)
+            {
+                Log.Trace($"{sphere.Center}: {sphere.Radius}");
+                revealed += RevealGridsInSphere(sphere);
+            }
+
+            if (_settingsChanged)
+            {
+                for (var i = ConcealedGroups.Count - 1; i >= 0; i--)
+                {
+                    if (IsExcluded(ConcealedGroups[i]))
+                        revealed += RevealGroup(ConcealedGroups[i]);
+                }
+
+                _settingsChanged = false;
+            }
+
+            if (revealed != 0)
+                Log.Info($"Revealed {revealed} grids near players.");
+            return revealed;
+        }
+
+        public int ConcealGrids(double distanceFromPlayers = 0)
         {
             Log.Debug("Concealing grids");
             int concealed = 0;
-            int revealed = 0;
+            var playerSpheres = GetPlayerViewSpheres(distanceFromPlayers);
 
             ConcurrentBag<ConcealGroup> groups = new ConcurrentBag<ConcealGroup>();
-            ConcurrentBag<ConcealGroup> reveal = new ConcurrentBag<ConcealGroup>();
             var sw = Stopwatch.StartNew();
             Parallel.ForEach(MyCubeGridGroups.Static.Physical.Groups, group =>
             {
                 var concealGroup = new ConcealGroup(group);
 
-                if (IsExcluded(concealGroup))
+                if (distanceFromPlayers != 0)
                 {
-                    Log.Trace("group excluded");
-                    return;
+                    var volume = group.GetWorldAABB();
+                    if (playerSpheres.Any(s => s.Contains(volume) != ContainmentType.Disjoint))
+                    {
+                        Log.Trace("group near player");
+                        return;
+                    }
                 }
 
-                //Checks if any connected clients have requested any grid in this group for replication
-                if (concealGroup.Grids.Any(g => Replication.IsReplicated(Utilities.GetReplicable(g))))
+                if (IsExcluded(concealGroup))
                 {
-                    Log.Trace("group in replication");
+                    Log.Trace("group excluded");
                     return;
                 }
 
                 groups.Add(concealGroup);
             });
-            Log.Debug($"Scanned conceal grids in {sw.ElapsedMilliseconds}ms.");
-            sw.Restart();
-
-            Parallel.ForEach(ConcealedGroups, group =>
-              {
-                  if (IsExcluded(group))
-                  {
-                      reveal.Add(group);
-                      return;
-                  }
-
-                  if (group.Grids.Any(grid => Replication.IsReplicated(Utilities.GetReplicable(grid))))
-                  {
-                      reveal.Add(group);
-                      return;
-                  }
-              });
-            Log.Debug($"Scanned reveal grids in {sw.ElapsedMilliseconds}ms");
+            Log.Debug($"Scanned grids in {sw.ElapsedMilliseconds}ms.");
             sw.Restart();
 
             foreach (var group in groups)
             {
                 concealed += ConcealGroup(group);
             }
             Log.Debug($"Concealed grids in {sw.ElapsedMilliseconds}ms.");
-            sw.Restart();
-
-            foreach (var group in reveal)
-            {
-                revealed += RevealGroup(group);
-            }
-
-            Log.Debug($"Revealed grids in {sw.ElapsedMilliseconds}ms");
             sw.Stop();
 
             var concealedCount = ConcealedGroups.SelectMany(x => x.Grids).Count();
@@ -369,10 +340,7 @@ public int RevealGridsInSphere(BoundingSphereD sphere)
             if (concealed > 0)
                 Log.Info($"{concealedCount+concealed}/{totalCount} grids are concealed ({concealedCount+concealed/(float)totalCount:P}), {concealed} new.");
 
-            if(revealed > 0)
-                Log.Info($"Revealed {revealed} grids replicated to players.");
-
-            return (concealed, revealed);
+            return concealed;
         }
 
         public bool IsExcluded(ConcealGroup group)

Concealment/DynamicConcealmentManager.cs

@@ -613,7 +613,7 @@ private static MyRelationsBetweenPlayerAndBlock GetRelationTolerant(long id1, lo
             if (playerFaction1 == playerFaction2)
                 return MyRelationsBetweenPlayerAndBlock.FactionShare;
             return MySession.Static.Factions.GetRelationBetweenFactions(playerFaction1.FactionId,
-                       playerFaction2.FactionId).Item1 == MyRelationsBetweenFactions.Neutral
+                       playerFaction2.FactionId) == MyRelationsBetweenFactions.Neutral
                 ? MyRelationsBetweenPlayerAndBlock.Neutral
                 : MyRelationsBetweenPlayerAndBlock.Enemies;
         }

Concealment/Settings.cs

@@ -203,6 +203,36 @@ public int ConcealInterval
             }
         }
 
+        public int RevealInterval
+        {
+            get => _revealInterval;
+            set
+            {
+                _revealInterval = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public double ConcealDistance
+        {
+            get => _concealDistance;
+            set
+            {
+                _concealDistance = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public double RevealDistance
+        {
+            get => _revealDistance;
+            set
+            {
+                _revealDistance = value;
+                OnPropertyChanged();
+            }
+        }
+
         public bool ConcealProduction
         {
             get => _concealProduction;

Concealment/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.4.2" targetFramework="net461" />
+  <package id="NLog" version="4.4.12" targetFramework="net461" />
 </packages>