Changeset 253 for binary-improvements/MapRendering/Web/Handlers/ItemIconHandler.cs

Timestamp:

Dec 12, 2015, 4:08:53 PM (9 years ago)

Author:

alloc

Message:

Fixes 6_8_10

File:

• binary-improvements/MapRendering/Web/Handlers/ItemIconHandler.cs (modified) (5 diffs)

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

@@ -8 +8 @@
 namespace AllocsFixes.NetConnections.Servers.Web.Handlers
 {
-        public class ItemIconHandler : PathHandler
-        {
+        public class ItemIconHandler : PathHandler {
                 private string staticPart;
                 private bool logMissingFiles;
-        private Dictionary<string, byte[]> icons = new Dictionary<string, byte[]> ();
-        private bool loaded = false;
+                private Dictionary<string, byte[]> icons = new Dictionary<string, byte[]> ();
+                private bool loaded = false;
 
                 public ItemIconHandler (string staticPart, bool logMissingFiles, string moduleName = null) : base(moduleName) {
@@ -29 +28 @@
                         }
 
-            // BEGIN CHANGED BY PSOUZA4
                         string requestFileName = req.Url.AbsolutePath.Remove (0, staticPart.Length);
                         requestFileName = requestFileName.Remove (requestFileName.LastIndexOf ('.'));
 
-            string requestColorTintHex = string.Empty;
-            
-            // Chose a split instead of using a querystring variable in the URI, but that may arguably be cleaner
-            if (requestFileName.Contains("@@")) {
-                try {
-                    string[] tempTintingOptions = requestFileName.Split (new string[] { "@@" }, StringSplitOptions.RemoveEmptyEntries);
-                    requestFileName = tempTintingOptions [0];
-                    requestColorTintHex = tempTintingOptions [1].Trim ().ToUpper ();
-                }
-                catch { }
-            }
-
-            if (icons.ContainsKey (requestFileName) && req.Url.AbsolutePath.ToLower ().EndsWith(".png")) {
+                        if (icons.ContainsKey (requestFileName) && req.Url.AbsolutePath.ToLower ().EndsWith (".png")) {
                                 resp.ContentType = MimeType.GetMimeType (".png");
 
-                byte[] itemIconData = icons [requestFileName];
-
-                // Note: optionally split this code into a ImageMultiplyBlend method
-                if (!string.IsNullOrEmpty (requestColorTintHex) && (requestColorTintHex != "FFFFFF")) {
-                    try {
-                        System.Drawing.Color colorTint = System.Drawing.ColorTranslator.FromHtml ("#" + requestColorTintHex);
-                        System.Drawing.Bitmap image = (System.Drawing.Bitmap)PetesUtils.GetImageFromBytes (itemIconData);
-
-                        for (var x = 0; x < image.Width; x++) {
-                            for (int y = 0; y < image.Height; y++) {
-                                System.Drawing.Color originalColor = image.GetPixel (x, y);
-                                System.Drawing.Color changedColor = originalColor;
-
-                                // Only change the icon tinting if the alpha channel is fully opaque
-                                if (originalColor.A == 255) {
-                                    // based on http://stackoverflow.com/questions/3837757/multiply-two-images-in-c-sharp-as-multiply-two-layers-in-photoshop
-
-                                    double component_R = (((double)originalColor.R) * ((double)colorTint.R)) / 255.0;
-                                    double component_G = (((double)originalColor.G) * ((double)colorTint.G)) / 255.0;
-                                    double component_B = (((double)originalColor.B) * ((double)colorTint.B)) / 255.0;
-
-                                    if (component_R > 255.0) component_R = 255.0;
-                                    if (component_G > 255.0) component_G = 255.0;
-                                    if (component_B > 255.0) component_B = 255.0;
-
-                                    // multiply blend shouldn't ever calculate below 0, but for completeness let's leave in this logic
-                                    if (component_R < 0.0) component_R = 0.0;
-                                    if (component_G < 0.0) component_G = 0.0;
-                                    if (component_B < 0.0) component_B = 0.0;
-
-                                    changedColor = System.Drawing.Color.FromArgb (originalColor.A, (int)component_R, (int)component_G, (int)component_B);
-                                }                                
-
-                                image.SetPixel (x, y, changedColor);
-                            }
-                        }
-
-                        itemIconData = PetesUtils.SaveImage_ToBytes (image, true);
-                    }
-                    catch { }
-                }
+                                byte[] itemIconData = icons [requestFileName];
 
                                 resp.ContentLength64 = itemIconData.Length;
                                 resp.OutputStream.Write (itemIconData, 0, itemIconData.Length);
-                // END CHANGED BY PSOUZA4
                         } else {
                                 resp.StatusCode = (int)HttpStatusCode.NotFound;
-                                if (logMissingFiles)
+                                if (logMissingFiles) {
                                         Log.Out ("Web:IconHandler:FileNotFound: \"" + req.Url.AbsolutePath + "\" ");
+                                }
                                 return;
                         }
@@ -106 +52 @@
                                         return true;
                                 }
+
+                                MicroStopwatch microStopwatch = new MicroStopwatch ();
 
                                 GameObject atlasObj = GameObject.Find ("/NGUI Root (2D)/ItemIconAtlas");
@@ -120 +68 @@
                                 }
 
+                                Dictionary<string, List<Color>> tintedIcons = new Dictionary<string, List<Color>> ();
+                                foreach (ItemClass ic in ItemClass.list) {
+                                        if (ic != null) {
+                                                Color tintColor = ic.GetIconTint ();
+                                                if (tintColor != Color.white) {
+                                                        string name = ic.GetIconName ();
+                                                        if (!tintedIcons.ContainsKey (name)) {
+                                                                tintedIcons.Add (name, new List<Color> ());
+                                                        }
+                                                        List<Color> list = tintedIcons [name];
+                                                        list.Add (tintColor);
+                                                }
+                                        }
+                                }
+
                                 Texture2D atlasTex = atlas.texture as Texture2D;
 
@@ -126 +89 @@
                                         Texture2D tex = new Texture2D (data.width, data.height, TextureFormat.ARGB32, false);
                                         tex.SetPixels (atlasTex.GetPixels (data.x, atlasTex.height - data.height - data.y, data.width, data.height));
-                                        byte[] pixData = tex.EncodeToPNG ();
 
-                                        icons.Add (name, pixData);
+                                        icons.Add (name + "__FFFFFF", tex.EncodeToPNG ());
+
+                                        if (tintedIcons.ContainsKey (name)) {
+                                                foreach (Color c in tintedIcons [name]) {
+                                                        Texture2D tintedTex = new Texture2D (data.width, data.height, TextureFormat.ARGB32, false);
+
+                                                        for (int x = 0; x < data.width; x++) {
+                                                                for (int y = 0; y < data.height; y++) {
+                                                                        tintedTex.SetPixel (x, y, tex.GetPixel (x, y) * c);
+                                                                }
+                                                        }
+
+                                                        icons.Add (name + "__" + AllocsUtils.ColorToHex (c), tintedTex.EncodeToPNG ());
+
+                                                        UnityEngine.Object.Destroy (tintedTex);
+                                                }
+                                        }
+
                                         UnityEngine.Object.Destroy (tex);
                                 }
 
                                 loaded = true;
-                                Log.Out ("Web:IconHandler: Icons loaded");
+                                Log.Out ("Web:IconHandler: Icons loaded - {0} ms", microStopwatch.ElapsedMilliseconds);
 
                                 return true;