aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators
diff options
context:
space:
mode:
authorAdam Frisby2007-07-24 05:22:33 +0000
committerAdam Frisby2007-07-24 05:22:33 +0000
commitd8997b59d30b63218f594d840d924a10287ce509 (patch)
treef96960b2605c8da0d6b0a0d9a905db28a62fca67 /OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators
parent* Terrain Fracture Generator now produces more appropriate results. (diff)
downloadopensim-SC_OLD-d8997b59d30b63218f594d840d924a10287ce509.zip
opensim-SC_OLD-d8997b59d30b63218f594d840d924a10287ce509.tar.gz
opensim-SC_OLD-d8997b59d30b63218f594d840d924a10287ce509.tar.bz2
opensim-SC_OLD-d8997b59d30b63218f594d840d924a10287ce509.tar.xz
* Terrain should now send just updated patches.
Diffstat (limited to 'OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators')
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/AerobicErosion.cs4
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/HydraulicErosion.cs2
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/ThermalWeathering.cs2
3 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/AerobicErosion.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/AerobicErosion.cs
index 198c337..f4dfe1d 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/AerobicErosion.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/AerobicErosion.cs
@@ -118,7 +118,7 @@ namespace libTerrain
118 118
119 if (surfacearea > pickupTalusMinimum) 119 if (surfacearea > pickupTalusMinimum)
120 { 120 {
121 this.map[x, y] -= amount; 121 Set(x, y, map[x, y] - amount);
122 sediment.map[x, y] += amount; 122 sediment.map[x, y] += amount;
123 } 123 }
124 } 124 }
@@ -168,7 +168,7 @@ namespace libTerrain
168 168
169 if (surfacearea > dropTalusMinimum) 169 if (surfacearea > dropTalusMinimum)
170 { 170 {
171 this.map[x + minside[0], y + minside[1]] += amount; 171 Set(x + minside[0], y + minside[1], map[x + minside[0], y + minside[1]] + amount);
172 sediment.map[x, y] -= amount; 172 sediment.map[x, y] -= amount;
173 } 173 }
174 } 174 }
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/HydraulicErosion.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/HydraulicErosion.cs
index 5ace241..36da77c 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/HydraulicErosion.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/HydraulicErosion.cs
@@ -36,6 +36,8 @@ namespace libTerrain
36 { 36 {
37 public void HydraulicErosion(Channel rain, double evaporation, double solubility, int frequency, int rounds) 37 public void HydraulicErosion(Channel rain, double evaporation, double solubility, int frequency, int rounds)
38 { 38 {
39 SetDiff();
40
39 Channel water = new Channel(w, h); 41 Channel water = new Channel(w, h);
40 Channel sediment = new Channel(w, h); 42 Channel sediment = new Channel(w, h);
41 Channel terrain = this; 43 Channel terrain = this;
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/ThermalWeathering.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/ThermalWeathering.cs
index 449bf85..07c7d66 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/ThermalWeathering.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/ThermalWeathering.cs
@@ -42,6 +42,8 @@ namespace libTerrain
42 /// <param name="c">The amount of rock to carry each round</param> 42 /// <param name="c">The amount of rock to carry each round</param>
43 public Channel ThermalWeathering(double talus, int rounds, double c) 43 public Channel ThermalWeathering(double talus, int rounds, double c)
44 { 44 {
45 SetDiff();
46
45 double[,] lastFrame; 47 double[,] lastFrame;
46 double[,] thisFrame; 48 double[,] thisFrame;
47 49