mirror of
https://github.com/opensim/opensim.git
synced 2026-08-11 20:05:33 +08:00
Massive tab and trailing space cleanup
This commit is contained in:
@@ -247,4 +247,4 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -104,10 +104,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
|
||||
using (Bitmap gradientmapLd = new Bitmap("defaultstripe.png"))
|
||||
{
|
||||
pallete = gradientmapLd.Height;
|
||||
|
||||
|
||||
bmp = new Bitmap(map.Width, map.Height);
|
||||
colours = new Color[pallete];
|
||||
|
||||
|
||||
for (int i = 0; i < pallete; i++)
|
||||
{
|
||||
colours[i] = gradientmapLd.GetPixel(0, i);
|
||||
|
||||
@@ -275,6 +275,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
|
||||
public bool SupportsTileSave()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -32,7 +32,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
|
||||
{
|
||||
public interface ITerrainFloodEffect
|
||||
{
|
||||
void FloodEffect(ITerrainChannel map, Boolean[,] fillArea, double strength,
|
||||
void FloodEffect(ITerrainChannel map, Boolean[,] fillArea, double strength,
|
||||
int startX, int endX, int startY, int endY);
|
||||
}
|
||||
}
|
||||
@@ -33,7 +33,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
|
||||
public interface ITerrainLoader
|
||||
{
|
||||
// Returns true if that extension can be used for terrain save-tile
|
||||
// (Look into each file in Region.CoreModules.World.Terrain.FileLoaders)
|
||||
// (Look into each file in Region.CoreModules.World.Terrain.FileLoaders)
|
||||
bool SupportsTileSave();
|
||||
|
||||
string FileExtension { get; }
|
||||
|
||||
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
|
||||
{
|
||||
map[x, y] += delta;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
|
||||
map[x, y] = 0.0;
|
||||
else
|
||||
map[x, y] = newz;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
|
||||
public class RaiseSphere : ITerrainPaintableEffect
|
||||
{
|
||||
#region ITerrainPaintableEffect Members
|
||||
|
||||
|
||||
|
||||
public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz,
|
||||
double strength, double duration, int startX, int endX, int startY, int endY)
|
||||
|
||||
@@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
|
||||
{
|
||||
strength = TerrainUtil.MetersToSphericalStrength(strength);
|
||||
duration = 0.03; //MCP Should be read from ini file
|
||||
|
||||
|
||||
if (duration > 1.0)
|
||||
duration = 1.0;
|
||||
if (duration < 0)
|
||||
|
||||
@@ -42,10 +42,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
|
||||
int x, y;
|
||||
double[,] tweak = new double[map.Width,map.Height];
|
||||
|
||||
double area = strength;
|
||||
double area = strength;
|
||||
double step = strength / 4.0;
|
||||
duration = 0.03; //MCP Should be read from ini file
|
||||
|
||||
|
||||
|
||||
// compute delta map
|
||||
for (x = startX; x <= endX; x++)
|
||||
|
||||
@@ -218,7 +218,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
|
||||
if (terrainConfig != null)
|
||||
{
|
||||
m_InitialTerrain = terrainConfig.GetString("InitialTerrain", m_InitialTerrain);
|
||||
m_sendTerrainUpdatesByViewDistance =
|
||||
m_sendTerrainUpdatesByViewDistance =
|
||||
terrainConfig.GetBoolean(
|
||||
"SendTerrainUpdatesByViewDistance",m_sendTerrainUpdatesByViewDistance);
|
||||
}
|
||||
@@ -240,7 +240,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
|
||||
if(m_baked != null)
|
||||
m_channel = m_baked.MakeCopy();
|
||||
else
|
||||
m_channel = new TerrainChannel(m_InitialTerrain,
|
||||
m_channel = new TerrainChannel(m_InitialTerrain,
|
||||
(int)m_scene.RegionInfo.RegionSizeX,
|
||||
(int)m_scene.RegionInfo.RegionSizeY,
|
||||
(int)m_scene.RegionInfo.RegionSizeZ);
|
||||
@@ -463,7 +463,7 @@ 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,
|
||||
public void LoadFromStream(string filename, Vector3 displacement,
|
||||
float rotationDegrees, Vector2 boundingOrigin, Vector2 boundingSize, Stream stream)
|
||||
{
|
||||
foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
|
||||
@@ -724,7 +724,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
|
||||
|
||||
/// <summary>
|
||||
/// Saves the current state of the region into the baked map buffer.
|
||||
|
||||
|
||||
/// </summary>
|
||||
public void UpdateBakedMap()
|
||||
{
|
||||
@@ -825,7 +825,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
|
||||
m_scene.RegionInfo.RegionName, filename, m_supportFileExtensionsForTileSave);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// This is used to check to see of any of the terrain is tainted and, if so, schedule
|
||||
/// updates for all the presences.
|
||||
@@ -945,7 +945,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
|
||||
lock (m_perClientPatchUpdates)
|
||||
m_perClientPatchUpdates.Remove(client);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Scan over changes in the terrain and limit height changes. This enforces the
|
||||
/// non-estate owner limits on rate of terrain editting.
|
||||
@@ -1312,7 +1312,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
private void client_OnModifyTerrain(UUID user, float height, float seconds, byte size, byte action,
|
||||
float north, float west, float south, float east, UUID agentId)
|
||||
|
||||
@@ -45,8 +45,8 @@ namespace OpenSim.Region.CoreModules.Terrain.Tests
|
||||
//UUID userId = TestHelpers.ParseTail(0x1);
|
||||
|
||||
TerrainModule tm = new TerrainModule();
|
||||
Scene scene = new SceneHelpers().SetupScene();
|
||||
SceneHelpers.SetupSceneModules(scene, tm);
|
||||
Scene scene = new SceneHelpers().SetupScene();
|
||||
SceneHelpers.SetupSceneModules(scene, tm);
|
||||
|
||||
// Fillheight of 30
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user