ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Quick patch before I start on a bigger project

Browse Source 
* Renamed ITerrainTemp to IMapImageGenerator
* Renamed WriteJpegImage to WriteJpeg2000Image to better reflect it's function.
This commit is contained in:
Adam Frisby
2008-04-15 03:07:31 +00:00
parent b7ae8701ce
commit 0b4a8191a1
3 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Region/Environment/Modules/Terrain/MapImageModule.cs
View File

@@ -10,7 +10,7 @@ using OpenSim.Region.Environment.Modules.ModuleFramework;
namespace OpenSim.Region.Environment.Modules.Terrain
{
class MapImageModule : ITerrainTemp, IRegionModule
class MapImageModule : IMapImageGenerator, IRegionModule
{
private Scene m_scene;
#region IRegionModule Members
@@ -18,7 +18,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain
public void Initialise(Scene scene, IConfigSource source)
{
m_scene = scene;
m_scene.RegisterModuleInterface<ITerrainTemp>(this);
m_scene.RegisterModuleInterface<IMapImageGenerator>(this);
}
public void PostInitialise()
@@ -40,15 +40,15 @@ namespace OpenSim.Region.Environment.Modules.Terrain
}
public byte[] WriteJpegImage(string gradientmap)
public byte[] WriteJpeg2000Image(string gradientmap)
{
byte[] imageData = null;
Bitmap bmp = TerrainToBitmap(gradientmap);
try
{
Bitmap bmp = TerrainToBitmap(gradientmap);
imageData = OpenJPEGNet.OpenJPEG.EncodeFromImage(bmp, true);
}
catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke
{
@@ -122,7 +122,12 @@ namespace OpenSim.Region.Environment.Modules.Terrain
{
// 512 is the largest possible height before colours clamp
int colorindex = (int)(Math.Max(Math.Min(1.0, copy[x, y] / 512.0), 0.0) * (pallete - 1));
bmp.SetPixel(x, copy.Height - y - 1, colours[colorindex]);
// Handle error conditions
if (colorindex > pallete - 1 || colorindex < 0)
bmp.SetPixel(x, copy.Height - y - 1, Color.Red);
else
bmp.SetPixel(x, copy.Height - y - 1, colours[colorindex]);
}
}
ShadeBuildings(ref bmp);