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

define constants for simulation height (-100,50000m) and terrain heightmap (-100,4000). No option. compile time decision. use them at ubOde

Browse Source
This commit is contained in:
UbitUmarov
2020-10-12 23:20:37 +01:00
parent c7c82773d0
commit 9773ff42c2
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/Constants.cs
View File

@@ -43,9 +43,15 @@ namespace OpenSim.Framework
public const uint MaximumRegionSize = 4096; public const uint MaximumRegionSize = 4096;
// Since terrain is stored in 16x16 heights, regions must be a multiple of this number and that is the minimum // Since terrain is stored in 16x16 heights, regions must be a multiple of this number and that is the minimum
public const int MinRegionSize = 16; // but for placement on a grid min must be 256m
public const int MinRegionSize = 256;
public const int TerrainPatchSize = 16; public const int TerrainPatchSize = 16;
public const float MinSimulationHeight = -100f;
public const float MaxSimulationHeight = 50000f;
public const float MinTerrainHeightmap = -100f;
public const float MaxTerrainHeightmap = 4000f;
public const string DefaultTexture = "89556747-24cb-43ed-920b-47caed15465f"; public const string DefaultTexture = "89556747-24cb-43ed-920b-47caed15465f";
public static readonly UUID m_MrOpenSimID = new UUID("11111111-1111-0000-0000-000100bba000"); public static readonly UUID m_MrOpenSimID = new UUID("11111111-1111-0000-0000-000100bba000");

4
OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
View File

@@ -177,11 +177,11 @@ namespace OpenSim.Region.PhysicsModule.ubOde
if(pos.IsFinite()) if(pos.IsFinite())
{ {
if(pos.Z > 99999f) if(pos.Z > Constants.MaxSimulationHeight)
{ {
pos.Z = parent_scene.GetTerrainHeightAtXY(127,127) + 5; pos.Z = parent_scene.GetTerrainHeightAtXY(127,127) + 5;
} }
if(pos.Z < -100f) // shouldn't this be 0 ? if(pos.Z < Constants.MinSimulationHeight) // shouldn't this be 0 ?
{ {
pos.Z = parent_scene.GetTerrainHeightAtXY(127,127) + 5; pos.Z = parent_scene.GetTerrainHeightAtXY(127,127) + 5;
} }

2
OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
View File

@@ -987,7 +987,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
{ {
_position.X = Util.Clip(_position.X, 0.5f, _parent_scene.WorldExtents.X - 0.5f); _position.X = Util.Clip(_position.X, 0.5f, _parent_scene.WorldExtents.X - 0.5f);
_position.Y = Util.Clip(_position.Y, 0.5f, _parent_scene.WorldExtents.Y - 0.5f); _position.Y = Util.Clip(_position.Y, 0.5f, _parent_scene.WorldExtents.Y - 0.5f);
_position.Z = Util.Clip(_position.Z + 0.2f, -100f, 50000f); _position.Z = Util.Clip(_position.Z + 0.2f, Constants.MinSimulationHeight, Constants.MaxSimulationHeight);
m_lastposition = _position; m_lastposition = _position;
_velocity.X = 0; _velocity.X = 0;

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

@@ -2068,9 +2068,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
if (x > 1 && x < maxXX) if (x > 1 && x < maxXX)
xx++; xx++;
val = heightMap[yy + xx]; val = Util.Clamp(heightMap[yy + xx], Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap);
if (val < -100.0f)
val = -100.0f;
if(val > maxH) if(val > maxH)
maxH = val; maxH = val;
if(val < minH) if(val < minH)