diff options
author | Adam Frisby | 2008-02-14 12:16:33 +0000 |
---|---|---|
committer | Adam Frisby | 2008-02-14 12:16:33 +0000 |
commit | f3afa68a2af6ad5999e6efe3e4725cb17293108d (patch) | |
tree | 4253a44bee39976d6b3dd6813439f5966cf12632 /OpenSim/Region/Physics/OdePlugin | |
parent | * Exposed AddHandlers in response to mantis #534. Thanks, kmeisthax! (diff) | |
download | opensim-SC-f3afa68a2af6ad5999e6efe3e4725cb17293108d.zip opensim-SC-f3afa68a2af6ad5999e6efe3e4725cb17293108d.tar.gz opensim-SC-f3afa68a2af6ad5999e6efe3e4725cb17293108d.tar.bz2 opensim-SC-f3afa68a2af6ad5999e6efe3e4725cb17293108d.tar.xz |
* Made new Framework.Constants class, added RegionSize member.
* Converted all instances of "256" spotted to use RegionSize instead. Some approximations used for border crossings (ie 255.9f) are still using that value, but should be updated to use something based on RegionSize.
* Moving Terrain to a RegionModule, implemented ITerrainChannel and TerrainModule - nonfunctional, but will be soon.
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 4fbf653..3d70a3d 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -85,9 +85,9 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
85 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 85 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
86 | 86 | ||
87 | CollisionLocker ode; | 87 | CollisionLocker ode; |
88 | // TODO: this should be hard-coded in some common place | 88 | |
89 | private const uint m_regionWidth = 256; | 89 | private const uint m_regionWidth = Constants.RegionSize; |
90 | private const uint m_regionHeight = 256; | 90 | private const uint m_regionHeight = Constants.RegionSize; |
91 | 91 | ||
92 | private static float ODE_STEPSIZE = 0.020f; | 92 | private static float ODE_STEPSIZE = 0.020f; |
93 | private static bool RENDER_FLAG = false; | 93 | private static bool RENDER_FLAG = false; |
@@ -585,7 +585,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
585 | } | 585 | } |
586 | private float GetTerrainHeightAtXY(float x, float y) | 586 | private float GetTerrainHeightAtXY(float x, float y) |
587 | { | 587 | { |
588 | return (float)_origheightmap[(int) y*256 + (int) x]; | 588 | return (float)_origheightmap[(int)y * Constants.RegionSize + (int)x]; |
589 | 589 | ||
590 | 590 | ||
591 | } | 591 | } |