diff options
Diffstat (limited to 'OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs')
-rw-r--r-- | OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs index a609623..f52d25a 100644 --- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs +++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs | |||
@@ -277,7 +277,7 @@ namespace OpenSim.Region.Terrain | |||
277 | resultText += "terrain save grdmap <filename> <gradient map> - creates a PNG snapshot of the region using a named gradient map\n"; | 277 | resultText += "terrain save grdmap <filename> <gradient map> - creates a PNG snapshot of the region using a named gradient map\n"; |
278 | resultText += "terrain rescale <min> <max> - rescales a terrain to be between <min> and <max> meters high\n"; | 278 | resultText += "terrain rescale <min> <max> - rescales a terrain to be between <min> and <max> meters high\n"; |
279 | resultText += "terrain fill <val> - fills a terrain at the specified height\n"; | 279 | resultText += "terrain fill <val> - fills a terrain at the specified height\n"; |
280 | resultText += "terrain erode aerobic <windspeed> <pickupmin> <dropmin> <carry> <rounds> <lowest>\n"; | 280 | resultText += "terrain erode aerobic <windspeed> <pickupmin> <dropmin> <carry> <rounds> <lowest t/f> <fluid dynamics t/f>\n"; |
281 | resultText += "terrain erode thermal <talus> <rounds> <carry>\n"; | 281 | resultText += "terrain erode thermal <talus> <rounds> <carry>\n"; |
282 | resultText += "terrain erode hydraulic <rain> <evaporation> <solubility> <frequency> <rounds>\n"; | 282 | resultText += "terrain erode hydraulic <rain> <evaporation> <solubility> <frequency> <rounds>\n"; |
283 | resultText += "terrain multiply <val> - multiplies a terrain by <val>\n"; | 283 | resultText += "terrain multiply <val> - multiplies a terrain by <val>\n"; |
@@ -426,11 +426,14 @@ namespace OpenSim.Region.Terrain | |||
426 | 426 | ||
427 | private bool ConsoleErosion(string[] args, ref string resultText) | 427 | private bool ConsoleErosion(string[] args, ref string resultText) |
428 | { | 428 | { |
429 | double min = heightmap.FindMin(); | ||
430 | double max = heightmap.FindMax(); | ||
431 | |||
429 | switch (args[1].ToLower()) | 432 | switch (args[1].ToLower()) |
430 | { | 433 | { |
431 | case "aerobic": | 434 | case "aerobic": |
432 | // WindSpeed, PickupMinimum,DropMinimum,Carry,Rounds,Lowest | 435 | // WindSpeed, PickupMinimum,DropMinimum,Carry,Rounds,Lowest |
433 | heightmap.AerobicErosion(Convert.ToDouble(args[2]), Convert.ToDouble(args[3]), Convert.ToDouble(args[4]), Convert.ToDouble(args[5]), Convert.ToInt32(args[6]), Convert.ToBoolean(args[7]), true); | 436 | heightmap.AerobicErosion(Convert.ToDouble(args[2]), Convert.ToDouble(args[3]), Convert.ToDouble(args[4]), Convert.ToDouble(args[5]), Convert.ToInt32(args[6]), Convert.ToBoolean(args[7]), Convert.ToBoolean(args[8])); |
434 | break; | 437 | break; |
435 | case "thermal": | 438 | case "thermal": |
436 | heightmap.ThermalWeathering(Convert.ToDouble(args[2]), Convert.ToInt32(args[3]), Convert.ToDouble(args[4])); | 439 | heightmap.ThermalWeathering(Convert.ToDouble(args[2]), Convert.ToInt32(args[3]), Convert.ToDouble(args[4])); |
@@ -444,6 +447,9 @@ namespace OpenSim.Region.Terrain | |||
444 | resultText = "Unknown erosion type"; | 447 | resultText = "Unknown erosion type"; |
445 | return false; | 448 | return false; |
446 | } | 449 | } |
450 | |||
451 | heightmap.Normalise(min, max); | ||
452 | |||
447 | tainted++; | 453 | tainted++; |
448 | return true; | 454 | return true; |
449 | } | 455 | } |