using System;
+using System.Collections;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.IO;
using System.Linq;
-using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using Hjg.Pngcs;
-using Hjg.Pngcs.Chunks;
-
-using Newtonsoft.Json;
using ProtoBuf;
private Snapshotter snapshot;
private ICoreClientAPI ClientAPI { get; set; }
private ILogger Logger { get; set; }
- private IChunkRenderer ChunkRenderer { get; set; }
+ private AChunkRenderer ChunkRenderer { get; set; }
private JsonGenerator JsonGenerator { get; set; }
internal const string _mapPath = @"Maps";
internal Dictionary<int, BlockDesignator> BlockID_Designators { get; private set; }
internal Dictionary<AssetLocation, EntityDesignator> Entity_Designators { get; private set; }
internal Dictionary<int, string> RockIdCodes { get; private set; }
+ internal Dictionary<int, string> AiryIdCodes { get; private set; }
internal CommandType CurrentState { get; set; }
//Run status, Chunks processed, stats, center of map....
configuration = config;
//TODO:Choose which one from GUI
- this.ChunkRenderer = new StandardRenderer(clientAPI, logger);
+ this.ChunkRenderer = new StandardRenderer(clientAPI, logger, this.configuration.SeasonalColors);
//Listen on bus for commands
ClientAPI.Event.RegisterEventBusListener(CommandListener, 1.0, AutomapSystem.AutomapCommandEventKey);
outputText.Flush();
Prefill_POI_Designators();
- startChunkColumn = new Vec2i((ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.X / chunkSize), (ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.Z / chunkSize));
+ startChunkColumn = new Vec2i((ClientAPI.World.Player.Entity.Pos.AsBlockPos.X / chunkSize), (ClientAPI.World.Player.Entity.Pos.AsBlockPos.Z / chunkSize));
chunkTopMetadata = new ColumnsMetadata(startChunkColumn);
Logger.Notification("AUTOMAP Start {0}", startChunkColumn);
Reload_Metadata();
private void ChunkAChanging(Vec3i chunkCoord, IWorldChunk chunk, EnumChunkDirtyReason reason)
{
- Vec2i topPosition = new Vec2i(chunkCoord.X, chunkCoord.Z);
-
- columnCounter.AddOrUpdate(topPosition, 1, (key, colAct) => colAct + 1);
+ Vec2i topPosition = new Vec2i(chunkCoord.X, chunkCoord.Z);
+
+ //TODO: Track Y Chunk - Column, surface chunks being more important
+ //Only NEW/LOADED chunks unless edits > N
+ //if (reason == EnumChunkDirtyReason.NewlyCreated || reason == EnumChunkDirtyReason.NewlyLoaded)
+ //{
+ columnCounter.AddOrUpdate(topPosition, 1, (key, colAct) => colAct + 1);
+ //}
}
private void AwakenCartographer(float delayed)
if (mapChunk == null)
{
+ //TODO: REVISIT THIS CHUNK!
Logger.Warning("SKIP CHUNK: ({0}) - Map Chunk NULL!", mostActiveCol.Key);
nullMapCount++;
columnCounter.TryRemove(mostActiveCol.Key, out ejectedItem);
if (chunkTopMetadata.Contains(mostActiveCol.Key))
{
chunkMeta = chunkTopMetadata[mostActiveCol.Key];
-#if DEBUG
- Logger.VerboseDebug("Loaded chunk {0}", mostActiveCol.Key);
-#endif
+ #if DEBUG
+ Logger.VerboseDebug("Loaded meta-chunk {0}", mostActiveCol.Key);
+ #endif
}
else
{
chunkMeta = CreateColumnMetadata(mostActiveCol, mapChunk);
-#if DEBUG
- Logger.VerboseDebug("Created chunk {0}", mostActiveCol.Key);
-#endif
+ #if DEBUG
+ Logger.VerboseDebug("Created meta-chunk {0}", mostActiveCol.Key);
+ #endif
}
ProcessChunkBlocks(mostActiveCol.Key, mapChunk, ref chunkMeta);
- PngWriter pngWriter = SetupPngImage(mostActiveCol.Key, ref chunkMeta);
- ChunkRenderer.GenerateChunkPngShard(mostActiveCol.Key, mapChunk, chunkMeta, pngWriter, out updatedPixels);
+ ChunkRenderer.SetupPngImage(mostActiveCol.Key, path, _chunkPath, ref chunkMeta);
+ ChunkRenderer.GenerateChunkPngShard(mostActiveCol.Key, mapChunk, chunkMeta, ref chunkTopMetadata, out updatedPixels);
if (updatedPixels > 0)
{
-#if DEBUG
- Logger.VerboseDebug("Wrote chunk shard: ({0}) - Edits#:{1}, Pixels#:{2}", mostActiveCol.Key, mostActiveCol.Value, updatedPixels);
-#endif
+ #if DEBUG
+ Logger.VerboseDebug("Wrote top-chunk shard: ({0}) - Edits#:{1}, Pixels#:{2}", mostActiveCol.Key, mostActiveCol.Value, updatedPixels);
+ #endif
updatedChunks++;
chunkTopMetadata.Update(chunkMeta);
columnCounter.TryRemove(mostActiveCol.Key, out ejectedItem);
else
{
columnCounter.TryRemove(mostActiveCol.Key, out ejectedItem);
-#if DEBUG
- Logger.VerboseDebug("Un-painted chunk: ({0}) ", mostActiveCol.Key);
-#endif
+ #if DEBUG
+ Logger.VerboseDebug("Un-painted chunk shard: ({0}) ", mostActiveCol.Key);
+ #endif
}
}
- //Cleanup persisted Metadata...
- chunkTopMetadata.ClearMetadata();
}
UpdateStatus(this.updatedChunksTotal, this.nullChunkCount, updatedChunks);
updatedChunksTotal += updatedChunks;
JsonGenerator.GenerateJSONMetadata(chunkTopMetadata, startChunkColumn, POIs, EOIs, RockIdCodes);
updatedChunks = 0;
+
+ //Cleanup in-memory Metadata...
+ chunkTopMetadata.ClearMetadata( );
}
//Then sleep until interupted again, and repeat
this.Entity_Designators = new Dictionary<AssetLocation, EntityDesignator>();
this.RockIdCodes = Helpers.ArbitrarytBlockIdHunter(ClientAPI, new AssetLocation(GlobalConstants.DefaultDomain, "rock-"), EnumBlockMaterial.Stone);
- //Add special marker types for BlockID's of "Interest", overwrite colour, and method
+ 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
+ select airyBlock;
+ //^^ 'Solid' phase - 'Plant' Blocks without any boundg box ? Except water...
+ this.AiryIdCodes = airBlocksQuery.ToDictionary(aBlk => aBlk.BlockId, aBlk => aBlk.Code.Path);
+ //Add special marker types for BlockID's of "Interest", overwrite colour, and method
Reload_POI_Designators();
}
private ColumnMeta CreateColumnMetadata(KeyValuePair<Vec2i, uint> mostActiveCol, IMapChunk mapChunk)
{
- ColumnMeta data = new ColumnMeta(mostActiveCol.Key.Copy(), ClientAPI, (byte) chunkSize);
+ ColumnMeta data = new ColumnMeta(mostActiveCol.Key.Copy(), ClientAPI, (byte) chunkSize, (ClientAPI.World.BlockAccessor.MapSizeY / chunkSize));
BlockPos equivBP = new BlockPos(mostActiveCol.Key.X * chunkSize,
mapChunk.YMax,
mostActiveCol.Key.Y * chunkSize);
Logger.Error("PNG Corruption file '{0}' - Reason: {1}", shardFile.Name, someEx);
continue;
}
+ catch (ProtoException protoEx)
+ {
+ Logger.Error("ProtoBuf invalid! file:'{0}' - Reason: {1}", shardFile.Name, protoEx);
+ continue;
+ }
}
}
}
- private PngWriter SetupPngImage(Vec2i coord, ref ColumnMeta metadata)
- {
- ImageInfo imageInf = new ImageInfo(chunkSize, chunkSize, 8, false);
-
- string filename = $"{coord.X}_{coord.Y}.png";
- filename = Path.Combine(path, _chunkPath ,filename);
-
- PngWriter pngWriter = FileHelper.CreatePngWriter(filename, imageInf, true);
- PngMetadata meta = pngWriter.GetMetadata();
- meta.SetTimeNow();
- meta.SetText("Chunk_X", coord.X.ToString("D"));
- meta.SetText("Chunk_Y", coord.Y.ToString("D"));
- //Setup specialized meta-data PNG chunks here...
- PngMetadataChunk pngChunkMeta = new PngMetadataChunk(pngWriter.ImgInfo)
- {
- ChunkMetadata = metadata
- };
- pngWriter.GetChunksList().Queue(pngChunkMeta);
- pngWriter.CompLevel = 5;// 9 is the maximum compression but thats too high for the small benefit it gives
- pngWriter.CompressionStrategy = Hjg.Pngcs.Zlib.EDeflateCompressStrategy.Huffman;
- return pngWriter;
- }
/// <summary>
/// Does the heavy lifting of Scanning columns of chunks - scans for BlockEntity, creates Heightmap and stats...
/// <param name="chunkMeta">Chunk metadata</param>
private void ProcessChunkBlocks(Vec2i key, IMapChunk mapChunk, ref ColumnMeta chunkMeta)
{
+ int targetChunkY = mapChunk.YMax / chunkSize;//Surface ish...
+ byte chunkTally = 0;
+
+ #if DEBUG
+ Logger.VerboseDebug("Start col @ X{0} Y{1} Z{2} !", key.X, targetChunkY, key.Y);
+ #endif
- int targetChunkY = mapChunk.YMax / chunkSize;//Surface ...
- for (; targetChunkY > 0; targetChunkY--)
+ chunkMeta.ResetMetadata(ClientAPI.World.BlockAccessor.MapSizeY);
+
+ for (; targetChunkY > 0; targetChunkY--)
{
- WorldChunk chunkData = ClientAPI.World.BlockAccessor.GetChunk(key.X, targetChunkY, key.Y) as WorldChunk;
+ WorldChunk worldChunk = ClientAPI.World.BlockAccessor.GetChunk(key.X, targetChunkY, key.Y) as WorldChunk;
- if (chunkData == null || chunkData.BlockEntities == null)
+ if (worldChunk == null || worldChunk.BlockEntities == null)
{
-#if DEBUG
- Logger.VerboseDebug("Chunk null or empty X{0} Y{1} Z{2}", key.X, targetChunkY, key.Y);
-#endif
+ #if DEBUG
+ Logger.VerboseDebug("WORLD chunk: null or empty X{0} Y{1} Z{2} !", key.X, targetChunkY, key.Y);
+ #endif
nullChunkCount++;
continue;
}
+ if (worldChunk.IsPacked())
+ {
+ Logger.VerboseDebug("WORLD chunk: Compressed: X{0} Y{1} Z{2}", key.X, targetChunkY, key.Y);
+ worldChunk.Unpack( );//RESEARCH: Thread Unsafe?
+ }
+
/*************** Chunk Entities Scanning *********************/
- if (chunkData.BlockEntities != null && chunkData.BlockEntities.Length > 0)
+ if (worldChunk.BlockEntities != null && worldChunk.BlockEntities.Count > 0)
{
-#if DEBUG
- Logger.VerboseDebug("Surface@ {0} = BlockEntities: {1}", key, chunkData.BlockEntities.Length);
-#endif
+ #if DEBUG
+ Logger.VerboseDebug("Scan pos.({0}) for BlockEntities# {1}", key, worldChunk.BlockEntities.Count);
+ #endif
- foreach (var blockEnt in chunkData.BlockEntities)
+ foreach (var blockEnt in worldChunk.BlockEntities)
{
- if (blockEnt != null && blockEnt.Block != null && BlockID_Designators.ContainsKey(blockEnt.Block.BlockId))
+ if (blockEnt.Value != null && blockEnt.Value.Block != null && BlockID_Designators.ContainsKey(blockEnt.Value.Block.BlockId))
{
- var designator = BlockID_Designators[blockEnt.Block.BlockId];
- designator.SpecialAction(ClientAPI, POIs, blockEnt.Pos.Copy(), blockEnt.Block);
+ var designator = BlockID_Designators[blockEnt.Value.Block.BlockId];
+ designator.SpecialAction(ClientAPI, POIs, blockEnt.Value.Pos.Copy(), blockEnt.Value.Block);
}
}
}
+
/********************* Chunk/Column BLOCKs scanning ****************/
//Heightmap, Stats, block tally
- chunkData.Unpack();
-
- //int X_index, Y_index, Z_index;
-
- //Ensure ChunkData Metadata fields arn't null...due to being tossed out
- //if (chunkMeta.HeightMap == null) { chunkMeta.HeightMap = new ushort[chunkSize, chunkSize]; }
- //if (chunkMeta.RockRatio == null) { chunkMeta.RockRatio = new Dictionary<int, uint>(10); }
-
- //for (Y_index = 0; Y_index < chunkSize - 1; Y_index++)
- //{
- // for (Z_index = 0; Z_index < chunkSize - 1; Z_index++)
- // {
- // for (X_index = 0; X_index < chunkSize - 1; X_index++)
- // {
- // /* Encode packed indicie
- // (y * chunksize + z) * chunksize + x
- // */
- // var indicie = Helpers.ChunkBlockIndicie16(X_index, Y_index, Z_index);
- // int aBlockId = chunkData.Blocks[indicie];
-
- // if (aBlockId == 0)
- // {//Air
- // chunkMeta.AirBlocks++;
- // continue;
- // }
-
- // if (RockIdCodes.ContainsKey(aBlockId))
- // {
- // if (chunkMeta.RockRatio.ContainsKey(aBlockId))
- // chunkMeta.RockRatio[aBlockId]++;
- // else
- // chunkMeta.RockRatio.Add(aBlockId, 1);
- // }
-
- // chunkMeta.NonAirBlocks++;
-
- // //Heightmap
- // //if (chunkMeta.HeightMap[X_index, Z_index] == 0)
- // //{
-
- // // chunkMeta.HeightMap[X_index, Z_index] = (ushort) (Y_index + (targetChunkY * chunkSize));
- // //}
- // }
- // }
-
- //}
+ int X_index, Y_index, Z_index;
+
+ //First Chance fail-safe;
+ if (worldChunk.Blocks == null || worldChunk.Blocks.Length <= 0) {
+ Logger.VerboseDebug("WORLD chunk; Missing block DATA⁈ X{0} Y{1} Z{2} ⁈", key.X, targetChunkY, key.Y);
+ nullChunkCount++;
+ continue;
+ }
+
+ chunkMeta.ColumnPresense[targetChunkY] = true;
+ chunkTally++;
+ for (Y_index = 0; Y_index < chunkSize; Y_index++)
+ {
+ for (Z_index = 0; Z_index < chunkSize; Z_index++)
+ {
+ for (X_index = 0; X_index < chunkSize; X_index++)
+ {
+ var indicie = MapUtil.Index3d(X_index, Y_index, Z_index, chunkSize, chunkSize);
+
+ //'Last' Chance fail-safe;
+ if (worldChunk.Blocks == null || worldChunk.Blocks.Length <= 0) {
+ Logger.VerboseDebug("Processing Block: Missing block DATA⁈ X{0} Y{1} Z{2} ⁈", X_index, Y_index, Z_index);
+ nullChunkCount++;
+ goto loop_bustout; ;
+ }
+
+ int aBlockId = worldChunk.Blocks[indicie];
+
+ if (aBlockId == 0 || AiryIdCodes.ContainsKey(aBlockId)) {//Airy blocks,,,
+ chunkMeta.AirBlocks++;
+ continue;
+ }
+
+ if (RockIdCodes.ContainsKey(aBlockId)) {
+ if (chunkMeta.RockRatio.ContainsKey(aBlockId))
+ chunkMeta.RockRatio[aBlockId]++;
+ else
+ chunkMeta.RockRatio.Add(aBlockId, 1);
+ }
+
+ chunkMeta.NonAirBlocks++;
+
+ ushort localHeight = ( ushort )(Y_index + (targetChunkY * chunkSize));
+ //Heightmap - Need to ignore Grass & Snow
+ if (localHeight > chunkMeta.HeightMap[X_index, Z_index])
+ {
+ chunkMeta.HeightMap[X_index, Z_index] = localHeight;
+ if (localHeight > chunkMeta.YMax) chunkMeta.YMax = localHeight;
+ }
+ }
+ }
+ }
+ loop_bustout:;
}
+ Logger.VerboseDebug("COLUMN X{0} Z{1}: {2}, processed.", key.X , key.Y, chunkTally + 1);
}
private void UpdateEntityMetadata()
foreach (var loadedEntity in ClientAPI.World.LoadedEntities.ToArray())
{
-#if DEBUG
+ #if DEBUG
//Logger.VerboseDebug($"ENTITY: ({loadedEntity.Value.Code}) = #{loadedEntity.Value.EntityId} {loadedEntity.Value.State} {loadedEntity.Value.LocalPos} <<<<<<<<<<<<");
-#endif
+ #endif
var dMatch = Entity_Designators.SingleOrDefault(se => se.Key.Equals(loadedEntity.Value.Code));
if (dMatch.Value != null)
{
- dMatch.Value.SpecialAction(ClientAPI, this.EOIs, loadedEntity.Value.LocalPos.AsBlockPos.Copy(), loadedEntity.Value);
+ dMatch.Value.SpecialAction(ClientAPI, this.EOIs, loadedEntity.Value.Pos.AsBlockPos.Copy(), loadedEntity.Value);
}
}
var playerNodePoi = new PointOfInterest()
{
Name = "Note",
- Location = ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.Copy(),
+ Location = ClientAPI.World.Player.Entity.Pos.AsBlockPos.Copy(),
Notes = notation,
Timestamp = DateTime.UtcNow,
};
OSDN Git Service
