Performance improvement in turret management

Author: rexxar-tc

EssentialsPlugin/AssemblyFileVersion.cs

@@ -1,10 +1,10 @@
-//289
+//291
 // 
 // This code was generated by a tool. Any changes made manually will be lost
 // the next time this code is regenerated.
 // 
 
 using System.Reflection;
 
-[assembly: AssemblyFileVersion("1.13.7.289")]
-[assembly: AssemblyVersion("1.13.7.289")]
+[assembly: AssemblyFileVersion("1.13.7.291")]
+[assembly: AssemblyVersion("1.13.7.291")]

EssentialsPlugin/EntityManagers/TurretManagement.cs

@@ -27,22 +27,23 @@ public static TurretManagement Instance
             }
         }
 
+        private List<MyEntity> _entityCache = new List<MyEntity>();
+
         public void ProcessTurrets( )
         {
-            List<MyEntity> entities = new List<MyEntity>( );
-            Wrapper.GameAction( ( ) => entities = MyEntities.GetEntities( ).ToList( ) );
-
-            foreach (MyEntity entity in entities)
-            {
-                MyCubeGrid grid = entity as MyCubeGrid;
-                if (grid == null)
-                    continue;
-
-                if (DoesGridHaveTarget( grid ))
-                    EnableTurrets( grid );
-                else
-                    DisableTurrets( grid );
-            }
+            Wrapper.GameAction( ( ) => _entityCache = MyEntities.GetEntities( ).ToList( ) );
+
+            Parallel.ForEach( _entityCache, entity =>
+                                        {
+                                            MyCubeGrid grid = entity as MyCubeGrid;
+                                            if (grid == null)
+                                                return;
+
+                                            if (DoesGridHaveTarget( grid ))
+                                                EnableTurrets( grid );
+                                            else
+                                                DisableTurrets( grid );
+                                        } );
         }
 
         public void EnableAllTurrets( )
@@ -76,12 +77,12 @@ private void DisableTurrets( MyCubeGrid grid )
                                         if (turret == null)
                                             continue;
 
-                                        if (!turret.Enabled)
-                                            continue;
-
-                                        turret.Enabled = false;
+                                        //if (!turret.Enabled)
+                                        //    continue;
+                                        //
+                                        //turret.Enabled = false;
                                         MyEntities.UnregisterForUpdate( turret );
-                                        count++;
+                                        //count++;
                                     }
                                 } );
             if (count > 0)
@@ -101,12 +102,12 @@ private void EnableTurrets( MyCubeGrid grid )
                                         if (turret == null)
                                             continue;
 
-                                        if (turret.Enabled)
-                                            continue;
-
-                                        turret.Enabled = true;
+                                        //if (turret.Enabled)
+                                        //    continue;
+                                        //
+                                        //turret.Enabled = true;
                                         MyEntities.RegisterForUpdate( turret );
-                                        count++;
+                                        //count++;
                                     }
                                 } );
             if (count > 0)
@@ -117,36 +118,28 @@ private bool DoesGridHaveTarget( MyCubeGrid grid )
         {
             HashSet<MySlimBlock> blocks = grid.GetBlocks( );
             BoundingSphereD sphere = new BoundingSphereD( Vector3D.Zero, 0 );
-            bool hasTurrets = false;
             foreach (MySlimBlock block in blocks)
             {
                 MyLargeTurretBase turret = block.FatBlock as MyLargeTurretBase;
                 if (turret == null)
                     continue;
 
-                hasTurrets = true;
-
                 BoundingSphereD gunSphere = new BoundingSphereD( turret.PositionComp.GetPosition( ), turret.ShootingRange * 2 );
                 if (sphere.Radius == 0)
                     sphere = gunSphere;
                 else
                     sphere.Include( gunSphere );
             }
 
-            if (!hasTurrets)
+            if (sphere.Radius == 0)
                 return false;
 
-            MyEntity[] targets;
-            try
-            {
-                var list = new List<MyEntity>( );
-                Wrapper.GameAction( ( ) => list = MyEntities.GetTopMostEntitiesInSphere( ref sphere ) );
-                targets = list.ToArray( );
-            }
-            catch (Exception ex)
+            var targets = new HashSet<MyEntity>();
+
+            foreach (var ent in _entityCache)
             {
-                Essentials.Log.Error( ex );
-                return true;
+                if (sphere.Contains( ent.PositionComp.WorldVolume ) != ContainmentType.Disjoint)
+                    targets.Add( ent );
             }
 
             foreach (MyEntity target in targets)
@@ -200,10 +193,7 @@ private bool DoesGridHaveTarget( MyCubeGrid grid )
                             break;
                         }
                         if (!grid.SmallOwners.Contains( controllingIdentity ))
-                        {
-                            Essentials.Log.Debug( "!" );
                             return true;
-                        }
                         break;
                     default:
                         throw new ArgumentOutOfRangeException( );

EssentialsPlugin/ProcessHandlers/ProcessTurrets.cs

@@ -7,7 +7,7 @@ public class ProcessTurrets : ProcessHandlerBase
 	{
 		public override int GetUpdateResolution( )
 		{
-			return 1000;
+			return 5000;
 		}
 
 		public override void Handle( )