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

* Renamed a number of TerrainEngine functions to conform naming standards better.

Browse Source
This commit is contained in:
Adam Frisby
2008-01-22 00:33:05 +00:00
parent f22b8b6f04
commit 7d61705c3c
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -685,7 +685,7 @@ namespace OpenSim.Region.Environment.Scenes
private void UpdateTerrain()
{
if (Terrain.Tainted() && !Terrain.StillEditing())
if (Terrain.IsTainted() && !Terrain.IsUserStillEditing())
{
CreateTerrainTexture(true);
@@ -706,7 +706,7 @@ namespace OpenSim.Region.Environment.Scenes
{
for (int y = 0; y < 16; y++)
{
if (Terrain.Tainted(x*16, y*16))
if (Terrain.IsTainted(x*16, y*16))
{
client.SendLayerData(x, y, terData);
}
@@ -807,6 +807,7 @@ namespace OpenSim.Region.Environment.Scenes
public void LoadWorldMap(string filename)
{
Terrain.LoadFromFileF32(filename);
Terrain.SaveRevertMap();
}
/// <summary>
@@ -823,7 +824,7 @@ namespace OpenSim.Region.Environment.Scenes
if (string.IsNullOrEmpty(m_regInfo.EstateSettings.terrainFile))
{
MainLog.Instance.Verbose("TERRAIN", "No default terrain. Generating a new terrain.");
Terrain.HillsGenerator();
Terrain.SetDefaultTerrain();
m_storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD(), RegionInfo.RegionID);
}
@@ -838,7 +839,7 @@ namespace OpenSim.Region.Environment.Scenes
{
MainLog.Instance.Verbose("TERRAIN",
"No terrain found in database or default. Generating a new terrain.");
Terrain.HillsGenerator();
Terrain.SetDefaultTerrain();
}
m_storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD(), RegionInfo.RegionID);
}
@@ -885,7 +886,7 @@ namespace OpenSim.Region.Environment.Scenes
public void CreateTerrainTexture(bool temporary)
{
//create a texture asset of the terrain
byte[] data = Terrain.ExportJpegImage("defaultstripe.png");
byte[] data = Terrain.WriteJpegImage("defaultstripe.png");
m_regInfo.EstateSettings.terrainImageID = LLUUID.Random();
AssetBase asset = new AssetBase();
asset.FullID = m_regInfo.EstateSettings.terrainImageID;