OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-12-04 02:55:50 +01:00
parent 5d4b7d537d fc1be7e41f
commit f26abce753
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
View File

@ -96,7 +96,7 @@ namespace OpenSim.Region.Physics.OdePlugin
private float feetSZ = 0.5f; private float feetSZ = 0.5f;
const float feetScale = 0.9f; const float feetScale = 0.9f;
const float invFeetScale = 1.0f / 0.9f; const float invFeetScale = 1.0f / 0.9f;
const float sizeZAdjust = 0.15f; const float sizeZAdjust = 0.18f;
private float boneOff = 0; private float boneOff = 0;
@ -676,12 +676,12 @@ namespace OpenSim.Region.Physics.OdePlugin
m_invElipSizeX = 1.0f / m_size.X; m_invElipSizeX = 1.0f / m_size.X;
m_invElipSizeY = 1.0f / m_size.Y; m_invElipSizeY = 1.0f / m_size.Y;
float topsx = m_size.X; float topsx = m_size.X * 0.9f;
float midsx = m_size.X; float midsx = m_size.X;
float feetsx = m_size.X * feetScale; float feetsx = m_size.X * feetScale;
float bonesx = feetsx * 0.2f; float bonesx = feetsx * 0.2f;
float topsy = m_size.Y * 0.5f; float topsy = m_size.Y * 0.4f;
float midsy = m_size.Y; float midsy = m_size.Y;
float feetsy = m_size.Y * feetScale; float feetsy = m_size.Y * feetScale;
float bonesy = feetsy * 0.2f; float bonesy = feetsy * 0.2f;
@ -1057,7 +1057,7 @@ namespace OpenSim.Region.Physics.OdePlugin
// colide with land // colide with land
d.AABB aabb; d.AABB aabb;
d.GeomGetAABB(feetbox, out aabb); d.GeomGetAABB(feetbox, out aabb);
float chrminZ = aabb.MinZ - 0.04f; // move up a bit float chrminZ = aabb.MinZ - 0.02f; // move up a bit
Vector3 posch = localpos; Vector3 posch = localpos;
float ftmp; float ftmp;