ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

* New Terrain Module (disabled, search for 'usingTerrainModule = false' to reenable)

Browse Source 
* *Much* faster terraforming (woot!)
* New "Brushes" design, so you can create custom terraforming brushes then apply those inplace of the standard tools. (ie an Erode Brush for example)
* New specialised "Flood Brushes" to do large area effects, ie, raise-area, now takes a bitmap rather than repeats the ordinary raise brush a thousand times.
* New modular file Load/Save systems -- write importers/exporters for multiple formats without having to hard code the whole thing in.
* Coming soon - effects system, ie the old Erosion functions, etc. for one-shot effects.
This commit is contained in:
Adam Frisby
2008-03-05 00:52:35 +00:00
parent 0926239541
commit f64611862a
10 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
View File

@@ -38,7 +38,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain
{
public interface ITerrainPaintableEffect
{
void PaintEffect(ITerrainChannel map, double x, double y, double strength);
void PaintEffect(ITerrainChannel map, double x, double y, double strength, double duration);
}
public interface ITerrainFloodEffect
@@ -63,6 +63,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain
public class TerrainChannel : ITerrainChannel
{
private double[,] map;
private bool[,] taint;
public int Width
{
@@ -103,29 +104,41 @@ namespace OpenSim.Region.Environment.Modules.Terrain
}
set
{
taint[x / 16, y / 16] = true;
map[x, y] = value;
}
}
public bool Tainted(int x, int y)
{
return taint[x / 16, y / 16];
}
public TerrainChannel()
{
map = new double[Constants.RegionSize, Constants.RegionSize];
taint = new bool[Constants.RegionSize / 16, Constants.RegionSize / 16];
}
public TerrainChannel(double[,] import)
{
map = import;
taint = new bool[import.GetLength(0), import.GetLength(1)];
}
public TerrainChannel(bool createMap)
{
if (createMap)
{
map = new double[Constants.RegionSize, Constants.RegionSize];
taint = new bool[Constants.RegionSize / 16, Constants.RegionSize / 16];
}
}
public TerrainChannel(int w, int h)
{
map = new double[w, h];
taint = new bool[w / 16, h / 16];
}
}
@@ -246,7 +259,14 @@ namespace OpenSim.Region.Environment.Modules.Terrain
if (m_painteffects.ContainsKey((StandardTerrainEffects)action))
{
m_painteffects[(StandardTerrainEffects)action].PaintEffect(
m_channel, west, south, Math.Pow(size, 2.0));
m_channel, west, south, Math.Pow(size, 2.0), seconds);
bool usingTerrainModule = false;
if (usingTerrainModule)
{
remoteClient.SendLayerData(m_channel.GetFloatsSerialised());
}
}
else
{
@@ -258,20 +278,32 @@ namespace OpenSim.Region.Environment.Modules.Terrain
if (m_floodeffects.ContainsKey((StandardTerrainEffects)action))
{
bool[,] fillArea = new bool[m_channel.Width, m_channel.Height];
fillArea.Initialize();
int x, y;
for (x = 0; x < m_channel.Width; x++)
{
for (y = 0; y < m_channel.Height; y++)
{
fillArea[x, y] = true;
if (x < east && x > west)
{
if (y < south && y > north)
{
fillArea[x, y] = true;
}
}
}
}
m_floodeffects[(StandardTerrainEffects)action].FloodEffect(
m_channel, fillArea, Math.Pow(size, 2.0));
bool usingTerrainModule = false;
if (usingTerrainModule)
{
remoteClient.SendLayerData(m_channel.GetFloatsSerialised());
}
}
else
{