OSDN Git Service

Assorted fixes
[automap/automap.git] / Automap / Subsystems / AutomapSystem.cs
index 1ceaadc..abbfc44 100644 (file)
@@ -33,7 +33,7 @@ namespace Automap
 
                internal const string _mapPath = @"Maps";
                internal const string _chunkPath = @"Chunks";
-               internal const uint editThreshold = 1;
+               internal const uint editThreshold = 9;
                private const string _domain = @"automap";
                private const string chunkFile_filter = @"*_*.png";
                private const string poiFileName = @"poi_binary";
@@ -44,9 +44,8 @@ namespace Automap
 
                private ConcurrentDictionary<Vec2i, ColumnCounter> columnCounters = new ConcurrentDictionary<Vec2i, ColumnCounter>(3, 150);
                private ColumnsMetadata chunkTopMetadata;
-               private PointsOfInterest POIs = new PointsOfInterest();
-               private EntitiesOfInterest EOIs = new EntitiesOfInterest();
-               private Dictionary<int, ulong> blockTally;//TODO: TOTAL Road Tally
+               internal PointsOfInterest POIs = new PointsOfInterest();
+               internal EntitiesOfInterest EOIs = new EntitiesOfInterest();
 
                internal Dictionary<int, BlockDesignator> BlockID_Designators { get; private set; }
                internal Dictionary<AssetLocation, EntityDesignator> Entity_Designators { get; private set; }
@@ -205,7 +204,9 @@ namespace Automap
                                                if (mapChunk == null)
                                                {
                                                        //TODO: REVISIT THIS CHUNK!
+                                                       #if DEBUG
                                                        Logger.Warning("SKIP CHUNK: ({0}) - Map Chunk NULL!", mostActiveCol.Key);
+                                                       #endif
                                                        nullMapCount++;
                                                        columnCounters.TryRemove(mostActiveCol.Key, out ejectedItem);
                                                        continue;
@@ -227,6 +228,7 @@ namespace Automap
                                                        #endif
                                                }
                                                ProcessChunkBlocks(mostActiveCol.Key, mapChunk, ref chunkMeta);
+                                               mostActiveCol.Value.SetCutoff(chunkMeta.YMax / chunkSize);
 
                                                ChunkRenderer.SetupPngImage(mostActiveCol.Key, path, _chunkPath, ref chunkMeta);
                                                ChunkRenderer.GenerateChunkPngShard(mostActiveCol.Key, mapChunk, chunkMeta, ref chunkTopMetadata, out updatedPixels);
@@ -342,7 +344,7 @@ namespace Automap
                        var airBlocksQuery = from airyBlock in ClientAPI.World.Blocks
                                                         where airyBlock.MatterState == EnumMatterState.Solid
                                                         where airyBlock.BlockMaterial == EnumBlockMaterial.Plant || airyBlock.BlockMaterial == EnumBlockMaterial.Leaves
-                                                        where airyBlock.CollisionBoxes == null || airyBlock.CollisionBoxes.Length == 0
+                                                        where airyBlock.CollisionBoxes == null || airyBlock.CollisionBoxes.Length == 0 ||airyBlock.RainPermeable == true                                                        
                                                         select airyBlock;                      
                        //^^ 'Solid' phase - 'Plant' Blocks without any boundg box ? Except water...
                        this.AiryIdCodes = airBlocksQuery.ToDictionary(aBlk => aBlk.BlockId, aBlk => aBlk.Code.Path);
