diff options
author | Adam Frisby | 2007-09-25 11:48:43 +0000 |
---|---|---|
committer | Adam Frisby | 2007-09-25 11:48:43 +0000 |
commit | 569ba9eb9acb9f024060a41ee4188a11aafa3fa7 (patch) | |
tree | 63cec15a6c0338a8777640ed13fd7c3ce05eeba7 /OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Grid.cs | |
parent | fix order issue with prebuild.xml, we need to build Local before (diff) | |
download | opensim-SC-569ba9eb9acb9f024060a41ee4188a11aafa3fa7.zip opensim-SC-569ba9eb9acb9f024060a41ee4188a11aafa3fa7.tar.gz opensim-SC-569ba9eb9acb9f024060a41ee4188a11aafa3fa7.tar.bz2 opensim-SC-569ba9eb9acb9f024060a41ee4188a11aafa3fa7.tar.xz |
Terrain:
* Attempted fix for lag/pause when doing lots of updates.
* Some naming fixes to libTerrain.
* Refactored terrain bitmap generation into a common call for both world map and export.
General:
* Switched some calls to Console.WriteLine to use MainLog.Warn/Verbose/Notice.
Diffstat (limited to 'OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Grid.cs')
-rw-r--r-- | OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Grid.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Grid.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Grid.cs index 0930a36..0155791 100644 --- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Grid.cs +++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Grid.cs | |||
@@ -341,7 +341,7 @@ namespace libTerrain | |||
341 | { | 341 | { |
342 | for (y = 0; y < h; y++) | 342 | for (y = 0; y < h; y++) |
343 | { | 343 | { |
344 | Set(x, y, Tools.linearInterpolate(map[x, y], other.map[x, y], amount)); | 344 | Set(x, y, Tools.LinearInterpolate(map[x, y], other.map[x, y], amount)); |
345 | } | 345 | } |
346 | } | 346 | } |
347 | return this; | 347 | return this; |
@@ -354,7 +354,7 @@ namespace libTerrain | |||
354 | { | 354 | { |
355 | for (y = 0; y < h; y++) | 355 | for (y = 0; y < h; y++) |
356 | { | 356 | { |
357 | Set(x, y, Tools.linearInterpolate(map[x, y], other.map[x, y], amount.map[x, y])); | 357 | Set(x, y, Tools.LinearInterpolate(map[x, y], other.map[x, y], amount.map[x, y])); |
358 | } | 358 | } |
359 | } | 359 | } |
360 | return this; | 360 | return this; |