diff options
author | UbitUmarov | 2012-12-04 01:54:37 +0000 |
---|---|---|
committer | UbitUmarov | 2012-12-04 01:54:37 +0000 |
commit | fc1be7e41fc7dd23c5396665f7b464de45590368 (patch) | |
tree | 5843ec2066b6b13a0d0818ab2227713bacd30343 | |
parent | Merge branch 'avination' into ubitwork (diff) | |
download | opensim-SC_OLD-fc1be7e41fc7dd23c5396665f7b464de45590368.zip opensim-SC_OLD-fc1be7e41fc7dd23c5396665f7b464de45590368.tar.gz opensim-SC_OLD-fc1be7e41fc7dd23c5396665f7b464de45590368.tar.bz2 opensim-SC_OLD-fc1be7e41fc7dd23c5396665f7b464de45590368.tar.xz |
raise standing avatar a bit to reduce knees bending on some collisions.
reduce head size a bit
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs index 3d5be3e..f33fdb4 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |||
@@ -96,7 +96,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
96 | private float feetSZ = 0.5f; | 96 | private float feetSZ = 0.5f; |
97 | const float feetScale = 0.9f; | 97 | const float feetScale = 0.9f; |
98 | const float invFeetScale = 1.0f / 0.9f; | 98 | const float invFeetScale = 1.0f / 0.9f; |
99 | const float sizeZAdjust = 0.15f; | 99 | const float sizeZAdjust = 0.18f; |
100 | private float boneOff = 0; | 100 | private float boneOff = 0; |
101 | 101 | ||
102 | 102 | ||
@@ -676,12 +676,12 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
676 | m_invElipSizeX = 1.0f / m_size.X; | 676 | m_invElipSizeX = 1.0f / m_size.X; |
677 | m_invElipSizeY = 1.0f / m_size.Y; | 677 | m_invElipSizeY = 1.0f / m_size.Y; |
678 | 678 | ||
679 | float topsx = m_size.X; | 679 | float topsx = m_size.X * 0.9f; |
680 | float midsx = m_size.X; | 680 | float midsx = m_size.X; |
681 | float feetsx = m_size.X * feetScale; | 681 | float feetsx = m_size.X * feetScale; |
682 | float bonesx = feetsx * 0.2f; | 682 | float bonesx = feetsx * 0.2f; |
683 | 683 | ||
684 | float topsy = m_size.Y * 0.5f; | 684 | float topsy = m_size.Y * 0.4f; |
685 | float midsy = m_size.Y; | 685 | float midsy = m_size.Y; |
686 | float feetsy = m_size.Y * feetScale; | 686 | float feetsy = m_size.Y * feetScale; |
687 | float bonesy = feetsy * 0.2f; | 687 | float bonesy = feetsy * 0.2f; |
@@ -1057,7 +1057,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1057 | // colide with land | 1057 | // colide with land |
1058 | d.AABB aabb; | 1058 | d.AABB aabb; |
1059 | d.GeomGetAABB(feetbox, out aabb); | 1059 | d.GeomGetAABB(feetbox, out aabb); |
1060 | float chrminZ = aabb.MinZ - 0.04f; // move up a bit | 1060 | float chrminZ = aabb.MinZ - 0.02f; // move up a bit |
1061 | Vector3 posch = localpos; | 1061 | Vector3 posch = localpos; |
1062 | 1062 | ||
1063 | float ftmp; | 1063 | float ftmp; |