diff options
-rw-r--r-- | OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs | 36 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs | 36 |
2 files changed, 43 insertions, 29 deletions
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs index bc52a43..c7ffeaf 100644 --- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs +++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs | |||
@@ -102,7 +102,8 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
102 | 102 | ||
103 | terrainRenderer.Initialise(m_scene, m_config); | 103 | terrainRenderer.Initialise(m_scene, m_config); |
104 | 104 | ||
105 | mapbmp = new Bitmap((int)Constants.RegionSize, (int)Constants.RegionSize, System.Drawing.Imaging.PixelFormat.Format24bppRgb); | 105 | mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height, |
106 | System.Drawing.Imaging.PixelFormat.Format24bppRgb); | ||
106 | //long t = System.Environment.TickCount; | 107 | //long t = System.Environment.TickCount; |
107 | //for (int i = 0; i < 10; ++i) { | 108 | //for (int i = 0; i < 10; ++i) { |
108 | terrainRenderer.TerrainToBitmap(mapbmp); | 109 | terrainRenderer.TerrainToBitmap(mapbmp); |
@@ -277,7 +278,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
277 | private Bitmap DrawObjectVolume(Scene whichScene, Bitmap mapbmp) | 278 | private Bitmap DrawObjectVolume(Scene whichScene, Bitmap mapbmp) |
278 | { | 279 | { |
279 | int tc = 0; | 280 | int tc = 0; |
280 | double[,] hm = whichScene.Heightmap.GetDoubles(); | 281 | ITerrainChannel hm = whichScene.Heightmap; |
281 | tc = Environment.TickCount; | 282 | tc = Environment.TickCount; |
282 | m_log.Debug("[MAPTILE]: Generating Maptile Step 2: Object Volume Profile"); | 283 | m_log.Debug("[MAPTILE]: Generating Maptile Step 2: Object Volume Profile"); |
283 | EntityBase[] objs = whichScene.GetEntities(); | 284 | EntityBase[] objs = whichScene.GetEntities(); |
@@ -363,7 +364,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
363 | Vector3 pos = part.GetWorldPosition(); | 364 | Vector3 pos = part.GetWorldPosition(); |
364 | 365 | ||
365 | // skip prim outside of retion | 366 | // skip prim outside of retion |
366 | if (pos.X < 0f || pos.X > 256f || pos.Y < 0f || pos.Y > 256f) | 367 | if (!m_scene.PositionIsInCurrentRegion(pos)) |
367 | continue; | 368 | continue; |
368 | 369 | ||
369 | // skip prim in non-finite position | 370 | // skip prim in non-finite position |
@@ -388,7 +389,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
388 | Vector3 lscale = new Vector3(part.Shape.Scale.X, part.Shape.Scale.Y, part.Shape.Scale.Z); | 389 | Vector3 lscale = new Vector3(part.Shape.Scale.X, part.Shape.Scale.Y, part.Shape.Scale.Z); |
389 | Vector3 scale = new Vector3(); | 390 | Vector3 scale = new Vector3(); |
390 | Vector3 tScale = new Vector3(); | 391 | Vector3 tScale = new Vector3(); |
391 | Vector3 axPos = new Vector3(pos.X,pos.Y,pos.Z); | 392 | Vector3 axPos = new Vector3(pos.X, pos.Y, pos.Z); |
392 | 393 | ||
393 | Quaternion llrot = part.GetWorldRotation(); | 394 | Quaternion llrot = part.GetWorldRotation(); |
394 | Quaternion rot = new Quaternion(llrot.W, llrot.X, llrot.Y, llrot.Z); | 395 | Quaternion rot = new Quaternion(llrot.W, llrot.X, llrot.Y, llrot.Z); |
@@ -406,9 +407,14 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
406 | int mapdrawendY = (int)(pos.Y + scale.Y); | 407 | int mapdrawendY = (int)(pos.Y + scale.Y); |
407 | 408 | ||
408 | // If object is beyond the edge of the map, don't draw it to avoid errors | 409 | // If object is beyond the edge of the map, don't draw it to avoid errors |
409 | if (mapdrawstartX < 0 || mapdrawstartX > ((int)Constants.RegionSize - 1) || mapdrawendX < 0 || mapdrawendX > ((int)Constants.RegionSize - 1) | 410 | if (mapdrawstartX < 0 |
410 | || mapdrawstartY < 0 || mapdrawstartY > ((int)Constants.RegionSize - 1) || mapdrawendY < 0 | 411 | || mapdrawstartX > (hm.Width - 1) |
411 | || mapdrawendY > ((int)Constants.RegionSize - 1)) | 412 | || mapdrawendX < 0 |
413 | || mapdrawendX > (hm.Width - 1) | ||
414 | || mapdrawstartY < 0 | ||
415 | || mapdrawstartY > (hm.Height - 1) | ||
416 | || mapdrawendY < 0 | ||
417 | || mapdrawendY > (hm.Height - 1)) | ||
412 | continue; | 418 | continue; |
413 | 419 | ||
414 | #region obb face reconstruction part duex | 420 | #region obb face reconstruction part duex |
@@ -530,11 +536,11 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
530 | for (int i = 0; i < FaceA.Length; i++) | 536 | for (int i = 0; i < FaceA.Length; i++) |
531 | { | 537 | { |
532 | Point[] working = new Point[5]; | 538 | Point[] working = new Point[5]; |
533 | working[0] = project(FaceA[i], axPos); | 539 | working[0] = project(hm, FaceA[i], axPos); |
534 | working[1] = project(FaceB[i], axPos); | 540 | working[1] = project(hm, FaceB[i], axPos); |
535 | working[2] = project(FaceD[i], axPos); | 541 | working[2] = project(hm, FaceD[i], axPos); |
536 | working[3] = project(FaceC[i], axPos); | 542 | working[3] = project(hm, FaceC[i], axPos); |
537 | working[4] = project(FaceA[i], axPos); | 543 | working[4] = project(hm, FaceA[i], axPos); |
538 | 544 | ||
539 | face workingface = new face(); | 545 | face workingface = new face(); |
540 | workingface.pts = working; | 546 | workingface.pts = working; |
@@ -609,17 +615,17 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
609 | return mapbmp; | 615 | return mapbmp; |
610 | } | 616 | } |
611 | 617 | ||
612 | private Point project(Vector3 point3d, Vector3 originpos) | 618 | private Point project(ITerrainChannel hm, Vector3 point3d, Vector3 originpos) |
613 | { | 619 | { |
614 | Point returnpt = new Point(); | 620 | Point returnpt = new Point(); |
615 | //originpos = point3d; | 621 | //originpos = point3d; |
616 | //int d = (int)(256f / 1.5f); | 622 | //int d = (int)(256f / 1.5f); |
617 | 623 | ||
618 | //Vector3 topos = new Vector3(0, 0, 0); | 624 | //Vector3 topos = new Vector3(0, 0, 0); |
619 | // float z = -point3d.z - topos.z; | 625 | // float z = -point3d.z - topos.z; |
620 | 626 | ||
621 | returnpt.X = (int)point3d.X;//(int)((topos.x - point3d.x) / z * d); | 627 | returnpt.X = (int)point3d.X;//(int)((topos.x - point3d.x) / z * d); |
622 | returnpt.Y = (int)(((int)Constants.RegionSize - 1) - point3d.Y);//(int)(255 - (((topos.y - point3d.y) / z * d))); | 628 | returnpt.Y = (int)((hm.Width - 1) - point3d.Y);//(int)(255 - (((topos.y - point3d.y) / z * d))); |
623 | 629 | ||
624 | return returnpt; | 630 | return returnpt; |
625 | } | 631 | } |
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs index cb06fd4..708286c 100644 --- a/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs +++ b/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs | |||
@@ -31,6 +31,7 @@ using System.Reflection; | |||
31 | using log4net; | 31 | using log4net; |
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Region.Framework.Interfaces; | ||
34 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
35 | 36 | ||
36 | namespace OpenSim.Region.CoreModules.World.LegacyMap | 37 | namespace OpenSim.Region.CoreModules.World.LegacyMap |
@@ -39,8 +40,8 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
39 | { | 40 | { |
40 | private static readonly Color WATER_COLOR = Color.FromArgb(29, 71, 95); | 41 | private static readonly Color WATER_COLOR = Color.FromArgb(29, 71, 95); |
41 | 42 | ||
42 | private static readonly ILog m_log = | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly string LogHeader = "[SHADED MAPTILE RENDERER]"; |
44 | 45 | ||
45 | private Scene m_scene; | 46 | private Scene m_scene; |
46 | //private IConfigSource m_config; // not used currently | 47 | //private IConfigSource m_config; // not used currently |
@@ -53,19 +54,26 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
53 | 54 | ||
54 | public void TerrainToBitmap(Bitmap mapbmp) | 55 | public void TerrainToBitmap(Bitmap mapbmp) |
55 | { | 56 | { |
57 | m_log.DebugFormat("{0} Generating Maptile Step 1: Terrain", LogHeader); | ||
56 | int tc = Environment.TickCount; | 58 | int tc = Environment.TickCount; |
57 | m_log.Debug("[SHADED MAP TILE RENDERER]: Generating Maptile Step 1: Terrain"); | ||
58 | 59 | ||
59 | double[,] hm = m_scene.Heightmap.GetDoubles(); | 60 | ITerrainChannel hm = m_scene.Heightmap; |
61 | |||
62 | if (mapbmp.Width != hm.Width || mapbmp.Height != hm.Height) | ||
63 | { | ||
64 | m_log.ErrorFormat("{0} TerrainToBitmap. Passed bitmap wrong dimensions. passed=<{1},{2}>, size=<{3},{4}>", | ||
65 | LogHeader, mapbmp.Width, mapbmp.Height, hm.Width, hm.Height); | ||
66 | } | ||
67 | |||
60 | bool ShadowDebugContinue = true; | 68 | bool ShadowDebugContinue = true; |
61 | 69 | ||
62 | bool terraincorruptedwarningsaid = false; | 70 | bool terraincorruptedwarningsaid = false; |
63 | 71 | ||
64 | float low = 255; | 72 | float low = 255; |
65 | float high = 0; | 73 | float high = 0; |
66 | for (int x = 0; x < (int)Constants.RegionSize; x++) | 74 | for (int x = 0; x < hm.Width; x++) |
67 | { | 75 | { |
68 | for (int y = 0; y < (int)Constants.RegionSize; y++) | 76 | for (int y = 0; y < hm.Height; y++) |
69 | { | 77 | { |
70 | float hmval = (float)hm[x, y]; | 78 | float hmval = (float)hm[x, y]; |
71 | if (hmval < low) | 79 | if (hmval < low) |
@@ -77,12 +85,12 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
77 | 85 | ||
78 | float waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight; | 86 | float waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight; |
79 | 87 | ||
80 | for (int x = 0; x < (int)Constants.RegionSize; x++) | 88 | for (int x = 0; x < hm.Width; x++) |
81 | { | 89 | { |
82 | for (int y = 0; y < (int)Constants.RegionSize; y++) | 90 | for (int y = 0; y < hm.Height; y++) |
83 | { | 91 | { |
84 | // Y flip the cordinates for the bitmap: hf origin is lower left, bm origin is upper left | 92 | // Y flip the cordinates for the bitmap: hf origin is lower left, bm origin is upper left |
85 | int yr = ((int)Constants.RegionSize - 1) - y; | 93 | int yr = ((int)hm.Height - 1) - y; |
86 | 94 | ||
87 | float heightvalue = (float)hm[x, y]; | 95 | float heightvalue = (float)hm[x, y]; |
88 | 96 | ||
@@ -109,12 +117,12 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
109 | // . | 117 | // . |
110 | // | 118 | // |
111 | // Shade the terrain for shadows | 119 | // Shade the terrain for shadows |
112 | if (x < ((int)Constants.RegionSize - 1) && yr < ((int)Constants.RegionSize - 1)) | 120 | if (x < (hm.Width - 1) && yr < (hm.Height - 1)) |
113 | { | 121 | { |
114 | float hfvalue = (float)hm[x, y]; | 122 | float hfvalue = (float)hm[x, y]; |
115 | float hfvaluecompare = 0f; | 123 | float hfvaluecompare = 0f; |
116 | 124 | ||
117 | if ((x + 1 < (int)Constants.RegionSize) && (y + 1 < (int)Constants.RegionSize)) | 125 | if ((x + 1 < hm.Width) && (y + 1 < hm.Height)) |
118 | { | 126 | { |
119 | hfvaluecompare = (float)hm[x + 1, y + 1]; // light from north-east => look at land height there | 127 | hfvaluecompare = (float)hm[x + 1, y + 1]; // light from north-east => look at land height there |
120 | } | 128 | } |
@@ -179,7 +187,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
179 | 187 | ||
180 | if (ShadowDebugContinue) | 188 | if (ShadowDebugContinue) |
181 | { | 189 | { |
182 | if ((x - 1 > 0) && (yr + 1 < (int)Constants.RegionSize)) | 190 | if ((x - 1 > 0) && (yr + 1 < hm.Height)) |
183 | { | 191 | { |
184 | color = mapbmp.GetPixel(x - 1, yr + 1); | 192 | color = mapbmp.GetPixel(x - 1, yr + 1); |
185 | int r = color.R; | 193 | int r = color.R; |
@@ -233,7 +241,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
233 | terraincorruptedwarningsaid = true; | 241 | terraincorruptedwarningsaid = true; |
234 | } | 242 | } |
235 | Color black = Color.Black; | 243 | Color black = Color.Black; |
236 | mapbmp.SetPixel(x, ((int)Constants.RegionSize - y) - 1, black); | 244 | mapbmp.SetPixel(x, (hm.Width - y) - 1, black); |
237 | } | 245 | } |
238 | } | 246 | } |
239 | } | 247 | } |
@@ -242,4 +250,4 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
242 | m_log.Debug("[SHADED MAP TILE RENDERER]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms"); | 250 | m_log.Debug("[SHADED MAP TILE RENDERER]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms"); |
243 | } | 251 | } |
244 | } | 252 | } |
245 | } \ No newline at end of file | 253 | } |