Changeset 254 for binary-improvements/MapRendering

Timestamp:

Dec 24, 2015, 1:15:17 PM (9 years ago)

Author:

alloc

Message:

Fixes 6_8_11

Location:

binary-improvements/MapRendering

Files:

• ModInfo.xml (modified) (1 diff)
• Web/Handlers/ItemIconHandler.cs (modified) (1 diff)
• WebAndMapRendering.csproj (modified) (2 diffs)

binary-improvements/MapRendering/ModInfo.xml

@@ -5 +5 @@
                 <Description value="Render the game map to image map tiles as it is uncovered" />
                 <Author value="Christian 'Alloc' Illy" />
-                <Version value="10" />
+                <Version value="11" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>

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

@@ -94 +94 @@
                                         if (tintedIcons.ContainsKey (name)) {
                                                 foreach (Color c in tintedIcons [name]) {
-                                                        Texture2D tintedTex = new Texture2D (data.width, data.height, TextureFormat.ARGB32, false);
+                                                        string tintedName = name + "__" + AllocsUtils.ColorToHex (c);
+                                                        if (!icons.ContainsKey (tintedName)) {
+                                                                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);
+                                                                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 (tintedName, tintedTex.EncodeToPNG ());
+
+                                                                UnityEngine.Object.Destroy (tintedTex);
                                                         }
-
-                                                        icons.Add (name + "__" + AllocsUtils.ColorToHex (c), tintedTex.EncodeToPNG ());
-
-                                                        UnityEngine.Object.Destroy (tintedTex);
                                                 }
                                         }

binary-improvements/MapRendering/WebAndMapRendering.csproj

@@ -4 +4 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
+    <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}</ProjectGuid>
@@ -19 +19 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
+    <NoStdLib>true</NoStdLib>
   </PropertyGroup>
   <ItemGroup>