Changeset 230 for binary-improvements/MapRendering/MapRendering/MapRenderBlockBuffer.cs

Timestamp:

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

Author:

alloc

Message:

Binary improvements

File:

• binary-improvements/MapRendering/MapRendering/MapRenderBlockBuffer.cs (modified) (3 diffs)

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);
-//                      }
                 }