aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRobert Adams2014-04-28 18:36:50 -0700
committerRobert Adams2014-04-28 18:36:50 -0700
commitdf89e1529077eb8aff46a1886057731a5d2372b8 (patch)
tree925a04c0d85cd3854e10ffb77aa93d68cff24707
parentBUlletSim: move safeynet ground plane to lower altitude. Define new BulletSim (diff)
downloadopensim-SC_OLD-df89e1529077eb8aff46a1886057731a5d2372b8.zip
opensim-SC_OLD-df89e1529077eb8aff46a1886057731a5d2372b8.tar.gz
opensim-SC_OLD-df89e1529077eb8aff46a1886057731a5d2372b8.tar.bz2
opensim-SC_OLD-df89e1529077eb8aff46a1886057731a5d2372b8.tar.xz
BulletSim: non-functional changes to debugging statements and formatting.
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs3
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs12
2 files changed, 7 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index d0a03cb..3901482 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -951,8 +951,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
951 if (allowed) 951 if (allowed)
952 { 952 {
953 StoreUndoState(); 953 StoreUndoState();
954 m_floodeffects[(StandardTerrainEffects) action].FloodEffect( 954 m_floodeffects[(StandardTerrainEffects) action].FloodEffect(m_channel, fillArea, size);
955 m_channel, fillArea, size);
956 955
957 //revert changes outside estate limits 956 //revert changes outside estate limits
958 if (!god) 957 if (!god)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
index 9067a2c..50f917a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -136,7 +136,7 @@ public sealed class BSTerrainManager : IDisposable
136 { 136 {
137 DetailLog("{0},BSTerrainManager.CreateInitialGroundPlaneAndTerrain,region={1}", BSScene.DetailLogZero, m_physicsScene.RegionName); 137 DetailLog("{0},BSTerrainManager.CreateInitialGroundPlaneAndTerrain,region={1}", BSScene.DetailLogZero, m_physicsScene.RegionName);
138 // The ground plane is here to catch things that are trying to drop to negative infinity 138 // The ground plane is here to catch things that are trying to drop to negative infinity
139 BulletShape groundPlaneShape = m_physicsScene.PE.CreateGroundPlaneShape(BSScene.GROUNDPLANE_ID, 1f, BSParam.TerrainCollisionMargin); 139 BulletShape groundPlaneShape = m_physicsScene.PE.CreateGroundPlaneShape(BSScene.GROUNDPLANE_ID, 1f, BSParam.TerrainCollisionMargin);
140 Vector3 groundPlaneAltitude = new Vector3(0f, 0f, BSParam.TerrainGroundPlane); 140 Vector3 groundPlaneAltitude = new Vector3(0f, 0f, BSParam.TerrainGroundPlane);
141 m_groundPlane = m_physicsScene.PE.CreateBodyWithDefaultMotionState(groundPlaneShape, 141 m_groundPlane = m_physicsScene.PE.CreateBodyWithDefaultMotionState(groundPlaneShape,
142 BSScene.GROUNDPLANE_ID, groundPlaneAltitude, Quaternion.Identity); 142 BSScene.GROUNDPLANE_ID, groundPlaneAltitude, Quaternion.Identity);
@@ -240,9 +240,6 @@ public sealed class BSTerrainManager : IDisposable
240 // Called during taint-time. 240 // Called during taint-time.
241 private void UpdateTerrain(uint id, float[] heightMap, Vector3 minCoords, Vector3 maxCoords) 241 private void UpdateTerrain(uint id, float[] heightMap, Vector3 minCoords, Vector3 maxCoords)
242 { 242 {
243 DetailLog("{0},BSTerrainManager.UpdateTerrain,call,id={1},minC={2},maxC={3}",
244 BSScene.DetailLogZero, id, minCoords, maxCoords);
245
246 // Find high and low points of passed heightmap. 243 // Find high and low points of passed heightmap.
247 // The min and max passed in is usually the area objects can be in (maximum 244 // The min and max passed in is usually the area objects can be in (maximum
248 // object height, for instance). The terrain wants the bounding box for the 245 // object height, for instance). The terrain wants the bounding box for the
@@ -262,6 +259,9 @@ public sealed class BSTerrainManager : IDisposable
262 minCoords.Z = minZ; 259 minCoords.Z = minZ;
263 maxCoords.Z = maxZ; 260 maxCoords.Z = maxZ;
264 261
262 DetailLog("{0},BSTerrainManager.UpdateTerrain,call,id={1},minC={2},maxC={3}",
263 BSScene.DetailLogZero, id, minCoords, maxCoords);
264
265 Vector3 terrainRegionBase = new Vector3(minCoords.X, minCoords.Y, 0f); 265 Vector3 terrainRegionBase = new Vector3(minCoords.X, minCoords.Y, 0f);
266 266
267 lock (m_terrains) 267 lock (m_terrains)
@@ -270,7 +270,7 @@ public sealed class BSTerrainManager : IDisposable
270 if (m_terrains.TryGetValue(terrainRegionBase, out terrainPhys)) 270 if (m_terrains.TryGetValue(terrainRegionBase, out terrainPhys))
271 { 271 {
272 // There is already a terrain in this spot. Free the old and build the new. 272 // There is already a terrain in this spot. Free the old and build the new.
273 DetailLog("{0},BSTErrainManager.UpdateTerrain:UpdateExisting,call,id={1},base={2},minC={3},maxC={4}", 273 DetailLog("{0},BSTerrainManager.UpdateTerrain:UpdateExisting,call,id={1},base={2},minC={3},maxC={4}",
274 BSScene.DetailLogZero, id, terrainRegionBase, minCoords, maxCoords); 274 BSScene.DetailLogZero, id, terrainRegionBase, minCoords, maxCoords);
275 275
276 // Remove old terrain from the collection 276 // Remove old terrain from the collection