Changeset 135 for binary-improvements/7dtd-server-fixes

Timestamp:

Aug 27, 2014, 5:41:07 PM (10 years ago)

Author:

alloc

Message:

Fixes

File:

• binary-improvements/7dtd-server-fixes/src/MapRendering/MapRendering.cs (modified) (7 diffs)

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

@@ -47 +47 @@
                                                 Chunk c = (Chunk)o;
                                                 Vector3i cPos = c.GetWorldPos ();
-                                                Vector2i cPos2 = new Vector2i(cPos.x / Constants.MAP_CHUNK_SIZE, cPos.z / Constants.MAP_CHUNK_SIZE);
+                                                Vector2i cPos2 = new Vector2i (cPos.x / Constants.MAP_CHUNK_SIZE, cPos.z / Constants.MAP_CHUNK_SIZE);
                                                 Instance.RenderChunk (c, cPos2);
                                                 Instance.chunkSaveTimer.Stop ();
@@ -75 +75 @@
                         getWorldExtent (out minChunk, out maxChunk, out minPos, out maxPos, out widthChunks, out heightChunks, out widthPix, out heightPix);
 
+                        Log.Out (String.Format ("RenderMap: min: {0}, max: {1}, minPos: {2}, maxPos: {3}, w/h: {4}/{5}, wP/hP: {6}/{7}",
+                                                minChunk.ToString (), maxChunk.ToString (),
+                                                minPos.ToString (), maxPos.ToString (),
+                                                widthChunks, heightChunks,
+                                                widthPix, heightPix));
+
                         fullMapTexture = new Texture2D (widthPix, heightPix);
 
@@ -93 +99 @@
 
                         byte[] array = fullMapTexture.EncodeToPNG ();
-                        File.WriteAllBytes (Constants.MAP_DIRECTORY+ "/map.png", array);
+                        File.WriteAllBytes (Constants.MAP_DIRECTORY + "/map.png", array);
                         Texture2D.Destroy (fullMapTexture);
 
@@ -110 +116 @@
                                 Log.Out ("------- SaveAllBlockMaps " + ++saveCount);
                                 for (int i = 0; i < Constants.ZOOMLEVELS; i++) {
-                                        zoomLevelBuffers[i].SaveBlock();
+                                        zoomLevelBuffers [i].SaveBlock ();
                                 }
                         } finally {
@@ -140 +146 @@
                                         }
 
-                                        zoomLevelBuffers[Constants.ZOOMLEVELS - 1].LoadBlock(block);
-                                        zoomLevelBuffers[Constants.ZOOMLEVELS - 1].SetPart(blockOffset, Constants.MAP_CHUNK_SIZE, chunkColors);
+                                        zoomLevelBuffers [Constants.ZOOMLEVELS - 1].LoadBlock (block);
+                                        zoomLevelBuffers [Constants.ZOOMLEVELS - 1].SetPart (blockOffset, Constants.MAP_CHUNK_SIZE, chunkColors);
 
                                         if (renderingFullMap)
@@ -160 +166 @@
                         if (level > 0) {
                                 Vector2i block, blockOffset;
-                                getBlockNumber(innerBlock, out block, out blockOffset, 2, Constants.MAP_BLOCK_SIZE / 2);
-
-                                zoomLevelBuffers[level - 1].LoadBlock(block);
-                                zoomLevelBuffers[level - 1].SetPart (blockOffset, Constants.MAP_BLOCK_SIZE / 2, zoomLevelBuffers[level].GetHalfScaled());
+                                getBlockNumber (innerBlock, out block, out blockOffset, 2, Constants.MAP_BLOCK_SIZE / 2);
+
+                                zoomLevelBuffers [level - 1].LoadBlock (block);
+                                zoomLevelBuffers [level - 1].SetPart (blockOffset, Constants.MAP_BLOCK_SIZE / 2, zoomLevelBuffers [level].GetHalfScaled ());
 
                                 RenderZoomLevel (level - 1, block);
@@ -220 +226 @@
                 }
 
-
                 private Color32 shortColorToColor32 (ushort col)
                 {