diff options
author | TomTheDragon | 2017-11-05 17:33:13 -0500 |
---|---|---|
committer | UbitUmarov | 2017-11-13 20:43:16 +0000 |
commit | 98f90f4eed231724f1105f19d9bc29cb23b3e5bf (patch) | |
tree | 3842b486087b5640256bbd15ac23a49ff9aabea2 /OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs | |
parent | mantis 8253: don't let attachments delete remove controls from viewers on cro... (diff) | |
download | opensim-SC_OLD-98f90f4eed231724f1105f19d9bc29cb23b3e5bf.zip opensim-SC_OLD-98f90f4eed231724f1105f19d9bc29cb23b3e5bf.tar.gz opensim-SC_OLD-98f90f4eed231724f1105f19d9bc29cb23b3e5bf.tar.bz2 opensim-SC_OLD-98f90f4eed231724f1105f19d9bc29cb23b3e5bf.tar.xz |
Changing map tile colors This change also allows setting the water color, as well as the 4 colors for textured map tiles.
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
Diffstat (limited to 'OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs index 708286c..0b37179 100644 --- a/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs +++ b/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs | |||
@@ -38,18 +38,20 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
38 | { | 38 | { |
39 | public class ShadedMapTileRenderer : IMapTileTerrainRenderer | 39 | public class ShadedMapTileRenderer : IMapTileTerrainRenderer |
40 | { | 40 | { |
41 | private static readonly Color WATER_COLOR = Color.FromArgb(29, 71, 95); | ||
42 | |||
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | private static readonly string LogHeader = "[SHADED MAPTILE RENDERER]"; | 42 | private static readonly string LogHeader = "[SHADED MAPTILE RENDERER]"; |
45 | 43 | ||
46 | private Scene m_scene; | 44 | private Scene m_scene; |
47 | //private IConfigSource m_config; // not used currently | 45 | private IConfigSource m_config; |
46 | private Color m_color_water; | ||
48 | 47 | ||
49 | public void Initialise(Scene scene, IConfigSource config) | 48 | public void Initialise(Scene scene, IConfigSource config) |
50 | { | 49 | { |
51 | m_scene = scene; | 50 | m_scene = scene; |
52 | // m_config = config; // not used currently | 51 | m_config = config; |
52 | |||
53 | string[] configSections = new string[] { "Map", "Startup" }; | ||
54 | m_color_water = System.Drawing.ColorTranslator.FromHtml(Util.GetConfigVarFromSections<string>(m_config, "MapColorWater", configSections, "#1D475F")); | ||
53 | } | 55 | } |
54 | 56 | ||
55 | public void TerrainToBitmap(Bitmap mapbmp) | 57 | public void TerrainToBitmap(Bitmap mapbmp) |
@@ -231,7 +233,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
231 | 233 | ||
232 | try | 234 | try |
233 | { | 235 | { |
234 | mapbmp.SetPixel(x, yr, WATER_COLOR); | 236 | mapbmp.SetPixel(x, yr, m_color_water); |
235 | } | 237 | } |
236 | catch (ArgumentException) | 238 | catch (ArgumentException) |
237 | { | 239 | { |