Changeset 329 for binary-improvements/7dtd-server-fixes/src

Timestamp:

Sep 5, 2018, 11:16:04 PM (6 years ago)

Author:

alloc

Message:

Some small optimizations to the map rendering stuff and added profiling instrumentation

File:

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

binary-improvements/7dtd-server-fixes/src/FileCache/MapTileCache.cs

@@ -2 +2 @@
 using System.IO;
 using UnityEngine;
+using UnityEngine.Profiling;
 using Object = UnityEngine.Object;
 
@@ -26 +27 @@
                 public void SetZoomCount (int count) {
                         cache = new CurrentZoomFile[count];
+                        for (int i = 0; i < cache.Length; i++) {
+                                cache [i] = new CurrentZoomFile ();
+                        }
                 }
 
@@ -31 +35 @@
                         try {
                                 lock (cache) {
-                                        if (cache [zoomlevel].filename == null || !cache [zoomlevel].filename.Equals (filename)) {
-                                                cache [zoomlevel].filename = filename;
+                                        CurrentZoomFile cacheEntry = cache [zoomlevel];
+                                        
+                                        if (cacheEntry.filename == null || !cacheEntry.filename.Equals (filename)) {
+                                                cacheEntry.filename = filename;
 
                                                 if (!File.Exists (filename)) {
-                                                        cache [zoomlevel].data = null;
+                                                        cacheEntry.pngData = null;
                                                         return null;
                                                 }
 
-                                                cache [zoomlevel].data = File.ReadAllBytes (filename);
+                                                Profiler.BeginSample ("ReadPng");
+                                                cacheEntry.pngData = File.ReadAllBytes (filename);
+                                                Profiler.EndSample ();
                                         }
 
-                                        return cache [zoomlevel].data;
+                                        return cacheEntry.pngData;
                                 }
                         } catch (Exception e) {
-                                Log.Out ("Error in MapTileCache.LoadTile: " + e);
+                                Log.Warning ("Error in MapTileCache.LoadTile: " + e);
                         }
 
@@ -51 +59 @@
                 }
 
-                public void SaveTile (int zoomlevel, byte[] content) {
+                public void SaveTile (int zoomlevel, byte[] contentPng) {
                         try {
                                 lock (cache) {
-                                        if (cache [zoomlevel].filename == null) {
+                                        CurrentZoomFile cacheEntry = cache [zoomlevel];
+                                        
+                                        if (string.IsNullOrEmpty (cacheEntry.filename)) {
                                                 return;
                                         }
+                                        
+                                        cacheEntry.pngData = contentPng;
 
-                                        cache [zoomlevel].data = content;
-                                        File.WriteAllBytes (cache [zoomlevel].filename, content);
+                                        Profiler.BeginSample ("WritePng");
+                                        File.WriteAllBytes (cacheEntry.filename, contentPng);
+                                        Profiler.EndSample ();
                                 }
                         } catch (Exception e) {
-                                Log.Out ("Error in MapTileCache.SaveTile: " + e);
+                                Log.Warning ("Error in MapTileCache.SaveTile: " + e);
                         }
                 }
@@ -71 +84 @@
                                         foreach (CurrentZoomFile czf in cache) {
                                                 if (czf.filename != null && czf.filename.Equals (filename)) {
-                                                        return czf.data;
+                                                        return czf.pngData;
                                                 }
                                         }
@@ -82 +95 @@
                                 }
                         } catch (Exception e) {
-                                Log.Out ("Error in MapTileCache.GetFileContent: " + e);
+                                Log.Warning ("Error in MapTileCache.GetFileContent: " + e);
                         }
 
@@ -88 +101 @@
                 }
 
-                private struct CurrentZoomFile {
+                private class CurrentZoomFile {
                         public string filename;
-                        public byte[] data;
+                        public byte[] pngData;
                 }
         }