@@ -353,34 +355,36 @@ namespace Automap
 
                private void Reload_POI_Designators()
                {
-                       Logger.VerboseDebug("Connecting {0} Configured Block-Designators", configuration.BlockDesignators.Count);
+               uint poisSetup =0, eoiSetup = 0;
                        foreach (var designator in configuration.BlockDesignators)
                        {
+                               if (designator.Enabled == false) continue;
                                var blockIDs = Helpers.ArbitrarytBlockIdHunter(ClientAPI, designator.Pattern, designator.Material);
                                if (blockIDs.Count > 0) { Logger.VerboseDebug("Designator {0} has {1} associated blockIDs", designator.ToString(), blockIDs.Count); }
                                foreach (var entry in blockIDs)
                                {
                                        BlockID_Designators.Add(entry.Key, designator);
+                                       poisSetup++;
                                }
                        }
                        this.ChunkRenderer.BlockID_Designators = BlockID_Designators;
+                       Logger.VerboseDebug("Connected {0} IDs from {1} Block-Designators", poisSetup, configuration.BlockDesignators.Count );
 
 
-                       Logger.VerboseDebug("Connecting {0} Configured Entity-Designators", configuration.EntityDesignators.Count);
                        foreach (var designator in configuration.EntityDesignators)
                        {
+                               if (designator.Enabled == false) continue;
                                //Get Variants first, from EntityTypes...better be populated!
                                var matched = ClientAPI.World.EntityTypes.FindAll(entp => entp.Code.BeginsWith(designator.Pattern.Domain, designator.Pattern.Path));
 
                                foreach (var match in matched)
-                               {
+                               {                                       
                                        Logger.VerboseDebug("Linked Entity: {0} Designator: {1}", match.Code, designator);
                                        this.Entity_Designators.Add(match.Code, designator);
+                                       eoiSetup++;
                                }
-
-                               //EntityProperties props = ClientAPI.World.GetEntityType(designator.Pattern);
                        }
-
+                       Logger.VerboseDebug("Connected {0} IDs from {1} Entity-Designators", eoiSetup, configuration.EntityDesignators.Count);
 
                }
 
@@ -398,17 +402,19 @@ namespace Automap
 
                        if (this.POIs.Count > 0)
                        {
-                               using (var poiFile = File.OpenWrite(poiPath))
+                               using (var poiFile = File.Open(poiPath, FileMode.Create, FileAccess.Write, FileShare.None))
                                {
                                        Serializer.Serialize<PointsOfInterest>(poiFile, this.POIs);
+                                       poiFile.Flush(true);
                                }
                        }
 
                        if (this.EOIs.Count > 0)
                        {
-                               using (var eoiFile = File.OpenWrite(eoiPath))
+                               using (var eoiFile = File.Open(eoiPath, FileMode.Create, FileAccess.Write, FileShare.None))
                                {
                                        Serializer.Serialize<EntitiesOfInterest>(eoiFile, this.EOIs);
+                                       eoiFile.Flush(true);
                                }
                        }
 
@@ -417,31 +423,33 @@ namespace Automap
 
                        using (var tsvWriter = new StreamWriter(pointsTsvPath, false, Encoding.UTF8))
                        {
-                               tsvWriter.WriteLine("Name\tDescription\tLocation\tTime\tDestination");
+                               tsvWriter.WriteLine("Name\tDescription\tLocation\tTime\tDestination\tEntity_UID");
                                foreach (var point in this.POIs)
                                {
                                        tsvWriter.Write(point.Name + "\t");
                                        var notes = point.Notes
-                                               .Replace("\n", "\\n")
+                                               .Replace('\n', '\x001f')
                                                .Replace("\t", "\\t")
                                                .Replace("\\", "\\\\");
                                        tsvWriter.Write(notes + "\t");
                                        tsvWriter.Write(point.Location.PrettyCoords(ClientAPI) + "\t");
                                        tsvWriter.Write(point.Timestamp.ToString("u") + "\t");
                                        tsvWriter.Write((point.Destination != null ? point.Destination.PrettyCoords(ClientAPI) : "---") +"\t");
+                                       tsvWriter.Write("null\t");
                                        tsvWriter.WriteLine();
                                }
                                foreach (var entity in this.EOIs)
                                {
                                        tsvWriter.Write(entity.Name + "\t");
                                        var notes = entity.Notes
-                                               .Replace("\n", "\\n")
+                                               .Replace('\n', '\x001f')
                                                .Replace("\t", "\\t")
                                                .Replace("\\", "\\\\");
                                        tsvWriter.Write(notes + "\t");
                                        tsvWriter.Write(entity.Location.PrettyCoords(ClientAPI) + "\t");
                                        tsvWriter.Write(entity.Timestamp.ToString("u") + "\t");
-                                       tsvWriter.Write("n/a\t");
+                                       tsvWriter.Write("---\t");
+                                       tsvWriter.Write(entity.EntityId.ToString("D"));
                                        tsvWriter.WriteLine();
                                }
                                tsvWriter.WriteLine();
@@ -467,6 +475,9 @@ namespace Automap
                                mdWriter.WriteLine("AMVersion '{0}'", ClientAPI.Self().Info.Version);
                                mdWriter.WriteLine("PlayTime {0:F1}", ClientAPI.InWorldEllapsedMilliseconds / 1000);
                                mdWriter.WriteLine("GameDate {0}", ClientAPI.World.Calendar.PrettyDate());
+                               mdWriter.WriteLine("Chunks {0:D}", chunkTopMetadata.Count);
+                               mdWriter.WriteLine("Chunks Updated {0:D}", updatedChunksTotal);
+                               mdWriter.WriteLine("Null Chunks {0:D}", nullChunkCount);        
                                mdWriter.Flush( );
                        }
                }
