Changeset 230 for binary-improvements/MapRendering

Timestamp:

Apr 18, 2015, 4:27:57 PM (10 years ago)

Author:

alloc

Message:

Binary improvements

Location:

binary-improvements/MapRendering

Files:

• API.cs (modified) (1 diff)
• Commands/EnableRendering.cs (modified) (1 diff)
• Commands/RenderMap.cs (modified) (1 diff)
• Commands/webstat.cs (added)
• MapRendering.csproj (deleted)
• MapRendering/MapRenderBlockBuffer.cs (modified) (3 diffs)
• MapRendering/MapRendering.cs (modified) (1 diff)
• ModInfo.xml (added)
• Web (added)
• Web/API (added)
• Web/API/GetLandClaims.cs (added)
• Web/API/GetPlayerInventory.cs (added)
• Web/API/GetPlayersLocation.cs (added)
• Web/API/GetPlayersOnline.cs (added)
• Web/API/WebAPI.cs (added)
• Web/ApiHandler.cs (added)
• Web/MimeType.cs (added)
• Web/PathHandler.cs (added)
• Web/SimpleRedirectHandler.cs (added)
• Web/StaticHandler.cs (added)
• Web/Web.cs (added)
• WebAndMapRendering.csproj (added)

binary-improvements/MapRendering/API.cs

