ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove some MegaRegions code from physics

Browse Source
This commit is contained in:
UbitUmarov
2016-09-01 16:15:51 +01:00
parent fced64aef5
commit 6c6a965320
4 changed files with 0 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
View File

@@ -171,7 +171,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public bool m_OSOdeLib = false;
public bool m_suportCombine = false; // mega suport not tested
public Scene m_frameWorkScene = null;
// private int threadid = 0;
@@ -380,8 +379,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
WorldExtents.Y = m_frameWorkScene.RegionInfo.RegionSizeY;
m_regionHeight = (uint)WorldExtents.Y;
m_suportCombine = false;
lock (OdeLock)
{
// Create the world and the first space
@@ -1938,12 +1935,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
int offsetX = 0;
int offsetY = 0;
if (m_suportCombine)
{
offsetX = ((int)(x / (int)Constants.RegionSize)) * (int)Constants.RegionSize;
offsetY = ((int)(y / (int)Constants.RegionSize)) * (int)Constants.RegionSize;
}
// get region map
IntPtr heightFieldGeom = IntPtr.Zero;
if (!RegionTerrain.TryGetValue(new Vector3(offsetX, offsetY, 0), out heightFieldGeom))
@@ -2076,12 +2067,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
int offsetX = 0;
int offsetY = 0;
if (m_suportCombine)
{
offsetX = ((int)(x / (int)Constants.RegionSize)) * (int)Constants.RegionSize;
offsetY = ((int)(y / (int)Constants.RegionSize)) * (int)Constants.RegionSize;
}
// get region map
IntPtr heightFieldGeom = IntPtr.Zero;
Vector3 norm = new Vector3(0, 0, 1);
@@ -2224,12 +2209,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
}
}
public override void CombineTerrain(float[] heightMap, Vector3 pOffset)
{
if(m_suportCombine)
SetTerrain(heightMap, pOffset);
}
public void SetTerrain(float[] heightMap, Vector3 pOffset)
{
if (m_OSOdeLib)
@@ -2479,11 +2458,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
return waterlevel;
}
public override bool SupportsCombining()
{
return m_suportCombine;
}
public override void SetWaterLevel(float baseheight)
{
waterlevel = baseheight;