Changeset 251 for binary-improvements/MapRendering/Web/Handlers

Timestamp:

Oct 28, 2015, 7:51:20 PM (9 years ago)

Author:

peter.souza

Message:

Enemies (zombies and hostile animal entities) are now shown on the map as Hostiles and require permission level 'webapi.gethostilelocation' for web viewers to see.

Animals (non-hostile entities) are now shown on the map as Animals and require permission level 'webapi.getanimalslocation' for web viewers to see.

Permission level for 'webapi.viewallclaims' is now required for a viewer to see all claims, otherwise the permission level for 'webapi.getlandclaims' will only show viewer-owned claims. A viewer requires both 'webapi.getlandclaims' and 'webapi.viewallclaims' to be set for all claims to show (you can't just set 'webapi.viewallclaims').
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317405&viewfull=1#post317405

Permission level for 'webapi.viewallplayers' is now required for a viewer to see all players, otherwise the permission level for 'webapi.getplayerslocation' will only show the player for the currently-authenticated viewer. A viewer requires both 'webapi.getplayerslocation' and 'webapi.viewallplayers' to be set for all players to show (you can't just set 'webapi.viewallplayers').
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317405&viewfull=1#post317405

Banned players are now hidden from the web map.
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=320702&viewfull=1#post320702

Items using 'CustomIcon' and 'CustomIconTint' are now supported (although the exact tinting may not be perfectly the same as the game).
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317117&viewfull=1#post317117
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317679&viewfull=1#post317679

Map marker icons for players, hostiles, and animals have been updated.

Location:

binary-improvements/MapRendering/Web/Handlers

Files:

• ApiHandler.cs (modified) (1 diff)
• ItemIconHandler.cs (modified) (3 diffs)
• StaticHandler.cs (modified) (1 diff)

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

@@ -13 +13 @@
                 private Dictionary<String, WebAPI> apis = new Dictionary<string, WebAPI> ();
 
-                public ApiHandler (string staticPart, string moduleName = null) : base(moduleName) {
+                public ApiHandler (string staticPart, string moduleName = null) : base (moduleName) {
                         this.staticPart = staticPart;
 
                         foreach (Type t in Assembly.GetExecutingAssembly ().GetTypes ()) {
                                 if (!t.IsAbstract && t.IsSubclassOf (typeof(WebAPI))) {
-                                        ConstructorInfo ctor = t.GetConstructor (new Type[0]);
+                                        ConstructorInfo ctor = t.GetConstructor (new Type [0]);
                                         if (ctor != null) {
-                                                WebAPI apiInstance = (WebAPI)ctor.Invoke (new object[0]);
+                                                WebAPI apiInstance = (WebAPI)ctor.Invoke (new object [0]);
                                                 addApi (t.Name.ToLower (), apiInstance);
                                         }
                                 }
                         }
+
+            // Add dummy types
+            Type dummy_t = typeof (API.Null);
+            ConstructorInfo dummy_ctor = dummy_t.GetConstructor (new Type [0]);
+            if (dummy_ctor != null) {
+                WebAPI dummy_apiInstance = (WebAPI)dummy_ctor.Invoke (new object[0]);
+
+                // Permissions that don't map to a real API
+                addApi("viewallclaims", dummy_apiInstance);
+                addApi("viewallplayers", dummy_apiInstance);
+            }
                 }
 

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

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Net;
 using System.Threading;
@@ -13 +12 @@
                 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) {
@@ -30 +29 @@
                         }
 
-                        string fn = req.Url.AbsolutePath.Remove (0, staticPart.Length);
-                        fn = fn.Remove (fn.LastIndexOf ('.'));
+            // BEGIN CHANGED BY PSOUZA4
+                        string requestFileName = req.Url.AbsolutePath.Remove (0, staticPart.Length);
+                        requestFileName = requestFileName.Remove (requestFileName.LastIndexOf ('.'));
 
-                        if (icons.ContainsKey (fn)) {
+            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")) {
                                 resp.ContentType = MimeType.GetMimeType (".png");
-                                resp.ContentLength64 = icons [fn].Length;
-                                resp.OutputStream.Write (icons [fn], 0, icons [fn].Length);
+
+                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 { }
+                }
+
+                                resp.ContentLength64 = itemIconData.Length;
+                                resp.OutputStream.Write (itemIconData, 0, itemIconData.Length);
+                // END CHANGED BY PSOUZA4
                         } else {
                                 resp.StatusCode = (int)HttpStatusCode.NotFound;

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

@@ -27 +27 @@
 
                         byte[] content = cache.GetFileContent (datapath + "/" + fn);
+
                         if (content != null) {
                                 resp.ContentType = MimeType.GetMimeType (Path.GetExtension (fn));