diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs | 10 |
1 files changed, 3 insertions, 7 deletions
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 | |||
97 | // No, that doesn't scale it: | 97 | // No, that doesn't scale it: |
98 | // heightvalue = low + mid * (heightvalue - low) / mid; => low + (heightvalue - low) * mid / mid = low + (heightvalue - low) * 1 = low + heightvalue - low = heightvalue | 98 | // heightvalue = low + mid * (heightvalue - low) / mid; => low + (heightvalue - low) * mid / mid = low + (heightvalue - low) * 1 = low + heightvalue - low = heightvalue |
99 | 99 | ||
100 | |||
101 | |||
102 | if (Single.IsInfinity(heightvalue) || Single.IsNaN(heightvalue)) | 100 | if (Single.IsInfinity(heightvalue) || Single.IsNaN(heightvalue)) |
103 | heightvalue = 0; | 101 | heightvalue = 0; |
104 | else if (heightvalue > 255f) | 102 | else if (heightvalue > 255f) |
@@ -136,7 +134,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
136 | int hfdiffi = 0; | 134 | int hfdiffi = 0; |
137 | int hfdiffihighlight = 0; | 135 | int hfdiffihighlight = 0; |
138 | float highlightfactor = 0.18f; | 136 | float highlightfactor = 0.18f; |
139 | 137 | ||
140 | try | 138 | try |
141 | { | 139 | { |
142 | // hfdiffi = Math.Abs((int)((hfdiff * 4) + (hfdiff * 0.5))) + 1; | 140 | // hfdiffi = Math.Abs((int)((hfdiff * 4) + (hfdiff * 0.5))) + 1; |
@@ -146,7 +144,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
146 | // hfdiffi = hfdiffi + Math.Abs((int)(((hfdiff % 1) * 0.5f) * 10f) - 1); | 144 | // hfdiffi = hfdiffi + Math.Abs((int)(((hfdiff % 1) * 0.5f) * 10f) - 1); |
147 | hfdiffi = hfdiffi + Math.Abs((int)((hfdiff % 1f) * 5f) - 1); | 145 | hfdiffi = hfdiffi + Math.Abs((int)((hfdiff % 1f) * 5f) - 1); |
148 | } | 146 | } |
149 | 147 | ||
150 | hfdiffihighlight = Math.Abs((int)((hfdiff * highlightfactor) * 4.5f)) + 1; | 148 | hfdiffihighlight = Math.Abs((int)((hfdiff * highlightfactor) * 4.5f)) + 1; |
151 | if (hfdiff % 1f != 0) | 149 | if (hfdiff % 1f != 0) |
152 | { | 150 | { |
@@ -195,10 +193,9 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
195 | color = Color.FromArgb((r - hfdiffi > 0) ? r - hfdiffi : 0, | 193 | color = Color.FromArgb((r - hfdiffi > 0) ? r - hfdiffi : 0, |
196 | (g - hfdiffi > 0) ? g - hfdiffi : 0, | 194 | (g - hfdiffi > 0) ? g - hfdiffi : 0, |
197 | (b - hfdiffi > 0) ? b - hfdiffi : 0); | 195 | (b - hfdiffi > 0) ? b - hfdiffi : 0); |
198 | 196 | ||
199 | mapbmp.SetPixel(x-1, yr+1, color); | 197 | mapbmp.SetPixel(x-1, yr+1, color); |
200 | } | 198 | } |
201 | |||
202 | } | 199 | } |
203 | } | 200 | } |
204 | } | 201 | } |
@@ -213,7 +210,6 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
213 | color = Color.Black; | 210 | color = Color.Black; |
214 | mapbmp.SetPixel(x, yr, color); | 211 | mapbmp.SetPixel(x, yr, color); |
215 | } | 212 | } |
216 | |||
217 | } | 213 | } |
218 | else | 214 | else |
219 | { | 215 | { |