diff options
author | Robert Adams | 2013-09-19 12:14:21 -0700 |
---|---|---|
committer | Robert Adams | 2013-09-25 17:30:45 -0700 |
commit | 96abbbb6fbab56e29c8a8af6974ef1df90e45ddf (patch) | |
tree | a077759f6c3563ef86c13f7a06fae549f4577b4b /OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |
parent | minor: Comment out windlight log message about sending scene data for now. (diff) | |
download | opensim-SC_OLD-96abbbb6fbab56e29c8a8af6974ef1df90e45ddf.zip opensim-SC_OLD-96abbbb6fbab56e29c8a8af6974ef1df90e45ddf.tar.gz opensim-SC_OLD-96abbbb6fbab56e29c8a8af6974ef1df90e45ddf.tar.bz2 opensim-SC_OLD-96abbbb6fbab56e29c8a8af6974ef1df90e45ddf.tar.xz |
VarRegion: change RegionInfo storage of region coordinates from region
count number to integer world coordinates.
Added new methods RegionWorldLoc[XY].
Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim.
Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability
of external region management packages.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index a26a5f0..c985ca2 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -240,7 +240,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
240 | // 6/8/2011 -- I'm adding an explicit 2048 check, so that we never forget that there is | 240 | // 6/8/2011 -- I'm adding an explicit 2048 check, so that we never forget that there is |
241 | // a hack here, and so that regions below 4096 don't get spammed with unnecessary map blocks. | 241 | // a hack here, and so that regions below 4096 don't get spammed with unnecessary map blocks. |
242 | 242 | ||
243 | if (m_scene.RegionInfo.RegionLocX >= 2048 || m_scene.RegionInfo.RegionLocY >= 2048) | 243 | if (m_scene.RegionInfo.LegacyRegionLocX >= 2048 || m_scene.RegionInfo.LegacyRegionLocY >= 2048) |
244 | { | 244 | { |
245 | ScenePresence avatarPresence = null; | 245 | ScenePresence avatarPresence = null; |
246 | 246 | ||
@@ -269,10 +269,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
269 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); ; | 269 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); ; |
270 | 270 | ||
271 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, | 271 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, |
272 | (int)(m_scene.RegionInfo.RegionLocX - 8) * (int)Constants.RegionSize, | 272 | (int)(m_scene.RegionInfo.LegacyRegionLocX - 8) * (int)Constants.RegionSize, |
273 | (int)(m_scene.RegionInfo.RegionLocX + 8) * (int)Constants.RegionSize, | 273 | (int)(m_scene.RegionInfo.LegacyRegionLocX + 8) * (int)Constants.RegionSize, |
274 | (int)(m_scene.RegionInfo.RegionLocY - 8) * (int)Constants.RegionSize, | 274 | (int)(m_scene.RegionInfo.LegacyRegionLocY - 8) * (int)Constants.RegionSize, |
275 | (int)(m_scene.RegionInfo.RegionLocY + 8) * (int)Constants.RegionSize); | 275 | (int)(m_scene.RegionInfo.LegacyRegionLocY + 8) * (int)Constants.RegionSize); |
276 | foreach (GridRegion r in regions) | 276 | foreach (GridRegion r in regions) |
277 | { | 277 | { |
278 | MapBlockData block = new MapBlockData(); | 278 | MapBlockData block = new MapBlockData(); |
@@ -1199,10 +1199,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1199 | 1199 | ||
1200 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); | 1200 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); |
1201 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, | 1201 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, |
1202 | (int)(m_scene.RegionInfo.RegionLocX - 9) * (int)Constants.RegionSize, | 1202 | (int)(m_scene.RegionInfo.LegacyRegionLocX - 9) * (int)Constants.RegionSize, |
1203 | (int)(m_scene.RegionInfo.RegionLocX + 9) * (int)Constants.RegionSize, | 1203 | (int)(m_scene.RegionInfo.LegacyRegionLocX + 9) * (int)Constants.RegionSize, |
1204 | (int)(m_scene.RegionInfo.RegionLocY - 9) * (int)Constants.RegionSize, | 1204 | (int)(m_scene.RegionInfo.LegacyRegionLocY - 9) * (int)Constants.RegionSize, |
1205 | (int)(m_scene.RegionInfo.RegionLocY + 9) * (int)Constants.RegionSize); | 1205 | (int)(m_scene.RegionInfo.LegacyRegionLocY + 9) * (int)Constants.RegionSize); |
1206 | List<AssetBase> textures = new List<AssetBase>(); | 1206 | List<AssetBase> textures = new List<AssetBase>(); |
1207 | List<Image> bitImages = new List<Image>(); | 1207 | List<Image> bitImages = new List<Image>(); |
1208 | 1208 | ||
@@ -1243,8 +1243,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1243 | 1243 | ||
1244 | for (int i = 0; i < mapBlocks.Count; i++) | 1244 | for (int i = 0; i < mapBlocks.Count; i++) |
1245 | { | 1245 | { |
1246 | ushort x = (ushort)((mapBlocks[i].X - m_scene.RegionInfo.RegionLocX) + 10); | 1246 | ushort x = (ushort)((mapBlocks[i].X - m_scene.RegionInfo.LegacyRegionLocX) + 10); |
1247 | ushort y = (ushort)((mapBlocks[i].Y - m_scene.RegionInfo.RegionLocY) + 10); | 1247 | ushort y = (ushort)((mapBlocks[i].Y - m_scene.RegionInfo.LegacyRegionLocY) + 10); |
1248 | g.DrawImage(bitImages[i], (x * 128), 2560 - (y * 128), 128, 128); // y origin is top | 1248 | g.DrawImage(bitImages[i], (x * 128), 2560 - (y * 128), 128, 128); // y origin is top |
1249 | } | 1249 | } |
1250 | 1250 | ||