Changeset 199 for binary-improvements/7dtd-server-fixes/src/MapRendering/MapRenderBlockBuffer.cs

Timestamp:

Sep 22, 2014, 11:15:14 PM (10 years ago)

Author:

alloc

Message:

fixes

File:

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

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

@@ -13 +13 @@
                 private Texture2D zoomBuffer = new Texture2D (1, 1);
                 private Color nullColor = new Color (0, 0, 0, 0);
+                private AllocsFixes.FileCache.MapTileCache cache;
 
-                public MapRenderBlockBuffer (int level)
+                public MapRenderBlockBuffer (int level, AllocsFixes.FileCache.MapTileCache cache)
                 {
                         zoomLevel = level;
+                        this.cache = cache;
                 }
 
@@ -68 +70 @@
                 private void loadTextureFromFile (string _fileName)
                 {
-                        try {
-                                byte[] array = File.ReadAllBytes (_fileName);
+                        byte[] array = cache.LoadTile (zoomLevel, _fileName);
+                        if (array != null) {
                                 blockMap.LoadImage (array);
-                        } catch (Exception) {
+                        } else {
+                                //try {
+                                //byte[] array = File.ReadAllBytes (_fileName);
+                                //blockMap.LoadImage (array);
+                                //} catch (Exception) {
                                 for (int x = 0; x < Constants.MAP_BLOCK_SIZE; x++) {
                                         for (int y = 0; y < Constants.MAP_BLOCK_SIZE; y++) {
@@ -82 +88 @@
                 private void saveTextureToFile (string _fileName)
                 {
-                        try {
-                                byte[] array = blockMap.EncodeToPNG ();
-                                File.WriteAllBytes (_fileName, array);
-                        } catch (Exception e) {
-                                Log.Out ("Exception in MapRenderBlockBuffer.saveTextureToFile(): " + e);
-                        }
+                        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);
+//                      }
                 }