From 3bf88587277b83c0b6f058fabba7d46a3b5a6a00 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 28 Aug 2008 14:41:54 +0000 Subject: Update svn properties, formatting cleanup. --- .../Modules/World/WorldMap/MapImageModule.cs | 2 +- .../World/WorldMap/ShadedMapTileRenderer.cs | 10 ++----- .../World/WorldMap/TexturedMapTileRenderer.cs | 32 +++++++++++----------- 3 files changed, 20 insertions(+), 24 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/World/WorldMap') diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs index 2ae4174..bfb5016 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs +++ b/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs @@ -103,7 +103,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap Bitmap mapbmp = new Bitmap(256, 256); //long t = System.Environment.TickCount; - //for(int i = 0; i < 10; ++i) { + //for (int i = 0; i < 10; ++i) { terrainRenderer.TerrainToBitmap(mapbmp); //} //t = System.Environment.TickCount - t; diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs index 253a7f5..1ee86ba 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs +++ b/OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs @@ -97,8 +97,6 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap // No, that doesn't scale it: // heightvalue = low + mid * (heightvalue - low) / mid; => low + (heightvalue - low) * mid / mid = low + (heightvalue - low) * 1 = low + heightvalue - low = heightvalue - - if (Single.IsInfinity(heightvalue) || Single.IsNaN(heightvalue)) heightvalue = 0; else if (heightvalue > 255f) @@ -136,7 +134,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap int hfdiffi = 0; int hfdiffihighlight = 0; float highlightfactor = 0.18f; - + try { // hfdiffi = Math.Abs((int)((hfdiff * 4) + (hfdiff * 0.5))) + 1; @@ -146,7 +144,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap // hfdiffi = hfdiffi + Math.Abs((int)(((hfdiff % 1) * 0.5f) * 10f) - 1); hfdiffi = hfdiffi + Math.Abs((int)((hfdiff % 1f) * 5f) - 1); } - + hfdiffihighlight = Math.Abs((int)((hfdiff * highlightfactor) * 4.5f)) + 1; if (hfdiff % 1f != 0) { @@ -195,10 +193,9 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap color = Color.FromArgb((r - hfdiffi > 0) ? r - hfdiffi : 0, (g - hfdiffi > 0) ? g - hfdiffi : 0, (b - hfdiffi > 0) ? b - hfdiffi : 0); - + mapbmp.SetPixel(x-1, yr+1, color); } - } } } @@ -213,7 +210,6 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap color = Color.Black; mapbmp.SetPixel(x, yr, color); } - } else { diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs index 957a1df..615befc 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs +++ b/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs @@ -82,10 +82,10 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap // (for info about algorithm, see http://en.wikipedia.org/wiki/HSL_and_HSV) public Color toColor() { - if(s < 0f) Console.WriteLine("S < 0: " + s); - else if(s > 1f) Console.WriteLine("S > 1: " + s); - if(v < 0f) Console.WriteLine("V < 0: " + v); - else if(v > 1f) Console.WriteLine("V > 1: " + v); + if (s < 0f) Console.WriteLine("S < 0: " + s); + else if (s > 1f) Console.WriteLine("S > 1: " + s); + if (v < 0f) Console.WriteLine("V < 0: " + v); + else if (v > 1f) Console.WriteLine("V > 1: " + v); float f = h / 60f; int sector = (int)f % 6; @@ -95,7 +95,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap int ti = (int)(v * (1f - (1f - f) * s) * 255f); int vi = (int)(v * 255f); - switch(sector) + switch (sector) { case 0: return Color.FromArgb(vi, ti, pi); @@ -168,7 +168,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap { AssetBase asset = m_scene.AssetCache.GetAsset(id, true); m_log.DebugFormat("Fetched texture {0}, found: {1}", id, asset != null); - if(asset == null) return null; + if (asset == null) return null; return new Bitmap(OpenJPEG.DecodeToImage(asset.Data)); } @@ -179,9 +179,9 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap // color-channel, so 2^24 is the maximum value we can get, adding everything. // int is be big enough for that. int r = 0, g = 0, b = 0; - for(int y = 0; y < bmp.Height; ++y) + for (int y = 0; y < bmp.Height; ++y) { - for(int x = 0; x < bmp.Width; ++x) + for (int x = 0; x < bmp.Width; ++x) { Color c = bmp.GetPixel(x, y); r += (int)c.R & 0xff; @@ -218,14 +218,14 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap // interpolate two colors in HSV space and return the resulting color private HSV interpolateHSV(ref HSV c1, ref HSV c2, float ratio) { - if(ratio <= 0f) return c1; - if(ratio >= 1f) return c2; + if (ratio <= 0f) return c1; + if (ratio >= 1f) return c2; // make sure we are on the same side on the hue-circle for interpolation // We change the hue of the parameters here, but we don't change the color // represented by that value - if(c1.h - c2.h > 180f) c1.h -= 360f; - else if(c2.h - c1.h > 180f) c1.h += 360f; + if (c1.h - c2.h > 180f) c1.h -= 360f; + else if (c2.h - c1.h > 180f) c1.h += 360f; return new HSV(c1.h * (1f - ratio) + c2.h * ratio, c1.s * (1f - ratio) + c2.s * ratio, @@ -321,16 +321,16 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap } HSV hsv; - if(hmod <= low) hsv = hsv1; // too low - else if(hmod >= high) hsv = hsv4; // too high + if (hmod <= low) hsv = hsv1; // too low + else if (hmod >= high) hsv = hsv4; // too high else { // HSV-interpolate along the colors // first, rescale h to 0.0 - 1.0 hmod = (hmod - low) / (high - low); // now we have to split: 0.00 => color1, 0.33 => color2, 0.67 => color3, 1.00 => color4 - if(hmod < 1f/3f) hsv = interpolateHSV(ref hsv1, ref hsv2, hmod * 3f); - else if(hmod < 2f/3f) hsv = interpolateHSV(ref hsv2, ref hsv3, (hmod * 3f) - 1f); + if (hmod < 1f/3f) hsv = interpolateHSV(ref hsv1, ref hsv2, hmod * 3f); + else if (hmod < 2f/3f) hsv = interpolateHSV(ref hsv2, ref hsv3, (hmod * 3f) - 1f); else hsv = interpolateHSV(ref hsv3, ref hsv4, (hmod * 3f) - 2f); } -- cgit v1.1