Changeset 144 for binary-improvements/7dtd-server-fixes/src/MapRendering

Timestamp:

Aug 30, 2014, 6:11:18 PM (10 years ago)

Author:

alloc

Message:

Fixes

Location:

binary-improvements/7dtd-server-fixes/src/MapRendering

Files:

• Constants.cs (modified) (1 diff)
• MapRendering.cs (modified) (3 diffs)

binary-improvements/7dtd-server-fixes/src/MapRendering/Constants.cs

@@ -3 +3 @@
 namespace AllocsFixes.MapRendering
 {
-        public class Constants
+        public static class Constants
         {
                 public const int MAP_BLOCK_SIZE = 128;

binary-improvements/7dtd-server-fixes/src/MapRendering/MapRendering.cs

@@ -36 +36 @@
 
                         chunkSaveTimer.AutoReset = false;
-                        chunkSaveTimer.Elapsed += new System.Timers.ElapsedEventHandler (RenderDirtyChunks);
+                        chunkSaveTimer.Elapsed += new System.Timers.ElapsedEventHandler (TimedRendering);
                 }
 
@@ -130 +130 @@
                                                 }
                                         }
+
+                                        while (dirtyChunks.Count > 0) {
+                                                RenderDirtyChunks ();
+                                        }
+
                                         Log.Out (String.Format ("RenderMap: {0}/{1} ({2}%)", curFullMapPos.x, widthPix, (int)((float)curFullMapPos.x / widthPix * 100)));
                                 }
                         } finally {
                                 Monitor.Exit (Instance.zoomLevelBuffers);
-                        }
-                        int totalDirtyCount = dirtyChunks.Count;
-                        Log.Out (String.Format ("Rendering chunks: {0}/{1} ({2}%)", totalDirtyCount - dirtyChunks.Count, totalDirtyCount, (int)((float)(totalDirtyCount - dirtyChunks.Count) / totalDirtyCount * 100)));
-                        while (dirtyChunks.Count > 0) {
-                                RenderDirtyChunks (null, null);
-                                Log.Out (String.Format ("Rendering chunks: {0}/{1} ({2}%)", totalDirtyCount - dirtyChunks.Count, totalDirtyCount, (int)((float)(totalDirtyCount - dirtyChunks.Count) / totalDirtyCount * 100)));
                         }
 
@@ -162 +161 @@
                 }
 
-                private void RenderDirtyChunks (object source, System.Timers.ElapsedEventArgs e)
+                private void TimedRendering (object source, System.Timers.ElapsedEventArgs e)
                 {
                         Monitor.Enter (zoomLevelBuffers);
                         try {
-                                msw.ResetAndRestart ();
-
-                                if (dirtyChunks.Count > 0) {
-                                        List<Vector2i> keys = new List<Vector2i> (dirtyChunks.Keys);
-                                        List<Vector2i> chunksDone = new List<Vector2i> ();
-
-                                        Vector2i chunkPos = keys [0];
-                                        chunksDone.Add (chunkPos);
-
-                                        //Log.Out ("Start Dirty: " + chunkPos);
-
-                                        Vector2i block, blockOffset;
-                                        getBlockNumber (chunkPos, out block, out blockOffset, Constants.MAP_BLOCK_TO_CHUNK_DIV, Constants.MAP_CHUNK_SIZE);
-
-                                        zoomLevelBuffers [Constants.ZOOMLEVELS - 1].LoadBlock (block);
-
-                                        Vector2i v_block, v_blockOffset;
-                                        foreach (Vector2i v in keys) {
-                                                getBlockNumber (v, out v_block, out v_blockOffset, Constants.MAP_BLOCK_TO_CHUNK_DIV, Constants.MAP_CHUNK_SIZE);
-                                                if (v_block.Equals (block)) {
-                                                        //Log.Out ("Dirty: " + v + " render: true");
-                                                        chunksDone.Add (v);
-                                                        zoomLevelBuffers [Constants.ZOOMLEVELS - 1].SetPart (v_blockOffset, Constants.MAP_CHUNK_SIZE, dirtyChunks [v]);
-                                                } else {
-                                                        //Log.Out ("Dirty: " + v + " render: false");
-                                                }
-                                        }
-
-                                        foreach (Vector2i v in chunksDone)
-                                                dirtyChunks.Remove (v);
-
-                                        RenderZoomLevel (Constants.ZOOMLEVELS - 1, block);
-
-                                        SaveAllBlockMaps (null, null);
-                                }
-
-                                if (e != null)
+                                RenderDirtyChunks ();
                                 if (dirtyChunks.Count > 0)
                                         Instance.chunkSaveTimer.Start ();
                         } finally {
                                 Monitor.Exit (zoomLevelBuffers);
+                        }
+                }
+
+                private void RenderDirtyChunks ()
+                {
+                        msw.ResetAndRestart ();
+
+                        if (dirtyChunks.Count > 0) {
+                                List<Vector2i> keys = new List<Vector2i> (dirtyChunks.Keys);
+                                List<Vector2i> chunksDone = new List<Vector2i> ();
+
+                                Vector2i chunkPos = keys [0];
+                                chunksDone.Add (chunkPos);
+
+                                //Log.Out ("Start Dirty: " + chunkPos);
+
+                                Vector2i block, blockOffset;
+                                getBlockNumber (chunkPos, out block, out blockOffset, Constants.MAP_BLOCK_TO_CHUNK_DIV, Constants.MAP_CHUNK_SIZE);
+
+                                zoomLevelBuffers [Constants.ZOOMLEVELS - 1].LoadBlock (block);
+
+                                Vector2i v_block, v_blockOffset;
+                                foreach (Vector2i v in keys) {
+                                        getBlockNumber (v, out v_block, out v_blockOffset, Constants.MAP_BLOCK_TO_CHUNK_DIV, Constants.MAP_CHUNK_SIZE);
+                                        if (v_block.Equals (block)) {
+                                                //Log.Out ("Dirty: " + v + " render: true");
+                                                chunksDone.Add (v);
+                                                zoomLevelBuffers [Constants.ZOOMLEVELS - 1].SetPart (v_blockOffset, Constants.MAP_CHUNK_SIZE, dirtyChunks [v]);
+                                        } else {
+                                                //Log.Out ("Dirty: " + v + " render: false");
+                                        }
+                                }
+
+                                foreach (Vector2i v in chunksDone)
+                                        dirtyChunks.Remove (v);
+
+                                RenderZoomLevel (Constants.ZOOMLEVELS - 1, block);
+
+                                SaveAllBlockMaps (null, null);
                         }
                 }