@@ -3 +3 @@
 namespace MapRendering
 {
-        public class API : AllocsFixes.ModAPI {
-                public override string ModName () {
-                        return "AllocsMapRendering";
+        public class API : ModApiAbstract {
+
+                public override void GameAwake () {
+                        new AllocsFixes.NetConnections.Servers.Web.Web ();
                 }
 
-                public override string ModVersion () {
-                        return "1.0 for A11.2";
+                public override void CalcChunkColorsDone (Chunk _chunk) {
+                        AllocsFixes.MapRendering.MapRendering.RenderSingleChunk (_chunk);
                 }
 
-                public override void CalcMapColors (Chunk _chunk) {
-                        AllocsFixes.MapRendering.MapRendering.RenderSingleChunk (_chunk);
-                }
         }
 }

binary-improvements/MapRendering/Commands/EnableRendering.cs

@@ -4 +4 @@
 namespace AllocsFixes.CustomCommands
 {
-        public class EnableRendering : ConsoleCommand
+        public class EnableRendering : ConsoleCmdAbstract
         {
-                public EnableRendering (ConsoleSdtd cons) : base(cons)
-                {
-                }
-
-                public override string Description ()
+                public override string GetDescription ()
                 {
                         return "enable/disable live map rendering";
                 }
 
-                public override string[] Names ()
+                public override string[] GetCommands ()
                 {
-                        return new string[] { "enablerendering", string.Empty };
+                        return new string[] { "enablerendering" };
                 }
 
-                public override void Run (string[] _params)
+                public override void Execute (List<string> _params, CommandSenderInfo _senderInfo)
                 {
                         try {
-                                if (_params.Length != 1) {
-                                        m_Console.SendResult ("Current state: " + AllocsFixes.MapRendering.MapRendering.renderingEnabled);
+                                if (_params.Count != 1) {
+                                        SdtdConsole.Instance.Output ("Current state: " + AllocsFixes.MapRendering.MapRendering.renderingEnabled);
                                         return;
                                 }
 
                                 AllocsFixes.MapRendering.MapRendering.renderingEnabled = _params[0].Equals("1");
-                                m_Console.SendResult ("Set live map rendering to " + _params [0].Equals ("1"));
+                                SdtdConsole.Instance.Output ("Set live map rendering to " + _params [0].Equals ("1"));
                         } catch (Exception e) {
                                 Log.Out ("Error in EnableRendering.Run: " + e);

binary-improvements/MapRendering/Commands/RenderMap.cs

@@ -6 +6 @@
 namespace AllocsFixes.CustomCommands
 {
-        public class RenderMap : ConsoleCommand
+        public class RenderMap : ConsoleCmdAbstract
         {
-                public RenderMap (ConsoleSdtd cons) : base(cons)
-                {
-                }
-
-                public override string Description ()
+                public override string GetDescription ()
                 {
                         return "render the current map to a file";
                 }
 
-                public override string[] Names ()
+                public override string[] GetCommands ()
                 {
-                        return new string[] { "rendermap", "rm" };
+                        return new string[] { "rendermap" };
                 }
 
-                public override void Run (string[] _params)
+                public override void Execute (List<string> _params, CommandSenderInfo _senderInfo)
                 {
                         try {
                                 AllocsFixes.MapRendering.MapRendering.Instance.RenderFullMap ();
 
-                                m_Console.SendResult ("Render map done");
+                                SdtdConsole.Instance.Output ("Render map done");
                         } catch (Exception e) {
                                 Log.Out ("Error in RenderMap.Run: " + e);

binary-improvements/MapRendering/MapRendering/MapRenderBlockBuffer.cs

@@ -53 +53 @@
                 }
 
-                public void SetPart (Vector2i offset, int partSize, Color[] pixels)
-                {
+                public void SetPart (Vector2i offset, int partSize, Color[] pixels) {
+                        if (offset.x + partSize > blockMap.width || offset.y + partSize > blockMap.height) {
+                                Log.Error (string.Format ("MapBlockBuffer[{0}].SetPart ({1}, {2}, {3}) has blockMap.size ({4}/{5})", zoomLevel, offset, partSize, pixels.Length, blockMap.width, blockMap.height));
+                                return;
+                        }
                         blockMap.SetPixels (offset.x, offset.y, partSize, partSize, pixels);
                 }
@@ -71 +74 @@
                 {
                         byte[] array = cache.LoadTile (zoomLevel, _fileName);
-                        if (array != null) {
-                                blockMap.LoadImage (array);
-                        } else {
-                                //try {
-                                //byte[] array = File.ReadAllBytes (_fileName);
-                                //blockMap.LoadImage (array);
-                                //} catch (Exception) {
+                        if (array == null || !blockMap.LoadImage (array)) {
+                                if (blockMap.height != Constants.MAP_BLOCK_SIZE || blockMap.width != Constants.MAP_BLOCK_SIZE) {
+                                        blockMap.Resize (Constants.MAP_BLOCK_SIZE, Constants.MAP_BLOCK_SIZE);
+                                }
                                 for (int x = 0; x < Constants.MAP_BLOCK_SIZE; x++) {
                                         for (int y = 0; y < Constants.MAP_BLOCK_SIZE; y++) {
@@ -86 +86 @@
                 }
 
-                private void saveTextureToFile (string _fileName)
-                {
+                private void saveTextureToFile (string _fileName) {
                         byte[] array = blockMap.EncodeToPNG ();
                         cache.SaveTile (zoomLevel, array);
-//                      try {
-//                              byte[] array = blockMap.EncodeToPNG ();
-//                              File.WriteAllBytes (_fileName, array);
-//                      } catch (Exception e) {
-//                              Log.Out ("Exception in MapRenderBlockBuffer.saveTextureToFile(): " + e);
-//                      }
                 }
 

binary-improvements/MapRendering/MapRendering/MapRendering.cs

@@ -210 +210 @@
                                                 //Log.Out ("Dirty: " + v + " render: true");
                                                 chunksDone.Add (v);
+                                                if (dirtyChunks [v].Length != Constants.MAP_CHUNK_SIZE * Constants.MAP_CHUNK_SIZE) {
+                                                        Log.Error (string.Format ("Rendering chunk has incorrect data size of {0} instead of {1}", dirtyChunks [v].Length, Constants.MAP_CHUNK_SIZE * Constants.MAP_CHUNK_SIZE));
+                                                }
                                                 zoomLevelBuffers [Constants.ZOOMLEVELS - 1].SetPart (v_blockOffset, Constants.MAP_CHUNK_SIZE, dirtyChunks [v]);
                                         } else {