@@ -608,7 +619,9 @@ namespace Automap
 
                                if (worldChunk.IsPacked()) 
                                {
+                               #if DEBUG
                                Logger.VerboseDebug("WORLD chunk: Compressed: X{0} Y{1} Z{2}", key.X, targetChunkY, key.Y);
+                               #endif
                                worldChunk.Unpack( );//RESEARCH: Thread Unsafe? 
                                }
 
@@ -621,10 +634,10 @@ namespace Automap
 
                                        foreach (var blockEnt in worldChunk.BlockEntities)
                                        {
-                                               if (blockEnt.Value != null && blockEnt.Value.Block != null && BlockID_Designators.ContainsKey(blockEnt.Value.Block.BlockId))
+                                               if (blockEnt.Key != null && blockEnt.Value != null && blockEnt.Value.Block != null && BlockID_Designators.ContainsKey(blockEnt.Value.Block.BlockId))
                                                {
                                                        var designator = BlockID_Designators[blockEnt.Value.Block.BlockId];
-                                                       designator.SpecialAction(ClientAPI, POIs, blockEnt.Value.Pos.Copy(), blockEnt.Value.Block);
+                                                       designator?.SpecialAction(ClientAPI, POIs, blockEnt.Value.Pos.Copy(), blockEnt.Value.Block);
                                                }
                                        }
                                }
@@ -636,7 +649,9 @@ namespace Automap
 
                                //First Chance fail-safe;
                                if (worldChunk.Blocks == null || worldChunk.Blocks.Length <= 0) {
+                               #if DEBUG
                                Logger.VerboseDebug("WORLD chunk; Missing block DATA⁈ X{0} Y{1} Z{2} ⁈", key.X, targetChunkY, key.Y);
+                               #endif
                                nullChunkCount++;
                                continue;
                                }               
@@ -653,9 +668,11 @@ namespace Automap
 
                                                //'Last' Chance fail-safe;
                                                if (worldChunk.Blocks == null || worldChunk.Blocks.Length <= 0) {
+                                               #if DEBUG
                                                Logger.VerboseDebug("Processing Block: Missing block DATA⁈ X{0} Y{1} Z{2} ⁈", X_index, Y_index, Z_index);
+                                               #endif
                                                nullChunkCount++;
-                                               goto loop_bustout; ;
+                                               goto loop_bustout; 
                                                }
 
                                                int aBlockId = worldChunk.Blocks[indicie];
@@ -686,12 +703,16 @@ namespace Automap
                                }
                                loop_bustout:;
                        }
+                       #if DEBUG
                        Logger.VerboseDebug("COLUMN X{0} Z{1}: {2}, processed.", key.X , key.Y, chunkTally + 1);
+                       #endif
                }
 
                private void UpdateEntityMetadata()
                {
+                       #if DEBUG
                        Logger.Debug("Presently {0} Entities", ClientAPI.World.LoadedEntities.Count);
+                       #endif
                        //Mabey scan only for 'new' entities by tracking ID in set?
                        foreach (var loadedEntity in ClientAPI.World.LoadedEntities.ToArray())
                        {
@@ -749,11 +770,11 @@ namespace Automap
                                        AddNote(cmdData.Notation);
                                        break;
                        }
-                       #if DEBUG
+
                        ClientAPI.TriggerChatMessage($"Automap commanded to: {cmdData.State} ");
-                       #endif
+
                }
-               #endregion
+#endregion
 
                private AChunkRenderer InstantiateChosenRenderer(string rendererName )
                {