using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
-using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using Newtonsoft.Json;
+using ProtoBuf;
+
using Vintagestory.API.Client;
using Vintagestory.API.Common;
using Vintagestory.API.Config;
private ICoreClientAPI ClientAPI { get; set; }
private ILogger Logger { get; set; }
private IChunkRenderer ChunkRenderer { get; set; }
+ private JsonGenerator JsonGenerator { get; set; }
private const string _mapPath = @"Maps";
private const string _chunkPath = @"Chunks";
private const string _domain = @"automap";
private const string chunkFile_filter = @"*_*.png";
+ private const string poiFileName = @"poi_binary";
+ private const string eoiFileName = @"eoi_binary";
+ private const string pointsTsvFileName = @"points_of_interest.tsv";
private static Regex chunkShardRegex = new Regex(@"(?<X>[\d]+)_(?<Z>[\d]+).png", RegexOptions.Singleline);
private ConcurrentDictionary<Vec2i, uint> columnCounter = new ConcurrentDictionary<Vec2i, uint>(3, 150);
public static string AutomapStatusEventKey = @"AutomapStatus";
public static string AutomapCommandEventKey = @"AutomapCommand";
- //PersistedConfiguration cachedConfiguration;
+ PersistedConfiguration cachedConfiguration;
public AutomapSystem(ICoreClientAPI clientAPI, ILogger logger, PersistedConfiguration config)
{
configuration = config;
-
//TODO:Choose which one from GUI
this.ChunkRenderer = new StandardRenderer(clientAPI, logger);
{
path = ClientAPI.GetOrCreateDataPath(_mapPath);
path = ClientAPI.GetOrCreateDataPath(Path.Combine(path, "World_" + ClientAPI.World.Seed));//Add name of World too...'ServerApi.WorldManager.CurrentWorldName'
-
+ JsonGenerator = new JsonGenerator(ClientAPI, Logger, path);
string mapFilename = Path.Combine(path, "automap.html");
StreamWriter outputText = new StreamWriter(File.Open(mapFilename, FileMode.Create, FileAccess.Write, FileShare.ReadWrite));
outputText.Write(staticMap.ToText());
outputText.Flush();
- MakePreBuiltJSON();
+ jsonPreBuilt = JsonGenerator.MakePreBuiltJSON();
Prefill_POI_Designators();
startChunkColumn = new Vec2i((ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.X / chunkSize), (ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.Z / chunkSize));
if (CurrentState == CommandType.Run && (ClientAPI.IsGamePaused != false || ClientAPI.IsShuttingDown != true))
{
-#if DEBUG
+ #if DEBUG
Logger.VerboseDebug("Cartographer re-trigger from [{0}]", cartographer_thread.ThreadState);
-#endif
+ #endif
- if (cartographer_thread.ThreadState.HasFlag(System.Threading.ThreadState.Unstarted))
+ if (cartographer_thread.ThreadState.HasFlag(ThreadState.Unstarted))
{
cartographer_thread.Start();
}
- else if (cartographer_thread.ThreadState.HasFlag(System.Threading.ThreadState.WaitSleepJoin))
+ else if (cartographer_thread.ThreadState.HasFlag(ThreadState.WaitSleepJoin))
{
//Time to (re)write chunk shards
cartographer_thread.Interrupt();
if (updatedPixels > 0)
{
-#if DEBUG
+ #if DEBUG
Logger.VerboseDebug("Wrote chunk shard: ({0}) - Edits#:{1}, Pixels#:{2}", mostActiveCol.Key, mostActiveCol.Value, updatedPixels);
-#endif
+ #endif
updatedChunks++;
chunkTopMetadata.Update(chunkMeta);
columnCounter.TryRemove(mostActiveCol.Key, out ejectedItem);
{
//What about chunk updates themselves; a update bitmap isn't kept...
updatedChunksTotal += updatedChunks;
- GenerateJSONMetadata();
+ JsonGenerator.GenerateJSONMetadata(chunkTopMetadata, startChunkColumn, POIs, EOIs, RockIdCodes);
updatedChunks = 0;
}
finally
{
Logger.VerboseDebug("Thread '{0}' executing finally block.", Thread.CurrentThread.Name);
+ PersistPointsData( );
}
}
}
+
+
/// <summary>
- /// Generates the JSON Metadata. (in Map object format )
+ /// Store Points/Entity of Interest
/// </summary>
- private void GenerateJSONMetadata()
+ private void PersistPointsData( )
{
- string jsonFilename = Path.Combine(path, "Metadata.js");
-
- StreamWriter stream = new StreamWriter(jsonFilename, false, Encoding.UTF8);
-
- using (stream)
- {
- Stopwatch stopWatch = new Stopwatch();
- stopWatch.Start();
-
- stream.Write(jsonPreBuilt);
-
- stream.Write("ViewFrame.chunks.genTime='{0}';",
- DateTimeOffset.UtcNow
- );
-
- stream.Write("ViewFrame.chunks.startCoords=[{0},{1}];",
- startChunkColumn.X, startChunkColumn.Y
- );
-
- stream.Write("ViewFrame.chunks.bounds=[{0},{1},{2},{3}];",
- chunkTopMetadata.North_mostChunk,
- chunkTopMetadata.South_mostChunk,
- chunkTopMetadata.West_mostChunk,
- chunkTopMetadata.East_mostChunk
- );
-
-
- //MAP object format - [key, value]: key is "x_y"
- stream.Write("ViewFrame.chunks.chunkMetadata=new Map([");
-
- foreach (var shard in chunkTopMetadata)
- {
- shard.Write(stream, ClientAPI);
- stream.Write(",");
- }
- stream.Write("]);");// Close constructor of Map (chunkMetadata)
-
-
- stream.Write("ViewFrame.chunks.pointsOfInterest=new Map([");
-
- foreach (var poi in POIs)
- {
- poi.Write(stream, ClientAPI);
- stream.Write(",");
- }
-
- stream.Write("]);");
-
- stream.Write("ViewFrame.chunks.entitiesOfInterest=new Map([");
- foreach (var eoi in EOIs)
- {
- eoi.Write(stream, ClientAPI);
- stream.Write(",");
- }
- stream.Write("]);\n");
-
- //stream.Write("//============= BlockID's for Rockmap / Rock-ratios ===============");
-
- //stream.Write("ViewFrame.chunks.rockLookup=new Map([");
-
- //foreach (var entry in RockIdCodes)
- //{
- // var block = ClientAPI.World.GetBlock(entry.Key);
-
- // stream.Write("[");
- // stream.Write("'{0},", block.Code.Path);
-
- // stream.Write("[");
- // stream.Write("'{0}',", entry.Value);
-
- // stream.Write("{0},", Lang.GetUnformatted(block.Code.Path));
- // //Color?
-
- // stream.Write("]],");
- //}
+ //POI and EOI raw dump files ~ WRITE em!
+ //var poiRawFile = File.
+ string poiPath = Path.Combine(path, poiFileName);
+ string eoiPath = Path.Combine(path, eoiFileName);
+
+ if (this.POIs.Count > 0) {
+ using (var poiFile = File.OpenWrite(poiPath)) {
+ Serializer.Serialize<PointsOfInterest>(poiFile, this.POIs);
+ }
+ }
- //stream.Write("]);\n");
+ if (this.EOIs.Count > 0) {
+ using (var eoiFile = File.OpenWrite(eoiPath)) {
+ Serializer.Serialize<EntitiesOfInterest>(eoiFile, this.EOIs);
+ }
+ }
- stream.Flush();
+ //Create Easy to Parse TSV file for tool/human use....
+ string pointsTsvPath = Path.Combine(path, pointsTsvFileName);
- stopWatch.Stop();
- Logger.Debug("Run time of chunk write {0}", stopWatch.Elapsed);
+ using (var tsvWriter = new StreamWriter(pointsTsvPath, false, Encoding.UTF8))
+ {
+ tsvWriter.WriteLine("Name\tDescription\tLocation\tTime\t");
+ foreach (var point in this.POIs) {
+ tsvWriter.Write(point.Name + "\t");
+ tsvWriter.Write(point.Notes + "\t");
+ tsvWriter.Write(point.Location.PrettyCoords(ClientAPI) + "\t");
+ tsvWriter.Write(point.Timestamp.ToString("u")+"\t");
+ tsvWriter.WriteLine();
}
-
+ foreach (var entity in this.EOIs) {
+ tsvWriter.Write(entity.Name + "\t");
+ tsvWriter.Write(entity.Notes + "\t");
+ tsvWriter.Write(entity.Location.PrettyCoords(ClientAPI) + "\t");
+ tsvWriter.Write(entity.Timestamp.ToString("u") + "\t");
+ tsvWriter.WriteLine( );
+ }
+ tsvWriter.WriteLine();
+ tsvWriter.Flush( );
}
+ }
private ColumnMeta CreateColumnMetadata(KeyValuePair<Vec2i, uint> mostActiveCol, IMapChunk mapChunk)
{
if (worldmapDir.Exists)
{
- var files = worldmapDir.GetFiles(chunkFile_filter);
+ var shardFiles = worldmapDir.GetFiles(chunkFile_filter);
- if (files.Length > 0)
+ if (shardFiles.Length > 0)
{
-#if DEBUG
- Logger.VerboseDebug("{0} Existing world chunk shards", files.Length);
-#endif
-
- foreach (var shardFile in files)
- {
-
- if (shardFile.Length < 1024) continue;
- var result = chunkShardRegex.Match(shardFile.Name);
- if (result.Success)
+ #if DEBUG
+ Logger.VerboseDebug("Metadata reloading from {0} shards", shardFiles.Length);
+ #endif
+
+ foreach (var shardFile in shardFiles) {
+
+ if (shardFile.Length < 1024) continue;
+ var result = chunkShardRegex.Match(shardFile.Name);
+ if (result.Success) {
+ int X_chunk_pos = int.Parse(result.Groups["X"].Value);
+ int Z_chunk_pos = int.Parse(result.Groups["Z"].Value);
+
+ try
{
- int X_chunk_pos = int.Parse(result.Groups["X"].Value);
- int Z_chunk_pos = int.Parse(result.Groups["Z"].Value);
+ using (var fileStream = shardFile.OpenRead( )) {
- try
- {
- using (var fileStream = shardFile.OpenRead())
- {
-
- PngReader pngRead = new PngReader(fileStream);
- pngRead.ReadSkippingAllRows();
- pngRead.End();
- //Parse PNG chunks for METADATA in shard
- PngMetadataChunk metadataFromPng = pngRead.GetChunksList().GetById1(PngMetadataChunk.ID) as PngMetadataChunk;
+ PngReader pngRead = new PngReader(fileStream);
+ pngRead.ReadSkippingAllRows( );
+ pngRead.End( );
+ //Parse PNG chunks for METADATA in shard
+ PngMetadataChunk metadataFromPng = pngRead.GetChunksList( ).GetById1(PngMetadataChunk.ID) as PngMetadataChunk;
- chunkTopMetadata.Add(metadataFromPng.ChunkMetadata);
- }
+ chunkTopMetadata.Add(metadataFromPng.ChunkMetadata);
+ }
- }
- catch (PngjException someEx)
- {
- Logger.Error("PNG Corruption file '{0}' - Reason: {1}", shardFile.Name, someEx);
- continue;
- }
+ }
+ catch (PngjException someEx)
+ {
+ Logger.Error("PNG Corruption file '{0}' - Reason: {1}", shardFile.Name, someEx);
+ continue;
+ }
}
}
}
+ //POI and EOI raw dump files ~ reload em!
+ //var poiRawFile = File.
+ string poiPath = Path.Combine(path, poiFileName);
+ string eoiPath = Path.Combine(path, eoiFileName);
+
+ if (File.Exists(poiPath)) {
+ using (var poiFile = File.OpenRead(poiPath)) {
+ this.POIs = Serializer.Deserialize<PointsOfInterest>(poiFile);
+ Logger.VerboseDebug("Reloaded {0} POIs from file.", this.POIs.Count);
+ }
+ }
+
+ if (File.Exists(eoiPath)) {
+ using (var eoiFile = File.OpenRead(eoiPath)) {
+ this.EOIs = Serializer.Deserialize<EntitiesOfInterest>(eoiFile);
+ Logger.VerboseDebug("Reloaded {0} EOIs from file.", this.EOIs.Count);
+ }
+ }
}
else
{
-#if DEBUG
+ #if DEBUG
Logger.VerboseDebug("Could not open world map directory");
-#endif
+ #endif
}
int targetChunkY = mapChunk.YMax / chunkSize;//Surface ...
for (; targetChunkY > 0; targetChunkY--)
{
- WorldChunk chunkData = ClientAPI.World.BlockAccessor.GetChunk(key.X, targetChunkY, key.Y) as WorldChunk;
- if (chunkData == null || chunkData.BlockEntities == null)
- {
-#if DEBUG
- Logger.VerboseDebug("Chunk null or empty X{0} Y{1} Z{2}", key.X, targetChunkY, key.Y);
-#endif
- continue;
- }
+ WorldChunk chunkData = ClientAPI.World.BlockAccessor.GetChunk(key.X, targetChunkY, key.Y) as WorldChunk;
+
+ if (chunkData == null || chunkData.BlockEntities == null) {
+ #if DEBUG
+ Logger.VerboseDebug("Chunk null or empty X{0} Y{1} Z{2}", key.X, targetChunkY, key.Y);
+ #endif
+ continue;
+ }
/*************** Chunk Entities Scanning *********************/
if (chunkData.BlockEntities != null && chunkData.BlockEntities.Length > 0)
{
-#if DEBUG
+ #if DEBUG
Logger.VerboseDebug("Surface@ {0} = BlockEntities: {1}", key, chunkData.BlockEntities.Length);
-#endif
+ #endif
foreach (var blockEnt in chunkData.BlockEntities)
{
}
chunkMeta.NonAirBlocks++;
+
+ //Heightmap
+ if (chunkMeta.HeightMap[X_index, Z_index] == 0)
+ { chunkMeta.HeightMap[X_index, Z_index] = (ushort) (Y_index + (targetChunkY * chunkSize)); }
+
}
while (X_index++ < (chunkSize - 1));
X_index = 0;
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)
{
- Logger.Chat("Entity designator hit!");
dMatch.Value.SpecialAction(ClientAPI, this.EOIs, loadedEntity.Value.LocalPos.AsBlockPos.Copy(), loadedEntity.Value);
}
{
var playerNodePoi = new PointOfInterest()
{
+ Name = "Note",
Location = ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.Copy(),
Notes = notation,
- Timestamp = DateTimeOffset.UtcNow,
+ Timestamp = DateTime.UtcNow,
};
this.POIs.AddReplace(playerNodePoi);
{
switch (cmdData.State)
{
- case CommandType.Run:
- CurrentState = cmdData.State;
- AwakenCartographer(0.0f);
- break;
-
+ case CommandType.Run:
case CommandType.Stop:
+ if (CurrentState != cmdData.State) {
CurrentState = cmdData.State;
+ AwakenCartographer(0.0f);
+ }
break;
case CommandType.Snapshot:
AddNote(cmdData.Notation);
break;
}
-
}
- if (CurrentState != cmdData.State)
- {
- CurrentState = cmdData.State;
- AwakenCartographer(0.0f);
- }
+
#if DEBUG
- Logger.VerboseDebug($"Automap commanded to: {cmdData.State} ");
+ ClientAPI.TriggerChatMessage($"Automap commanded to: {cmdData.State} ");
#endif
}
- private void MakePreBuiltJSON()
- {
- var builder = new StringBuilder(512);
- builder.Append("ViewFrame.chunks={};\n");
- builder.AppendFormat("ViewFrame.chunks.worldSeedNum='{0}';",
- ClientAPI.World.Seed
- );
- builder.AppendFormat("ViewFrame.chunks.chunkSize={0};",
- chunkSize
- );
-
- builder.Append("ViewFrame.chunks.chunkMetadataNames=[");
- var fields = typeof(ColumnMeta).GetFields();
- var attsToSort = new List<DisplayNameAttribute>();
- // this is so gross
- foreach (var f in fields)
- {
- var att = f.GetCustomAttribute(typeof(DisplayNameAttribute));
- if (att != null)
- {
- attsToSort.Add((DisplayNameAttribute) att);
- }
-
- }
- foreach (var att in attsToSort.OrderBy(a => a.order))
- builder.AppendFormat("'{0}',", att.name);
- builder.Append("];\n");
-
- builder.Append("ViewFrame.chunks.pointsOfInterestNames=[");
- fields = typeof(PointOfInterest).GetFields();
- attsToSort = new List<DisplayNameAttribute>();
- foreach (var f in fields)
- {
- var att = f.GetCustomAttribute(typeof(DisplayNameAttribute));
- if (att != null)
- attsToSort.Add((DisplayNameAttribute) att);
- }
- foreach (var att in attsToSort.OrderBy(a => a.order))
- builder.AppendFormat("'{0}',", att.name);
- builder.Append("];\n");
-
- builder.Append("ViewFrame.chunks.entityOfInterestNames=[");
- fields = typeof(EntityOfInterest).GetFields();
- attsToSort = new List<DisplayNameAttribute>();
-
- foreach (var f in fields)
- {
- var att = f.GetCustomAttribute(typeof(DisplayNameAttribute));
- if (att != null)
- attsToSort.Add((DisplayNameAttribute) att);
- }
- foreach (var att in attsToSort.OrderBy(a => a.order))
- builder.AppendFormat("'{0}',", att.name);
- builder.Append("];\n");
-
- jsonPreBuilt = builder.ToString();
- }
#endregion
}
-}
\ No newline at end of file
+}
OSDN Git Service
