提交: f2daf9ef05f9f97f40f18a56be811851c4cbe3c0 - automap (git)

Automap (client) [VS plugin mod]

Commit MetaInfo

• 修訂: f2daf9ef05f9f97f40f18a56be811851c4cbe3c0 (tree)
• 時間: 2020-11-26 12:11:50
• 作者: melchior <melchior@user...>
• Commiter: melchior

Log Message

Added configurability for Renderer choice,
*New* Flat Renderer added

Change Summary

• modified: Automap/Automap.csproj
• modified: Automap/Data/PersistedConfiguration.cs
• modified: Automap/Renderers/AlternateRenderer.cs
• add: Automap/Renderers/FlatRenderer.cs
• modified: Automap/Renderers/StandardRenderer.cs
• modified: Automap/Subsystems/AutomapSystem.cs

差異

--- a/Automap/Automap.csproj
+++ b/Automap/Automap.csproj
@@ -100,6 +100,7 @@
 	<Compile Include="Subsystems\Snapshot.cs" />
 	<Compile Include="Data\JSON\BlockPosJson.cs" />
 	<Compile Include="Data\ColumnCounter.cs" />
+	<Compile Include="Renderers\FlatRenderer.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="VS_libs\" />

--- a/Automap/Data/PersistedConfiguration.cs
+++ b/Automap/Data/PersistedConfiguration.cs
@@ -20,7 +20,11 @@ namespace Automap
 		/// <value>The seasonal colors.</value>
 		public bool SeasonalColors { get; set; } = true;
 
-		//public string ChosenRendererName { get; set; }
+		/// <summary>
+		/// Which appearance 'theme' should shards have?
+		/// </summary>
+		/// <value>'Standard' / 'Alternate' / 'Flat'</value>
+		public string RendererName { get; set; } = @"Standard";
 
 		//All - Designators, setup
 		public List<BlockDesignator> BlockDesignators { get; set; }

