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

* Removed and sorted using clauses in a number of files.

Browse Source 
* Cleaned up ITerrainChannel
* Implemented Raise, Lower, Smooth, Flatten, Noise Terrain Paint Brushes
* Implemented Raise, Lower, Smooth, Flatten, Noise Terrain Fill Brushes
* Implemented Export functionality for RAW32 terrain loader
* Implemented Import/Export for SLRAW terrain loader
* Implemented Export for JPEG terrain loader
This commit is contained in:
Adam Frisby
2008-03-03 08:35:59 +00:00
parent fe49c96ee0
commit c5d1f87cd2
31 changed files with 1111 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -31,14 +31,12 @@ using System.Drawing;
using System.Drawing.Imaging;
using System.Threading;
using System.Timers;
using Axiom.Math;
using libsecondlife;
using libsecondlife.Packets;
using OpenJPEGNet;
using OpenSim.Framework;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.LandManagement;
@@ -1002,6 +1000,8 @@ namespace OpenSim.Region.Environment.Scenes
}
else
{
// TODO: Install 'GetDefaultTerrainProvider' method here?
Heightmap = new Modules.Terrain.TerrainChannel(map);
Terrain.SetHeights2D(map);
}

11
OpenSim/Region/Environment/Scenes/SceneBase.cs
View File

@@ -112,7 +112,16 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="RemoteClient">Client to send to</param>
public virtual void SendLayerData(IClientAPI RemoteClient)
{
RemoteClient.SendLayerData(Terrain.GetHeights1D());
bool usingTerrainModule = false;
if (usingTerrainModule)
{
RemoteClient.SendLayerData(Heightmap.GetFloatsSerialised());
}
else
{
RemoteClient.SendLayerData(Terrain.GetHeights1D());
}
}
#endregion