diff options
author | Melanie | 2011-10-25 02:55:46 +0100 |
---|---|---|
committer | Melanie | 2011-10-25 02:55:46 +0100 |
commit | 71b4486356901fd67493035a0035252c60eb46b8 (patch) | |
tree | 480446d1f77d34b107aa724fdf8fd8faa2efd5f4 | |
parent | Merge commit '03202ada2918c0c0837e8de50e3a0436e4407c91' into bigmerge (diff) | |
parent | Temporarily put in log lines to record time taken to set terrain in OdeScene. (diff) | |
download | opensim-SC_OLD-71b4486356901fd67493035a0035252c60eb46b8.zip opensim-SC_OLD-71b4486356901fd67493035a0035252c60eb46b8.tar.gz opensim-SC_OLD-71b4486356901fd67493035a0035252c60eb46b8.tar.bz2 opensim-SC_OLD-71b4486356901fd67493035a0035252c60eb46b8.tar.xz |
Merge commit '581885da75c57250201b34e2d585d32c8f07089a' into bigmerge
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 8cce349..32d6481 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
@@ -3444,6 +3444,9 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name); | |||
3444 | 3444 | ||
3445 | private void SetTerrain(float[] heightMap, Vector3 pOffset) | 3445 | private void SetTerrain(float[] heightMap, Vector3 pOffset) |
3446 | { | 3446 | { |
3447 | int startTime = Util.EnvironmentTickCount(); | ||
3448 | m_log.DebugFormat("[PHYSICS]: Setting terrain for {0}", Name); | ||
3449 | |||
3447 | // this._heightmap[i] = (double)heightMap[i]; | 3450 | // this._heightmap[i] = (double)heightMap[i]; |
3448 | // dbm (danx0r) -- creating a buffer zone of one extra sample all around | 3451 | // dbm (danx0r) -- creating a buffer zone of one extra sample all around |
3449 | //_origheightmap = heightMap; | 3452 | //_origheightmap = heightMap; |
@@ -3565,6 +3568,9 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name); | |||
3565 | RegionTerrain.Add(pOffset, GroundGeom, GroundGeom); | 3568 | RegionTerrain.Add(pOffset, GroundGeom, GroundGeom); |
3566 | TerrainHeightFieldHeights.Add(GroundGeom,_heightmap); | 3569 | TerrainHeightFieldHeights.Add(GroundGeom,_heightmap); |
3567 | } | 3570 | } |
3571 | |||
3572 | m_log.DebugFormat( | ||
3573 | "[PHYSICS]: Setting terrain for {0} took {1}ms", Name, Util.EnvironmentTickCountSubtract(startTime)); | ||
3568 | } | 3574 | } |
3569 | 3575 | ||
3570 | public override void DeleteTerrain() | 3576 | public override void DeleteTerrain() |