--- a/Automap/Renderers/AlternateRenderer.cs
+++ b/Automap/Renderers/AlternateRenderer.cs
@@ -11,13 +11,14 @@ namespace Automap
 {
 	public class AlternateRenderer : AChunkRenderer
 	{
-		
+		public const string Name = @"Alternate";
+
 		/// <summary>
 		/// V.G.D:'s Alternative renderer
 		/// </summary>
 		/// <param name="clientAPI">Client API.</param>
 		/// <param name="logger">Logger.</param>
-		public AlternateRenderer(ICoreClientAPI clientAPI, ILogger logger) : base(clientAPI, logger)
+		public AlternateRenderer(ICoreClientAPI clientAPI, ILogger logger, bool seasonalColor) : base(clientAPI, logger)
 		{
 			
 		}

--- /dev/null
+++ b/Automap/Renderers/FlatRenderer.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Hjg.Pngcs;
+
+using Vintagestory.API.Client;
+using Vintagestory.API.Common;
+using Vintagestory.API.MathTools;
+using Vintagestory.Common;
+
+namespace Automap
+{
+	public class FlatRenderer : AChunkRenderer
+	{
+		public const string Name = @"Flat";
+
+		/// <summary>
+		/// Renders shards similar to the OLD VS (1.8) version, plus P.O.I. markings.
+		/// </summary>
+		/// <param name="clientAPI">Client API.</param>
+		/// <param name="logger">Logger.</param>
+		public FlatRenderer(ICoreClientAPI clientAPI, ILogger logger, bool seasonalColor) : base(clientAPI, logger, seasonalColor)
+		{
+
+		}
+
+		public override void GenerateChunkPngShard(Vec2i chunkPos, IMapChunk mc, ColumnMeta targetColMeta, ref ColumnsMetadata allCols, out uint pixelCount)
+		{
+		pixelCount = 0;
+		BlockPos tmpPos = new BlockPos( );
+		Vec2i localpos = new Vec2i( );
+
+		var chunksColumn = new IWorldChunk[ClientAPI.World.BlockAccessor.MapSizeY / chunkSize];
+
+		//pre-create PNG line slices...
+		ImageLine[ ] lines = Enumerable.Repeat(new object( ), chunkSize).Select(l => new ImageLine(this.PngWriter.ImgInfo)).ToArray( );
+
+		int topChunkY = targetColMeta.YMax / chunkSize;
+
+		for (int chunkY = 0; chunkY <= topChunkY; chunkY++) {
+		chunksColumn[chunkY] = ClientAPI.World.BlockAccessor.GetChunk(chunkPos.X, chunkY, chunkPos.Y);
+		WorldChunk ownChunk = chunksColumn[chunkY] as WorldChunk;
+		if (ownChunk != null) {
+		if (ownChunk.IsPacked( )) ownChunk.Unpack( );//Gah - probably done already by chunk processor
+		}
+		else {
+		Logger.Warning("CHUNK A.W.O.L. : X{0} Y{1} Z{2}	- Missing slice FOR COLUMN", chunkPos.X, chunkY, chunkPos.Y);
+		//return;
+		}
+		}
+
+		for (int pixelIndex = 0; pixelIndex < (chunkSize * chunkSize); pixelIndex++) {
+		MapUtil.PosInt2d(pixelIndex, chunkSize, localpos);
+		int localX = localpos.X;
+		int localZ = localpos.Y;
+		ushort localY = targetColMeta.HeightMap[localX, localZ];
+
+		int localChunkY = localY / chunkSize;
+		if (localChunkY >= (chunksColumn.Length)) continue;//Out of range!
+		if (chunksColumn[localChunkY] == null) continue;//BIG Gaps!
+
+		int blockId = chunksColumn[localChunkY].MaybeBlocks[MapUtil.Index3d(localX, (localY % chunkSize), localZ, chunkSize, chunkSize)];
+
+		Block block = ClientAPI.World.Blocks[blockId];
+
+		tmpPos.Set(chunkSize * chunkPos.X + localpos.X, localY, chunkSize * chunkPos.Y + localpos.Y);
+
+		int red = 0, green = 0, blue = 0;
+
+		ExtractBlockColor(tmpPos, block, 1.0f, out red, out green, out blue);
+
+		//============ POI Population =================
+		if (BlockID_Designators.ContainsKey(blockId)) {
+		var desig = BlockID_Designators[blockId];
+
+		if (desig.Enabled) {
+		red = desig.OverwriteColor.R;
+		green = desig.OverwriteColor.G;
+		blue = desig.OverwriteColor.B;
+		}
+		}
+
+		ImageLineHelper.SetPixel(lines[localZ], localX, red, green, blue);
+		pixelCount++;
+		}
+
+		for (int row = 0; row < this.PngWriter.ImgInfo.Rows; row++) {
+		this.PngWriter.WriteRow(lines[row], row);
+		}
+
+		this.PngWriter.End( );
+		}
+	}
+}
\ No newline at end of file

--- a/Automap/Renderers/StandardRenderer.cs
+++ b/Automap/Renderers/StandardRenderer.cs
@@ -13,6 +13,7 @@ namespace Automap
 {
 	public class StandardRenderer : AChunkRenderer
 	{
+		public const string Name = @"Standard";
 
 		/// <summary>
 		/// Renders shards similar to the Default VS version, plus P.O.I. markings.
@@ -21,7 +22,7 @@ namespace Automap
 		/// <param name="logger">Logger.</param>
 		public StandardRenderer(ICoreClientAPI clientAPI, ILogger logger, bool seasonalColor) : base(clientAPI, logger, seasonalColor)
 		{
-
+			
 		}
 
 		public override void GenerateChunkPngShard(Vec2i chunkPos, IMapChunk mc, ColumnMeta targetColMeta, ref ColumnsMetadata allCols, out uint pixelCount)

--- a/Automap/Subsystems/AutomapSystem.cs
+++ b/Automap/Subsystems/AutomapSystem.cs
@@ -73,8 +73,7 @@ namespace Automap
 			ClientAPI.Event.LevelFinalize += EngageAutomap;
 			configuration = config;
 
-			//TODO:Choose which one from GUI 
-			this.ChunkRenderer = new StandardRenderer(clientAPI, logger, this.configuration.SeasonalColors);
+			this.ChunkRenderer = InstantiateChosenRenderer(config.RendererName);
 
 			//Listen on bus for commands
 			ClientAPI.Event.RegisterEventBusListener(CommandListener, 1.0, AutomapSystem.AutomapCommandEventKey);
@@ -723,12 +722,32 @@ namespace Automap
 					AddNote(cmdData.Notation);
 					break;
 			}
-#if DEBUG
+			#if DEBUG
 			ClientAPI.TriggerChatMessage($"Automap commanded to: {cmdData.State} ");
-#endif
+			#endif
 		}
 		#endregion
 
+		private AChunkRenderer InstantiateChosenRenderer(string rendererName )
+		{
+		Logger.VerboseDebug("Using '{0}' style Shard Renderer", rendererName);
+		switch (rendererName) 
+		{				
+		case StandardRenderer.Name:
+			return new StandardRenderer(ClientAPI, Logger, this.configuration.SeasonalColors);
+		
+		case AlternateRenderer.Name:
+			return new AlternateRenderer(ClientAPI, Logger, this.configuration.SeasonalColors);
+	
+		case FlatRenderer.Name:
+			return new FlatRenderer(ClientAPI, Logger, this.configuration.SeasonalColors);	
+
+		default:
+			throw new ArgumentOutOfRangeException("rendererName",rendererName,"That value isn't supported or known...");
+		}
+
+		return null;
+		}
 	}
 
 }