Changeset 291 for binary-improvements

Timestamp:

Sep 25, 2016, 1:51:43 PM (8 years ago)

Author:

alloc

Message:

Fixed ItemIconHandler for A15

Location:

binary-improvements/MapRendering

Files:

• API.cs (modified) (1 diff)
• Web/Handlers/ItemIconHandler.cs (modified) (4 diffs)

binary-improvements/MapRendering/API.cs

@@ -10 +10 @@
                 }
 
-//              public override void GameStartDone () {
-//                      if (AllocsFixes.NetConnections.Servers.Web.Handlers.ItemIconHandler.Instance != null) {
-//                              AllocsFixes.NetConnections.Servers.Web.Handlers.ItemIconHandler.Instance.LoadIcons ();
-//                      }
-//              }
+                public override void GameStartDone () {
+                        if (AllocsFixes.NetConnections.Servers.Web.Handlers.ItemIconHandler.Instance != null) {
+                                AllocsFixes.NetConnections.Servers.Web.Handlers.ItemIconHandler.Instance.LoadIcons ();
+                        }
+                }
 
                 public override void CalcChunkColorsDone (Chunk _chunk) {

binary-improvements/MapRendering/Web/Handlers/ItemIconHandler.cs

@@ -27 +27 @@
                 public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, int permissionLevel) {
                         if (!loaded) {
-                                if (!LoadIcons ()) {
-                                        resp.StatusCode = (int)HttpStatusCode.NotFound;
-                                        Log.Out ("Web:IconHandler: Could not load icons");
-                                        return;
-                                }
+                                resp.StatusCode = (int)HttpStatusCode.InternalServerError;
+                                Log.Out ("Web:IconHandler: Icons not loaded");
+                                return;
                         }
 
@@ -74 +72 @@
                                 }
 
+                                string textureResourceName = atlas.PrebakedAtlas;
+                                List<UISpriteData> sprites;
+                                int elementWidth, elementHeight;
+                                Texture2D atlasTex;
+
+                                if (!DynamicUIAtlasTools.ReadPrebakedAtlasDescriptor (textureResourceName, out sprites, out elementWidth, out elementHeight)) {
+                                        SdtdConsole.Instance.Output ("Web:IconHandler: Could not read dynamic atlas descriptor");
+                                        return false;
+                                }
+
+                                if (!DynamicUIAtlasTools.ReadPrebakedAtlasTexture (textureResourceName, out atlasTex)) {
+                                        SdtdConsole.Instance.Output ("Web:IconHandler: Could not read dynamic atlas texture");
+                                        return false;
+                                }
+
                                 Dictionary<string, List<Color>> tintedIcons = new Dictionary<string, List<Color>> ();
                                 foreach (ItemClass ic in ItemClass.list) {
@@ -89 +102 @@
                                 }
 
-                                Texture2D atlasTex = atlas.texture as Texture2D;
-
-                                foreach (UISpriteData data in atlas.spriteList) {
+                                foreach (UISpriteData data in sprites) {
                                         string name = data.name;
                                         Texture2D tex = new Texture2D (data.width, data.height, TextureFormat.ARGB32, false);
@@ -120 +131 @@
                                 }
 
+                                Resources.UnloadAsset(atlasTex);
+
                                 loaded = true;
                                 Log.Out ("Web:IconHandler: Icons loaded - {0} ms", microStopwatch.ElapsedMilliseconds);