OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changes to TerrainModule/ITerrainModule to support importing OARs with different Region sizes to the destination region. 

Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
LSLKeyTest
Jak Daniels 2015-11-18 18:18:30 +00:00 committed by UbitUmarov
parent 7cac0ccbe3
commit cc992bf156
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
View File

@ -456,6 +456,37 @@ namespace OpenSim.Region.CoreModules.World.Terrain
throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename));
}
public void LoadFromStream(string filename, Vector3 displacement,
float rotationDegrees, Vector2 boundingOrigin, Vector2 boundingSize, Stream stream)
{
foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
{
if (filename.EndsWith(loader.Key))
{
lock (m_scene)
{
try
{
ITerrainChannel channel = loader.Value.LoadStream(stream);
m_channel.MergeWithBounding(channel, displacement, rotationDegrees, boundingOrigin, boundingSize);
UpdateBakedMap();
}
catch (NotImplementedException)
{
m_log.Error("[TERRAIN]: Unable to load heightmap, the " + loader.Value +
" parser does not support file loading. (May be save only)");
throw new TerrainException(String.Format("unable to load heightmap: parser {0} does not support loading", loader.Value));
}
}
m_log.Info("[TERRAIN]: File (" + filename + ") loaded successfully");
return;
}
}
m_log.Error("[TERRAIN]: Unable to load heightmap, no file loader available for that format.");
throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename));
}
private static Stream URIFetch(Uri uri)
{
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri);

2
OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
View File

@ -60,6 +60,8 @@ namespace OpenSim.Region.Framework.Interfaces
void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap);
void LoadFromStream(string filename, Vector3 displacement,
float radianRotation, Vector2 rotationDisplacement, Stream stream);
void LoadFromStream(string filename, Vector3 displacement,
float rotationDegress, Vector2 boundingOrigin, Vector2 boundingSize, Stream stream);
/// <summary>
/// Save a terrain to a stream.
/// </summary>